diff options
30 files changed, 49 insertions, 50 deletions
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 2170fd8b637e..79f3e7cd9f36 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -486,7 +486,7 @@ public: virtual VclPtr<SfxAbstractInsertObjectDialog> CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommmand, const css::uno::Reference < css::embed::XStorage >& xStor, - const SvObjectServerList* pList = nullptr ) override; + const SvObjectServerList* pList ) override; virtual VclPtr<VclAbstractDialog> CreateEditObjectDialog( const OUString& rCommmand, const css::uno::Reference < css::embed::XEmbeddedObject >& xObj ) override; virtual VclPtr<SfxAbstractPasteDialog> CreatePasteDialog( vcl::Window* pParent ) override; diff --git a/include/sfx2/StyleManager.hxx b/include/sfx2/StyleManager.hxx index c6e7c238537a..b67a710b92a4 100644 --- a/include/sfx2/StyleManager.hxx +++ b/include/sfx2/StyleManager.hxx @@ -39,7 +39,7 @@ public: virtual StylePreviewRenderer* CreateStylePreviewRenderer( OutputDevice& rOutputDev, SfxStyleSheetBase* pStyle, - long nMaxHeight = 32) = 0; + long nMaxHeight) = 0; }; } // end namespace sfx2 diff --git a/include/sfx2/StylePreviewRenderer.hxx b/include/sfx2/StylePreviewRenderer.hxx index 971ce01b0d8b..2cace9158ae0 100644 --- a/include/sfx2/StylePreviewRenderer.hxx +++ b/include/sfx2/StylePreviewRenderer.hxx @@ -37,7 +37,7 @@ public: StylePreviewRenderer(const SfxObjectShell& rShell, OutputDevice& rOutputDev, SfxStyleSheetBase* pStyle, - long nMaxHeight = 32) + long nMaxHeight) : mrShell(rShell) , mrOutputDev(rOutputDev) , mpStyle(pStyle) diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 63cc0307bcc2..74d29003aa9e 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -155,7 +155,7 @@ public: /** * @param pArgs Takes ownership */ - sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc, const OUString& rFileName, SfxItemSet* pArgs = nullptr ); + sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc, const OUString& rFileName, SfxItemSet* pArgs ); vcl::Window* GetTopWindow() const; // members @@ -226,7 +226,7 @@ public: SAL_DLLPRIVATE void SetLastDir_Impl( const OUString & ); SAL_DLLPRIVATE static void Registrations_Impl(); - SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame *pFrame=nullptr) const; + SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame *pFrame) const; // TODO/CLEANUP: still needed? -- unclear whether this comment // refers to the GetDisabledSlotList_Impl() method which was diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 0f282a753aff..6e1ef1256d01 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -124,7 +124,7 @@ protected: SfxFloatingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, vcl::Window* pParent, - WinBits nWinBits=WB_STDMODELESS); + WinBits nWinBits); SfxFloatingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, vcl::Window* pParent, @@ -168,7 +168,7 @@ public: const OUString& rID = OUString("SingleTabDialog"), const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui")); - SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet* pInSet = nullptr, + SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet* pInSet, const OUString& rID = OUString("SingleTabDialog"), const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui")); diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index 134a4fd09953..3401549b1bed 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -53,7 +53,7 @@ public: virtual ~SfxControllerItem(); virtual void dispose(); - void Bind( sal_uInt16 nNewId, SfxBindings * = nullptr); // Register in SfxBindings + void Bind( sal_uInt16 nNewId, SfxBindings *); // Register in SfxBindings void UnBind(); void ReBind(); bool IsBound() const; diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 78dc67ea5f47..ac675cc242b3 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -102,7 +102,7 @@ friend class SfxHelp; SfxItemSet &rState, const SfxSlot *pRealSlot ); void Execute_( SfxShell &rShell, const SfxSlot &rSlot, SfxRequest &rReq, - SfxCallMode eCall = SfxCallMode::RECORD); + SfxCallMode eCall); void FlushImpl(); @@ -124,7 +124,7 @@ public: SfxCallMode nCall, SfxItemSet* pArgs, SfxItemSet* pInternalArgs, - sal_uInt16 nModi = 0); + sal_uInt16 nModi); const SfxPoolItem* ExecuteList( sal_uInt16 nSlot, SfxCallMode nCall, diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index 379340d0d0a7..29063e799caa 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -73,7 +73,7 @@ public: SfxDockingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, vcl::Window* pParent, - WinBits nWinBits=0); + WinBits nWinBits); SfxDockingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, vcl::Window* pParent, diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx index eae08b3a6ec1..6137496183b6 100644 --- a/include/sfx2/event.hxx +++ b/include/sfx2/event.hxx @@ -41,7 +41,7 @@ class SFX2_DLLPUBLIC SfxEventHint : public SfxHint sal_uInt16 nEventId; public: - SfxEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj = nullptr ) + SfxEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj ) : pObjShell(pObj), aEventName(aName), nEventId(nId) diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx index ed7055923188..996f8aca4f42 100644 --- a/include/sfx2/fcontnr.hxx +++ b/include/sfx2/fcontnr.hxx @@ -95,7 +95,7 @@ public: std::shared_ptr<const SfxFilter> GetFilter4FilterName( const OUString& rName, SfxFilterFlags nMust = SfxFilterFlags::NONE, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; std::shared_ptr<const SfxFilter> GetFilter4UIName( const OUString& rName, SfxFilterFlags nMust = SfxFilterFlags::NONE, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; std::shared_ptr<const SfxFilter> GetFilterForProps( const css::uno::Sequence < css::beans::NamedValue >& aSeq, SfxFilterFlags nMust = SfxFilterFlags::NONE, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; - std::shared_ptr<const SfxFilter> GetAnyFilter( SfxFilterFlags nMust=SfxFilterFlags::NONE, SfxFilterFlags nDont=SFX_FILTER_NOTINSTALLED ) const; + std::shared_ptr<const SfxFilter> GetAnyFilter( SfxFilterFlags nMustg=SfxFilterFlags::NONE, SfxFilterFlags nDont=SFX_FILTER_NOTINSTALLED ) const; }; class SfxFilterContainer_Impl; diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index a56b0b0c1300..039a9e54cb9c 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -246,8 +246,8 @@ ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType, std::vector<OUString>& rpURLList, OUString& rFilter, SfxItemSet *& rpSet, - const OUString* pPath = nullptr, - sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG, + const OUString* pPath, + sal_Int16 nDialog, const OUString& rStandardDir = OUString(), const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >()); diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 2df3fcd830c0..a46fd2616cec 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -186,7 +186,7 @@ class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem public: SfxFrameItem( sal_uInt16 nWhich, SfxViewFrame *p ); - SfxFrameItem( SfxFrame *p=nullptr ); + SfxFrameItem( SfxFrame *p ); SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p ); virtual bool operator==( const SfxPoolItem& ) const override; @@ -195,8 +195,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SfxFrame* GetFrame() const - { return wFrame; } + SfxFrame* GetFrame() const { return wFrame; } }; class SFX2_DLLPUBLIC SfxUsrAnyItem : public SfxPoolItem diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx index fae4be363dd7..cfbc60d87631 100644 --- a/include/sfx2/hintpost.hxx +++ b/include/sfx2/hintpost.hxx @@ -49,7 +49,7 @@ protected: public: SfxHintPoster(const Link<SfxRequest*,void>& rLink); - void Post( SfxRequest* pHint = nullptr ); + void Post( SfxRequest* pHint ); void SetEventHdl(const Link<SfxRequest*,void>& rLink); }; diff --git a/include/sfx2/inputdlg.hxx b/include/sfx2/inputdlg.hxx index 69cee70da20b..78221831b74c 100644 --- a/include/sfx2/inputdlg.hxx +++ b/include/sfx2/inputdlg.hxx @@ -21,7 +21,7 @@ class Button; class SFX2_DLLPUBLIC InputDialog : public ModalDialog { public: - InputDialog (const OUString &labelText, vcl::Window *pParent = nullptr); + InputDialog (const OUString &labelText, vcl::Window *pParent); OUString GetEntryText () const; void SetEntryText( OUString const & sStr ); void HideHelpBtn(); diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index 3419f08e8899..0615ca6da2f5 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -55,7 +55,7 @@ friend class SfxInPlaceClient_Impl; SAL_DLLPRIVATE virtual void ViewChanged(); public: - SfxInPlaceClient( SfxViewShell* pViewShell, vcl::Window* pDraw, sal_Int64 nAspect = css::embed::Aspects::MSOLE_CONTENT ); + SfxInPlaceClient( SfxViewShell* pViewShell, vcl::Window* pDraw, sal_Int64 nAspect ); virtual ~SfxInPlaceClient(); SfxViewShell* GetViewShell() const { return m_pViewSh; } diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx index ab59dddc1ed8..acaa7dc340fe 100644 --- a/include/sfx2/linkmgr.hxx +++ b/include/sfx2/linkmgr.hxx @@ -60,7 +60,7 @@ class SFX2_DLLPUBLIC LinkManager SfxObjectShell *pPersist; // LinkMgr must be release before SfxObjectShell protected: bool InsertLink( SvBaseLink* pLink, sal_uInt16 nObjType, SfxLinkUpdateMode nUpdateType, - const OUString* pName = nullptr ); + const OUString* pName ); public: enum LinkState diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index 6c81fff9b2de..5ad572947d1b 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -96,7 +96,7 @@ protected: m_xInputStreamToLoadFrom; SvBaseLink(); - SvBaseLink( SfxLinkUpdateMode nLinkType, SotClipboardFormatId nContentType = SotClipboardFormatId::STRING ); + SvBaseLink( SfxLinkUpdateMode nLinkType, SotClipboardFormatId nContentType ); virtual ~SvBaseLink() override; void GetRealObject_( bool bConnect = true ); diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx index a0d58b0fdfec..7ce3c8207da7 100644 --- a/include/sfx2/new.hxx +++ b/include/sfx2/new.hxx @@ -63,7 +63,7 @@ private: public: - SfxNewFileDialog(vcl::Window *pParent, sal_uInt16 nFlags = 0); + SfxNewFileDialog(vcl::Window *pParent, sal_uInt16 nFlags); virtual ~SfxNewFileDialog() override; virtual void dispose() override; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index fe72c66287b7..84ff20818883 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -295,7 +295,7 @@ public: void SetSharedXMLFlag( bool bFlag ) const; bool HasSharedXMLFlagSet() const; - SAL_DLLPRIVATE void SetModalMode_Impl(bool bModal=true); + SAL_DLLPRIVATE void SetModalMode_Impl(bool bModal); SAL_DLLPRIVATE void SetMacroMode_Impl(bool bModal=true); void ResetError(); @@ -431,7 +431,7 @@ public: virtual HiddenInformation GetHiddenInformationState( HiddenInformation nStates ); sal_Int16 QueryHiddenInformation( HiddenWarningFact eFact, vcl::Window* pParent ); bool IsSecurityOptOpenReadOnly() const; - void SetSecurityOptOpenReadOnly( bool bOpenReadOnly = true ); + void SetSecurityOptOpenReadOnly( bool bOpenReadOnly ); Size GetFirstPageSize(); bool DoClose(); @@ -455,7 +455,7 @@ public: bool IsAvoidRecentDocs() const { return mbAvoidRecentDocs; } /// Don't add to the recent documents - it's an expensive operation, sometimes it is not wanted. - void AvoidRecentDocs(bool bAvoid = true) { mbAvoidRecentDocs = bAvoid; } + void AvoidRecentDocs(bool bAvoid) { mbAvoidRecentDocs = bAvoid; } // Transfer IFace bool IsAbortingImport() const; @@ -463,7 +463,7 @@ public: void TemplateDisconnectionAfterLoad(); bool IsLoading() const; bool IsLoadingFinished() const; - void SetAutoLoad( const INetURLObject&, sal_uInt32 nTime, bool bReload = true ); + void SetAutoLoad( const INetURLObject&, sal_uInt32 nTime, bool bReload ); bool IsAutoLoadLocked() const; // Misc @@ -676,8 +676,8 @@ public: SAL_DLLPRIVATE void UpdateFromTemplate_Impl(); SAL_DLLPRIVATE bool CanReload_Impl(); SAL_DLLPRIVATE void SetNamedVisibility_Impl(); - SAL_DLLPRIVATE bool DoSave_Impl( const SfxItemSet* pSet=nullptr ); - SAL_DLLPRIVATE bool Save_Impl( const SfxItemSet* pSet=nullptr ); + SAL_DLLPRIVATE bool DoSave_Impl( const SfxItemSet* pSet ); + SAL_DLLPRIVATE bool Save_Impl( const SfxItemSet* pSet ); SAL_DLLPRIVATE bool PreDoSaveAs_Impl(const OUString& rFileName, const OUString& rFiltName, SfxItemSet& rItemSet); SAL_DLLPRIVATE bool APISaveAs_Impl(const OUString& aFileName, SfxItemSet& rItemSet); SAL_DLLPRIVATE bool CommonSaveAs_Impl(const INetURLObject& aURL, const OUString& aFilterName, SfxItemSet& rItemSet); diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx index 299778c51963..63ff1ef31277 100644 --- a/include/sfx2/recentdocsviewitem.hxx +++ b/include/sfx2/recentdocsviewitem.hxx @@ -16,7 +16,7 @@ class RecentDocsViewItem : public ThumbnailViewItem { public: RecentDocsViewItem(ThumbnailView &rView, const OUString &rURL, - const OUString &rTitle, const BitmapEx& rThumbnail, sal_uInt16 nId, long nThumbnailSize = 256); + const OUString &rTitle, const BitmapEx& rThumbnail, sal_uInt16 nId, long nThumbnailSize); /** Updates own highlight status based on the aPoint position. diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx index a30d3ab2be09..b95ca969ed8f 100644 --- a/include/sfx2/request.hxx +++ b/include/sfx2/request.hxx @@ -94,8 +94,8 @@ public: void SetReturnValue(const SfxPoolItem &); const SfxPoolItem* GetReturnValue() const; - static css::uno::Reference< css::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=nullptr ); - static bool HasMacroRecorder( SfxViewFrame* pFrame=nullptr ); + static css::uno::Reference< css::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame ); + static bool HasMacroRecorder( SfxViewFrame* pFrame ); SfxCallMode GetCallMode() const; void AllowRecording( bool ); bool AllowsRecording() const; diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index b1ca6371665e..14e93052b5be 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -137,7 +137,7 @@ public: virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0; virtual VclPtr<SfxAbstractInsertObjectDialog> CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommand, const css::uno::Reference < css::embed::XStorage >& xStor, - const SvObjectServerList* pList = nullptr )=0; + const SvObjectServerList* pList )=0; virtual VclPtr<VclAbstractDialog> CreateEditObjectDialog( const OUString& rCommand, const css::uno::Reference < css::embed::XEmbeddedObject >& xObj )=0; virtual VclPtr<SfxAbstractPasteDialog> CreatePasteDialog( vcl::Window* pParent )=0; diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx index 6be84c2f98d5..90031e4471cf 100644 --- a/include/sfx2/sfxhtml.hxx +++ b/include/sfx2/sfxhtml.hxx @@ -45,7 +45,7 @@ class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser protected: - SfxHTMLParser( SvStream& rStream, bool bNewDoc=true, SfxMedium *pMedium=nullptr ); + SfxHTMLParser( SvStream& rStream, bool bNewDoc, SfxMedium *pMedium ); virtual ~SfxHTMLParser() override; @@ -58,11 +58,11 @@ public: { return ParseMapOptions(pImageMap, GetOptions()); } static bool ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL, const HTMLOptions& rOptions, - sal_uInt16 nEventMouseOver = 0, - sal_uInt16 nEventMouseOut = 0 ); + sal_uInt16 nEventMouseOver, + sal_uInt16 nEventMouseOut ); inline bool ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL, - sal_uInt16 nEventMouseOver = 0, - sal_uInt16 nEventMouseOut = 0); + sal_uInt16 nEventMouseOver, + sal_uInt16 nEventMouseOut); // <TD SDVAL="..." SDNUM="..."> static double GetTableDataOptionsValNum( sal_uInt32& nNumForm, diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index dfe4eaf085e4..e36f6c6c9a75 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -74,7 +74,7 @@ protected: void CreateController(const sal_uInt16 nItemId, const css::uno::Reference<css::frame::XFrame>& rxFrame, - const sal_Int32 nItemWidth = 0); + const sal_Int32 nItemWidth); void RegisterHandlers(); }; diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 811a140928df..efed3fff4d35 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -51,7 +51,7 @@ class SFX2_DLLPUBLIC SfxTabDialogItem: public SfxSetItem { public: SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet ); - SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool=nullptr); + SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool); virtual SfxPoolItem* Clone(SfxItemPool* pToPool = nullptr) const override; virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override; }; diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index b1406f1b8a07..ecf75d61f7ca 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -192,7 +192,7 @@ public: class SFX2_DLLPUBLIC SfxTemplateSelectionDlg : public SfxTemplateManagerDlg { public: - SfxTemplateSelectionDlg(vcl::Window *parent = nullptr); + SfxTemplateSelectionDlg(vcl::Window *parent); virtual ~SfxTemplateSelectionDlg() override; virtual void dispose() override; diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 17bab08a5706..175c2eab8501 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -226,7 +226,7 @@ public: void ShowTooltips( bool bShowTooltips ); - void SetMultiSelectionEnabled( bool bIsMultiSelectionEnabled = true ); + void SetMultiSelectionEnabled( bool bIsMultiSelectionEnabled ); void filterItems (const std::function<bool (const ThumbnailViewItem*) > &func); diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 8ae9b8d1423f..d692f5ae3626 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -72,7 +72,7 @@ class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener sal_uInt16 m_nAdjustPosPixelLock; private: - SAL_DLLPRIVATE void Construct_Impl( SfxObjectShell *pObjSh=nullptr ); + SAL_DLLPRIVATE void Construct_Impl( SfxObjectShell *pObjSh ); protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -84,7 +84,7 @@ protected: virtual ~SfxViewFrame() override; public: - SfxViewFrame( SfxFrame& rFrame, SfxObjectShell *pDoc = nullptr ); + SfxViewFrame( SfxFrame& rFrame, SfxObjectShell *pDoc ); SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWFRM) @@ -98,7 +98,7 @@ public: static SfxViewFrame* LoadHiddenDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId ); static SfxViewFrame* LoadDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId ); - static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const sal_uInt16 i_nViewId = 0 ); + static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const sal_uInt16 i_nViewId ); static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const css::uno::Reference< css::frame::XFrame >& i_rFrameItem ); static SfxViewFrame* DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest ); @@ -106,10 +106,10 @@ public: static SfxViewFrame* GetFirst( const SfxObjectShell* pDoc = nullptr, bool bOnlyVisible = true ); static SfxViewFrame* GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = nullptr, bool bOnlyVisible = true ); - static SfxViewFrame* Get( const css::uno::Reference< css::frame::XController>& i_rController, const SfxObjectShell* i_pDoc = nullptr ); + static SfxViewFrame* Get( const css::uno::Reference< css::frame::XController>& i_rController, const SfxObjectShell* i_pDoc ); void DoActivate(bool bMDI); - void DoDeactivate(bool bMDI, SfxViewFrame *pOld=nullptr); + void DoDeactivate(bool bMDI, SfxViewFrame *pOld); using SfxShell::GetDispatcher; SfxDispatcher* GetDispatcher() { return m_pDispatcher; } diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 84f73ceee3b1..f7a672fd96f9 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -187,7 +187,7 @@ private: public: - SfxViewShell( SfxViewFrame *pFrame, SfxViewShellFlags nFlags = SfxViewShellFlags::NONE ); + SfxViewShell( SfxViewFrame *pFrame, SfxViewShellFlags nFlags ); virtual ~SfxViewShell() override; SfxInPlaceClient* GetIPClient() const; diff --git a/include/svx/CommonStyleManager.hxx b/include/svx/CommonStyleManager.hxx index b8e6ad63f759..9b144c0f3d6b 100644 --- a/include/svx/CommonStyleManager.hxx +++ b/include/svx/CommonStyleManager.hxx @@ -31,7 +31,7 @@ public: virtual sfx2::StylePreviewRenderer* CreateStylePreviewRenderer( OutputDevice& rOutputDev, SfxStyleSheetBase* pStyle, - long nMaxHeight = 32) override; + long nMaxHeight) override; }; } // end namespace svx |