diff options
author | Oliver Bolte <obo@openoffice.org> | 2005-11-16 08:21:03 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2005-11-16 08:21:03 +0000 |
commit | 34712035bcc5f72e48c3ad60e697f73c52c2cccb (patch) | |
tree | 804553b1155d04adf0a504e9edb8b5979a3accf5 | |
parent | 496886d4b7c975065ad1fc07e5fdadb064007f5d (diff) |
INTEGRATION: CWS thaiissues (1.21.12); FILE MERGED
2005/10/25 09:19:18 fme 1.21.12.2: RESYNC: (1.21-1.23); FILE MERGED
2005/10/17 14:05:24 cl 1.21.12.1: #i55135# added FormattingMark menu
-rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 65e6e09e5a8c..8e7abd0b443a 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ViewShellBase.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: rt $ $Date: 2005-11-08 16:30:55 $ + * last change: $Author: obo $ $Date: 2005-11-16 09:21:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -138,6 +138,10 @@ #include <sfx2/objface.hxx> #include <sfx2/viewfrm.hxx> +#ifndef SD_FU_BULLET_HXX +#include "fubullet.hxx" +#endif + using namespace sd; #define ViewShellBase #include "sdslots.hxx" @@ -868,9 +872,9 @@ void ViewShellBase::GetState (SfxItemSet& rSet) rSet.DisableItem(SID_WIN_FULLSCREEN); mpPaneManager->GetSlotState (rSet); -} - + FuBullet::GetSlotState( rSet, 0, GetViewFrame() ); +} void ViewShellBase::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < |