diff options
author | Noel Grandin <noel@peralex.com> | 2016-03-17 11:21:56 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-03-17 11:02:18 +0000 |
commit | db93b92d78714ed193b3cbe52b18e3cfd9da99b8 (patch) | |
tree | 1442edf9552192ce29b3e271396291e2bbd269a0 /sd | |
parent | 336d816176650726f6d14539464d9fd28ddd032d (diff) |
loplugin:constantparam in sfx2
Change-Id: I53e690ab8d50fb3ce43ba633fc018e7b66e591cd
Reviewed-on: https://gerrit.libreoffice.org/23321
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/dlgass.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/ViewShellBase.hxx | 5 | ||||
-rw-r--r-- | sd/source/ui/sidebar/MasterPageContainerProviders.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 16 |
5 files changed, 9 insertions, 20 deletions
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 45dfe096b1da..a8c065c74cda 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -497,7 +497,7 @@ SfxFrame* SdModule::CreateFromTemplate( const OUString& rTemplatePath, const Ref SfxItemSet* pSet = new SfxAllItemSet( SfxGetpApp()->GetPool() ); pSet->Put( SfxBoolItem( SID_TEMPLATE, true ) ); - sal_uLong lErr = SfxGetpApp()->LoadTemplate( xDocShell, rTemplatePath, true, pSet ); + sal_uLong lErr = SfxGetpApp()->LoadTemplate( xDocShell, rTemplatePath, pSet ); SfxObjectShell* pDocShell = xDocShell; diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 67dba1cdd3d5..11268d11eb14 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -1469,7 +1469,7 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview ) if(bDocPreview) pSet->Put( SfxBoolItem( SID_PREVIEW, true ) ); RestorePassword( pSet, aDocFile ); - if( (lErr = pSfxApp->LoadTemplate( xDocShell, aDocFile, true, pSet )) != 0 ) + if( (lErr = pSfxApp->LoadTemplate( xDocShell, aDocFile, pSet )) != 0 ) ErrorHandler::HandleError(lErr); else SavePassword( xDocShell, aDocFile ); @@ -1513,7 +1513,7 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview ) pSet->Put( SfxBoolItem( SID_PREVIEW, true ) ); RestorePassword( pSet, aLayoutFile ); - if( (lErr = pSfxApp->LoadTemplate( xLayoutDocShell, aLayoutFile, true, pSet )) != 0 ) + if( (lErr = pSfxApp->LoadTemplate( xLayoutDocShell, aLayoutFile, pSet )) != 0 ) ErrorHandler::HandleError(lErr); SavePassword( xLayoutDocShell, aLayoutFile ); } diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index d02a1573b4e9..8a5d2c8337fd 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -136,7 +136,7 @@ public: /// Forwarded to the print manager. virtual sal_uInt16 SetPrinter ( SfxPrinter* pNewPrinter, - SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false) override; + SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL) override; /// Forward methods to main sub shell. virtual void WriteUserDataSequence ( @@ -147,8 +147,7 @@ public: pane. */ virtual void ReadUserDataSequence ( - const css::uno::Sequence< css::beans::PropertyValue >&, - bool bBrowse = false) override; + const css::uno::Sequence< css::beans::PropertyValue >&) override; virtual void UIActivating( SfxInPlaceClient* ) override; virtual void UIDeactivated( SfxInPlaceClient* ) override; diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx index 8e4bce88f485..709f9a0efd4c 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx @@ -155,7 +155,7 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume SfxItemSet* pSet = new SfxAllItemSet (pSfxApp->GetPool()); pSet->Put (SfxBoolItem (SID_TEMPLATE, true)); pSet->Put (SfxBoolItem (SID_PREVIEW, true)); - if (pSfxApp->LoadTemplate (mxDocumentShell, sFileName, true, pSet)) + if (pSfxApp->LoadTemplate (mxDocumentShell, sFileName, pSet)) { mxDocumentShell = nullptr; } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 79026733d1ef..580f85edeae1 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -528,8 +528,7 @@ SfxPrinter* ViewShellBase::GetPrinter (bool bCreate) sal_uInt16 ViewShellBase::SetPrinter ( SfxPrinter* pNewPrinter, - SfxPrinterChangeFlags nDiffFlags, - bool bIsAPI) + SfxPrinterChangeFlags nDiffFlags) { OSL_ASSERT(mpImpl.get()!=nullptr); @@ -545,14 +544,6 @@ sal_uInt16 ViewShellBase::SetPrinter ( Size aNewSize = pNewPrinter->GetOutputSize(); bool bScaleAll = false; - if ( bIsAPI ) - { - ScopedVclPtrInstance<WarningBox> aWarnBox ( - GetWindow(), - (WinBits)(WB_YES_NO | WB_DEF_YES), - SD_RESSTR(STR_SCALE_OBJS_TO_PAGE)); - bScaleAll = (aWarnBox->Execute() == RET_YES); - } std::shared_ptr<DrawViewShell> pDrawViewShell ( std::dynamic_pointer_cast<DrawViewShell>(GetMainViewShell())); @@ -696,14 +687,13 @@ void ViewShellBase::WriteUserDataSequence ( } void ViewShellBase::ReadUserDataSequence ( - const css::uno::Sequence< css::beans::PropertyValue >& rSequence, - bool bBrowse) + const css::uno::Sequence< css::beans::PropertyValue >& rSequence) { // Forward call to main sub shell. ViewShell* pShell = GetMainViewShell().get(); if (pShell != nullptr) { - pShell->ReadUserDataSequence (rSequence, bBrowse); + pShell->ReadUserDataSequence (rSequence, true/*bBrowse*/); // For certain shell types ReadUserDataSequence may have changed the // type to another one. Make sure that the center pane shows the |