diff options
44 files changed, 111 insertions, 197 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 2dac0259a46f..e732c7b28b48 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -861,54 +861,21 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog( const Referenc } // TabDialog outside the drawing layer -SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nResId, - vcl::Window* pParent, - const SfxItemSet* pAttrSet, - SfxViewFrame* ) +SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateAutoCorrTabDialog( const SfxItemSet* pAttrSet ) { - SfxTabDialog* pDlg=nullptr; - switch ( nResId ) - { - case RID_OFA_AUTOCORR_DLG : - pDlg = VclPtr<OfaAutoCorrDlg>::Create( pParent, pAttrSet ); - break; - case RID_SVXDLG_CUSTOMIZE : - pDlg = VclPtr<SvxConfigDialog>::Create( pParent, pAttrSet ); - break; - default: - break; - } - - if ( pDlg ) - return new CuiAbstractTabDialog_Impl( pDlg ); - return nullptr; + VclPtrInstance<OfaAutoCorrDlg> pDlg( nullptr, pAttrSet ); + return new CuiAbstractTabDialog_Impl( pDlg ); } -SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nResId, - vcl::Window* pParent, +SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateCustomizeTabDialog( const SfxItemSet* pAttrSet, const Reference< frame::XFrame >& xViewFrame ) { VclPtr<SfxTabDialog> pDlg; - switch ( nResId ) - { - case RID_OFA_AUTOCORR_DLG : - pDlg = VclPtr<OfaAutoCorrDlg>::Create( pParent, pAttrSet ); - break; - case RID_SVXDLG_CUSTOMIZE : - { - VclPtrInstance<SvxConfigDialog> pDlg1( pParent, pAttrSet ); - pDlg1->SetFrame(xViewFrame); - pDlg.reset(pDlg1); - } - break; - default: - break; - } - - if ( pDlg ) - return new CuiAbstractTabDialog_Impl( pDlg ); - return nullptr; + VclPtrInstance<SvxConfigDialog> pDlg1( nullptr, pAttrSet ); + pDlg1->SetFrame(xViewFrame); + pDlg.reset(pDlg1); + return new CuiAbstractTabDialog_Impl( pDlg ); } // TabDialog that use functionality of the drawing layer diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 63d2a8dedb2e..ada887ed7a08 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -467,12 +467,8 @@ public: virtual VclAbstractDialog* CreateFrameDialog( const css::uno::Reference< css::frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ) override; - virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, - vcl::Window* pParent, - const SfxItemSet* pAttrSet, - SfxViewFrame* pViewFrame ) override; - virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, - vcl::Window* pParent, + virtual SfxAbstractTabDialog* CreateAutoCorrTabDialog( const SfxItemSet* pAttrSet ) override; + virtual SfxAbstractTabDialog* CreateCustomizeTabDialog( const SfxItemSet* pAttrSet, const css::uno::Reference< css::frame::XFrame >& xViewFrame ) override; virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window* pParent, diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 55550b74ac5e..62f1e0413968 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -176,14 +176,12 @@ public: virtual ~SfxSingleTabDialog(); virtual void dispose() override; - void SetTabPage(SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = nullptr, sal_uInt32 nSettingsId = 0); + void SetTabPage(SfxTabPage* pTabPage, sal_uInt32 nSettingsId = 0); SfxTabPage* GetTabPage() const { return pImpl->m_pSfxPage; } OKButton* GetOKButton() const { return pOKBtn; } protected: - GetTabPageRanges fnGetRanges; - VclPtr<OKButton> pOKBtn; VclPtr<CancelButton> pCancelBtn; VclPtr<HelpButton> pHelpBtn; diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index cb852c9a7f04..e77785d801ce 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -167,19 +167,17 @@ public: SfxItemState QueryState( sal_uInt16 nSID, std::unique_ptr<SfxPoolItem> &rpState ); const SfxPoolItem* ExecuteSynchron( sal_uInt16 nSlot, - const SfxPoolItem **pArgs = nullptr, - const SfxPoolItem **pInternalArgs = nullptr); + const SfxPoolItem **pArgs = nullptr); bool Execute( sal_uInt16 nSlot, const SfxPoolItem **pArgs = nullptr, - SfxCallMode nCall = SfxCallMode::SLOT, - const SfxPoolItem **pInternalArgs = nullptr); + SfxCallMode nCall = SfxCallMode::SLOT); SAL_DLLPRIVATE void SetDispatchProvider_Impl( const css::uno::Reference< css::frame::XDispatchProvider > & rFrame ); void SetActiveFrame( const css::uno::Reference< css::frame::XFrame > & rFrame ); const css::uno::Reference< css::frame::XFrame > GetActiveFrame() const; // Reconfig - sal_uInt16 EnterRegistrations(const char *pFile = nullptr, int nLine = 0); - void LeaveRegistrations( sal_uInt16 nLevel = USHRT_MAX, const char *pFile = nullptr, int nLine = 0 ); + sal_uInt16 EnterRegistrations(const char *pFile = nullptr, int nLine = 0); + void LeaveRegistrations( const char *pFile = nullptr, int nLine = 0 ); void Register( SfxControllerItem& rBinding ); void Release( SfxControllerItem& rBinding ); SfxDispatcher* GetDispatcher() const @@ -204,11 +202,11 @@ public: #ifdef DBG_UTIL #define ENTERREGISTRATIONS() EnterRegistrations(__FILE__, __LINE__) -#define LEAVEREGISTRATIONS() LeaveRegistrations(USHRT_MAX, __FILE__, __LINE__) +#define LEAVEREGISTRATIONS() LeaveRegistrations(__FILE__, __LINE__) #define DENTERREGISTRATIONS() \ EnterRegistrations( OStringBuffer(__FILE__).append('(').append(reinterpret_cast<sal_Int64>(this)).append(')').getStr(), __LINE__ ) #define DLEAVEREGISTRATIONS( ) \ - LeaveRegistrations( USHRT_MAX, OStringBuffer(__FILE__).append('(').append(reinterpret_cast<sal_Int64>(this)).append(')').getStr(), __LINE__ ) + LeaveRegistrations( OStringBuffer(__FILE__).append('(').append(reinterpret_cast<sal_Int64>(this)).append(')').getStr(), __LINE__ ) #else #define ENTERREGISTRATIONS() EnterRegistrations() #define LEAVEREGISTRATIONS() LeaveRegistrations() diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 023486854201..416f003b1a49 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -110,8 +110,8 @@ protected: void FlushImpl(); public: - SfxDispatcher( SfxDispatcher* pParent ); - SfxDispatcher( SfxViewFrame *pFrame = nullptr ); + SfxDispatcher(); + SfxDispatcher( SfxViewFrame *pFrame ); SAL_DLLPRIVATE void Construct_Impl( SfxDispatcher* pParent ); @@ -183,7 +183,7 @@ public: SAL_DLLPRIVATE void RemoveShell_Impl( SfxShell& rShell ); SAL_DLLPRIVATE void DoParentActivate_Impl(); SAL_DLLPRIVATE void DoParentDeactivate_Impl(); - SAL_DLLPRIVATE void DoActivate_Impl( bool bMDI, SfxViewFrame* pOld ); + SAL_DLLPRIVATE void DoActivate_Impl( bool bMDI ); SAL_DLLPRIVATE void DoDeactivate_Impl( bool bMDI, SfxViewFrame* pNew ); SAL_DLLPRIVATE void InvalidateBindings_Impl(bool); }; diff --git a/include/sfx2/emojiview.hxx b/include/sfx2/emojiview.hxx index 0eac5adf1fd7..7e83b617d1e4 100644 --- a/include/sfx2/emojiview.hxx +++ b/include/sfx2/emojiview.hxx @@ -57,7 +57,7 @@ protected: class EmojiView : public ThumbnailView { public: - EmojiView ( vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP | WB_VSCROLL); + EmojiView ( vcl::Window* pParent); virtual ~EmojiView (); diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx index bb3d3603326e..6000378ee9ac 100644 --- a/include/sfx2/mailmodelapi.hxx +++ b/include/sfx2/mailmodelapi.hxx @@ -82,7 +82,7 @@ public: SfxMailModel(); ~SfxMailModel(); - void AddAddress( const OUString& rAddress, AddressRole eRole ); + void AddToAddress( const OUString& rAddress ); void SetSubject( const OUString& rSubject ) { maSubject = rSubject; } /** attaches a document to the current attachment list, can be called more than once. diff --git a/include/sfx2/saveastemplatedlg.hxx b/include/sfx2/saveastemplatedlg.hxx index bc3eade1b6b8..7d4d46e16e0a 100644 --- a/include/sfx2/saveastemplatedlg.hxx +++ b/include/sfx2/saveastemplatedlg.hxx @@ -59,7 +59,7 @@ public: public: - explicit SfxSaveAsTemplateDialog(vcl::Window *parent = nullptr); + explicit SfxSaveAsTemplateDialog(); virtual ~SfxSaveAsTemplateDialog(); virtual void dispose() override; diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index df8c08b2e1c9..13c1908385ed 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -117,12 +117,8 @@ public: virtual ~SfxAbstractDialogFactory(); // needed for export of vtable static SfxAbstractDialogFactory* Create(); 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, - SfxViewFrame* pViewFrame ) = 0; - virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, - vcl::Window* pParent, + virtual SfxAbstractTabDialog* CreateAutoCorrTabDialog( const SfxItemSet* pAttrSet ) = 0; + virtual SfxAbstractTabDialog* CreateCustomizeTabDialog( const SfxItemSet* pAttrSet, const css::uno::Reference< css::frame::XFrame >& xViewFrame ) = 0; virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 6962b5917c05..ba975f57fe9e 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -183,7 +183,7 @@ public: public: - explicit SfxTemplateCategoryDialog(vcl::Window *parent = nullptr); + explicit SfxTemplateCategoryDialog(); virtual ~SfxTemplateCategoryDialog(); virtual void dispose() override; diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index bd08a57a9dd9..c4e2e1a069f7 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -180,7 +180,7 @@ class SFX2_DLLPUBLIC ThumbnailView : public Control { public: - ThumbnailView(vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP, bool bDisableTransientChildren = false); + ThumbnailView(vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP); virtual ~ThumbnailView(); virtual void dispose() override; diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index 4b21a8e9b6eb..cbb8766da125 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -34,7 +34,7 @@ namespace sfx2 public: TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, - vcl::Window* i_pParent, WinBits i_nStyle = 0 + vcl::Window* i_pParent ); virtual ~TitledDockingWindow(); diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx index 17c4a5295819..a98f13ee75e8 100644 --- a/include/sfx2/tplpitem.hxx +++ b/include/sfx2/tplpitem.hxx @@ -32,8 +32,7 @@ public: static SfxPoolItem* CreateDefault(); SfxTemplateItem(); SfxTemplateItem( sal_uInt16 nWhich, - const OUString &rStyle, - sal_uInt16 nMask = SFXSTYLEBIT_ALL ); + const OUString &rStyle ); SfxTemplateItem( const SfxTemplateItem& ); const OUString& GetStyleName() const { return aStyle; } diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 20059109bd6a..1b4e5ecd89c8 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -207,17 +207,17 @@ IMPL_LINK_NOARG_TYPED(ScHFPage, HFEditHdl, void*, void) { aText = ScGlobal::GetRscString( STR_PAGEHEADER ); if ( bRightPage ) - pDlg->SetTabPage( ScRightHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ), nullptr, nSettingsId ); + pDlg->SetTabPage( ScRightHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ), nSettingsId ); else - pDlg->SetTabPage( ScLeftHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ), nullptr, nSettingsId ); + pDlg->SetTabPage( ScLeftHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ), nSettingsId ); } else { aText = ScGlobal::GetRscString( STR_PAGEFOOTER ); if ( bRightPage ) - pDlg->SetTabPage( ScRightFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ), nullptr, nSettingsId ); + pDlg->SetTabPage( ScRightFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ), nSettingsId ); else - pDlg->SetTabPage( ScLeftFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ), nullptr, nSettingsId ); + pDlg->SetTabPage( ScLeftFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ), nSettingsId ); } SvxNumType eNumType = static_cast<const SvxPageItem&>(aDataSet.Get(ATTR_PAGE)).GetNumType(); diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 87c5b7e5f6b4..a76a2fe4afc5 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -40,7 +40,7 @@ namespace sd { PaneDockingWindow::PaneDockingWindow( SfxBindings *_pBindings, SfxChildWindow *pChildWindow, vcl::Window* pParent, const OUString& rsTitle ) - : TitledDockingWindow(_pBindings, pChildWindow, pParent, WB_MOVEABLE|WB_CLOSEABLE|WB_DOCKABLE|WB_HIDE|WB_3DLOOK) + : TitledDockingWindow(_pBindings, pChildWindow, pParent) { SetTitle(rsTitle); SetSizePixel(LogicToPixel(Size(80,200), MAP_APPFONT)); diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index a6220499ce05..9ec5f0ee3af8 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -250,7 +250,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/notify/eventsupplier \ sfx2/source/notify/globalevents \ sfx2/source/notify/hintpost \ - sfx2/source/notify/stringhint \ + sfx2/source/notify/openurlhint \ sfx2/source/sidebar/Sidebar \ sfx2/source/sidebar/SidebarChildWindow \ sfx2/source/sidebar/SidebarDockingWindow \ diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index a1b63462f634..8daf1fa1a94d 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -237,7 +237,7 @@ void SfxApplication::Initialize_Impl() } DBG_ASSERT( !pImpl->pAppDispat, "AppDispatcher already exists" ); - pImpl->pAppDispat = new SfxDispatcher(static_cast<SfxDispatcher*>(nullptr)); + pImpl->pAppDispat = new SfxDispatcher; pImpl->pSlotPool = new SfxSlotPool; pImpl->pTbxCtrlFac = new SfxTbxCtrlFactArr_Impl; pImpl->pStbCtrlFac = new SfxStbCtrlFactArr_Impl; @@ -263,7 +263,7 @@ void SfxApplication::Initialize_Impl() // App-Dispatcher aufbauen pImpl->pAppDispat->Push(*this); pImpl->pAppDispat->Flush(); - pImpl->pAppDispat->DoActivate_Impl( true, nullptr ); + pImpl->pAppDispat->DoActivate_Impl( true ); { SolarMutexGuard aGuard; diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index b78255b1e17a..e841d2edadd7 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -277,11 +277,11 @@ namespace private: DECL_LINK_TYPED(ShowHdl, Button*, void); public: - explicit LicenseDialog(vcl::Window *pParent=nullptr); + explicit LicenseDialog(); }; - LicenseDialog::LicenseDialog(vcl::Window *pParent) - : ModalDialog(pParent, "LicenseDialog", "sfx/ui/licensedialog.ui") + LicenseDialog::LicenseDialog() + : ModalDialog(nullptr, "LicenseDialog", "sfx/ui/licensedialog.ui") { get<PushButton>("show")->SetClickHdl(LINK(this, LicenseDialog, ShowHdl)); } @@ -396,9 +396,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) if ( pFrameItem ) xFrame = pFrameItem->GetFrame(); - std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog( - RID_SVXDLG_CUSTOMIZE, - nullptr, &aSet, xFrame )); + std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateCustomizeTabDialog( + &aSet, xFrame )); if ( pDlg ) { @@ -1548,7 +1547,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) if ( pSet && pSet->GetItemState( pSetPool->GetWhich( SID_AUTO_CORRECT_DLG ), false, &pItem ) == SfxItemState::SET ) aSet.Put( *pItem ); - std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateTabDialog( RID_OFA_AUTOCORR_DLG, nullptr, &aSet, nullptr )); + std::unique_ptr<SfxAbstractTabDialog> pDlg(pFact->CreateAutoCorrTabDialog( &aSet )); pDlg->Execute(); } diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index ac0f027aff96..f0e409b78fe0 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -49,7 +49,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/docfile.hxx> #include "objshimp.hxx" -#include <stringhint.hxx> +#include <openurlhint.hxx> #include <sfx2/docfilt.hxx> #include <rtl/instance.hxx> @@ -188,11 +188,10 @@ SfxPickList::~SfxPickList() void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint ) { - const SfxStringHint* pStringHint = dynamic_cast<const SfxStringHint*>(&rHint); - if ( pStringHint ) + const SfxOpenUrlHint* pOpenUrlHint = dynamic_cast<const SfxOpenUrlHint*>(&rHint); + if ( pOpenUrlHint ) { - if ( pStringHint->GetId() == SID_OPENURL ) - INetURLHistory::GetOrCreate()->PutUrl( INetURLObject( pStringHint->GetObject() )); + INetURLHistory::GetOrCreate()->PutUrl( INetURLObject( pOpenUrlHint->GetDocumentURL() )); } const SfxEventHint* pEventHint = dynamic_cast<const SfxEventHint*>(&rHint); diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 3b782f1edbfa..371ff8f0d4ee 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -951,26 +951,24 @@ void SfxBindings::Release( SfxControllerItem& rItem ) } -const SfxPoolItem* SfxBindings::ExecuteSynchron( sal_uInt16 nId, const SfxPoolItem** ppItems, - const SfxPoolItem **ppInternalArgs ) +const SfxPoolItem* SfxBindings::ExecuteSynchron( sal_uInt16 nId, const SfxPoolItem** ppItems ) { DBG_ASSERT( pImpl->pCaches != nullptr, "SfxBindings not initialized" ); if( !nId || !pDispatcher ) return nullptr; - return Execute_Impl( nId, ppItems, 0, SfxCallMode::SYNCHRON, ppInternalArgs ); + return Execute_Impl( nId, ppItems, 0, SfxCallMode::SYNCHRON, nullptr ); } -bool SfxBindings::Execute( sal_uInt16 nId, const SfxPoolItem** ppItems, SfxCallMode nCallMode, - const SfxPoolItem **ppInternalArgs ) +bool SfxBindings::Execute( sal_uInt16 nId, const SfxPoolItem** ppItems, SfxCallMode nCallMode ) { DBG_ASSERT( pImpl->pCaches != nullptr, "SfxBindings not initialized" ); if( !nId || !pDispatcher ) return false; - const SfxPoolItem* pRet = Execute_Impl( nId, ppItems, 0, nCallMode, ppInternalArgs ); + const SfxPoolItem* pRet = Execute_Impl( nId, ppItems, 0, nCallMode, nullptr ); return ( pRet != nullptr ); } @@ -1595,11 +1593,9 @@ sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine) } -void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int nLine ) +void SfxBindings::LeaveRegistrations( const char *pFile, int nLine ) { - (void)nLevel; // unused variable DBG_ASSERT( nRegLevel, "Leave without Enter" ); - DBG_ASSERT( nLevel == USHRT_MAX || nLevel == nRegLevel, "wrong Leave" ); // Only when the SubBindings are still locked by the Superbindings, // remove this lock (i.e. if there are more locks than "real" ones) diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index c959816ed449..a83c6cb8361a 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -457,9 +457,9 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent ) xImp->aIdle.SetIdleHdl( LINK(this, SfxDispatcher, EventHdl_Impl ) ); } -SfxDispatcher::SfxDispatcher( SfxDispatcher* pParent ) +SfxDispatcher::SfxDispatcher() { - Construct_Impl( pParent ); + Construct_Impl( nullptr ); xImp->pFrame = nullptr; } @@ -742,7 +742,7 @@ SfxViewFrame* SfxDispatcher::GetFrame() const are called with the handler <SfxShell::Activate(bool)>, starting with the lowest. */ -void SfxDispatcher::DoActivate_Impl(bool bMDI, SfxViewFrame* /* pOld */) +void SfxDispatcher::DoActivate_Impl(bool bMDI) { SFX_STACK(SfxDispatcher::DoActivate); if ( bMDI ) diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx index c29ea7533dcd..6ab877f9d4c2 100644 --- a/sfx2/source/control/emojiview.cxx +++ b/sfx2/source/control/emojiview.cxx @@ -65,8 +65,8 @@ bool ViewFilter_Category::operator () (const ThumbnailViewItem *pItem) return true; } -EmojiView::EmojiView (vcl::Window *pParent, WinBits nWinStyle) - : ThumbnailView(pParent,nWinStyle) +EmojiView::EmojiView (vcl::Window *pParent) + : ThumbnailView(pParent, WB_TABSTOP | WB_VSCROLL) { //locate json data file OUString sPath("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/emojiconfig/emoji.json"); diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx index d86172ccf96d..1f3fc76ee469 100644 --- a/sfx2/source/control/templatesearchview.cxx +++ b/sfx2/source/control/templatesearchview.cxx @@ -23,8 +23,8 @@ #define MNI_DEFAULT_TEMPLATE 3 #define MNI_DELETE 4 -TemplateSearchView::TemplateSearchView (vcl::Window *pParent, WinBits nWinStyle) - : ThumbnailView(pParent,nWinStyle), +TemplateSearchView::TemplateSearchView (vcl::Window *pParent) + : ThumbnailView(pParent,WB_TABSTOP | WB_VSCROLL), maSelectedItem(nullptr), maPosition(0,0) { diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index a6a48e89ccaf..716883c47825 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -57,12 +57,12 @@ enum SCROLL_OFFSET = 4 }; -ThumbnailView::ThumbnailView (vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren) +ThumbnailView::ThumbnailView (vcl::Window *pParent, WinBits nWinStyle) : Control( pParent, nWinStyle ) , mpItemAttrs(new ThumbnailItemAttributes) { ImplInit(); - mbIsTransientChildrenDisabled = bDisableTransientChildren; + mbIsTransientChildrenDisabled = false; } ThumbnailView::~ThumbnailView() diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index d694dee656a9..d97ae949afeb 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -665,7 +665,6 @@ IMPL_LINK_NOARG_TYPED(SfxSingleTabDialog, OKHdl_Impl, Button*, void) SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rSet, const OUString& rID, const OUString& rUIXMLDescription) : SfxModalDialog(pParent, rID, rUIXMLDescription) - , fnGetRanges(nullptr) , pImpl(new SingleTabDlgImpl) { get(pOKBtn, "ok"); @@ -678,7 +677,6 @@ SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& r SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window* pParent, const SfxItemSet* pInSet, const OUString& rID, const OUString& rUIXMLDescription) : SfxModalDialog(pParent, rID, rUIXMLDescription) - , fnGetRanges(nullptr) , pImpl(new SingleTabDlgImpl) { get(pOKBtn, "ok"); @@ -705,7 +703,7 @@ void SfxSingleTabDialog::dispose() } void SfxSingleTabDialog::SetTabPage(SfxTabPage* pTabPage, - GetTabPageRanges pRangesFunc, sal_uInt32 nSettingsId) + sal_uInt32 nSettingsId) /* [Description] Insert a (new) TabPage; an existing page is deleted. @@ -717,7 +715,6 @@ void SfxSingleTabDialog::SetTabPage(SfxTabPage* pTabPage, SetUniqId(nSettingsId); pImpl->m_pSfxPage.disposeAndClear(); pImpl->m_pSfxPage = pTabPage; - fnGetRanges = pRangesFunc; if ( pImpl->m_pSfxPage ) { diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index c7995c9f2a08..9d6e6b3ae1ca 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -656,43 +656,17 @@ SfxMailModel::~SfxMailModel() { } -void SfxMailModel::AddAddress( const OUString& rAddress, AddressRole eRole ) +void SfxMailModel::AddToAddress( const OUString& rAddress ) { // don't add a empty address if ( !rAddress.isEmpty() ) { - AddressList_Impl* pList = nullptr; - if ( ROLE_TO == eRole ) - { - if ( !mpToList ) - // create the list - mpToList.reset(new AddressList_Impl); - pList = mpToList.get(); - } - else if ( ROLE_CC == eRole ) - { - if ( !mpCcList ) - // create the list - mpCcList.reset(new AddressList_Impl); - pList = mpCcList.get(); - } - else if ( ROLE_BCC == eRole ) - { - if ( !mpBccList ) - // create the list - mpBccList.reset(new AddressList_Impl); - pList = mpBccList.get(); - } - else - { - SAL_WARN( "sfx.dialog", "invalid address role" ); - } + if ( !mpToList ) + // create the list + mpToList.reset(new AddressList_Impl); - if ( pList ) - { - // add address to list - pList->push_back( rAddress ); - } + // add address to list + mpToList->push_back( rAddress ); } } diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 39e6bcd92ed1..bbe836309a11 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -179,7 +179,7 @@ void SfxSplitWindow::MouseButtonDown( const MouseEvent& rMEvt ) } SfxSplitWindow::SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl, - SfxWorkWindow *pW, bool bWithButtons, WinBits nBits ) + SfxWorkWindow *pW, bool bWithButtons ) /* [Description] @@ -189,7 +189,7 @@ SfxSplitWindow::SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl, the arrangement of the SfxDockingWindows. */ -: SplitWindow ( pParent, nBits | WB_HIDE ), +: SplitWindow ( pParent, WB_BORDER | WB_SIZEABLE | WB_3DLOOK | WB_HIDE ), eAlign(eAl), pWorkWin(pW), pDockArr( new SfxDockArr_Impl ), diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index bfa9d6782f56..27f292be0249 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -31,9 +31,8 @@ namespace sfx2 { //= TitledDockingWindow - TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, vcl::Window* i_pParent, - WinBits i_nStyle ) - :SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_nStyle ) + TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, vcl::Window* i_pParent ) + :SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, WB_MOVEABLE|WB_CLOSEABLE|WB_DOCKABLE|WB_HIDE|WB_3DLOOK ) ,m_sTitle() ,m_aToolbox( VclPtr<ToolBox>::Create(this) ) ,m_aContentWindow( VclPtr<vcl::Window>::Create(this, WB_DIALOGCONTROL) ) diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx index 6df782b266d2..6f5f77ef1d37 100644 --- a/sfx2/source/dialog/tplpitem.cxx +++ b/sfx2/source/dialog/tplpitem.cxx @@ -31,9 +31,8 @@ SfxTemplateItem::SfxTemplateItem() : SfxTemplateItem::SfxTemplateItem ( sal_uInt16 nWhichId, // Slot-ID - const OUString& rStyle, // Name of the current Styles - sal_uInt16 nValue // Flags for the filters of the automatic display -) : SfxFlagItem( nWhichId, nValue ), + const OUString& rStyle // Name of the current Styles +) : SfxFlagItem( nWhichId, SFXSTYLEBIT_ALL ), aStyle( rStyle ) { } diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx index cd384ac545aa..e2d103cf89c4 100644 --- a/sfx2/source/doc/saveastemplatedlg.cxx +++ b/sfx2/source/doc/saveastemplatedlg.cxx @@ -33,8 +33,8 @@ using namespace ::com::sun::star::frame; // Class SfxSaveAsTemplateDialog -------------------------------------------------- -SfxSaveAsTemplateDialog::SfxSaveAsTemplateDialog( vcl::Window* pParent): - ModalDialog(pParent, "SaveAsTemplateDialog", "sfx/ui/saveastemplatedlg.ui"), +SfxSaveAsTemplateDialog::SfxSaveAsTemplateDialog(): + ModalDialog(nullptr, "SaveAsTemplateDialog", "sfx/ui/saveastemplatedlg.ui"), msSelectedCategory(OUString()), msTemplateName(OUString()), mnRegionPos(0), diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 17c8411d462a..62e87918b82b 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -111,7 +111,7 @@ #include <sfx2/brokenpackageint.hxx> #include "graphhelp.hxx" #include "docundomanager.hxx" -#include <stringhint.hxx> +#include <openurlhint.hxx> #include <sfx2/msgpool.hxx> #include <sfx2/DocumentMetadataAccess.hxx> #include "printhelper.hxx" @@ -1074,7 +1074,7 @@ void SAL_CALL SfxBaseModel::connectController( const Reference< frame::XControll pViewFrame->UpdateDocument_Impl(); const OUString sDocumentURL = GetObjectShell()->GetMedium()->GetName(); if ( !sDocumentURL.isEmpty() ) - SfxGetpApp()->Broadcast( SfxStringHint( SID_OPENURL, sDocumentURL ) ); + SfxGetpApp()->Broadcast( SfxOpenUrlHint( sDocumentURL ) ); } } diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index f746147fa1e8..fae62da8a5d1 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -1289,8 +1289,8 @@ static std::vector<OUString> lcl_getAllFactoryURLs () // Class SfxTemplateCategoryDialog -------------------------------------------------- -SfxTemplateCategoryDialog::SfxTemplateCategoryDialog( vcl::Window* pParent): - ModalDialog(pParent, "TemplatesCategoryDialog", "sfx/ui/templatecategorydlg.ui"), +SfxTemplateCategoryDialog::SfxTemplateCategoryDialog(): + ModalDialog(nullptr, "TemplatesCategoryDialog", "sfx/ui/templatecategorydlg.ui"), msSelectedCategory(OUString()), mbIsNewCategory(false) { diff --git a/sfx2/source/inc/stringhint.hxx b/sfx2/source/inc/openurlhint.hxx index 4c2ed2ebdd67..ae8356ede52a 100644 --- a/sfx2/source/inc/stringhint.hxx +++ b/sfx2/source/inc/openurlhint.hxx @@ -23,14 +23,14 @@ #include <svl/smplhint.hxx> #include <rtl/ustring.hxx> -class SfxStringHint: public SfxSimpleHint +class SfxOpenUrlHint: public SfxSimpleHint { - OUString aObj; + OUString msDocumentURL; public: - SfxStringHint(sal_uInt16 nId, const OUString& rObject); - const OUString& GetObject() const; - virtual ~SfxStringHint(); + SfxOpenUrlHint(const OUString& sDocumentURL); + const OUString& GetDocumentURL() const; + virtual ~SfxOpenUrlHint(); }; #endif diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index b0a97b69dfd7..389384b37906 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -76,8 +76,7 @@ protected: public: SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl, - SfxWorkWindow *pW, bool bWithButtons, - WinBits nBits = WB_BORDER | WB_SIZEABLE | WB_3DLOOK ); + SfxWorkWindow *pW, bool bWithButtons ); virtual ~SfxSplitWindow(); virtual void dispose() override; diff --git a/sfx2/source/inc/templatesearchview.hxx b/sfx2/source/inc/templatesearchview.hxx index ce3c44b0ee37..c7d3fb7997b4 100644 --- a/sfx2/source/inc/templatesearchview.hxx +++ b/sfx2/source/inc/templatesearchview.hxx @@ -19,7 +19,7 @@ class TemplateSearchView : public ThumbnailView { public: - TemplateSearchView ( vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP | WB_VSCROLL); + TemplateSearchView ( vcl::Window* pParent); void setOpenTemplateHdl (const Link<ThumbnailViewItem*, void> &rLink); diff --git a/sfx2/source/notify/stringhint.cxx b/sfx2/source/notify/openurlhint.cxx index 980cf95d1880..1eba43b358dc 100644 --- a/sfx2/source/notify/stringhint.cxx +++ b/sfx2/source/notify/openurlhint.cxx @@ -17,17 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <stringhint.hxx> +#include <openurlhint.hxx> +#include <sfx2/sfxsids.hrc> -SfxStringHint::SfxStringHint( sal_uInt16 nId, const OUString& rObject ) : - SfxSimpleHint( nId ), - aObj(rObject) { } +SfxOpenUrlHint::SfxOpenUrlHint( const OUString& sDocumentURL ) : + SfxSimpleHint( SID_OPENURL ), + msDocumentURL(sDocumentURL) { } -const OUString& SfxStringHint::GetObject() const +const OUString& SfxOpenUrlHint::GetDocumentURL() const { - return aObj; + return msDocumentURL; } -SfxStringHint::~SfxStringHint() {} +SfxOpenUrlHint::~SfxOpenUrlHint() {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index f1c93d81243e..963876a8a859 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1077,7 +1077,7 @@ void SfxViewFrame::DoActivate( bool bUI ) { SfxGetpApp(); - m_pDispatcher->DoActivate_Impl( bUI, nullptr ); + m_pDispatcher->DoActivate_Impl( bUI ); // If this ViewFrame has got a parent and this is not a parent of the // old ViewFrames, it gets a ParentActivate. diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 710c9cbb1189..e2d2473f71c5 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -508,7 +508,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) if ( aRecipient.startsWith( aMailToStr ) ) aRecipient = aRecipient.copy( aMailToStr.getLength() ); - aModel.AddAddress( aRecipient, SfxMailModel::ROLE_TO ); + aModel.AddToAddress( aRecipient ); } const SfxStringItem* pMailDocType = rReq.GetArg<SfxStringItem>(SID_TYPE_NAME); if ( pMailDocType ) diff --git a/shell/inc/xml_parser.hxx b/shell/inc/xml_parser.hxx index 90aa36638c76..3ef5ada394ac 100644 --- a/shell/inc/xml_parser.hxx +++ b/shell/inc/xml_parser.hxx @@ -45,7 +45,7 @@ class i_xml_parser_event_handler; class xml_parser { public: - xml_parser(const XML_Char* EncodingName = nullptr); + xml_parser(); ~xml_parser(); diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx index 3c4dd0bb893b..6f466477aaed 100644 --- a/shell/source/all/xml_parser.cxx +++ b/shell/source/all/xml_parser.cxx @@ -69,9 +69,9 @@ namespace /* private */ } } -xml_parser::xml_parser(const XML_Char* EncodingName) : +xml_parser::xml_parser() : document_handler_(nullptr), - xml_parser_(XML_ParserCreate(EncodingName)) + xml_parser_(XML_ParserCreate(nullptr)) { init(); } diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx index 2b6659a67d22..a578b488e23d 100644 --- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx +++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx @@ -25,7 +25,7 @@ namespace { GError* m_pError; public: - explicit GErrorWrapper(GError* pError) : m_pError(pError) {} + explicit GErrorWrapper() : m_pError(nullptr) {} ~GErrorWrapper() noexcept(false) { if(!m_pError) @@ -41,7 +41,7 @@ namespace const OString sFullInterface = OUStringToOString("org.freedesktop.PackageKit." + sInterface, RTL_TEXTENCODING_ASCII_US); GDBusProxy* proxy = nullptr; { - GErrorWrapper error(nullptr); + GErrorWrapper error; proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_NONE, nullptr, "org.freedesktop.PackageKit", @@ -71,7 +71,7 @@ void request( auto iactUtf8(OUStringToOString(interaction, RTL_TEXTENCODING_UTF8)); std::shared_ptr<GDBusProxy> proxy( lcl_GetPackageKitProxy("Modify"), GObjectDeleter<GDBusProxy>()); - GErrorWrapper error(nullptr); + GErrorWrapper error; g_dbus_proxy_call_sync( proxy.get(), method, g_variant_new( @@ -168,7 +168,7 @@ void SyncDbusSessionHelper::InstallPrinterDrivers( const OString sPackagenameAscii = OUStringToOString(sPackagename, RTL_TEXTENCODING_ASCII_US); const OString sInteractionAscii = OUStringToOString(sInteraction, RTL_TEXTENCODING_ASCII_US); std::shared_ptr<GDBusProxy> proxy(lcl_GetPackageKitProxy("Query"), GObjectDeleter<GDBusProxy>()); - GErrorWrapper error(nullptr); + GErrorWrapper error; std::shared_ptr<GVariant> result(g_dbus_proxy_call_sync (proxy.get(), "IsInstalled", g_variant_new ("(ss)", diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx index 75af049601a4..c1b03c8f6f60 100644 --- a/shell/source/tools/lngconvex/lngconvex.cxx +++ b/shell/source/tools/lngconvex/lngconvex.cxx @@ -130,12 +130,11 @@ class StreamExceptionsEnabler { public: explicit StreamExceptionsEnabler( - std::ios& iostrm, - std::ios::iostate NewIos = std::ios::failbit | std::ios::badbit) : + std::ios& iostrm ) : m_IoStrm(iostrm), m_OldIos(m_IoStrm.exceptions()) { - m_IoStrm.exceptions(NewIos); + m_IoStrm.exceptions(std::ios::failbit | std::ios::badbit); } ~StreamExceptionsEnabler() diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx index d6be7b63f33b..9d19de32b555 100644 --- a/shell/source/unix/sysshell/recently_used_file_handler.cxx +++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx @@ -305,11 +305,9 @@ namespace /* private */ { class recent_item_writer { public: - recent_item_writer( - recently_used_file& file, - int max_items_to_write = MAX_RECENTLY_USED_ITEMS) : + recent_item_writer( recently_used_file& file ) : file_(file), - max_items_to_write_(max_items_to_write), + max_items_to_write_(MAX_RECENTLY_USED_ITEMS), items_written_(0) {} diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 6554b2689b51..cd79d2feb86b 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -372,9 +372,9 @@ void SwDocShell::Execute(SfxRequest& rReq) aSet.Put( *static_cast<const SfxBoolItem*>(pOpenSmartTagOptionsItem) ); SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - SfxAbstractTabDialog* pDlg = pFact->CreateTabDialog( RID_OFA_AUTOCORR_DLG, nullptr, &aSet, nullptr ); - pDlg->Execute(); - delete pDlg; + SfxAbstractTabDialog* pDlg = pFact->CreateAutoCorrTabDialog( &aSet ); + pDlg->Execute(); + delete pDlg; rACW.SetLockWordLstLocked( bOldLocked ); |