diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
commit | c61cd1a5a26de1d1f62389988b00229c04e36693 (patch) | |
tree | 9d6de00f4d149cba080fe88f1eff71a67786b5f0 /sd/source/ui/dlg/PaneChildWindows.cxx | |
parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/dlg/PaneChildWindows.cxx')
-rw-r--r-- | sd/source/ui/dlg/PaneChildWindows.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index 2b84bfe34a95..7b3188639d55 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -63,11 +63,11 @@ SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_TASKPANE) PaneChildWindow::PaneChildWindow ( ::Window* pParentWindow, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, - const USHORT nDockWinTitleResId, - const USHORT nTitleBarResId, + const sal_uInt16 nDockWinTitleResId, + const sal_uInt16 nTitleBarResId, SfxChildAlignment eAlignment) : SfxChildWindow (pParentWindow, nId) { @@ -79,7 +79,7 @@ PaneChildWindow::PaneChildWindow ( String( SdResId( nTitleBarResId ) ) ); eChildAlignment = eAlignment; static_cast<SfxDockingWindow*>(pWindow)->Initialize(pInfo); - SetHideNotDelete(TRUE); + SetHideNotDelete(sal_True); ViewShellBase* pBase = ViewShellBase::GetViewShellBase(pBindings->GetDispatcher()->GetFrame()); if (pBase != NULL) @@ -111,7 +111,7 @@ PaneChildWindow::~PaneChildWindow (void) LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( ::Window* pParentWindow, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : PaneChildWindow( @@ -132,7 +132,7 @@ LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( ::Window* pParentWindow, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : PaneChildWindow( @@ -153,7 +153,7 @@ LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( //= ToolPanelChildWindow //====================================================================================================================== //---------------------------------------------------------------------------------------------------------------------- -ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, USHORT i_nId, SfxBindings* i_pBindings, +ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pChildWindowInfo ) :PaneChildWindow( i_pParentWindow, i_nId, i_pBindings, i_pChildWindowInfo, FLT_TOOL_PANEL_DOCKING_WINDOW, STR_RIGHT_PANE_TITLE, SFX_ALIGN_RIGHT ) |