[Libreoffice-commits] core.git: sc/source
Caolán McNamara
caolanm at redhat.com
Sun Jan 31 03:47:08 PST 2016
sc/source/ui/formdlg/dwfunctr.cxx | 6 ++----
sc/source/ui/inc/dwfunctr.hxx | 1 -
sc/source/ui/sidebar/ScPanelFactory.cxx | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 24af8af98edd3808d96b00b51648c1bb55da22eb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 29 15:44:51 2016 +0000
SfxChildWindow is always null
Change-Id: I0a17066b8571cb40f53921000b7eeb4cdf0c9527
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index d86cc50..8e1686f 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 a6f54e3..77b0728 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 c953f19..acefaae 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;
}
More information about the Libreoffice-commits
mailing list