drviewsj.cxx (79aad27f) drviewsj.cxx (d5370dc8)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 77 unchanged lines hidden (view full) ---

86 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_UNGROUP ) ||
87 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ENTER_GROUP ) ||
88 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_NAME_GROUP ) ||
89
90 // #i68101#
91 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_TITLE_DESCRIPTION ) ||
92
93 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_FILL_STYLE ) ||
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 77 unchanged lines hidden (view full) ---

86 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_UNGROUP ) ||
87 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ENTER_GROUP ) ||
88 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_NAME_GROUP ) ||
89
90 // #i68101#
91 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_TITLE_DESCRIPTION ) ||
92
93 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_FILL_STYLE ) ||
94 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_FILL_TRANSPARENCE ) ||
95 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_FILL_FLOATTRANSPARENCE ) ||
94 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CHANGEBEZIER ) ||
95 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CHANGEPOLYGON ) ||
96 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_LINEEND_POLYGON ) ||
97 SFX_ITEM_AVAILABLE == rSet.GetItemState( OBJ_TITLETEXT ) ||
98 SFX_ITEM_AVAILABLE == rSet.GetItemState( OBJ_OUTLINETEXT ) ||
99 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MEASURE_DLG ) ||
100 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_DLG ) ||
101 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_NEW_ROUTING ) ||

--- 82 unchanged lines hidden (view full) ---

184 if( nInv == SdrInventor &&
185 (nId == OBJ_LINE ||
186 nId == OBJ_PLIN ||
187 nId == OBJ_PATHLINE ||
188 nId == OBJ_FREELINE ))
189 {
190 //rSet.DisableItem( SID_ATTRIBUTES_AREA ); // wieder raus!
191 rSet.DisableItem( SID_ATTR_FILL_STYLE );
96 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CHANGEBEZIER ) ||
97 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CHANGEPOLYGON ) ||
98 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_LINEEND_POLYGON ) ||
99 SFX_ITEM_AVAILABLE == rSet.GetItemState( OBJ_TITLETEXT ) ||
100 SFX_ITEM_AVAILABLE == rSet.GetItemState( OBJ_OUTLINETEXT ) ||
101 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_MEASURE_DLG ) ||
102 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_DLG ) ||
103 SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CONNECTION_NEW_ROUTING ) ||

--- 82 unchanged lines hidden (view full) ---

186 if( nInv == SdrInventor &&
187 (nId == OBJ_LINE ||
188 nId == OBJ_PLIN ||
189 nId == OBJ_PATHLINE ||
190 nId == OBJ_FREELINE ))
191 {
192 //rSet.DisableItem( SID_ATTRIBUTES_AREA ); // wieder raus!
193 rSet.DisableItem( SID_ATTR_FILL_STYLE );
194 rSet.DisableItem( SID_ATTR_FILL_TRANSPARENCE );
195 rSet.DisableItem( SID_ATTR_FILL_FLOATTRANSPARENCE );
192 }
193 if( (!pObj->ISA( SdrPathObj ) && !aInfoRec.bCanConvToPath) || pObj->ISA( SdrObjGroup ) ) // Solange es JOE fehlerhaft behandelt!
194 { // JOE: Ein Gruppenobjekt kann eben u.U. in ein PathObj gewandelt werden
195 rSet.DisableItem( SID_LINEEND_POLYGON );
196 }
197 if(nInv == SdrInventor &&
198 (nId == OBJ_PATHFILL || nId == OBJ_PATHLINE || !aInfoRec.bCanConvToPath))
199 rSet.DisableItem( SID_CHANGEBEZIER );

--- 206 unchanged lines hidden (view full) ---

406 rSet.DisableItem( SID_PARA_DLG );
407 rSet.DisableItem( SID_CHARMAP );
408 }
409 */
410 if( bLine && !bText && !bDrawObj &&!b3dObj)
411 {
412 //rSet.DisableItem( SID_ATTRIBUTES_AREA );
413 rSet.DisableItem( SID_ATTR_FILL_STYLE );
196 }
197 if( (!pObj->ISA( SdrPathObj ) && !aInfoRec.bCanConvToPath) || pObj->ISA( SdrObjGroup ) ) // Solange es JOE fehlerhaft behandelt!
198 { // JOE: Ein Gruppenobjekt kann eben u.U. in ein PathObj gewandelt werden
199 rSet.DisableItem( SID_LINEEND_POLYGON );
200 }
201 if(nInv == SdrInventor &&
202 (nId == OBJ_PATHFILL || nId == OBJ_PATHLINE || !aInfoRec.bCanConvToPath))
203 rSet.DisableItem( SID_CHANGEBEZIER );

--- 206 unchanged lines hidden (view full) ---

410 rSet.DisableItem( SID_PARA_DLG );
411 rSet.DisableItem( SID_CHARMAP );
412 }
413 */
414 if( bLine && !bText && !bDrawObj &&!b3dObj)
415 {
416 //rSet.DisableItem( SID_ATTRIBUTES_AREA );
417 rSet.DisableItem( SID_ATTR_FILL_STYLE );
418 rSet.DisableItem( SID_ATTR_FILL_TRANSPARENCE );
419 rSet.DisableItem( SID_ATTR_FILL_FLOATTRANSPARENCE );
414 }
415 if( !bEdgeObj )
416 rSet.DisableItem( SID_CONNECTION_DLG );
417
418 if (b3dObj)
419 {
420 rSet.DisableItem( SID_COMBINE );
421 rSet.DisableItem(SID_POLY_MERGE);

--- 137 unchanged lines hidden --- 		420 }
421 if( !bEdgeObj )
422 rSet.DisableItem( SID_CONNECTION_DLG );
423
424 if (b3dObj)
425 {
426 rSet.DisableItem( SID_COMBINE );
427 rSet.DisableItem(SID_POLY_MERGE);

--- 137 unchanged lines hidden ---