sc/source/ui/formdlg/dwfunctr.cxx | 10 ++--------
sc/source/ui/formdlg/dwfunctr.hrc | 1 -
sc/source/ui/formdlg/dwfunctr.src | 11 -----------
sc/source/ui/inc/dwfunctr.hxx | 3 +--
4 files changed, 3 insertions(+), 22 deletions(-)
New commits:
commit c99227e30b32d17e2ca314fa42f74682cb9ab4ca
Author: Caolán McNamara <caol...@redhat.com>
Date: Sun Oct 23 17:22:45 2016 +0100
DDLB_FUNC listbox never used
Change-Id: I8f377182f655cc9e1bfe672727890db5e5492e5d
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx
b/sc/source/ui/formdlg/dwfunctr.cxx
index 11f9ab7..dc3ad06 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -60,7 +60,6 @@ ScFunctionWin::ScFunctionWin( SfxBindings* pBindingsP,
vcl::Window* pParent, con
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() ) ) ),
- aDDFuncList ( VclPtr<ListBox>::Create( this, ResId( DDLB_FUNC,
*rResId.GetResMgr() ) ) ),
aInsertButton ( VclPtr<ImageButton>::Create( this, ResId( IMB_INSERT,
*rResId.GetResMgr() ) ) ),
aFiFuncDesc ( VclPtr<FixedText>::Create( this, ResId( FI_FUNCDESC,
*rResId.GetResMgr() ) ) ),
aOldSize (0,0),
@@ -75,8 +74,6 @@ ScFunctionWin::ScFunctionWin( SfxBindings* pBindingsP,
vcl::Window* pParent, con
aFiFuncDesc->SetUpdateMode(true);
pAllFuncList=aFuncList;
- aDDFuncList->Disable();
- aDDFuncList->Hide();
nArgs=0;
bSizeFlag=false;
aCatBox->SetDropDownLineCount(9);
@@ -88,10 +85,8 @@ ScFunctionWin::ScFunctionWin( SfxBindings* pBindingsP,
vcl::Window* pParent, con
Link<ListBox&,void> aLink=LINK( this, ScFunctionWin, SelHdl);
aCatBox->SetSelectHdl(aLink);
aFuncList->SetSelectHdl(aLink);
- aDDFuncList->SetSelectHdl(aLink);
aFuncList->SetDoubleClickHdl(LINK( this, ScFunctionWin, SetSelectionHdl));
- aDDFuncList->SetSelectHdl(aLink);
aInsertButton->SetClickHdl(LINK( this, ScFunctionWin,
SetSelectionClickHdl));
Link<ScPrivatSplit&,void> a3Link=LINK( this, ScFunctionWin, SetSplitHdl);
@@ -137,7 +132,6 @@ void ScFunctionWin::dispose()
aPrivatSplit.disposeAndClear();
aCatBox.disposeAndClear();
aFuncList.disposeAndClear();
- aDDFuncList.disposeAndClear();
aInsertButton.disposeAndClear();
aFiFuncDesc.disposeAndClear();
pAllFuncList.clear();
@@ -606,13 +600,13 @@ void ScFunctionWin::DoEnter()
IMPL_LINK( ScFunctionWin, SelHdl, ListBox&, rLb, void )
{
- if ( &rLb == aCatBox.get() )
+ if (&rLb == aCatBox.get())
{
UpdateFunctionList();
SetDescription();
}
- if ( &rLb == aFuncList.get() || &rLb == aDDFuncList.get() )
+ if (&rLb == aFuncList.get())
{
SetDescription();
}
diff --git a/sc/source/ui/formdlg/dwfunctr.hrc
b/sc/source/ui/formdlg/dwfunctr.hrc
index 202af84..8b34df8 100644
--- a/sc/source/ui/formdlg/dwfunctr.hrc
+++ b/sc/source/ui/formdlg/dwfunctr.hrc
@@ -19,7 +19,6 @@
#define CB_CAT 1
#define LB_FUNC 2
-#define DDLB_FUNC 3
#define IMB_INSERT 1
#define FI_FUNCDESC 1
#define FT_SPLIT 2
diff --git a/sc/source/ui/formdlg/dwfunctr.src
b/sc/source/ui/formdlg/dwfunctr.src
index 7f7d136..6d6e9b9 100644
--- a/sc/source/ui/formdlg/dwfunctr.src
+++ b/sc/source/ui/formdlg/dwfunctr.src
@@ -53,17 +53,6 @@ Window FID_FUNCTION_BOX
< "Add-in" ; Default ; > ;
};
};
- ListBox DDLB_FUNC
- {
- HelpID = "sc:ListBox:FID_FUNCTION_BOX:DDLB_FUNC";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 103 , 4 ) ;
- Size = MAP_APPFONT ( 56 , 80 ) ;
- Hide = TRUE ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- AutoHScroll = TRUE ;
- };
ListBox LB_FUNC
{
HelpID = "sc:ListBox:FID_FUNCTION_BOX:LB_FUNC";
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index d05f438..ef122e1 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -40,8 +40,7 @@ private:
VclPtr<ScPrivatSplit> aPrivatSplit;
VclPtr<ListBox> aCatBox;
VclPtr<ListBox> aFuncList;
- VclPtr<ListBox> aDDFuncList;
- VclPtr<ListBox> pAllFuncList;
+ VclPtr<ListBox> pAllFuncList;
VclPtr<ImageButton> aInsertButton;
VclPtr<FixedText> aFiFuncDesc;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
