Kaydet (Commit) 24af8af9 authored tarafından Caolán McNamara's avatar Caolán McNamara

SfxChildWindow is always null

Change-Id: I0a17066b8571cb40f53921000b7eeb4cdf0c9527
üst 682c07cc
...@@ -53,10 +53,8 @@ ...@@ -53,10 +53,8 @@
#* #*
#************************************************************************/ #************************************************************************/
ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, vcl::Window* pParent, const ResId& rResId ) :
SfxChildWindow *pCW, vcl::Window* pParent, const ResId& rResId ) : SfxDockingWindow( pBindingsP, nullptr, pParent, rResId ),
SfxDockingWindow( pBindingsP, pCW, pParent, rResId ),
aPrivatSplit ( VclPtr<ScPrivatSplit>::Create( this, ResId( FT_SPLIT, *rResId.GetResMgr() ) ) ), aPrivatSplit ( VclPtr<ScPrivatSplit>::Create( this, ResId( FT_SPLIT, *rResId.GetResMgr() ) ) ),
aCatBox ( VclPtr<ListBox>::Create( this, ResId( CB_CAT, *rResId.GetResMgr() ) ) ), aCatBox ( VclPtr<ListBox>::Create( this, ResId( CB_CAT, *rResId.GetResMgr() ) ) ),
aFuncList ( VclPtr<ListBox>::Create( this, ResId( LB_FUNC, *rResId.GetResMgr() ) ) ), aFuncList ( VclPtr<ListBox>::Create( this, ResId( LB_FUNC, *rResId.GetResMgr() ) ) ),
......
...@@ -84,7 +84,6 @@ protected: ...@@ -84,7 +84,6 @@ protected:
public: public:
ScFunctionDockWin( SfxBindings* pBindings, ScFunctionDockWin( SfxBindings* pBindings,
SfxChildWindow *pCW,
vcl::Window* pParent, vcl::Window* pParent,
const ResId& rResId ); const ResId& rResId );
......
...@@ -99,7 +99,7 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( ...@@ -99,7 +99,7 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement (
} }
else if (rsResourceURL.endsWith("/FunctionsPanel")) 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; nMinimumSize = 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment