diff options
author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-04-09 09:37:17 +0200 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-04-09 09:37:17 +0200 |
commit | 9c32c9129e18505a6ecc78c6880d96136d101129 (patch) | |
tree | e0156f7148a3f1837dc75d49219f5e4bafe88603 /sd/source/ui/dlg/PaneDockingWindow.cxx | |
parent | e725e315399f527e63f919a9a6861066b1f41512 (diff) | |
parent | 17d7bf8f871c2b2e04a14c3d9cca27e7e6c84cac (diff) |
slidecopy: merge CWS wth MWS-m76
Diffstat (limited to 'sd/source/ui/dlg/PaneDockingWindow.cxx')
-rw-r--r-- | sd/source/ui/dlg/PaneDockingWindow.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index c0dcd76f0fae..439e864e13c0 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -49,7 +49,6 @@ PaneDockingWindow::PaneDockingWindow ( SfxChildWindow *pChildWindow, ::Window* pParent, const ResId& rResId, - const ::rtl::OUString& rsPaneURL, const ::rtl::OUString& rsTitle) : SfxDockingWindow ( _pBindings, @@ -57,7 +56,6 @@ PaneDockingWindow::PaneDockingWindow ( pParent, rResId ), - msPaneURL(rsPaneURL), msTitle(rsTitle), mpTitleToolBox(), maBorder (3,1,3,3), @@ -394,6 +392,16 @@ void PaneDockingWindow::DataChanged (const DataChangedEvent& rEvent) +void PaneDockingWindow::EndDocking( const Rectangle& rRect, BOOL bFloatMode ) +{ + SfxDockingWindow::EndDocking( rRect, bFloatMode ); + + if ( maEndDockingHdl.IsSet() ) + maEndDockingHdl.Call( this ); +} + + + ::Window* PaneDockingWindow::GetContentWindow (void) { return mpContentWindow.get(); |