diff options
author | Noel Grandin <noel@peralex.com> | 2016-09-09 13:55:14 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-09-10 11:28:16 +0000 |
commit | b1164b07f9fdcd06a77dbdd74d45245a7c42c93e (patch) | |
tree | 3d07fe2ad37e2c7b931fb771da6dd2152657b3d4 /sdext/source | |
parent | 1c6596af456e4cb98784a0728bcb936d3b1f9d0d (diff) |
loplugin:constantparam in sd
Change-Id: I2bc989802c12b379a1ba4202f54ecfef1f339c8c
Reviewed-on: https://gerrit.libreoffice.org/28774
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sdext/source')
-rw-r--r-- | sdext/source/minimizer/configurationaccess.cxx | 5 | ||||
-rw-r--r-- | sdext/source/minimizer/configurationaccess.hxx | 3 | ||||
-rw-r--r-- | sdext/source/minimizer/informationdialog.cxx | 2 | ||||
-rw-r--r-- | sdext/source/minimizer/optimizerdialog.cxx | 2 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterAccessibility.cxx | 10 |
5 files changed, 7 insertions, 15 deletions
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 6193056f93eb..49f34809e93a 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -146,12 +146,11 @@ bool OptimizerSettings::operator==( const OptimizerSettings& rOptimizerSettings } -ConfigurationAccess::ConfigurationAccess( const Reference< uno::XComponentContext >& rxContext, OptimizerSettings* pDefaultSettings ) : +ConfigurationAccess::ConfigurationAccess( const Reference< uno::XComponentContext >& rxContext ) : mxContext( rxContext ) { LoadStrings(); - maSettings.push_back( pDefaultSettings ? - *pDefaultSettings : OptimizerSettings() ); + maSettings.push_back( OptimizerSettings() ); maSettings.back().maName = "LastUsedSettings"; LoadConfiguration(); maInitialSettings = maSettings; diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx index 5477934fbead..8cae507ecea9 100644 --- a/sdext/source/minimizer/configurationaccess.hxx +++ b/sdext/source/minimizer/configurationaccess.hxx @@ -80,8 +80,7 @@ class ConfigurationAccess { public: - ConfigurationAccess( const css::uno::Reference< css::uno::XComponentContext >& rXFactory, - OptimizerSettings* pDefaultSettings = nullptr ); + ConfigurationAccess( const css::uno::Reference< css::uno::XComponentContext >& rXFactory ); ~ConfigurationAccess(); void SaveConfiguration(); diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index c7f6c860c7d2..787a6ddf6830 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -306,7 +306,7 @@ void InformationDialog::InitDialog() InformationDialog::InformationDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, const OUString& rSaveAsURL, bool& rbOpenNewDocument, sal_Int64 rSourceSize, sal_Int64 rDestSize, sal_Int64 rApproxSize ) : UnoDialog( rxContext, rxFrame ), - ConfigurationAccess( rxContext, nullptr ), + ConfigurationAccess( rxContext ), mxActionListener( new OKActionListener( *this ) ), mnSourceSize( rSourceSize ), mnDestSize( rDestSize ), diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 700765df0e90..78c044a752c5 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -198,7 +198,7 @@ void OptimizerDialog::UpdateConfiguration() OptimizerDialog::OptimizerDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, Reference< XDispatch > const & rxStatusDispatcher ) : UnoDialog( rxContext, rxFrame ), - ConfigurationAccess( rxContext, nullptr ), + ConfigurationAccess( rxContext ), mnCurrentStep( 0 ), mnTabIndex( 0 ), mxFrame( rxFrame ), diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index fd26f801ad64..521ddd727708 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -312,7 +312,6 @@ class PresenterAccessible::AccessibleParagraph public: AccessibleParagraph ( const css::lang::Locale& rLocale, - const sal_Int16 nRole, const OUString& rsName, const SharedPresenterTextParagraph& rpParagraph, const sal_Int32 nParagraphIndex); @@ -474,7 +473,6 @@ class AccessibleNotes : public PresenterAccessible::AccessibleObject public: AccessibleNotes ( const css::lang::Locale& rLocale, - const sal_Int16 nRole, const OUString& rsName); static rtl::Reference<PresenterAccessible::AccessibleObject> Create ( @@ -1478,11 +1476,10 @@ AccessibleRelation SAL_CALL AccessibleRelationSet::getRelationByType (sal_Int16 PresenterAccessible::AccessibleParagraph::AccessibleParagraph ( const lang::Locale& rLocale, - const sal_Int16 nRole, const OUString& rsName, const SharedPresenterTextParagraph& rpParagraph, const sal_Int32 nParagraphIndex) - : PresenterAccessibleParagraphInterfaceBase(rLocale, nRole, rsName), + : PresenterAccessibleParagraphInterfaceBase(rLocale, AccessibleRole::PARAGRAPH, rsName), mpParagraph(rpParagraph), mnParagraphIndex(nParagraphIndex) { @@ -1822,9 +1819,8 @@ bool PresenterAccessible::AccessibleParagraph::GetWindowState (const sal_Int16 n AccessibleNotes::AccessibleNotes ( const css::lang::Locale& rLocale, - const sal_Int16 nRole, const OUString& rsName) - : AccessibleObject(rLocale,nRole,rsName), + : AccessibleObject(rLocale,AccessibleRole::PANEL,rsName), mpTextView() { } @@ -1849,7 +1845,6 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create ( rtl::Reference<AccessibleNotes> pObject ( new AccessibleNotes( rLocale, - AccessibleRole::PANEL, sName)); pObject->LateInitialization(); pObject->SetTextView(rpTextView); @@ -1884,7 +1879,6 @@ void AccessibleNotes::SetTextView ( rtl::Reference<PresenterAccessible::AccessibleParagraph> pParagraph ( new PresenterAccessible::AccessibleParagraph( css::lang::Locale(), - AccessibleRole::PARAGRAPH, "Paragraph"+OUString::number(nIndex), rpTextView->GetParagraph(nIndex), nIndex)); |