[Libreoffice-commits] core.git: sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Mar 19 21:19:38 UTC 2019
sw/source/ui/fldui/fldpage.cxx | 30 ------------------------------
sw/source/ui/fldui/fldpage.hxx | 13 +++----------
2 files changed, 3 insertions(+), 40 deletions(-)
New commits:
commit 9d294b08a891f02f4e33bec0bf7d44d013abfa5e
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Mar 19 15:36:08 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Mar 19 22:19:08 2019 +0100
more newly unused functions
Change-Id: Id89fb1104bdcfd1c14842b5c6641466c83f2f995
Reviewed-on: https://gerrit.libreoffice.org/69434
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index 2894bb908048..787c33f29728 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -281,16 +281,6 @@ void SwFieldPage::InsertField(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUS
}
}
-void SwFieldPage::SavePos( const ListBox* pLst1 )
-{
- if( pLst1 && pLst1->GetEntryCount() )
- m_aLstStrArr[ 0 ] = pLst1->GetSelectedEntry();
- else
- m_aLstStrArr[ 0 ].clear();
- m_aLstStrArr[ 1 ].clear();
- m_aLstStrArr[ 2 ].clear();
-}
-
void SwFieldPage::SavePos( const weld::TreeView& rLst1 )
{
if (rLst1.n_children())
@@ -301,15 +291,6 @@ void SwFieldPage::SavePos( const weld::TreeView& rLst1 )
m_aLstStrArr[ 2 ].clear();
}
-void SwFieldPage::RestorePos(ListBox* pLst1)
-{
- sal_Int32 nPos = 0;
- if( pLst1 && pLst1->GetEntryCount() && !m_aLstStrArr[ 0 ].isEmpty() &&
- LISTBOX_ENTRY_NOTFOUND !=
- ( nPos = pLst1->GetEntryPos(m_aLstStrArr[ 0 ] ) ) )
- pLst1->SelectEntryPos( nPos );
-}
-
void SwFieldPage::RestorePos(weld::TreeView& rLst1)
{
sal_Int32 nPos = 0;
@@ -319,17 +300,6 @@ void SwFieldPage::RestorePos(weld::TreeView& rLst1)
}
// Insert new fields
-IMPL_LINK( SwFieldPage, TreeListBoxInsertHdl, SvTreeListBox*, pBtn, bool )
-{
- InsertHdl(pBtn);
- return false;
-}
-
-IMPL_LINK( SwFieldPage, ListBoxInsertHdl, ListBox&, rBox, void )
-{
- InsertHdl(&rBox);
-}
-
IMPL_LINK( SwFieldPage, TreeViewInsertHdl, weld::TreeView&, rBox, void )
{
InsertHdl(&rBox);
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index a2720cb918ae..3ac09fc7cc46 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -24,15 +24,12 @@
#define FIELD_COLUMN_WIDTH 76
-class ListBox;
-class SvTreeListBox;
-
const int coLBCount = 3;
class SwFieldPage : public SfxTabPage
{
OUString m_aLstStrArr[ coLBCount ];
- SwFieldMgr m_aMgr;
+ SwFieldMgr m_aMgr;
SwField *m_pCurField;
SwWrtShell* m_pWrtShell;
sal_Int32 m_nTypeSel;
@@ -54,22 +51,18 @@ protected:
SwField* GetCurField() { return m_pCurField;}
SwWrtShell* GetWrtShell() { return m_pWrtShell;}
- DECL_LINK( ListBoxInsertHdl, ListBox&, void );
DECL_LINK( TreeViewInsertHdl, weld::TreeView&, void );
- DECL_LINK( TreeListBoxInsertHdl, SvTreeListBox*, bool );
DECL_LINK( NumFormatHdl, weld::TreeView&, void );
void InsertHdl(void *);
void Init();
- void SavePos( const ListBox* pLst1);
void SavePos( const weld::TreeView& rLst1);
- void RestorePos( ListBox* pLst1 );
void RestorePos( weld::TreeView& rLst1 );
void EnableInsert(bool bEnable);
- bool IsFieldEdit() const { return m_bFieldEdit; }
+ bool IsFieldEdit() const { return m_bFieldEdit; }
// insert field
- void InsertField( sal_uInt16 nTypeId,
+ void InsertField(sal_uInt16 nTypeId,
sal_uInt16 nSubType,
const OUString& rPar1,
const OUString& rPar2,
More information about the Libreoffice-commits
mailing list