diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-21 16:33:08 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-21 16:33:08 +0000 |
| commit | aeeaa68cec9f11a36ffb3607139845c34864a0be (patch) | |
| tree | ceb1b6e1462f07d6cc45ce991f1f0ba99263fd06 /sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx | |
| parent | 0c473da041ecde9110a14b77b1b9a5cd56ce108e (diff) | |
INTEGRATION: CWS viewswitch (1.13.62); FILE MERGED
2006/02/16 10:19:36 af 1.13.62.3: RESYNC: (1.14-1.15); FILE MERGED
2006/01/19 17:49:37 af 1.13.62.2: RESYNC: (1.13-1.14); FILE MERGED
2005/11/17 15:09:44 af 1.13.62.1: #i57551# TaskPaneShellManager supports ViewShell::ShellFactory interface.
Diffstat (limited to 'sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx')
| -rw-r--r-- | sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index cdea13edc233..b3ace38eb93e 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -4,9 +4,9 @@ * * $RCSfile: MasterPagesSelector.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: hr $ $Date: 2006-01-24 14:43:56 $ + * last change: $Author: obo $ $Date: 2006-03-21 17:33:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -165,7 +165,7 @@ MasterPagesSelector::~MasterPagesSelector (void) Clear(); mpPageSet.reset(); if (GetShellManager() != NULL) - GetShellManager()->RemoveSubShell (this); + GetShellManager()->RemoveSubShell(this); } @@ -173,8 +173,6 @@ MasterPagesSelector::~MasterPagesSelector (void) void MasterPagesSelector::LateInit (void) { - if (GetShellManager() != NULL) - GetShellManager()->AddSubShell (this); } |