mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:constantparam

Browse Source 
Change-Id: I0110e0c662004456e4bc8f8082e2e2fea59e0148
Reviewed-on: https://gerrit.libreoffice.org/54385
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2018-05-15 15:21:22 +02:00
parent 19b4520fbf
commit 196f46db1b
18 changed files with 43 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/svx/xoutbmp.hxx
View File

@ -71,7 +71,6 @@ public:
static Bitmap DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold );
static tools::Polygon GetContour( const Bitmap& rBmp, const XOutFlags nContourFlags,
const sal_uInt8 cEdgeDetectThreshold,
const tools::Rectangle* pWorkRect );
};

2
sc/source/core/data/documen2.cxx
View File

@ -1101,7 +1101,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos,
xLib->getByName( sSrcCodeName ) >>= sRTLSource;
sSource = sRTLSource;
}
VBA_InsertModule( *this, nDestPos, OUString(), sSource );
VBA_InsertModule( *this, nDestPos, sSource );
}
}

15
sc/source/ui/docshell/docfunc.cxx
View File

@ -3039,7 +3039,7 @@ static script::ModuleInfo lcl_InitModuleInfo( const SfxObjectShell& rDocSh, cons
return sModuleInfo;
}
void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleName, const OUString& sSource )
void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sSource )
{
SfxObjectShell& rDocSh = *rDoc.GetDocumentShell();
uno::Reference< script::XLibraryContainer > xLibContainer = rDocSh.GetBasicContainer();
@ -3059,15 +3059,8 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleName
if( xLib.is() )
{
// if the Module with codename exists then find a new name
sal_Int32 nNum = 0;
OUString genModuleName;
if ( !sModuleName.isEmpty() )
genModuleName = sModuleName;
else
{
genModuleName = "Sheet1";
nNum = 1;
}
sal_Int32 nNum = 1;
OUString genModuleName = "Sheet1";
while( xLib->hasByName( genModuleName ) )
genModuleName = "Sheet" + OUString::number( ++nNum );
@ -3152,7 +3145,7 @@ bool ScDocFunc::InsertTable( SCTAB nTab, const OUString& rName, bool bRecord, bo
// Only insert vba modules if vba mode ( and not currently importing XML )
if( bInsertDocModule )
{
VBA_InsertModule( rDoc, nTab, OUString(), OUString() );
VBA_InsertModule( rDoc, nTab, OUString() );
}
rDocShell.Broadcast( ScTablesHint( SC_TAB_INSERTED, nTab ) );

2
sc/source/ui/docshell/docsh5.cxx
View File

@ -974,7 +974,7 @@ bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, bool bCopy, bool bRec
catch ( const css::uno::Exception& )
{
}
VBA_InsertModule( aDocument, nTabToUse, OUString(), sSource );
VBA_InsertModule( aDocument, nTabToUse, sSource );
}
}
Broadcast( ScTablesHint( SC_TAB_COPIED, nSrcTab, nDestTab ) );

2
sc/source/ui/inc/docsh.hxx
View File

@ -484,7 +484,7 @@ namespace HelperNotifyChanges
}
};
void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleName, const OUString& sModuleSource );
void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleSource );
#endif

6
sc/source/ui/vba/vbarange.cxx
View File

