diff options
| author | Andre Fischer <af@apache.org> | 2013-04-19 08:51:45 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:16 +0100 |
| commit | 0b2c09a180f076230a1f1ac3ecf4725e82aada4c (patch) | |
| tree | cd61de0a554320ae3c6c7c5ef9ef4c412e0dd3ac /sfx2/source/sidebar/SidebarChildWindow.cxx | |
| parent | c991fb49aa174f300be0b978d89bc63e01e0aa2b (diff) | |
Resolves: #i121960# Extend the sidebar::ControllerItem to check Disabled state
Converted TextPropertyPanel to use this new functionality.
(cherry picked from commit 5e32abe48b0833e4e370507a1e74fbb1ba98b5e3)
Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
sfx2/inc/sfx2/sidebar/ControllerItem.hxx
sfx2/source/sidebar/ControllerItem.cxx
sfx2/source/sidebar/FocusManager.cxx
sfx2/source/sidebar/SidebarChildWindow.cxx
svx/Library_svx.mk
svx/source/sidebar/text/TextPropertyPanel.cxx
svx/source/sidebar/text/TextPropertyPanel.hrc
svx/source/sidebar/text/TextPropertyPanel.hxx
svx/source/sidebar/text/TextPropertyPanel.src
svx/source/sidebar/text/TextUnderlineControl.hxx
Change-Id: I3a25bb0a02e6165ceeb6dbd9e6ecd3e94051f594
Diffstat (limited to 'sfx2/source/sidebar/SidebarChildWindow.cxx')
| -rw-r--r-- | sfx2/source/sidebar/SidebarChildWindow.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx index 2fdf0a23d865..f02b37c54b40 100644 --- a/sfx2/source/sidebar/SidebarChildWindow.cxx +++ b/sfx2/source/sidebar/SidebarChildWindow.cxx @@ -30,23 +30,25 @@ SFX_IMPL_DOCKINGWINDOW_WITHID(SidebarChildWindow, SID_SIDEBAR); SidebarChildWindow::SidebarChildWindow ( - Window* pSidebarParent, + Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, - SfxChildWinInfo* pInfo ) - : SfxChildWindow(pSidebarParent, nId) + SfxChildWinInfo* pInfo) + : SfxChildWindow(pParentWindow, nId) { this->pWindow = new SidebarDockingWindow( pBindings, *this, - pSidebarParent, + pParentWindow, WB_STDDOCKWIN | WB_OWNERDRAWDECORATION | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE); eChildAlignment = SFX_ALIGN_RIGHT; this->pWindow->SetHelpId(HID_SIDEBAR_WINDOW); this->pWindow->SetOutputSizePixel(Size(300, 450)); - dynamic_cast<SfxDockingWindow*>(pWindow)->Initialize(pInfo); + SfxDockingWindow* pDockingParent = dynamic_cast<SfxDockingWindow*>(pParentWindow); + if (pDockingParent != NULL) + pDockingParent->Initialize(pInfo); SetHideNotDelete(sal_True); this->pWindow->Show(); |