diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-29 15:44:51 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-31 11:45:54 +0000 |
| commit | 24af8af98edd3808d96b00b51648c1bb55da22eb (patch) | |
| tree | 6a4c9ba06613fc8fc41f94af037ca3507e114756 | |
| parent | 682c07cc3f023a2a0f036f48700fca16b6b62c19 (diff) | |
SfxChildWindow is always null
Change-Id: I0a17066b8571cb40f53921000b7eeb4cdf0c9527
| -rw-r--r-- | sc/source/ui/formdlg/dwfunctr.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/inc/dwfunctr.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/sidebar/ScPanelFactory.cxx | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index d86cc5021612..8e1686f62da3 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -53,10 +53,8 @@ #* #************************************************************************/ -ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, - SfxChildWindow *pCW, vcl::Window* pParent, const ResId& rResId ) : - - SfxDockingWindow( pBindingsP, pCW, pParent, rResId ), +ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, vcl::Window* pParent, const ResId& rResId ) : + SfxDockingWindow( pBindingsP, nullptr, pParent, rResId ), aPrivatSplit ( VclPtr<ScPrivatSplit>::Create( this, ResId( FT_SPLIT, *rResId.GetResMgr() ) ) ), aCatBox ( VclPtr<ListBox>::Create( this, ResId( CB_CAT, *rResId.GetResMgr() ) ) ), aFuncList ( VclPtr<ListBox>::Create( this, ResId( LB_FUNC, *rResId.GetResMgr() ) ) ), diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index a6f54e346217..77b0728df20f 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -84,7 +84,6 @@ protected: public: ScFunctionDockWin( SfxBindings* pBindings, - SfxChildWindow *pCW, vcl::Window* pParent, const ResId& rResId ); diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx index c953f192ea83..acefaae501ab 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.cxx +++ b/sc/source/ui/sidebar/ScPanelFactory.cxx @@ -99,7 +99,7 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( } else if (rsResourceURL.endsWith("/FunctionsPanel")) { - pPanel = VclPtr<ScFunctionDockWin>::Create(pBindings, nullptr, pParentWindow, ScResId(FID_FUNCTION_BOX)); + pPanel = VclPtr<ScFunctionDockWin>::Create(pBindings, pParentWindow, ScResId(FID_FUNCTION_BOX)); nMinimumSize = 0; } |