summaryrefslogtreecommitdiff
path: root/sw/source/uibase
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 /sw/source/uibase
parent976a4803e4cca4c5104c0ed60544a91a50ada012 (diff)
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 'sw/source/uibase')
-rw-r--r--sw/source/uibase/shells/tabsh.cxx2
-rw-r--r--sw/source/uibase/sidebar/PageMarginControl.cxx10
-rw-r--r--sw/source/uibase/sidebar/PageSizeControl.cxx3
3 files changed, 7 insertions, 8 deletions
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 132b91ca3784..09235458cb75 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -986,7 +986,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
if( pFact )
{
const long nMaxVert = rSh.GetAnyCurRect( RECT_FRM ).Width() / MINLAY;
- std::unique_ptr<SvxAbstractSplittTableDialog> pDlg(pFact->CreateSvxSplittTableDialog( GetView().GetWindow(), rSh.IsTableVertical(), nMaxVert, 99 ));
+ std::unique_ptr<SvxAbstractSplittTableDialog> pDlg(pFact->CreateSvxSplittTableDialog( GetView().GetWindow(), rSh.IsTableVertical(), nMaxVert ));
if( pDlg && (pDlg->Execute() == RET_OK) )
{
nCount = pDlg->GetCount();
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 04b198f2ecc9..ca73e952dfe0 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -204,7 +204,7 @@ void PageMarginControl::FillValueSet(
aHelpText += aBottom;
aHelpText += aNarrowValText;
mpMarginValueSet->AddItem(
- Image((bLandscape) ? SW_RES(IMG_NARROW_L) : SW_RES(IMG_NARROW)), nullptr,
+ Image((bLandscape) ? SW_RES(IMG_NARROW_L) : SW_RES(IMG_NARROW)),
SW_RESSTR(STR_NARROW), &aHelpText );
SetMetricValue( *maWidthHeightField.get(), SWPAGE_NORMAL_VALUE, meUnit );
@@ -218,7 +218,7 @@ void PageMarginControl::FillValueSet(
aHelpText += aBottom;
aHelpText += aNormalValText;
mpMarginValueSet->AddItem(
- Image((bLandscape) ? SW_RES(IMG_NORMAL_L) : SW_RES(IMG_NORMAL)), nullptr,
+ Image((bLandscape) ? SW_RES(IMG_NORMAL_L) : SW_RES(IMG_NORMAL)),
SW_RESSTR(STR_NORMAL), &aHelpText );
SetMetricValue( *maWidthHeightField.get(), SWPAGE_WIDE_VALUE1, meUnit );
@@ -234,7 +234,7 @@ void PageMarginControl::FillValueSet(
aHelpText += aBottom;
aHelpText += aWide1ValText;
mpMarginValueSet->AddItem(
- Image((bLandscape) ? SW_RES(IMG_WIDE_L) : SW_RES(IMG_WIDE)), nullptr,
+ Image((bLandscape) ? SW_RES(IMG_WIDE_L) : SW_RES(IMG_WIDE)),
SW_RESSTR(STR_WIDE), &aHelpText );
const OUString aInner = SW_RESSTR(STR_MARGIN_TOOLTIP_INNER);
@@ -251,7 +251,7 @@ void PageMarginControl::FillValueSet(
aHelpText += aBottom;
aHelpText += aWide1ValText;
mpMarginValueSet->AddItem(
- Image((bLandscape) ? SW_RES(IMG_MIRRORED_L) : SW_RES(IMG_MIRRORED)), nullptr,
+ Image((bLandscape) ? SW_RES(IMG_MIRRORED_L) : SW_RES(IMG_MIRRORED)),
SW_RESSTR(STR_MIRRORED), &aHelpText );
if ( bUserCustomValuesAvailable )
@@ -274,7 +274,7 @@ void PageMarginControl::FillValueSet(
aHelpText.clear();
}
mpMarginValueSet->AddItem(
- Image((bUserCustomValuesAvailable) ? SW_RES(IMG_CUSTOM) : SW_RES(IMG_CUSTOM_DIS)), nullptr,
+ Image((bUserCustomValuesAvailable) ? SW_RES(IMG_CUSTOM) : SW_RES(IMG_CUSTOM_DIS)),
SW_RESSTR(STR_LCVALUE), &aHelpText );
}
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 4ad77aee5727..29151a1a2099 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -117,8 +117,7 @@ PageSizeControl::PageSizeControl(
mpSizeValueSet->AddItem(
SvxPaperInfo::GetName( maPaperList[ nPaperIdx ] ),
- aItemText2,
- nullptr );
+ aItemText2 );
if ( maPaperList[ nPaperIdx ] == mePaper )
{