@ -1287,7 +1287,7 @@ uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference
}
/// @throws uno::RuntimeException
uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::Reference< sheet::XSheetCellRangeContainer >& rxCellRanges, bool bRecursive )
uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::Reference< sheet::XSheetCellRangeContainer >& rxCellRanges )
{
if( !rxCellRanges.is() )
throw uno::RuntimeException("Missing cell ranges object" );
@ -1299,7 +1299,7 @@ uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::
for( sal_Int32 nIndex = 0; nIndex < nCount; ++nIndex )
{
uno::Reference< table::XCellRange > xRange( rxCellRanges->getByIndex( nIndex ), uno::UNO_QUERY_THROW );
table::CellRangeAddress aRangeAddr = lclGetRangeAddress( lclExpandToMerged( xRange, bRecursive ) );
table::CellRangeAddress aRangeAddr = lclGetRangeAddress( lclExpandToMerged( xRange, /*bRecursive*/true ) );
ScRange aScRange;
ScUnoConversion::FillScRange( aScRange, aRangeAddr );
aScRanges.push_back( aScRange );
@ -2242,7 +2242,7 @@ ScVbaRange::Select()
uno::Reference< frame::XModel > xModel( pShell->GetModel(), uno::UNO_QUERY_THROW );
uno::Reference< view::XSelectionSupplier > xSelection( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
if ( mxRanges.is() )
xSelection->select( uno::Any( lclExpandToMerged( mxRanges, true ) ) );
xSelection->select( uno::Any( lclExpandToMerged( mxRanges ) ) );
else
xSelection->select( uno::Any( lclExpandToMerged( mxRange, true ) ) );
// set focus on document e.g.

21
sd/source/ui/table/TableDesignPane.cxx
View File

@ -84,25 +84,16 @@ static const OUStringLiteral gPropNames[CB_COUNT] =
"UseBandingColumnStyle"
};
TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal )
TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase )
: mrBase(rBase)
, mbModal(bModal)
, mbStyleSelected(false)
, mbOptionsChanged(false)
{
pParent->get(m_pValueSet, "previews");
m_pValueSet->SetStyle(m_pValueSet->GetStyle() | WB_NO_DIRECTSELECT | WB_FLATVALUESET | WB_ITEMBORDER);
m_pValueSet->SetExtraSpacing(8);
m_pValueSet->setModal(mbModal);
if( !mbModal )
{
m_pValueSet->SetColor();
}
else
{
m_pValueSet->SetColor( COL_WHITE );
m_pValueSet->SetBackground( COL_WHITE );
}
m_pValueSet->setModal(false);
m_pValueSet->SetColor();
m_pValueSet->SetSelectHdl (LINK(this, TableDesignWidget, implValueSetHdl));
for (sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i)
@ -156,8 +147,7 @@ static SfxDispatcher* getDispatcher( ViewShellBase const & rBase )
IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl, ValueSet*, void)
{
mbStyleSelected = true;
if( !mbModal )
ApplyStyle();
ApplyStyle();
}
void TableDesignWidget::ApplyStyle()
@ -214,8 +204,7 @@ IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl, Button*, void)
{
mbOptionsChanged = true;
if( !mbModal )
ApplyOptions();
ApplyOptions();
FillDesignPreviewControl();
}

7
sd/source/ui/table/TableDesignPane.hxx
View File

@ -69,7 +69,7 @@ public:
class TableDesignWidget final
{
public:
TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal );
TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase );
~TableDesignWidget();
// callbacks
@ -102,7 +102,6 @@ private:
css::uno::Reference< css::drawing::XDrawView > mxView;
css::uno::Reference< css::container::XIndexAccess > mxTableFamily;
bool mbModal;
bool mbStyleSelected;
bool mbOptionsChanged;
};
@ -115,13 +114,13 @@ public:
TableDesignPane( vcl::Window* pParent, ViewShellBase& rBase )
: PanelLayout(pParent, "TableDesignPanel",
"modules/simpress/ui/tabledesignpanel.ui", css::uno::Reference<css::frame::XFrame>())
, aImpl(this, rBase, false)
, aImpl(this, rBase)
{
}
TableDesignPane( vcl::Window* pParent, ViewShellBase& rBase, bool )
: PanelLayout(pParent, "TableDesignPanel",
"modules/simpress/ui/tabledesignpanelhorizontal.ui", css::uno::Reference<css::frame::XFrame>())
, aImpl(this, rBase, false)
, aImpl(this, rBase)
{
}
};

16
sdext/source/minimizer/optimizerdialogcontrols.cxx
View File

