diff options
29 files changed, 81 insertions, 103 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index c59a32f36c75..0335cc3b04d4 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -850,8 +850,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( vcl::Window* pPa return nullptr; } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog( - vcl::Window* pParent, const Reference< frame::XFrame >& rxFrame, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog( const Reference< frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ) { VclPtr<Dialog> pDlg; @@ -859,7 +858,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog( { // only activate last page if we don't want to activate a special page bool bActivateLastSelection = ( nResId != SID_OPTIONS_DATABASES && rParameter.isEmpty() ); - VclPtrInstance<OfaTreeOptionsDialog> pOptDlg( pParent, rxFrame, bActivateLastSelection ); + VclPtrInstance<OfaTreeOptionsDialog> pOptDlg( nullptr, rxFrame, bActivateLastSelection ); if ( nResId == SID_OPTIONS_DATABASES ) pOptDlg->ActivatePage(SID_SB_DBREGISTEROPTIONS); else if ( !rParameter.isEmpty() ) @@ -1000,10 +999,9 @@ VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgre } VclAbstractDialog* -AbstractDialogFactory_Impl::CreateScriptErrorDialog( - vcl::Window* pParent, const css::uno::Any& rException) +AbstractDialogFactory_Impl::CreateScriptErrorDialog(const css::uno::Any& rException) { - return new SvxScriptErrorDialog(pParent, rException); + return new SvxScriptErrorDialog(nullptr, rException); } AbstractScriptSelectorDialog* @@ -1551,12 +1549,12 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia return nullptr; } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommand, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( const OUString& rCommand, const Reference < css::embed::XEmbeddedObject >& xObj ) { if ( rCommand == ".uno:InsertObjectFloatingFrame" ) { - VclPtrInstance<SfxInsertFloatingFrameDialog> pDlg( pParent, xObj ); + VclPtrInstance<SfxInsertFloatingFrameDialog> pDlg( nullptr, xObj ); pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) ); return new CuiVclAbstractDialog_Impl( pDlg ); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index fd98e4dd46fe..6f8bc05635e4 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -487,8 +487,7 @@ public: const SfxItemSet& rAttr, const css::uno::Reference< css::frame::XFrame >& _rxFrame, sal_uInt32 nResId ) override; - virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, - const css::uno::Reference< css::frame::XFrame >& rxFrame, + virtual VclAbstractDialog* CreateFrameDialog( const css::uno::Reference< css::frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ) override; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, @@ -511,7 +510,7 @@ public: virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommmand, const css::uno::Reference < css::embed::XStorage >& xStor, const SvObjectServerList* pList = nullptr ) override; - virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommmand, + virtual VclAbstractDialog* CreateEditObjectDialog( const OUString& rCommmand, const css::uno::Reference < css::embed::XEmbeddedObject >& xObj ) override; virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent ) override; virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=nullptr ) override; @@ -634,8 +633,7 @@ public: const css::uno::Reference< css::frame::XFrame >& _rxFrame ) override; - virtual VclAbstractDialog* CreateScriptErrorDialog( - vcl::Window* pParent, const css::uno::Any& rException) override; + virtual VclAbstractDialog* CreateScriptErrorDialog(const css::uno::Any& rException) override; virtual VclAbstractDialog* CreateSvxMacroAssignDlg( vcl::Window* _pParent, diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index aabf312759e5..12b25efbcf78 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -206,14 +206,14 @@ public: SAL_DLLPRIVATE void CloseAndReleaseStreams_Impl(); SAL_DLLPRIVATE void AddVersion_Impl( css::util::RevisionTag& rVersion ); SAL_DLLPRIVATE bool TransferVersionList_Impl( SfxMedium& rMedium ); - SAL_DLLPRIVATE void SaveVersionList_Impl( bool bUseXML ); + SAL_DLLPRIVATE void SaveVersionList_Impl(); SAL_DLLPRIVATE void RemoveVersion_Impl( const OUString& rVersion ); SAL_DLLPRIVATE void SetExpired_Impl( const DateTime& rDateTime ); SAL_DLLPRIVATE SvKeyValueIterator* GetHeaderAttributes_Impl(); SAL_DLLPRIVATE void Init_Impl(); - SAL_DLLPRIVATE void ForceSynchronStream_Impl( bool bSynchron ); + SAL_DLLPRIVATE void ForceSynchronStream_Impl(); SAL_DLLPRIVATE void GetLockingStream_Impl(); SAL_DLLPRIVATE void GetMedium_Impl(); diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index ffca96b2c639..9f2f71a4529f 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -359,7 +359,7 @@ public: bool SwitchChildrenPersistance( const css::uno::Reference< css::embed::XStorage >& xStorage, bool bForceNonModified = false ); - bool SaveCompletedChildren( bool bSuccess ); + bool SaveCompletedChildren(); /** a very special case to insert at a position in Writer from UNO, via OwnSubFilterService */ @@ -375,8 +375,7 @@ public: SignatureState GetScriptingSignatureState(); void SignScriptingContent(); - virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( - vcl::Window *pParent, const SfxItemSet& ); + virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( const SfxItemSet& ); ErrCode CallBasic( const OUString& rMacro, const OUString& rBasicName, SbxArray* pArgs = nullptr, SbxValue* pRet = nullptr ); diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index 4548dc889bf9..0a77e80df052 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -116,7 +116,7 @@ class SFX2_DLLPUBLIC SfxAbstractDialogFactory : virtual public VclAbstractDialog public: virtual ~SfxAbstractDialogFactory(); // needed for export of vtable static SfxAbstractDialogFactory* Create(); - virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, const css::uno::Reference< css::frame::XFrame >& rFrame, sal_uInt32 nResId, const rtl::OUString& rParameter ) = 0; + virtual VclAbstractDialog* CreateFrameDialog( const css::uno::Reference< css::frame::XFrame >& rFrame, sal_uInt32 nResId, const rtl::OUString& rParameter ) = 0; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, vcl::Window* pParent, const SfxItemSet* pAttrSet, @@ -130,7 +130,7 @@ public: virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommand, const css::uno::Reference < css::embed::XStorage >& xStor, const SvObjectServerList* pList = nullptr )=0; - virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommand, + virtual VclAbstractDialog* CreateEditObjectDialog( const OUString& rCommand, const css::uno::Reference < css::embed::XEmbeddedObject >& xObj )=0; virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent )=0; virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=nullptr )=0; @@ -143,8 +143,7 @@ public: const css::uno::Reference< css::frame::XFrame >& _rxFrame ) = 0; - virtual VclAbstractDialog* CreateScriptErrorDialog( - vcl::Window* pParent, const css::uno::Any& rException ) = 0; + virtual VclAbstractDialog* CreateScriptErrorDialog( const css::uno::Any& rException ) = 0; virtual VclAbstractDialog* CreateOptionsDialog( vcl::Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) = 0; diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index b960289245b3..2f0ec163f89d 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -197,7 +197,7 @@ public: SAL_DLLPRIVATE void ExecHistory_Impl( SfxRequest &rReq ); SAL_DLLPRIVATE void StateHistory_Impl( SfxItemSet &rSet ); SAL_DLLPRIVATE SfxViewFrame* GetParentViewFrame_Impl() const; - SAL_DLLPRIVATE void ForceOuterResize_Impl(bool bOn=true); + SAL_DLLPRIVATE void ForceOuterResize_Impl(); SAL_DLLPRIVATE bool IsResizeInToOut_Impl() const; SAL_DLLPRIVATE void UpdateDocument_Impl(); diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index f6ddfdf5cb99..e5f9aef610eb 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -409,8 +409,7 @@ public: const css::uno::Reference< css::frame::XFrame >& _rxFrame ) override = 0; - virtual VclAbstractDialog* CreateScriptErrorDialog( - vcl::Window* pParent, const css::uno::Any& rException) override = 0; + virtual VclAbstractDialog* CreateScriptErrorDialog(const css::uno::Any& rException) override = 0; virtual VclAbstractDialog* CreateSvxMacroAssignDlg( vcl::Window* _pParent, diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 08dbab971a38..0309e1dcc44a 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2878,10 +2878,9 @@ void ScDocShell::GetDocStat( ScDocStat& rDocStat ) (sal_uInt16) ScPrintFunc( this, pPrinter, i ).GetTotalPages() ); } -VclPtr<SfxDocumentInfoDialog> ScDocShell::CreateDocumentInfoDialog( - vcl::Window *pParent, const SfxItemSet &rSet ) +VclPtr<SfxDocumentInfoDialog> ScDocShell::CreateDocumentInfoDialog( const SfxItemSet &rSet ) { - VclPtr<SfxDocumentInfoDialog> pDlg = VclPtr<SfxDocumentInfoDialog>::Create( pParent, rSet ); + VclPtr<SfxDocumentInfoDialog> pDlg = VclPtr<SfxDocumentInfoDialog>::Create( nullptr, rSet ); ScDocShell* pDocSh = dynamic_cast< ScDocShell *>( SfxObjectShell::Current() ); // Only for statistics, if this Doc is shown; not from the Doc Manager diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 74bf9155e375..d0f93d4e71ad 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -220,8 +220,7 @@ public: void SetVisAreaOrSize( const Rectangle& rVisArea, bool bModifyStart ); - virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( vcl::Window *pParent, - const SfxItemSet &rSet ) override; + virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( const SfxItemSet &rSet ) override; void GetDocStat( ScDocStat& rDocStat ); diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 1c5d8558d485..85573b51a5c3 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -274,7 +274,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( if ( pFact != nullptr ) { std::unique_ptr<VclAbstractDialog> pDlg( - pFact->CreateScriptErrorDialog( nullptr, aException )); + pFact->CreateScriptErrorDialog( aException )); if ( pDlg ) pDlg->Execute(); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index e34157813aeb..ff5999d6d030 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -1052,9 +1052,9 @@ void DrawDocShell::OpenBookmark( const OUString& rBookmarkURL ) ( mpViewShell ? mpViewShell->GetViewFrame() : SfxViewFrame::Current() )->GetBindings().Execute( SID_OPENHYPERLINK, ppArgs ); } -VclPtr<SfxDocumentInfoDialog> DrawDocShell::CreateDocumentInfoDialog( vcl::Window *pParent, const SfxItemSet &rSet ) +VclPtr<SfxDocumentInfoDialog> DrawDocShell::CreateDocumentInfoDialog( const SfxItemSet &rSet ) { - VclPtr<SfxDocumentInfoDialog> pDlg = VclPtr<SfxDocumentInfoDialog>::Create( pParent, rSet ); + VclPtr<SfxDocumentInfoDialog> pDlg = VclPtr<SfxDocumentInfoDialog>::Create( nullptr, rSet ); DrawDocShell* pDocSh = dynamic_cast< DrawDocShell *>( SfxObjectShell::Current() ); if( pDocSh == this ) diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 8aa9b3b2664a..2b7a2cc41713 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -101,8 +101,7 @@ public: virtual Size GetFirstPageSize() override; virtual void FillClass(SvGlobalName* pClassName, SotClipboardFormatId* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const override; virtual void SetModified( bool = true ) override; - virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( vcl::Window *pParent, - const SfxItemSet &rSet ) override; + virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( const SfxItemSet &rSet ) override; using SfxObjectShell::GetVisArea; using SfxShell::GetViewShell; diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index f29288ed0408..25fb7729cb33 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -973,7 +973,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) if ( pFact ) { VclAbstractDialog* pDlg = - pFact->CreateFrameDialog( nullptr, xFrame, rReq.GetSlot(), sPageURL ); + pFact->CreateFrameDialog( xFrame, rReq.GetSlot(), sPageURL ); short nRet = pDlg->Execute(); delete pDlg; SfxViewFrame* pView = SfxViewFrame::GetFirst(); diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index da3da96d60ee..2ab9ab8b762e 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1905,7 +1905,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : InitToolBoxImages(); aToolBox->Show(); - InitOnStartupBox( false ); + InitOnStartupBox(); aOnStartupCB->SetClickHdl( LINK( this, SfxHelpTextWindow_Impl, CheckHdl ) ); aSelectIdle.SetIdleHdl( LINK( this, SfxHelpTextWindow_Impl, SelectHdl ) ); @@ -2001,7 +2001,7 @@ void SfxHelpTextWindow_Impl::InitToolBoxImages() } -void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) +void SfxHelpTextWindow_Impl::InitOnStartupBox() { sCurrentFactory = SfxHelp::GetCurrentModuleIdentifier(); @@ -2078,18 +2078,15 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) SetOnStartupBoxPosition(); } - if ( !bOnlyText ) - { - // set position of the checkbox - Size a3Size = LogicToPixel( Size( 3, 3 ), MAP_APPFONT ); - Size aTBSize = aToolBox->GetSizePixel(); - Size aCBSize = aOnStartupCB->GetSizePixel(); - Point aPnt = aToolBox->GetPosPixel(); - aPnt.X() += aTBSize.Width() + a3Size.Width(); - aPnt.Y() += ( ( aTBSize.Height() - aCBSize.Height() ) / 2 ); - aOnStartupCB->SetPosPixel( aPnt ); - nMinPos = aPnt.X(); - } + // set position of the checkbox + Size a3Size = LogicToPixel( Size( 3, 3 ), MAP_APPFONT ); + Size aTBSize = aToolBox->GetSizePixel(); + Size aCBSize = aOnStartupCB->GetSizePixel(); + Point aPnt = aToolBox->GetPosPixel(); + aPnt.X() += aTBSize.Width() + a3Size.Width(); + aPnt.Y() += ( ( aTBSize.Height() - aCBSize.Height() ) / 2 ); + aOnStartupCB->SetPosPixel( aPnt ); + nMinPos = aPnt.X(); } } diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 464e2b36ee43..9b9d43495a68 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -444,7 +444,7 @@ private: bool HasSelection() const; void InitToolBoxImages(); - void InitOnStartupBox( bool bOnlyText ); + void InitOnStartupBox(); void SetOnStartupBoxPosition(); css::uno::Reference< css::i18n::XBreakIterator > diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 89601b84317c..b343050e65ea 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -295,7 +295,7 @@ bool DropListBox_Impl::Notify( NotifyEvent& rNEvt ) { if( pDialog->bCanDel && KEY_DELETE == rKeyCode.GetCode()) { - pDialog->DeleteHdl( nullptr ); + pDialog->DeleteHdl(); bRet = true; } else if( KEY_RETURN == rKeyCode.GetCode()) @@ -1857,7 +1857,7 @@ IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl&, } // Handler for the New-Buttons -void SfxCommonTemplateDialog_Impl::NewHdl(void *) +void SfxCommonTemplateDialog_Impl::NewHdl() { if ( nActFamily != 0xffff && (pTreeBox || aFmtLb->GetSelectionCount() <= 1)) { @@ -1892,7 +1892,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *) } // Handler for the edit-Buttons -void SfxCommonTemplateDialog_Impl::EditHdl(void *) +void SfxCommonTemplateDialog_Impl::EditHdl() { if(IsInitialized() && HasSelectedStyle()) { @@ -1915,7 +1915,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *) } // Handler for the Delete-Buttons -void SfxCommonTemplateDialog_Impl::DeleteHdl(void *) +void SfxCommonTemplateDialog_Impl::DeleteHdl() { if ( IsInitialized() && HasSelectedStyle() ) { @@ -1986,7 +1986,7 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *) } } -void SfxCommonTemplateDialog_Impl::HideHdl(void *) +void SfxCommonTemplateDialog_Impl::HideHdl() { if ( IsInitialized() && HasSelectedStyle() ) { @@ -2004,7 +2004,7 @@ void SfxCommonTemplateDialog_Impl::HideHdl(void *) } } -void SfxCommonTemplateDialog_Impl::ShowHdl(void *) +void SfxCommonTemplateDialog_Impl::ShowHdl() { if ( IsInitialized() && HasSelectedStyle() ) @@ -2145,11 +2145,11 @@ IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, MenuSelectAsyncHdl, void*, void ) { switch(nLastItemId) { - case ID_NEW: NewHdl(nullptr); break; - case ID_EDIT: EditHdl(nullptr); break; - case ID_DELETE: DeleteHdl(nullptr); break; - case ID_HIDE: HideHdl(nullptr); break; - case ID_SHOW: ShowHdl(nullptr); break; + case ID_NEW: NewHdl(); break; + case ID_EDIT: EditHdl(); break; + case ID_DELETE: DeleteHdl(); break; + case ID_HIDE: HideHdl(); break; + case ID_SHOW: ShowHdl(); break; } } diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index a10bf5bc7cbd..df0d7c96c62e 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -637,7 +637,7 @@ const OUString& SfxMedium::GetPhysicalName() const void SfxMedium::CreateFileStream() { - ForceSynchronStream_Impl( true ); + ForceSynchronStream_Impl(); GetInStream(); if( pImp->m_pInStream ) { @@ -3131,13 +3131,13 @@ bool SfxMedium::IsExpired() const } -void SfxMedium::ForceSynchronStream_Impl( bool bForce ) +void SfxMedium::ForceSynchronStream_Impl() { if( pImp->m_pInStream ) { SvLockBytes* pBytes = pImp->m_pInStream->GetLockBytes(); if( pBytes ) - pBytes->SetSynchronMode( bForce ); + pBytes->SetSynchronMode( true/*bForce*/ ); } } @@ -3303,7 +3303,7 @@ bool SfxMedium::TransferVersionList_Impl( SfxMedium& rMedium ) return false; } -void SfxMedium::SaveVersionList_Impl( bool /*bUseXML*/ ) +void SfxMedium::SaveVersionList_Impl() { if ( GetStorage().is() ) { diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index a6dad472493d..7f6d50c9eeb8 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -302,7 +302,7 @@ public: bool renameGroup( const OUString& rOldName, const OUString& rNewName ); - void update( bool bUpdateNow ); + void update(); void doUpdate(); void finished() { mpUpdater = nullptr; } }; @@ -465,7 +465,7 @@ void SfxDocTplService_Impl::init_Impl() aSolarGuard.clear(); ::osl::ClearableMutexGuard anotherGuard( maMutex ); - update( true ); + update(); anotherGuard.clear(); SolarMutexGuard aSecondSolarGuard; @@ -474,7 +474,7 @@ void SfxDocTplService_Impl::init_Impl() } else if ( needsUpdate() ) // the UI should be shown only on the first update - update( true ); + update(); } else { @@ -1146,17 +1146,11 @@ void SfxDocTplService_Impl::setLocale( const lang::Locale &rLocale ) } -void SfxDocTplService_Impl::update( bool bUpdateNow ) +void SfxDocTplService_Impl::update() { ::osl::MutexGuard aGuard( maMutex ); - if ( bUpdateNow ) - doUpdate(); - else - { - mpUpdater = new Updater_Impl( this ); - mpUpdater->create(); - } + doUpdate(); } @@ -2378,7 +2372,7 @@ void SAL_CALL SfxDocTplService::update() throw( uno::RuntimeException, std::exception ) { if ( pImp->init() ) - pImp->update( true ); + pImp->update(); } diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index 4d8b48607ca3..4b2d79d9703c 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -405,7 +405,7 @@ void SAL_CALL IFrameObject::removeVetoableChangeListener(const OUString&, const ::sal_Int16 SAL_CALL IFrameObject::execute() throw (css::uno::RuntimeException, std::exception) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( nullptr, ".uno:InsertObjectFloatingFrame", mxObj ); + VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( ".uno:InsertObjectFloatingFrame", mxObj ); if ( pDlg ) pDlg->Execute(); return 0; diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 1024dadf5687..28d972eef333 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -284,11 +284,10 @@ void SfxObjectShell::UpdateTime_Impl( VclPtr<SfxDocumentInfoDialog> SfxObjectShell::CreateDocumentInfoDialog ( - vcl::Window* pParent, const SfxItemSet& rSet ) { - return VclPtr<SfxDocumentInfoDialog>::Create(pParent, rSet); + return VclPtr<SfxDocumentInfoDialog>::Create(nullptr, rSet); } diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 6a291cbf2fa3..a8dd86db683f 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1531,7 +1531,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon std::unique_ptr< VclAbstractDialog > pScriptErrDlg; SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); if ( pFact ) - pScriptErrDlg.reset( pFact->CreateScriptErrorDialog( nullptr, aException ) ); + pScriptErrDlg.reset( pFact->CreateScriptErrorDialog( aException ) ); OSL_ENSURE( pScriptErrDlg.get(), "SfxObjectShell::CallXScript: no script error dialog!" ); if ( pScriptErrDlg.get() ) diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 8880f48de430..19b1072eca30 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -490,7 +490,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // creating dialog is done via virtual method; application will // add its own statistics page - ScopedVclPtr<SfxDocumentInfoDialog> pDlg(CreateDocumentInfoDialog(nullptr, aSet)); + ScopedVclPtr<SfxDocumentInfoDialog> pDlg(CreateDocumentInfoDialog(aSet)); if ( RET_OK == pDlg->Execute() ) { const SfxDocumentInfoItem* pDocInfoItem = SfxItemSet::GetItem<SfxDocumentInfoItem>(pDlg->GetOutputItemSet(), SID_DOCINFO, false); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 07a3c6dbe5c0..cfc8710804e6 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -1519,13 +1519,13 @@ bool SfxObjectShell::SaveTo_Impl // add new version information into the versionlist and save the versionlist // the version list must have been transferred from the "old" medium before rMedium.AddVersion_Impl( aInfo ); - rMedium.SaveVersionList_Impl( true ); + rMedium.SaveVersionList_Impl(); bOk = PutURLContentsToVersionStream_Impl( aTmpVersionURL, xMedStorage, aInfo.Identifier ); } } else if ( bOk && ( pImp->bIsSaving || pImp->bPreserveVersions ) ) { - rMedium.SaveVersionList_Impl( true ); + rMedium.SaveVersionList_Impl(); } } @@ -2035,7 +2035,7 @@ bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed ) if( pFilter && !IsPackageStorageFormat_Impl( *pMedium ) && (pMedium->GetOpenMode() & StreamMode::WRITE )) { pMedium->ReOpen(); - bOk = SaveCompletedChildren( false ); + bOk = SaveCompletedChildren(); } else bOk = SaveCompleted( nullptr ); @@ -3144,7 +3144,7 @@ bool SfxObjectShell::SaveAsChildren( SfxMedium& rMedium ) return bResult; } -bool SfxObjectShell::SaveCompletedChildren( bool bSuccess ) +bool SfxObjectShell::SaveCompletedChildren() { bool bResult = true; @@ -3162,7 +3162,7 @@ bool SfxObjectShell::SaveCompletedChildren( bool bSuccess ) { try { - xPersist->saveCompleted( bSuccess ); + xPersist->saveCompleted( false/*bSuccess*/ ); } catch( uno::Exception& ) { @@ -3208,7 +3208,7 @@ bool SfxObjectShell::SaveCompleted( const uno::Reference< embed::XStorage >& xSt if ( !xStorage.is() || xStorage == GetStorage() ) { // no persistence change - bResult = SaveCompletedChildren( false ); + bResult = SaveCompletedChildren(); } else { diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index e4d949dc7aea..0535db0e0074 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -4304,7 +4304,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController( const sal_Int16 nPluginMode = aDocumentLoadArgs.getOrDefault( "PluginMode", sal_Int16( 0 ) ); if ( nPluginMode == 1 ) { - pViewFrame->ForceOuterResize_Impl( false ); + pViewFrame->ForceOuterResize_Impl(); pViewFrame->GetBindings().HidePopups(); SfxFrame& rFrame = pViewFrame->GetFrame(); diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index d3b6deb2e096..d21d5835b766 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -237,11 +237,11 @@ protected: virtual void ClearFamilyList() = 0; virtual void ReplaceUpdateButtonByMenu(); - void NewHdl( void* ); - void EditHdl( void* ); - void DeleteHdl( void* ); - void HideHdl( void* ); - void ShowHdl( void* ); + void NewHdl(); + void EditHdl(); + void DeleteHdl(); + void HideHdl(); + void ShowHdl(); bool Execute_Impl(sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr, sal_uInt16 nFamily, sal_uInt16 nMask = 0, diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index b19470bf1583..bea3126630c1 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1611,10 +1611,10 @@ SfxViewFrame* SfxViewFrame::GetParentViewFrame_Impl() const return nullptr; } -void SfxViewFrame::ForceOuterResize_Impl(bool bOn) +void SfxViewFrame::ForceOuterResize_Impl() { if ( !pImp->bDontOverwriteResizeInToOut ) - pImp->bResizeInToOut = !bOn; + pImp->bResizeInToOut = true; } bool SfxViewFrame::IsResizeInToOut_Impl() const diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 53caa2568c3b..3a73b9ed7886 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -109,8 +109,7 @@ class SW_DLLPUBLIC SwDocShell override; /// Make DocInfo known to the Doc. - SAL_DLLPRIVATE virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( - vcl::Window *pParent, const SfxItemSet &) override; + SAL_DLLPRIVATE virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog(const SfxItemSet &) override; /// OLE-stuff SAL_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16) override; diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index efb72ea696f8..accd64a86af1 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -358,7 +358,7 @@ sal_uLong SwXMLTextBlocks::PutBlock( SwPaM& , const OUString& ) pTmpMedium = new SfxMedium( xTempStorage, GetBaseURL() ); bool bTmpOK = pDocSh->SaveAsChildren( *pTmpMedium ); if( bTmpOK ) - bTmpOK = pDocSh->SaveCompletedChildren( false ); + bTmpOK = pDocSh->SaveCompletedChildren(); xTempStorage->copyToStorage( xRoot ); bOK = bTmpOK; diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index b952c3270bfd..2127b1ed3531 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -134,10 +134,9 @@ using namespace ::com::sun::star; using namespace ::sfx2; // create DocInfo (virtual) -VclPtr<SfxDocumentInfoDialog> SwDocShell::CreateDocumentInfoDialog( - vcl::Window *pParent, const SfxItemSet &rSet) +VclPtr<SfxDocumentInfoDialog> SwDocShell::CreateDocumentInfoDialog(const SfxItemSet &rSet) { - VclPtr<SfxDocumentInfoDialog> pDlg = VclPtr<SfxDocumentInfoDialog>::Create(pParent, rSet); + VclPtr<SfxDocumentInfoDialog> pDlg = VclPtr<SfxDocumentInfoDialog>::Create(nullptr, rSet); //only with statistics, when this document is being shown, not //from within the Doc-Manager SwDocShell* pDocSh = static_cast<SwDocShell*>( SfxObjectShell::Current()); |