diff options
Diffstat (limited to 'sfx2/source')
-rw-r--r-- | sfx2/source/appl/app.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/appopen.cxx | 41 | ||||
-rw-r--r-- | sfx2/source/appl/appserv.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/bastyp/fltfnc.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/bindings.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 22 | ||||
-rw-r--r-- | sfx2/source/control/objface.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/control/templateremoteview.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/new.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 21 | ||||
-rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/explorer/nochaos.cxx | 14 | ||||
-rw-r--r-- | sfx2/source/view/frame2.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/view/ipclient.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/view/viewprn.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/view/viewsh.cxx | 2 |
17 files changed, 59 insertions, 87 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 3925544fd6d2..4b800583a6f8 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -535,7 +535,7 @@ SfxApplication::ChooseScript() uno::Reference< frame::XFrame > xFrame( pFrame ? pFrame->GetFrameInterface() : uno::Reference< frame::XFrame >() ); std::unique_ptr<AbstractScriptSelectorDialog> pDlg( - pFact->CreateScriptSelectorDialog( nullptr, false, xFrame )); + pFact->CreateScriptSelectorDialog( nullptr, xFrame )); SAL_INFO( "sfx.appl", "done, now exec it"); diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 879ac5c750a5..07a1deef8619 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -278,7 +278,7 @@ sal_uInt32 CheckPasswd_Impl } -sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUString &rFileName, bool bCopy, SfxItemSet* pSet ) +sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUString &rFileName, SfxItemSet* pSet ) { std::shared_ptr<const SfxFilter> pFilter; SfxMedium aMedium( rFileName, ( StreamMode::READ | StreamMode::SHARE_DENYNONE ) ); @@ -348,34 +348,29 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUStri } } - if( bCopy ) + try { - try - { - // TODO: introduce error handling - - uno::Reference< embed::XStorage > xTempStorage = ::comphelper::OStorageHelper::GetTemporaryStorage(); - if( !xTempStorage.is() ) - throw uno::RuntimeException(); + // TODO: introduce error handling - xDoc->GetStorage()->copyToStorage( xTempStorage ); + uno::Reference< embed::XStorage > xTempStorage = ::comphelper::OStorageHelper::GetTemporaryStorage(); + if( !xTempStorage.is() ) + throw uno::RuntimeException(); - if ( !xDoc->DoSaveCompleted( new SfxMedium( xTempStorage, OUString() ) ) ) - throw uno::RuntimeException(); - } - catch( uno::Exception& ) - { - xDoc->DoClose(); - xDoc.Clear(); + xDoc->GetStorage()->copyToStorage( xTempStorage ); - // TODO: transfer correct error outside - return ERRCODE_SFX_GENERAL; - } + if ( !xDoc->DoSaveCompleted( new SfxMedium( xTempStorage, OUString() ) ) ) + throw uno::RuntimeException(); + } + catch( uno::Exception& ) + { + xDoc->DoClose(); + xDoc.Clear(); - SetTemplate_Impl( rFileName, OUString(), xDoc ); + // TODO: transfer correct error outside + return ERRCODE_SFX_GENERAL; } - else - SetTemplate_Impl( rFileName, OUString(), xDoc ); + + SetTemplate_Impl( rFileName, OUString(), xDoc ); xDoc->SetNoName(); xDoc->InvalidateName(); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 25fb7729cb33..f467783104ce 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -1151,7 +1151,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) do // artificial loop for flow control { std::unique_ptr<AbstractScriptSelectorDialog> pDlg(pFact->CreateScriptSelectorDialog( - lcl_getDialogParent( xFrame, GetTopWindow() ), false, xFrame )); + lcl_getDialogParent( xFrame, GetTopWindow() ), xFrame )); OSL_ENSURE( pDlg, "SfxApplication::OfaExec_Impl( SID_RUNMACRO ): no dialog!" ); if ( !pDlg ) break; diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 80cb675b3b59..a1c7b0bdeeb9 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -398,7 +398,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilter( SfxMedium& rMedium, std::shared_ptr<c } -sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, std::shared_ptr<const SfxFilter>& rpFilter, SfxFilterFlags nMust, SfxFilterFlags nDont, bool /*bDefUI*/ ) const +sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, std::shared_ptr<const SfxFilter>& rpFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ) const { std::shared_ptr<const SfxFilter> pOldFilter = rpFilter; diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index e9eba41d1b04..e681c199ec83 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1038,7 +1038,7 @@ void SfxBindings::Release( SfxControllerItem& rItem ) } -const SfxPoolItem* SfxBindings::ExecuteSynchron( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_uInt16 nModi, +const SfxPoolItem* SfxBindings::ExecuteSynchron( sal_uInt16 nId, const SfxPoolItem** ppItems, const SfxPoolItem **ppInternalArgs ) { DBG_ASSERT( pImp->pCaches != nullptr, "SfxBindings not initialized" ); @@ -1046,10 +1046,10 @@ const SfxPoolItem* SfxBindings::ExecuteSynchron( sal_uInt16 nId, const SfxPoolIt if( !nId || !pDispatcher ) return nullptr; - return Execute_Impl( nId, ppItems, nModi, SfxCallMode::SYNCHRON, ppInternalArgs ); + return Execute_Impl( nId, ppItems, 0, SfxCallMode::SYNCHRON, ppInternalArgs ); } -bool SfxBindings::Execute( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_uInt16 nModi, SfxCallMode nCallMode, +bool SfxBindings::Execute( sal_uInt16 nId, const SfxPoolItem** ppItems, SfxCallMode nCallMode, const SfxPoolItem **ppInternalArgs ) { DBG_ASSERT( pImp->pCaches != nullptr, "SfxBindings not initialized" ); @@ -1057,7 +1057,7 @@ bool SfxBindings::Execute( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_uInt if( !nId || !pDispatcher ) return false; - const SfxPoolItem* pRet = Execute_Impl( nId, ppItems, nModi, nCallMode, ppInternalArgs ); + const SfxPoolItem* pRet = Execute_Impl( nId, ppItems, 0, nCallMode, ppInternalArgs ); return ( pRet != nullptr ); } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 8c4a2f9b5f11..f0d4327bd64e 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -179,13 +179,13 @@ void SfxDispatcher::Push(SfxShell& rShell) /** This method checks whether a particular <SfxShell> instance is on the SfxDispatcher. - @returns sal_True The SfxShell instance is on the SfxDispatcher. - sal_False The SfxShell instance is not on the SfxDispatcher. + @returns true The SfxShell instance is on the SfxDispatcher. + false The SfxShell instance is not on the SfxDispatcher. */ bool SfxDispatcher::IsActive(const SfxShell& rShell) { - return CheckVirtualStack(rShell, true); + return CheckVirtualStack(rShell); } /** With this method it can be determined whether the SfxDispatcher is @@ -515,7 +515,7 @@ IMPL_LINK_NOARG_TYPED( SfxDispatcher, EventHdl_Impl, Idle *, void ) This method is intended among other things to make assertions possible without the side effect of having to flush the SfxDispathcer. */ -bool SfxDispatcher::CheckVirtualStack(const SfxShell& rShell, bool bDeep) +bool SfxDispatcher::CheckVirtualStack(const SfxShell& rShell) { SFX_STACK(SfxDispatcher::CheckVirtualStack); @@ -538,11 +538,7 @@ bool SfxDispatcher::CheckVirtualStack(const SfxShell& rShell, bool bDeep) } } - bool bReturn; - if ( bDeep ) - bReturn = std::find(aStack.begin(), aStack.end(), &rShell) != aStack.end(); - else - bReturn = aStack.back() == &rShell; + bool bReturn = std::find(aStack.begin(), aStack.end(), &rShell) != aStack.end(); return bReturn; } @@ -990,12 +986,6 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall, const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall, const SfxItemSet &rArgs) { - return Execute( nSlot, eCall, 0, rArgs ); -} - -const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall, - sal_uInt16 nModi, const SfxItemSet &rArgs) -{ if ( IsLocked(nSlot) ) return nullptr; @@ -1011,7 +1001,7 @@ const SfxPoolItem* SfxDispatcher::Execute(sal_uInt16 nSlot, SfxCallMode eCall, pArg = aIter.NextItem() ) MappedPut_Impl( aSet, *pArg ); SfxRequest aReq( nSlot, eCall, aSet ); - aReq.SetModifier( nModi ); + aReq.SetModifier( 0 ); _Execute( *pShell, *pSlot, aReq, eCall ); return aReq.GetReturnValue(); } diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 69ec8f1c7455..38ee27667ee0 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -59,10 +59,10 @@ struct SfxObjectUI_Impl bool bContext; sal_uInt32 nFeature; - SfxObjectUI_Impl(sal_uInt16 n, sal_uInt32 nId, bool bVis, sal_uInt32 nFeat) : + SfxObjectUI_Impl(sal_uInt16 n, sal_uInt32 nId, sal_uInt32 nFeat) : nPos(n), nResId(nId), - bVisible(bVis), + bVisible(true), bContext(false), nFeature(nFeat) { @@ -381,7 +381,7 @@ SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, sal_uInt32 nResId, sal if ((nPos & SFX_VISIBILITY_MASK) == 0) nPos |= SFX_VISIBILITY_STANDARD; - return new SfxObjectUI_Impl(nPos, nResId, true, nFeature); + return new SfxObjectUI_Impl(nPos, nResId, nFeature); } sal_uInt32 SfxInterface::GetObjectBarId(sal_uInt16 nNo) const @@ -437,7 +437,7 @@ void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext) void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext, sal_uInt32 nFeature) { - SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, nId, true, nFeature); + SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, nId, nFeature); pUI->bContext = bContext; pImpData->aChildWindows.push_back(pUI); } diff --git a/sfx2/source/control/templateremoteview.cxx b/sfx2/source/control/templateremoteview.cxx index 9f74e8329654..07aaef278cae 100644 --- a/sfx2/source/control/templateremoteview.cxx +++ b/sfx2/source/control/templateremoteview.cxx @@ -70,12 +70,12 @@ void TemplateRemoteView::showRegion(ThumbnailViewItem * /*pItem*/) //TODO: } -bool TemplateRemoteView::loadRepository (TemplateRepository* pItem, bool bRefresh) +bool TemplateRemoteView::loadRepository (TemplateRepository* pItem) { if (!pItem) return false; - if (!pItem->getTemplates().empty() && !bRefresh) + if (!pItem->getTemplates().empty()) { insertItems(pItem->getTemplates()); return true; diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 603de57c5be5..3eb85f12760c 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -223,7 +223,7 @@ IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, Update, Idle*, void) SfxItemSet* pSet = new SfxAllItemSet(pSfxApp->GetPool()); pSet->Put(SfxBoolItem(SID_TEMPLATE, true)); pSet->Put(SfxBoolItem(SID_PREVIEW, true)); - lErr = pSfxApp->LoadTemplate(xDocShell, aFileName, true, pSet); + lErr = pSfxApp->LoadTemplate(xDocShell, aFileName, pSet); if (lErr) ErrorHandler::HandleError(lErr); Application::SetDefDialogParent(pParent); diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 4bcfdc93cbf1..878f9d75717e 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -448,14 +448,12 @@ class SfxSaveGuard public: SfxSaveGuard(const Reference< frame::XModel >& xModel , - IMPL_SfxBaseModel_DataContainer* pData , - bool bRejectConcurrentSaveRequest); + IMPL_SfxBaseModel_DataContainer* pData); ~SfxSaveGuard(); }; SfxSaveGuard::SfxSaveGuard(const Reference< frame::XModel >& xModel , - IMPL_SfxBaseModel_DataContainer* pData , - bool bRejectConcurrentSaveRequest) + IMPL_SfxBaseModel_DataContainer* pData) : m_xModel (xModel) , m_pData (pData ) , m_pFramesLock(nullptr ) @@ -463,13 +461,6 @@ SfxSaveGuard::SfxSaveGuard(const Reference< frame::XModel >& xModel if ( m_pData->m_bClosed ) throw lang::DisposedException("Object already disposed."); - if ( - bRejectConcurrentSaveRequest && - m_pData->m_bSaving - ) - throw io::IOException( - "Concurrent save requests on the same document are not possible."); - m_pData->m_bSaving = true; m_pFramesLock = new SfxOwnFramesLocker(m_pData->m_pObjectShell); } @@ -1522,7 +1513,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue > if ( m_pData->m_pObjectShell.Is() ) { m_pData->m_pObjectShell->AddLog( OSL_LOG_PREFIX "storeSelf" ); - SfxSaveGuard aSaveGuard(this, m_pData, false); + SfxSaveGuard aSaveGuard(this, m_pData); bool bCheckIn = false; for ( sal_Int32 nInd = 0; nInd < aSeqArgs.getLength(); nInd++ ) @@ -1651,7 +1642,7 @@ void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL if ( m_pData->m_pObjectShell.Is() ) { m_pData->m_pObjectShell->AddLog( OSL_LOG_PREFIX "storeAsURL" ); - SfxSaveGuard aSaveGuard(this, m_pData, false); + SfxSaveGuard aSaveGuard(this, m_pData); impl_store( rURL, rArgs, false ); @@ -1692,7 +1683,7 @@ void SAL_CALL SfxBaseModel::storeToURL( const OUString& rURL if ( m_pData->m_pObjectShell.Is() ) { m_pData->m_pObjectShell->AddLog( OSL_LOG_PREFIX "storeToURL" ); - SfxSaveGuard aSaveGuard(this, m_pData, false); + SfxSaveGuard aSaveGuard(this, m_pData); try { impl_store(rURL, rArgs, true); } @@ -1717,7 +1708,7 @@ void SAL_CALL SfxBaseModel::storeToRecoveryFile( const OUString& i_TargetLocatio SfxModelGuard aGuard( *this ); // delegate - SfxSaveGuard aSaveGuard( this, m_pData, false ); + SfxSaveGuard aSaveGuard( this, m_pData ); impl_store( i_TargetLocation, i_MediaDescriptor, true ); // no need for subsequent calls to storeToRecoveryFile, unless we're modified, again diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index bffbe89d07b1..5e05de675f6f 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -644,7 +644,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, RepositoryMenuSelectHdl, Menu*, pMenu, bo } } - if (mpRemoteView->loadRepository(pRepository,false)) + if (mpRemoteView->loadRepository(pRepository)) switchMainView(false); } diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx index 4f174a848379..ba13039a680d 100644 --- a/sfx2/source/explorer/nochaos.cxx +++ b/sfx2/source/explorer/nochaos.cxx @@ -41,7 +41,7 @@ class CntStaticPoolDefaults_Impl: private boost::noncopyable SfxItemInfo* m_pItemInfos; private: - inline void Insert( SfxPoolItem* pItem, sal_uInt16 nSID, bool bPoolable ); + inline void Insert( SfxPoolItem* pItem ); public: explicit CntStaticPoolDefaults_Impl( CntItemPool* pPool ); @@ -157,14 +157,13 @@ sal_uInt16 CntItemPool::Release() inline void CntStaticPoolDefaults_Impl::Insert( - SfxPoolItem* pItem, /* Static Pool Default Item */ - sal_uInt16 nSID, bool bPoolable /* Item Info */ ) + SfxPoolItem* pItem /* Static Pool Default Item */ ) { sal_uInt16 nPos = pItem->Which() - WID_CHAOS_START; m_ppDefaults[ nPos ] = pItem; - m_pItemInfos[ nPos ]._nSID = nSID; - m_pItemInfos[ nPos ]._bPoolable = bPoolable; + m_pItemInfos[ nPos ]._nSID = 0; + m_pItemInfos[ nPos ]._bPoolable = true; } @@ -185,10 +184,7 @@ CntStaticPoolDefaults_Impl::CntStaticPoolDefaults_Impl( CntItemPool* /*pPool*/ ) { memset( m_ppDefaults, 0, sizeof( SfxPoolItem* ) * m_nItems ); memset( m_pItemInfos, 0, sizeof( SfxItemInfo ) * m_nItems ); - Insert( - new SfxStringItem( WID_CHAOS_START, OUString() ), - 0, - true ); + Insert( new SfxStringItem( WID_CHAOS_START, OUString() ) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 60fcc2f0bded..8f7c6ce633c0 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -285,12 +285,12 @@ SfxFrame* SfxFrame::Create( const Reference < XFrame >& i_rFrame ) vcl::Window* pWindow = VCLUnoHelper::GetWindow( i_rFrame->getContainerWindow() ); ENSURE_OR_THROW( pWindow, "frame without container window not allowed" ); - SfxFrame* pFrame = new SfxFrame( *pWindow, false ); + SfxFrame* pFrame = new SfxFrame( *pWindow ); pFrame->SetFrameInterface_Impl( i_rFrame ); return pFrame; } -SfxFrame::SfxFrame( vcl::Window& i_rContainerWindow, bool i_bHidden ) +SfxFrame::SfxFrame( vcl::Window& i_rContainerWindow ) :SvCompatWeakBase<SfxFrame>( this ) ,pParentFrame( nullptr ) ,pChildArr( nullptr ) @@ -299,7 +299,7 @@ SfxFrame::SfxFrame( vcl::Window& i_rContainerWindow, bool i_bHidden ) { Construct_Impl(); - pImp->bHidden = i_bHidden; + pImp->bHidden = false; InsertTopFrame_Impl( this ); pImp->pExternalContainerWindow = &i_rContainerWindow; diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index abf5df204132..807b5c98ac68 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -73,9 +73,9 @@ class SfxBooleanFlagGuard bool& m_rFlag; bool m_bLifeValue; public: - SfxBooleanFlagGuard( bool& bFlag, bool bLifeValue ) + SfxBooleanFlagGuard( bool& bFlag ) : m_rFlag( bFlag ) - , m_bLifeValue( bLifeValue ) + , m_bLifeValue( true ) { m_rFlag = m_bLifeValue; } @@ -499,7 +499,7 @@ void SAL_CALL SfxInPlaceClient_Impl::changedPlacement( const awt::Rectangle& aPo { // the calculation of the object area has not changed the object size // it should be done here then - SfxBooleanFlagGuard aGuard( m_bResizeNoScale, true ); + SfxBooleanFlagGuard aGuard( m_bResizeNoScale ); // new size of the object area without scaling Size aNewObjSize( Fraction( aNewLogicRect.GetWidth() ) / m_aScaleWidth, diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 66836406e73d..0f4298f93ddf 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1416,7 +1416,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) Sequence< PropertyValue > aViewData; OSL_VERIFY( xViewData->getByIndex( nViewDataIndex ) >>= aViewData ); if ( aViewData.getLength() > 0 ) - m_pData->m_pViewShell->ReadUserDataSequence( aViewData, true ); + m_pData->m_pViewShell->ReadUserDataSequence( aViewData ); } } catch (const Exception&) diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index ab9b8d41859a..448c043c0796 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -884,7 +884,7 @@ SfxPrinter* SfxViewShell::GetPrinter( bool /*bCreate*/ ) return nullptr; } -sal_uInt16 SfxViewShell::SetPrinter( SfxPrinter* /*pNewPrinter*/, SfxPrinterChangeFlags /*nDiffFlags*/, bool ) +sal_uInt16 SfxViewShell::SetPrinter( SfxPrinter* /*pNewPrinter*/, SfxPrinterChangeFlags /*nDiffFlags*/ ) { return 0; } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index ea6518e6bf6c..11cf17ed7317 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1399,7 +1399,7 @@ void SfxViewShell::ReadUserData(const OUString&, bool ) { } -void SfxViewShell::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >&, bool ) +void SfxViewShell::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >& ) { } |