diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-09 18:56:58 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-09 18:56:58 +0200 |
| commit | 336d933a1b109549a35b54a58bc5fb81bc5f73e0 (patch) | |
| tree | 5852c4de7bd7395dbf01d693065a1760fd174aad /sd/source/ui/view/drviews7.cxx | |
| parent | CWS changehid: #i111874#: some HID cleanup (diff) | |
| parent | #i10000# (diff) | |
| download | core-336d933a1b109549a35b54a58bc5fb81bc5f73e0.tar.gz core-336d933a1b109549a35b54a58bc5fb81bc5f73e0.zip | |
CWS changehid: resync to m89
Diffstat (limited to 'sd/source/ui/view/drviews7.cxx')
| -rwxr-xr-x | sd/source/ui/view/drviews7.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 2855bacb7069..fa2ddf1120d0 100755 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -301,7 +301,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { SdPage* pPage = dynamic_cast< SdPage* >( pPageView->GetPage() ); - if( pPage ) + if( pPage && !pPage->IsMasterPage() ) { rSet.Put( SfxUInt32Item( SID_ASSIGN_LAYOUT, static_cast< sal_uInt32 >(pPage->GetAutoLayout()) ) ); bDisable = false; @@ -1556,7 +1556,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if ( bDisableEditHyperlink ) rSet.DisableItem( SID_OPEN_HYPERLINK ); -#if defined WIN || defined WNT || defined UNX +#if defined WNT || defined UNX if( !mxScannerManager.is() ) { rSet.DisableItem( SID_TWAIN_SELECT ); |