[Libreoffice-commits] core.git: cui/source include/sfx2 sc/source sd/source sw/source
Caolán McNamara
caolanm at redhat.com
Wed Apr 25 19:25:24 UTC 2018
cui/source/factory/dlgfact.cxx | 21 ---------------------
cui/source/factory/dlgfact.hxx | 4 ----
include/sfx2/sfxdlg.hxx | 1 -
sc/source/ui/attrdlg/scdlgfact.cxx | 5 -----
sc/source/ui/attrdlg/scdlgfact.hxx | 1 -
sd/source/ui/dlg/sddlgfact.cxx | 15 ---------------
sd/source/ui/dlg/sddlgfact.hxx | 3 ---
sw/source/ui/dialog/swdlgfact.cxx | 15 ---------------
sw/source/ui/dialog/swdlgfact.hxx | 3 ---
9 files changed, 68 deletions(-)
New commits:
commit e92cf0ebbe01dc1498d89013febb23960496ec01
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 25 10:20:54 2018 +0100
no users of the numeric SetCurPageId left
Change-Id: I0bf708b9924fa006da801483e178e18430b9443a
Reviewed-on: https://gerrit.libreoffice.org/53440
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index dc7ecab87fb5..e5a3cfac7114 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -250,12 +250,6 @@ IMPL_LINK( VclAbstractDialog2_Impl, EndDialogHdl, Dialog&, rDlg, void )
m_aEndDlgHdl = Link<Dialog&,void>();
}
-
-void CuiAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
-{
- pDlg->SetCurPageId( nId );
-}
-
void CuiAbstractTabDialog_Impl::SetCurPageId( const OString& rName )
{
pDlg->SetCurPageId( rName );
@@ -538,11 +532,6 @@ bool AbstractSvxSearchSimilarityDialog_Impl::IsRelaxed()
}
// AbstractSvxTransformTabDialog implementations just forwards everything to the dialog
-void AbstractSvxTransformTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
-{
- pDlg->SetCurPageId( nId );
-}
-
void AbstractSvxTransformTabDialog_Impl::SetCurPageId( const OString& rName )
{
pDlg->SetCurPageId( rName );
@@ -573,11 +562,6 @@ void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link<Svx
}
// AbstractSvxCaptionDialog implementations just forwards everything to the dialog
-void AbstractSvxCaptionDialog_Impl::SetCurPageId( sal_uInt16 nId )
-{
- pDlg->SetCurPageId( nId );
-}
-
void AbstractSvxCaptionDialog_Impl::SetCurPageId( const OString& rName )
{
pDlg->SetCurPageId( rName );
@@ -755,11 +739,6 @@ Graphic AbstractGraphicFilterDialog_Impl::GetFilteredGraphic( const Graphic& rGr
}
// AbstractSvxAreaTabDialog implementations just forwards everything to the dialog
-void AbstractSvxAreaTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
-{
- pDlg->SetCurPageId( nId );
-}
-
void AbstractSvxAreaTabDialog_Impl::SetCurPageId( const OString& rName )
{
pDlg->SetCurPageId( rName );
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 923d74d1e55e..2012658cbc9a 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -116,7 +116,6 @@ class CuiAbstractSfxDialog_Impl : public SfxAbstractDialog
class CuiAbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE(CuiAbstractTabDialog_Impl,SfxTabDialog)
- virtual void SetCurPageId( sal_uInt16 nId ) override;
virtual void SetCurPageId( const OString& rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override;
@@ -276,7 +275,6 @@ class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
{
DECL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl,SvxTransformTabDialog)
virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) override;
- virtual void SetCurPageId( sal_uInt16 nId ) override;
virtual void SetCurPageId( const OString& rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override;
@@ -288,7 +286,6 @@ class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
{
DECL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl,SvxCaptionTabDialog)
virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) override;
- virtual void SetCurPageId( sal_uInt16 nId ) override;
virtual void SetCurPageId( const OString& rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override;
@@ -428,7 +425,6 @@ class SvxAreaTabDialog;
class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog
{
DECL_ABSTDLG_BASE(AbstractSvxAreaTabDialog_Impl,SvxAreaTabDialog)
- virtual void SetCurPageId( sal_uInt16 nId ) override;
virtual void SetCurPageId( const OString& rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override;
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index dd49c8d1c103..fa7ad8aeadbe 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -71,7 +71,6 @@ class SfxAbstractTabDialog : virtual public SfxAbstractDialog
protected:
virtual ~SfxAbstractTabDialog() override = default;
public:
- virtual void SetCurPageId( sal_uInt16 nId ) = 0;
virtual void SetCurPageId( const OString &rName ) = 0;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& ) = 0;
virtual void SetInputSet( const SfxItemSet* pInSet ) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 4a7925f2a33c..d1035d97a79a 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -139,11 +139,6 @@ short AbstractScLinkedAreaDlg_Impl::Execute()
return m_xDlg->run();
}
-void ScAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
-{
- pDlg->SetCurPageId( nId );
-}
-
void ScAbstractTabDialog_Impl::SetCurPageId( const OString& rName )
{
pDlg->SetCurPageId( rName );
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 3c056db5a36b..3d37a2bbdff2 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -412,7 +412,6 @@ class AbstractScTextImportOptionsDlg_Impl : public AbstractScTextImportOptionsDl
class ScAbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( ScAbstractTabDialog_Impl,SfxTabDialog )
- virtual void SetCurPageId( sal_uInt16 nId ) override;
virtual void SetCurPageId( const OString &rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override;
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index 6cd5d4e49d77..21ce7322b165 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -89,11 +89,6 @@ bool AbstractSdCustomShowDlg_Impl::IsCustomShow() const
return pDlg->IsCustomShow();
}
-void SdAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
-{
- pDlg->SetCurPageId( nId );
-}
-
void SdAbstractTabDialog_Impl::SetCurPageId( const OString& rName )
{
pDlg->SetCurPageId( rName );
@@ -120,11 +115,6 @@ void SdAbstractTabDialog_Impl::SetText( const OUString& rStr )
pDlg->SetText( rStr );
}
-void AbstractBulletDialog_Impl::SetCurPageId( sal_uInt16 nId )
-{
- static_cast< ::sd::OutlineBulletDlg*>(pDlg.get())->SetCurPageId( nId );
-}
-
void AbstractBulletDialog_Impl::SetCurPageId( const OString& rName )
{
static_cast< ::sd::OutlineBulletDlg*>(pDlg.get())->SetCurPageId( rName );
@@ -150,11 +140,6 @@ void AbstractBulletDialog_Impl::SetText( const OUString& rStr )
static_cast< ::sd::OutlineBulletDlg*>(pDlg.get())->SetText( rStr );
}
-void SdPresLayoutTemplateDlg_Impl::SetCurPageId( sal_uInt16 nId )
-{
- pDlg->SetCurPageId( nId );
-}
-
void SdPresLayoutTemplateDlg_Impl::SetCurPageId( const OString& rName )
{
pDlg->SetCurPageId( rName );
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index bb8586386467..1b9e0fe6cbcb 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -90,7 +90,6 @@ class SfxTabDialog;
class SdAbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( SdAbstractTabDialog_Impl,SfxTabDialog )
- virtual void SetCurPageId( sal_uInt16 nId ) override;
virtual void SetCurPageId( const OString& rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override;
@@ -102,7 +101,6 @@ class SdAbstractTabDialog_Impl : public SfxAbstractTabDialog
class AbstractBulletDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( AbstractBulletDialog_Impl,SfxTabDialog )
- virtual void SetCurPageId( sal_uInt16 nId ) override;
virtual void SetCurPageId( const OString& rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override;
@@ -115,7 +113,6 @@ class SdPresLayoutTemplateDlg;
class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( SdPresLayoutTemplateDlg_Impl,SdPresLayoutTemplateDlg )
- virtual void SetCurPageId( sal_uInt16 nId ) override;
virtual void SetCurPageId( const OString& rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index a5a6ca3ded6c..842fe09aff9e 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -182,11 +182,6 @@ IMPL_ABSTDLG_BASE(AbstractInsertSectionTabDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractIndexMarkFloatDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractAuthMarkFloatDlg_Impl);
-void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
-{
- pDlg->SetCurPageId( nId );
-}
-
void AbstractTabDialog_Impl::SetCurPageId( const OString &rName )
{
pDlg->SetCurPageId( rName );
@@ -294,11 +289,6 @@ bool AbstractDropDownFieldDialog_Impl::NextButtonPressed() const
return m_xDlg->NextButtonPressed();
}
-void AbstractSwLabDlg_Impl::SetCurPageId( sal_uInt16 nId )
-{
- pDlg->SetCurPageId( nId );
-}
-
void AbstractSwLabDlg_Impl::SetCurPageId( const OString &rName )
{
pDlg->SetCurPageId( rName );
@@ -354,11 +344,6 @@ SwTableAutoFormat* AbstractSwAutoFormatDlg_Impl::FillAutoFormatOfIndex() const
return m_xDlg->FillAutoFormatOfIndex();
}
-void AbstractSwFieldDlg_Impl::SetCurPageId( sal_uInt16 nId )
-{
- pDlg->SetCurPageId( nId );
-}
-
void AbstractSwFieldDlg_Impl::SetCurPageId( const OString &rName )
{
pDlg->SetCurPageId( rName );
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index fd13c1d76100..635d99ccb0cd 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -215,7 +215,6 @@ public:
class AbstractTabDialog_Impl : virtual public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
- virtual void SetCurPageId( sal_uInt16 nId ) override;
virtual void SetCurPageId( const OString &rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override;
@@ -277,7 +276,6 @@ public:
class AbstractSwLabDlg_Impl : public AbstractSwLabDlg
{
DECL_ABSTDLG_BASE(AbstractSwLabDlg_Impl,SwLabDlg)
- virtual void SetCurPageId( sal_uInt16 nId ) override;
virtual void SetCurPageId( const OString &rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override;
@@ -312,7 +310,6 @@ public:
class AbstractSwFieldDlg_Impl : public AbstractSwFieldDlg
{
DECL_ABSTDLG_BASE(AbstractSwFieldDlg_Impl,SwFieldDlg )
- virtual void SetCurPageId( sal_uInt16 nId ) override;
virtual void SetCurPageId( const OString &rName ) override;
virtual const SfxItemSet* GetOutputItemSet() const override;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) override;
More information about the Libreoffice-commits
mailing list