diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-03-12 10:56:53 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-03-12 10:56:53 +0000 |
| commit | 58a2498658f678a3958a47060ff14343a363d593 (patch) | |
| tree | 480870a27340cd29c473bcbd40ef9cc4004c5894 /sd/source/ui/view/drviews7.cxx | |
| parent | INTEGRATION: CWS impresstables2 (1.37.52); FILE MERGED (diff) | |
| download | core-58a2498658f678a3958a47060ff14343a363d593.tar.gz core-58a2498658f678a3958a47060ff14343a363d593.zip | |
INTEGRATION: CWS impresstables2 (1.74.4); FILE MERGED
2008/03/11 18:45:37 cl 1.74.4.2: RESYNC: (1.74-1.75); FILE MERGED
2008/02/28 15:59:42 cl 1.74.4.1: #i68103# disable text and line dialog for tables
Diffstat (limited to 'sd/source/ui/view/drviews7.cxx')
| -rw-r--r-- | sd/source/ui/view/drviews7.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 104760a2d0df..0c97fbd72ea3 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -4,9 +4,9 @@ * * $RCSfile: drviews7.cxx,v $ * - * $Revision: 1.75 $ + * $Revision: 1.76 $ * - * last change: $Author: obo $ $Date: 2008-02-26 07:27:15 $ + * last change: $Author: rt $ $Date: 2008-03-12 11:56:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1441,6 +1441,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) BOOL bFoundObjNoArea = FALSE; BOOL bFoundNoGraphicObj = FALSE; BOOL bFoundAny = FALSE; + bool bFoundTable = false; // const int nMarkCount = (int) aMarkList.GetMarkCount(); for (ULONG i=0; i < nMarkCount && !bFoundAny; i++) @@ -1485,6 +1486,9 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // #i25616# bFoundObjNoLine = TRUE; // #i25616# bFoundObjNoArea = TRUE; break; + case OBJ_TABLE: + bFoundTable = true; + break; default : bFoundAny = TRUE; } @@ -1496,6 +1500,9 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } } + if( bFoundTable ) + rSet.DisableItem( SID_ATTRIBUTES_LINE ); + if (!bFoundAny) { // Disable menuitem for area-dialog |