summaryrefslogtreecommitdiffstats
path: root/cui/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-09-08 14:20:31 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-09-09 06:43:43 +0000
commit8bfcb53c3d1389632fc7f1eca53d73187a489dfa (patch)
treeefb8d68fc4600ea7585290757f78866c061234bf /cui/source
parentdisallow calls to ::Create in VclPtr subclasses (diff)
downloadcore-8bfcb53c3d1389632fc7f1eca53d73187a489dfa.tar.gz
core-8bfcb53c3d1389632fc7f1eca53d73187a489dfa.zip
loplugin:constantparam in svx
Change-Id: Id08850b90a0e286ff837dd6b0c1691fa7dc793fa Reviewed-on: https://gerrit.libreoffice.org/28746 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/factory/dlgfact.cxx73
-rw-r--r--cui/source/factory/dlgfact.hxx16
-rw-r--r--cui/source/options/optlingu.cxx2
3 files changed, 27 insertions, 64 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 14ffacf86708..2dac0259a46f 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1106,33 +1106,13 @@ AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTab
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pSdrView,
- sal_uInt32 nResId,
bool bSizeTabPage
)
{
- VclPtr<SfxTabDialog> pDlg;
- switch ( nResId )
- {
- case RID_SCH_TransformTabDLG_SVXPAGE_ANGLE :
- {
- pDlg.reset( VclPtr<SvxTransformTabDialog>::Create( pParent, pAttr,pSdrView, bSizeTabPage ? SvxAnchorIds::NoProtect : SvxAnchorIds::NoProtect|SvxAnchorIds::NoResize) );
- pDlg->RemoveTabPage( "RID_SVXPAGE_ANGLE" );
- pDlg->RemoveTabPage( "RID_SVXPAGE_SLANT" );
- }
- break;
- case RID_SCH_TransformTabDLG_SVXPAGE_SLANT:
- {
- pDlg.reset(VclPtr<SvxTransformTabDialog>::Create ( pParent, pAttr,pSdrView, bSizeTabPage ? SvxAnchorIds::NoProtect : SvxAnchorIds::NoProtect|SvxAnchorIds::NoResize ) );
- pDlg->RemoveTabPage( "RID_SVXPAGE_SLANT" );
- }
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new CuiAbstractTabDialog_Impl( pDlg );
- return nullptr;
+ VclPtrInstance<SvxTransformTabDialog> pDlg( pParent, pAttr,pSdrView, bSizeTabPage ? SvxAnchorIds::NoProtect : SvxAnchorIds::NoProtect|SvxAnchorIds::NoResize);
+ pDlg->RemoveTabPage( "RID_SVXPAGE_ANGLE" );
+ pDlg->RemoveTabPage( "RID_SVXPAGE_SLANT" );
+ return new CuiAbstractTabDialog_Impl( pDlg );
}
AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOptionsDialog( vcl::Window* pParent,
@@ -1156,22 +1136,10 @@ AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDiction
}
VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( vcl::Window* pParent,
- const OUString& rName,
- sal_uInt32 nResId )
+ const OUString& rName )
{
- Dialog* pDlg=nullptr;
- switch ( nResId )
- {
- case RID_SFXDLG_EDITDICT :
- pDlg = VclPtr<SvxEditDictionaryDialog>::Create( pParent, rName );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new CuiVclAbstractDialog_Impl( pDlg );
- return nullptr;
+ VclPtrInstance<SvxEditDictionaryDialog> pDlg( pParent, rName );
+ return new CuiVclAbstractDialog_Impl( pDlg );
}
AbstractSvxNameDialog * AbstractDialogFactory_Impl::CreateSvxNameDialog( vcl::Window* pParent,
@@ -1222,26 +1190,23 @@ AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(vcl::W
}
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmboss (vcl::Window* pParent,
- const Graphic& rGraphic,
- RectPoint eLightSource)
+ const Graphic& rGraphic)
{
- VclPtrInstance<GraphicFilterEmboss> pDlg( pParent, rGraphic, eLightSource );
+ VclPtrInstance<GraphicFilterEmboss> pDlg( pParent, rGraphic, RectPoint::MM );
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPoster(vcl::Window* pParent,
- const Graphic& rGraphic,
- sal_uInt16 nCount)
+ const Graphic& rGraphic)
{
- VclPtrInstance<GraphicFilterPoster> pDlg( pParent, rGraphic, nCount );
+ VclPtrInstance<GraphicFilterPoster> pDlg( pParent, rGraphic, 16 );
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSepia (vcl::Window* pParent,
- const Graphic& rGraphic,
- sal_uInt16 nCount)
+ const Graphic& rGraphic)
{
- VclPtrInstance<GraphicFilterSepia> pDlg( pParent, rGraphic, nCount );
+ VclPtrInstance<GraphicFilterSepia> pDlg( pParent, rGraphic, 10 );
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
@@ -1253,16 +1218,16 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSmo
}
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (vcl::Window* pParent,
- const Graphic& rGraphic, sal_uInt8 nGreyThreshold)
+ const Graphic& rGraphic)
{
- VclPtrInstance<GraphicFilterSolarize> pDlg( pParent, rGraphic, nGreyThreshold, false/*bInvert*/ );
+ VclPtrInstance<GraphicFilterSolarize> pDlg( pParent, rGraphic, 128, false/*bInvert*/ );
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (vcl::Window* pParent,
- const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight)
+ const Graphic& rGraphic)
{
- VclPtrInstance<GraphicFilterMosaic> pDlg(pParent, rGraphic, nTileWidth, nTileHeight, false/*bEnhanceEdges*/);
+ VclPtrInstance<GraphicFilterMosaic> pDlg(pParent, rGraphic, 4, 4, false/*bEnhanceEdges*/);
return new AbstractGraphicFilterDialog_Impl( pDlg );
}
@@ -1567,9 +1532,9 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog( co
return new CuiAbstractTabDialog_Impl( VclPtr<SvxFormatCellsDialog>::Create( nullptr, pAttr, pModel ) );
}
-SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )
+SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical )
{
- return new SvxSplitTableDlg( pParent, bIsTableVertical, nMaxVertical, nMaxHorizontal );
+ return new SvxSplitTableDlg( pParent, bIsTableVertical, nMaxVertical, 99 );
}
SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog()
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index f3dff6948c60..63d2a8dedb2e 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -519,7 +519,6 @@ public:
virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pSdrView,
- sal_uInt32 nResId,
bool bSizeTabPage
) override;
virtual AbstractSpellDialog * CreateSvxSpellDialog(
@@ -554,8 +553,7 @@ public:
virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog() override;
virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent ) override;
virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent,
- const OUString& rName,
- sal_uInt32 nResId) override;
+ const OUString& rName) override;
virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent,
const OUString& rName, const OUString& rDesc ) override;
// #i68101#
@@ -571,17 +569,17 @@ public:
sal_Int16 nInitialContext,
const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier) override;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(vcl::Window* pParent,
- const Graphic& rGraphic, RectPoint eLightSource) override;
+ const Graphic& rGraphic) override;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(vcl::Window* pParent,
- const Graphic& rGraphic, sal_uInt16 nCount) override;
+ const Graphic& rGraphic) override;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (vcl::Window* pParent,
- const Graphic& rGraphic, sal_uInt16 nCount) override;
+ const Graphic& rGraphic) override;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (vcl::Window* pParent,
const Graphic& rGraphic, double nRadius) override;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (vcl::Window* pParent,
- const Graphic& rGraphic, sal_uInt8 nGreyThreshold) override;
+ const Graphic& rGraphic) override;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (vcl::Window* pParent,
- const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight) override;
+ const Graphic& rGraphic) override;
virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( vcl::Window* pParent,
const SfxItemSet* pAttr,
SdrModel* pModel,
@@ -619,7 +617,7 @@ public:
virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj ) override;
- virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) override;
+ virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical ) override;
virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog() override ;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index d9718f9ef618..fc7cc554fb4e 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1630,7 +1630,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::unique_ptr<VclAbstractDialog> aDlg(pFact->CreateSvxEditDictionaryDialog( this, xDic->getName(), RID_SFXDLG_EDITDICT ));
+ std::unique_ptr<VclAbstractDialog> aDlg(pFact->CreateSvxEditDictionaryDialog( this, xDic->getName() ));
DBG_ASSERT(aDlg, "Dialog creation failed!");
aDlg->Execute();
}