sc/source/ui/formdlg/dwfunctr.cxx | 22 +---------------------
sc/source/ui/inc/dwfunctr.hxx | 10 ++--------
sc/source/ui/sidebar/ScPanelFactory.cxx | 2 +-
3 files changed, 4 insertions(+), 30 deletions(-)
New commits:
commit 770535d0aae73f5889cf4c1367f022f4a25d9457
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Oct 23 17:36:27 2016 +0100
at which point SfxBindings is no longer needed as an argument
Change-Id: I49b7418918c3159cf6cabaea2044ce9b2430d0a5
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx
b/sc/source/ui/formdlg/dwfunctr.cxx
index 569d0f1..935d471 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -53,9 +53,8 @@
#*
#************************************************************************/
-ScFunctionWin::ScFunctionWin( SfxBindings* pBindingsP, vcl::Window* pParent,
const ResId& rResId ) :
+ScFunctionWin::ScFunctionWin(vcl::Window* pParent, const ResId& rResId) :
vcl::Window(pParent, rResId),
- rBindings ( *pBindingsP ),
aIdle ( "sc formdlg ScFunctionWin" ),
aPrivatSplit ( VclPtr<ScPrivatSplit>::Create( this, ResId( FT_SPLIT,
*rResId.GetResMgr() ) ) ),
aCatBox ( VclPtr<ListBox>::Create( this, ResId( CB_CAT,
*rResId.GetResMgr() ) ) ),
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index b728217..73945d2 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -35,7 +35,6 @@ class ScFunctionWin : public vcl::Window
{
private:
- SfxBindings& rBindings;
Idle aIdle;
VclPtr<ScPrivatSplit> aPrivatSplit;
VclPtr<ListBox> aCatBox;
@@ -75,9 +74,7 @@ protected:
virtual void StateChanged( StateChangedType nStateChange ) override;
public:
- ScFunctionWin( SfxBindings* pBindings,
- vcl::Window* pParent,
- const ResId& rResId );
+ ScFunctionWin(vcl::Window* pParent, const ResId& rResId);
virtual ~ScFunctionWin() override;
virtual void dispose() override;
diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx
b/sc/source/ui/sidebar/ScPanelFactory.cxx
index b526c35..02a060e 100644
--- a/sc/source/ui/sidebar/ScPanelFactory.cxx
+++ b/sc/source/ui/sidebar/ScPanelFactory.cxx
@@ -98,7 +98,7 @@ Reference<ui::XUIElement> SAL_CALL
ScPanelFactory::createUIElement (
}
else if (rsResourceURL.endsWith("/FunctionsPanel"))
{
- pPanel = VclPtr<ScFunctionWin>::Create(pBindings, pParentWindow,
ScResId(FID_FUNCTION_BOX));
+ pPanel = VclPtr<ScFunctionWin>::Create(pParentWindow,
ScResId(FID_FUNCTION_BOX));
nMinimumSize = 0;
}
commit a73b4cfcc3eb273190975b2dff1dedfe0915294f
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Oct 23 17:33:52 2016 +0100
why listen to bindings to then ignore notifications
Change-Id: I92e0253b08e64ed03946456e4dff24213e3bbe70
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx
b/sc/source/ui/formdlg/dwfunctr.cxx
index 59a9d9a..569d0f1 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -90,7 +90,6 @@ ScFunctionWin::ScFunctionWin( SfxBindings* pBindingsP,
vcl::Window* pParent, con
Link<ScPrivatSplit&,void> a3Link=LINK( this, ScFunctionWin, SetSplitHdl);
aPrivatSplit->SetCtrModifiedHdl(a3Link);
- StartListening( rBindings, true );
Point aTopLeft=aCatBox->GetPosPixel();
OUString aString("ww");
@@ -127,7 +126,6 @@ ScFunctionWin::~ScFunctionWin()
void ScFunctionWin::dispose()
{
- EndListening( rBindings );
aPrivatSplit.disposeAndClear();
aCatBox.disposeAndClear();
aFuncList.disposeAndClear();
@@ -373,23 +371,6 @@ void ScFunctionWin::SetDescription()
aFiFuncDesc->Update();
}
- }
-
-/*************************************************************************
-#* Member: Close
-#*------------------------------------------------------------------------
-#*
-#* Klasse: ScFunctionWin
-#*
-#* Funktion: Aenderungen erkennen
-#*
-#* Input: ---
-#*
-#* Output: TRUE
-#*
-#************************************************************************/
-void ScFunctionWin::Notify( SfxBroadcaster&, const SfxHint& /* rHint */ )
-{
}
/// override to set new size of the controls
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index f78be8c..b728217 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -31,7 +31,7 @@
#include "privsplt.hxx"
#include "funcdesc.hxx"
-class ScFunctionWin : public vcl::Window, public SfxListener
+class ScFunctionWin : public vcl::Window
{
private:
@@ -82,9 +82,6 @@ public:
virtual ~ScFunctionWin() override;
virtual void dispose() override;
- using ::vcl::Window::Notify;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
override;
-
void InitLRUList();
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