@ -285,7 +285,7 @@ OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon
OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XItemListener >& rItemListener,
const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, bool bMultiLine, sal_Int16 nTabIndex )
const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int16 nTabIndex )
{
sal_Int32 nHeight = 8;
OUString pNames[] = {
@ -301,7 +301,7 @@ OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& r
Any pValues[] = {
Any( nHeight ),
Any( rLabel ),
Any( bMultiLine ),
Any( false ), // bMultiLine
Any( nXPos ),
Any( nYPos ),
Any( sal_Int16(0) ),
@ -518,8 +518,8 @@ void OptimizerDialog::InitPage2()
std::vector< OUString > aControlList;
aControlList.push_back( InsertFixedText( *this, "FixedText0Pg1", getString( STR_GRAPHIC_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false, true, mnTabIndex++ ) );
aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg1", mxItemListener, getString( STR_LOSSLESS_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, false, mnTabIndex++ ) );
aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg1", mxItemListener, getString( STR_JPEG_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12, false, mnTabIndex++ ) );
aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg1", mxItemListener, getString( STR_LOSSLESS_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, mnTabIndex++ ) );
aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg1", mxItemListener, getString( STR_JPEG_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12, mnTabIndex++ ) );
aControlList.push_back( InsertFixedText( *this, "FixedText1Pg1", getString( STR_QUALITY ), PAGE_POS_X + 20, PAGE_POS_Y + 40, 72, 8, false, false, mnTabIndex++ ) );
aControlList.push_back( InsertFormattedField( *this, "FormattedField0Pg1", mxTextListenerFormattedField0Pg1, mxSpinListenerFormattedField0Pg1, PAGE_POS_X + 106, PAGE_POS_Y + 38, 0, 100, mnTabIndex++ ) );
aControlList.push_back( InsertFixedText( *this, "FixedText2Pg1", getString( STR_IMAGE_RESOLUTION ), PAGE_POS_X + 6, PAGE_POS_Y + 54, 94, 8, false, false, mnTabIndex++ ) );
@ -564,8 +564,8 @@ void OptimizerDialog::InitPage3()
std::vector< OUString > aControlList;
aControlList.push_back( InsertFixedText( *this, "FixedText0Pg2", getString( STR_OLE_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false, true, mnTabIndex++ ) );
aControlList.push_back( InsertCheckBox( *this, "CheckBox0Pg2", mxItemListener, getString( STR_OLE_REPLACE ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, mnTabIndex++ ) );
aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg2", mxItemListener, getString( STR_ALL_OLE_OBJECTS ), PAGE_POS_X + 14, PAGE_POS_Y + 28, PAGE_WIDTH - 22, false, mnTabIndex++ ) );
aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg2", mxItemListener, getString( STR_ALIEN_OLE_OBJECTS_ONLY ), PAGE_POS_X + 14, PAGE_POS_Y + 40, PAGE_WIDTH - 22, false, mnTabIndex++ ) );
aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg2", mxItemListener, getString( STR_ALL_OLE_OBJECTS ), PAGE_POS_X + 14, PAGE_POS_Y + 28, PAGE_WIDTH - 22, mnTabIndex++ ) );
aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg2", mxItemListener, getString( STR_ALIEN_OLE_OBJECTS_ONLY ), PAGE_POS_X + 14, PAGE_POS_Y + 40, PAGE_WIDTH - 22, mnTabIndex++ ) );
aControlList.push_back( InsertFixedText( *this, "FixedText1Pg2", nOLECount ? getString( STR_OLE_OBJECTS_DESC ) : getString( STR_NO_OLE_OBJECTS_DESC ), PAGE_POS_X + 6, PAGE_POS_Y + 64, PAGE_WIDTH - 22, 50, true, false, mnTabIndex++ ) );
maControlPages.push_back( aControlList );
DeactivatePage( 3 );
@ -868,8 +868,8 @@ void OptimizerDialog::InitPage4()
aControlList.push_back( InsertFixedText( *this, "FixedText8Pg4", OUString(), PAGE_POS_X + 100, PAGE_POS_Y + 58, 30, 8, false, false, mnTabIndex++ ) );
setControlProperty( "FixedText8Pg4", "Align", Any( static_cast< short >( 2 ) ) );
aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg4", mxItemListener, getString( STR_APPLY_TO_CURRENT ), PAGE_POS_X + 6, PAGE_POS_Y + 78, PAGE_WIDTH - 12, false, mnTabIndex++ ) );
aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg4", mxItemListener, getString( STR_SAVE_AS ), PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, false, mnTabIndex++ ) );
aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg4", mxItemListener, getString( STR_APPLY_TO_CURRENT ), PAGE_POS_X + 6, PAGE_POS_Y + 78, PAGE_WIDTH - 12, mnTabIndex++ ) );
aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg4", mxItemListener, getString( STR_SAVE_AS ), PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, mnTabIndex++ ) );
aControlList.push_back( InsertFixedText( *this, "FixedText1Pg4", OUString(), PAGE_POS_X + 6, DIALOG_HEIGHT - 87, PAGE_WIDTH - 12, 8, true, false, mnTabIndex++ ) );
aControlList.emplace_back("Progress" );
aControlList.push_back( InsertSeparator( *this, "Separator1Pg4", 0, PAGE_POS_X + 6, DIALOG_HEIGHT - 58, PAGE_WIDTH - 12, 1 ) );

3
sdext/source/presenter/PresenterTheme.cxx
View File

@ -318,10 +318,9 @@ OUString PresenterTheme::GetStyleName (const OUString& rsResourceURL) const
PresenterTheme::SharedFontDescriptor PresenterTheme::ReadFont (
const Reference<container::XHierarchicalNameAccess>& rxNode,
const OUString& rsFontPath,
const PresenterTheme::SharedFontDescriptor& rpDefault)
{
return ReadContext::ReadFont(rxNode, rsFontPath, rpDefault);
return ReadContext::ReadFont(rxNode, OUString(), rpDefault);
}
bool PresenterTheme::ConvertToColor (

1
sdext/source/presenter/PresenterTheme.hxx
View File

@ -112,7 +112,6 @@ public:
static SharedFontDescriptor ReadFont (
const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode,
const OUString& rsFontPath,
const SharedFontDescriptor& rDefaultFount);
static bool ConvertToColor (

1
sdext/source/presenter/PresenterToolBar.cxx
View File

@ -1390,7 +1390,6 @@ void ElementMode::ReadElementMode (
PresenterConfigurationAccess::GetProperty(xProperties, "Font"), UNO_QUERY);
PresenterTheme::SharedFontDescriptor pFont (PresenterTheme::ReadFont(
xFontNode,
"",
rpDefaultMode.get()!=nullptr
? rpDefaultMode->maText.GetFont()
: PresenterTheme::SharedFontDescriptor()));

2
sfx2/source/appl/newhelp.hxx
View File

@ -577,7 +577,7 @@ public:
};
/// Appends ?Language=xy&System=abc to the help URL in rURL
void AppendConfigToken(OUStringBuffer& rURL, bool bQuestionMark, const OUString &rLang = OUString());
void AppendConfigToken(OUStringBuffer& rURL, bool bQuestionMark);
#endif // INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HXX

6
sfx2/source/appl/sfxhelp.cxx
View File

@ -272,11 +272,9 @@ static OUString HelpLocaleString()
void AppendConfigToken( OUStringBuffer& rURL, bool bQuestionMark, const OUString &rLang )
void AppendConfigToken( OUStringBuffer& rURL, bool bQuestionMark )
{
OUString aLocaleStr( rLang );
if ( aLocaleStr.isEmpty() )
aLocaleStr = HelpLocaleString();
OUString aLocaleStr = HelpLocaleString();
// query part exists?
if ( bQuestionMark )

8
sfx2/source/doc/DocumentMetadataAccess.cxx
View File

@ -478,7 +478,6 @@ handleError( ucb::InteractiveAugmentedIOException const & i_rException,
e.g. ODB files seem to only have content.xml */
static void
collectFilesFromStorage(uno::Reference<embed::XStorage> const& i_xStorage,
const OUString& i_Path,
std::set< OUString > & o_rFiles)
{
static OUString content(s_content);
@ -487,12 +486,12 @@ collectFilesFromStorage(uno::Reference<embed::XStorage> const& i_xStorage,
if (i_xStorage->hasByName(content) &&
i_xStorage->isStreamElement(content))
{
o_rFiles.insert(i_Path + content);
o_rFiles.insert(content);
}
if (i_xStorage->hasByName(styles) &&
i_xStorage->isStreamElement(styles))
{
o_rFiles.insert(i_Path + styles);
o_rFiles.insert(styles);
}
} catch (const uno::Exception &) {
SAL_WARN("sfx", "collectFilesFromStorage: exception?");
@ -1055,8 +1054,7 @@ void SAL_CALL DocumentMetadataAccess::loadMetadataFromStorage(
initLoading(*m_pImpl, i_xStorage, i_xBaseURI, i_xHandler);
std::set< OUString > StgFiles;
collectFilesFromStorage(i_xStorage,
"", StgFiles);
collectFilesFromStorage(i_xStorage, StgFiles);
std::vector< OUString > MfstMetadataFiles;

2
svx/source/dialog/_contdlg.cxx
View File

@ -179,7 +179,7 @@ tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
aBmp.SetPrefSize( rGraphic.GetPrefSize() );
aBmp.SetPrefMapMode( rGraphic.GetPrefMapMode() );
return tools::PolyPolygon( XOutBitmap::GetContour( aBmp, nContourFlags, 128, pRect ) );
return tools::PolyPolygon( XOutBitmap::GetContour( aBmp, nContourFlags, pRect ) );
}
// Loop through to super class, no virtual Methods to not become incompatible

2
svx/source/xoutdev/_xoutbmp.cxx
View File

@ -528,9 +528,9 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold )
}
tools::Polygon XOutBitmap::GetContour( const Bitmap& rBmp, const XOutFlags nFlags,
const sal_uInt8 cEdgeDetectThreshold,
const tools::Rectangle* pWorkRectPixel )
{
const sal_uInt8 cEdgeDetectThreshold = 128;
Bitmap aWorkBmp;
tools::Polygon aRetPoly;
tools::Rectangle aWorkRect( Point(), rBmp.GetSizePixel() );

17
xmloff/source/text/txtftne.cxx
View File

@ -230,15 +230,14 @@ static void lcl_exportString(
const OUString& sProperty,
sal_uInt16 nPrefix,
enum XMLTokenEnum eElement,
bool bEncodeName,
bool bOmitIfEmpty)
bool bEncodeName)
{
SAL_WARN_IF( eElement == XML_TOKEN_INVALID, "xmloff", "need element token");
Any aAny = rPropSet->getPropertyValue(sProperty);
OUString sTmp;
aAny >>= sTmp;
if (!bOmitIfEmpty || !sTmp.isEmpty())
if (!sTmp.isEmpty())
{
if( bEncodeName )
sTmp = rExport.EncodeStyleName( sTmp );
@ -257,33 +256,33 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper(
lcl_exportString( GetExport(), rFootnoteConfig,
sParaStyleName,
XML_NAMESPACE_TEXT, XML_DEFAULT_STYLE_NAME,
true, true);
true);
// citation style
lcl_exportString( GetExport(), rFootnoteConfig,
sCharStyleName,
XML_NAMESPACE_TEXT, XML_CITATION_STYLE_NAME,
true, true);
true);
// citation body style
lcl_exportString( GetExport(), rFootnoteConfig,
sAnchorCharStyleName,
XML_NAMESPACE_TEXT, XML_CITATION_BODY_STYLE_NAME,
true, true);
true);
// page style
lcl_exportString( GetExport(), rFootnoteConfig,
sPageStyleName,
XML_NAMESPACE_TEXT, XML_MASTER_PAGE_NAME,
true, true );
true );
// prefix
lcl_exportString( GetExport(), rFootnoteConfig, sPrefix,
XML_NAMESPACE_STYLE, XML_NUM_PREFIX, false, true);
XML_NAMESPACE_STYLE, XML_NUM_PREFIX, false);
// suffix
lcl_exportString( GetExport(), rFootnoteConfig, sSuffix,
XML_NAMESPACE_STYLE, XML_NUM_SUFFIX, false, true);
XML_NAMESPACE_STYLE, XML_NUM_SUFFIX, false);
Any aAny;