diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 15:57:28 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 15:57:28 +0000 |
| commit | 446e24f0b925a4b8ec6f6eee6ab45ad48ea25e62 (patch) | |
| tree | 9c0bc4b07701e41a5fd92293042ed25832b77b34 /sd/source/ui/dlg/PaneDockingWindow.cxx | |
| parent | 5d6ac9ba924063bb938e2b693b73a4e8e6d9d9dc (diff) | |
INTEGRATION: CWS sdwarningsbegone (1.13.36); FILE MERGED
2006/11/27 13:47:56 cl 1.13.36.2: #i69285# warning free code changes for sd project
2006/11/22 12:41:44 cl 1.13.36.1: #i69285# warning free code changes for unxlngi6.pro
Diffstat (limited to 'sd/source/ui/dlg/PaneDockingWindow.cxx')
| -rw-r--r-- | sd/source/ui/dlg/PaneDockingWindow.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index c4da2fdddee2..c0f95e400f45 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -4,9 +4,9 @@ * * $RCSfile: PaneDockingWindow.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: obo $ $Date: 2006-09-16 18:34:23 $ + * last change: $Author: kz $ $Date: 2006-12-12 16:57:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,14 +52,14 @@ namespace sd { PaneDockingWindow::PaneDockingWindow ( - SfxBindings *pBindings, + SfxBindings *_pBindings, SfxChildWindow *pChildWindow, ::Window* pParent, const ResId& rResId, PaneManager::PaneType ePane, const String& rsTitle) : SfxDockingWindow ( - pBindings, + _pBindings, pChildWindow, pParent, rResId @@ -141,7 +141,6 @@ void PaneDockingWindow::Resize (void) ViewShell* pViewShell = pBase->GetPaneManager().GetViewShell (mePane); if (pViewShell != NULL) { - ::sd::Window* pWindow = pViewShell->GetActiveWindow(); if (nTitleBarHeight < aToolBoxSize.Height()) nTitleBarHeight = aToolBoxSize.Height(); aWindowSize.Height() -= nTitleBarHeight; @@ -278,8 +277,8 @@ USHORT PaneDockingWindow::AddMenu ( const Link& rCallback) { // Add the menu before the closer button. - int nItemCount (mpTitleToolBox->GetItemCount()); - USHORT nItemId = nItemCount+1; + USHORT nItemCount (mpTitleToolBox->GetItemCount()); + USHORT nItemId = (nItemCount+1); mpTitleToolBox->InsertItem ( nItemId, rsMenuName, @@ -345,7 +344,7 @@ void PaneDockingWindow::DataChanged (const DataChangedEvent& rEvent) switch (rEvent.GetType()) { case DATACHANGED_SETTINGS: - if ((rEvent.GetFlags() & SETTINGS_STYLE) == NULL) + if ((rEvent.GetFlags() & SETTINGS_STYLE) == 0) break; // else fall through. case DATACHANGED_FONTS: |