strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS impresstables2 (1.21.52); FILE MERGED

Browse source 
2008/02/28 15:59:42 cl 1.21.52.1: #i68103# disable text and line dialog for tables
This commit is contained in:
Rüdiger Timm 2008-03-12 10:58:21 +00:00
parent bafc034287
commit 7d2a1c0115
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sd/source/ui/view/drviewsj.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: drviewsj.cxx,v $
*
* $Revision: 1.21 $
* $Revision: 1.22 $
*
* last change: $Author: kz $ $Date: 2007-05-10 15:35:53 $
* last change: $Author: rt $ $Date: 2008-03-12 11:58:21 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -173,7 +173,8 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_BEHIND_OBJ ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REVERSE_ORDER ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ORIGINAL_SIZE ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_SAVEGRAPHIC ) )
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_SAVEGRAPHIC ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_TEXTATTR_DLG ) )
{
const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
UINT32 nInv = pObj->GetObjInventor();
@ -255,10 +256,14 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
rSet.DisableItem( SID_CHANGEPOLYGON );
}
if(nInv == SdrInventor &&
(nId == OBJ_TITLETEXT || nId == OBJ_OUTLINETEXT))
if(nInv == SdrInventor && (nId == OBJ_TITLETEXT || nId == OBJ_OUTLINETEXT))
rSet.DisableItem( SID_TEXTATTR_DLG );
if(nInv == SdrInventor && nId == OBJ_TABLE )
{
rSet.DisableItem( SID_TEXTATTR_DLG );
}
if( nInv != SdrInventor || nId != OBJ_MEASURE )
rSet.DisableItem( SID_MEASURE_DLG );
@ -396,6 +401,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
BOOL bDrawObj = FALSE;
BOOL b3dObj = FALSE;
BOOL bTitOutText = FALSE;
bool bTable = false;
BOOL bMeasureObj = FALSE;
BOOL bEdgeObj = FALSE; // Connector
BOOL bE3dCompoundObject = FALSE;
@ -436,6 +442,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
case OBJ_TITLETEXT:
case OBJ_OUTLINETEXT: bTitOutText = TRUE; break;
case OBJ_TABLE: bTable = true; break;
}
}
else if (nInv == E3dInventor)
@ -482,7 +489,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
{
rSet.DisableItem( SID_UNGROUP );
}
if( bTitOutText )
if( bTitOutText || bTable )
rSet.DisableItem( SID_TEXTATTR_DLG );
if( !bMeasureObj )