diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-04 08:01:19 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-04 08:01:19 +0000 |
| commit | 170bfbb7c268f6c879b20bca221c8b4d4f1525bb (patch) | |
| tree | d94cbe185bdc9f1b6ea99aed501644cf458c1b53 /sd/source/ui | |
| parent | ad1bedbf94a0f743de2c841f2c56267e6aa16d70 (diff) | |
INTEGRATION: CWS impress18ea (1.41.10); FILE MERGED
2004/07/28 15:06:59 af 1.41.10.1: #i31419# Moved part of the ShowUIControls() code to base class.
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/view/drviewse.cxx | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 163cecebed34..61e9a1ecf0e1 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drviewse.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: rt $ $Date: 2004-07-15 08:59:00 $ + * last change: $Author: rt $ $Date: 2004-08-04 09:01:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1808,32 +1808,17 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText, |* \************************************************************************/ -void DrawViewShell::ShowUIControls( sal_Bool bVisible ) +void DrawViewShell::ShowUIControls (bool bVisible) { - if (mbHasRulers) - { - if (mpHorizontalRuler.get() != NULL) - mpHorizontalRuler->Show( bVisible ); - - if (mpVerticalRuler.get() != NULL) - mpVerticalRuler->Show( bVisible ); - } - - if (mpVerticalScrollBar.get() != NULL) - mpVerticalScrollBar->Show( bVisible ); - - if (mpHorizontalScrollBar.get() != NULL) - mpHorizontalScrollBar->Show( bVisible ); + ViewShell::ShowUIControls (bVisible); GetViewFrame()->SetChildWindow( LayerDialogChildWindow::GetChildWindowId(), IsLayerModeActive() && bVisible); aTabControl.Show (bVisible); - - if (mpContentWindow.get() != NULL) - mpContentWindow->Show( bVisible ); } + #ifdef WNT #pragma optimize ( "", on ) #endif |