diff options
Diffstat (limited to 'include/sfx2')
-rw-r--r-- | include/sfx2/app.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/bindings.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/childwin.hxx | 3 | ||||
-rw-r--r-- | include/sfx2/docfac.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/docfile.hxx | 8 | ||||
-rw-r--r-- | include/sfx2/docfilt.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/dockwin.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/doctempl.hxx | 10 | ||||
-rw-r--r-- | include/sfx2/fcontnr.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/frame.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/frmdescr.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/linksrc.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/mgetempl.hxx | 3 | ||||
-rw-r--r-- | include/sfx2/objsh.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/passwd.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/request.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/sfxdlg.hxx | 9 | ||||
-rw-r--r-- | include/sfx2/tabdlg.hxx | 10 | ||||
-rw-r--r-- | include/sfx2/viewfrm.hxx | 8 | ||||
-rw-r--r-- | include/sfx2/viewsh.hxx | 2 |
20 files changed, 37 insertions, 52 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 6703157b7c6b..10205d32bbf0 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -162,8 +162,8 @@ public: static OUString ChooseScript(); static void MacroOrganizer( sal_Int16 nTabId ); static ErrCode CallBasic( const OUString&, BasicManager*, SbxArray *pArgs, SbxValue *pRet ); - static ErrCode CallAppBasic( const OUString& i_macroName, SbxArray* i_args = nullptr, SbxValue* i_ret = nullptr ) - { return CallBasic( i_macroName, SfxApplication::GetBasicManager(), i_args, i_ret ); } + static ErrCode CallAppBasic( const OUString& i_macroName, SbxArray* i_args = nullptr ) + { return CallBasic( i_macroName, SfxApplication::GetBasicManager(), i_args, nullptr ); } static BasicManager* GetBasicManager(); css::script::XLibraryContainer * GetDialogContainer(); css::script::XLibraryContainer * GetBasicContainer(); diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index 186e6b6c5668..3667a5a16e5d 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -159,7 +159,7 @@ public: bool IsInUpdate() const; void SetVisibleState( sal_uInt16 nId, bool bShow ); - bool IsBound( sal_uInt16 nMsgId, sal_uInt16 nStartSearchAt = 0 ); + bool IsBound( sal_uInt16 nMsgId ); SfxStateCache* GetStateCache( sal_uInt16 nId); SAL_DLLPRIVATE SfxStateCache* GetAnyStateCache_Impl( sal_uInt16 nId ); @@ -200,7 +200,7 @@ public: SAL_DLLPRIVATE void Register_Impl( SfxControllerItem& rBinding, bool ); SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl() const; SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* ); - SAL_DLLPRIVATE SfxBindings* GetSubBindings_Impl( bool bTop = false ) const; + SAL_DLLPRIVATE SfxBindings* GetSubBindings_Impl() const; SAL_DLLPRIVATE void InvalidateUnoControllers_Impl(); SAL_DLLPRIVATE void RegisterUnoController_Impl( SfxUnoControllerItem* ); SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* ); diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 4701bb44a377..973e23fd96e1 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -79,8 +79,7 @@ struct SAL_DLLPUBLIC_RTTI SfxChildWinInfo bool GetExtraData_Impl( SfxChildAlignment *pAlign, SfxChildAlignment *pLastAlign = nullptr, Size *pSize = nullptr, - sal_uInt16 *pLine = nullptr, - sal_uInt16 *pPos = nullptr ) const; + sal_uInt16 *pLine = nullptr ) const; }; // ChildWindow factory methods diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx index 3d279923d87f..0e98186bc29a 100644 --- a/include/sfx2/docfac.hxx +++ b/include/sfx2/docfac.hxx @@ -57,7 +57,7 @@ public: OUString GetFactoryURL() const; // shortcut for "private:factory/GetShortName()" OUString GetFactoryName() const { return OUString::createFromAscii(pShortName); } OUString GetModuleName() const; - SfxFilterContainer *GetFilterContainer( bool bForceLoad = true) const; + SfxFilterContainer *GetFilterContainer() const; // Views void RegisterViewFactory(SfxViewFactory &rFactory); diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index 2dc8014c8fa4..aabf312759e5 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -113,10 +113,10 @@ public: void SetLoadTargetFrame(SfxFrame* pFrame ); SfxFrame* GetLoadTargetFrame() const; - void SetFilter(const SfxFilter *pFlt, bool bResetOrig = false); - const SfxFilter* GetFilter() const; - const SfxFilter * GetOrigFilter( bool bNotCurrent = false ) const; - const OUString& GetOrigURL() const; + void SetFilter(const SfxFilter *pFlt); + const SfxFilter* GetFilter() const; + const SfxFilter* GetOrigFilter() const; + const OUString& GetOrigURL() const; SfxItemSet * GetItemSet() const; void Close(); diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx index 6f45c9780b16..f67a69f2f410 100644 --- a/include/sfx2/docfilt.hxx +++ b/include/sfx2/docfilt.hxx @@ -111,7 +111,7 @@ public: static OUString GetTypeFromStorage( const SotStorage& rStg ); static OUString GetTypeFromStorage( const css::uno::Reference<css::embed::XStorage>& xStorage, - bool bTemplate = false, OUString* pName = nullptr ) + bool bTemplate = false ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index e9ecf60cd5af..40a7f8081293 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -111,7 +111,7 @@ public: SAL_DLLPRIVATE void Disappear_Impl(); SAL_DLLPRIVATE void Reappear_Impl(); SAL_DLLPRIVATE bool IsAutoHide_Impl() const; - SAL_DLLPRIVATE void AutoShow_Impl( bool bShow = true ); + SAL_DLLPRIVATE void AutoShow_Impl(); SAL_DLLPRIVATE void ReleaseChildWindow_Impl(); }; diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx index 82fdc1136adc..66b1dcee6bb6 100644 --- a/include/sfx2/doctempl.hxx +++ b/include/sfx2/doctempl.hxx @@ -108,16 +108,8 @@ public: configuration. This means that just by copying files into OOo's template directories, this change is not reflected in the SfxDocumentTemplates - 'cause the configuration is not synchronous with the file system. This can be enforced with this method.</p> - - @param _bSmart - The update of the configuration is rather expensive - nothing you want to do regulary if you don't really - need it. So you have the possibility to do a smart update - it first checks if the update if necessary. - In case the update is needed, the additional check made it somewhat more expensive. In case it's not - necessary (which should be the usual case), the check alone is (much) less expensive than the real update. - <br/> - So set <arg>_bSmart</arg> to <TRUE/> to do a check for necessity first. */ - void Update( bool _bSmart = true ); + void Update(); }; #endif // INCLUDED_SFX2_DOCTEMPL_HXX diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx index 3bfa5e07a614..a15c9b0d7133 100644 --- a/include/sfx2/fcontnr.hxx +++ b/include/sfx2/fcontnr.hxx @@ -95,10 +95,10 @@ public: SAL_DLLPRIVATE static bool IsFilterInstalled_Impl( const SfxFilter* pFilter ); DECL_DLLPRIVATE_LINK_TYPED( MaybeFileHdl_Impl, OUString*, bool ); - sal_uInt32 GuessFilterIgnoringContent( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SfxFilterFlags::IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; + sal_uInt32 GuessFilterIgnoringContent( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SfxFilterFlags::IMPORT ) const; sal_uInt32 GuessFilter( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SfxFilterFlags::IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; sal_uInt32 GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SfxFilterFlags::IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED, bool bDefUI = true ) const; - sal_uInt32 DetectFilter( SfxMedium& rMedium, const SfxFilter **, bool bPlugIn, bool bAPI = false ) const; + sal_uInt32 DetectFilter( SfxMedium& rMedium, const SfxFilter ** ) const; const SfxFilter* GetFilter4Mime( const OUString& rMime, SfxFilterFlags nMust = SfxFilterFlags::IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED) const; const SfxFilter* GetFilter4ClipBoardId( SotClipboardFormatId nId, SfxFilterFlags nMust = SfxFilterFlags::IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 0111f5e92577..2a7aa0615d03 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -117,8 +117,8 @@ public: CreateBlankFrame(); static SfxFrame* Create( SfxObjectShell& rDoc, vcl::Window& rWindow, sal_uInt16 nViewId, bool bHidden ); - vcl::Window& GetWindow() const { return *pWindow;} - void CancelTransfers( bool bCancelLoadEnv = true ); + vcl::Window& GetWindow() const { return *pWindow;} + void CancelTransfers(); bool DoClose(); sal_uInt16 GetChildFrameCount() const; SfxFrame* GetChildFrame( sal_uInt16 nPos ) const; diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index eafbf4e9123e..df96ceeab04d 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -132,7 +132,7 @@ public: { bHasBorder = false; bHasBorderSet = false; } // Copy for example for Views - SfxFrameDescriptor* Clone( bool bWithIds = true ) const; + SfxFrameDescriptor* Clone() const; }; // No block to implement a =operator diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx index 4c87a068b750..7e00047c769b 100644 --- a/include/sfx2/linksrc.hxx +++ b/include/sfx2/linksrc.hxx @@ -60,7 +60,7 @@ public: SvLinkSource(); virtual ~SvLinkSource(); - bool HasDataLinks( const SvBaseLink* = nullptr ) const; + bool HasDataLinks() const; void Closed(); diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index 504e7ee526e7..67d0b4ebeb6b 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -89,8 +89,7 @@ protected: virtual void Reset(const SfxItemSet *) override; static bool Execute_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr, - sal_uInt16 nFamily, sal_uInt16 nMask = 0, - const sal_uInt16* pModifier = nullptr ); + sal_uInt16 nFamily, sal_uInt16 nMask = 0 ); using TabPage::ActivatePage; virtual void ActivatePage(const SfxItemSet &) override; using TabPage::DeactivatePage; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 7cfd3584fbf5..ffca96b2c639 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -408,7 +408,7 @@ public: @return whether macros from this document should be executed */ - bool AdjustMacroMode( const OUString& rScriptType, bool _bSuppressUI = false ); + bool AdjustMacroMode(); SvKeyValueIterator* GetHeaderAttributes(); void ClearHeaderAttributesForSourceViewHack(); @@ -541,7 +541,7 @@ public: static SfxObjectShell* CreateObject( const OUString& rServiceName, SfxObjectCreateMode = SfxObjectCreateMode::STANDARD ); static SfxObjectShell* CreateObjectByFactoryName( const OUString& rURL, SfxObjectCreateMode = SfxObjectCreateMode::STANDARD ); static css::uno::Reference< css::lang::XComponent > - CreateAndLoadComponent( const SfxItemSet& rSet, SfxFrame* pFrame = nullptr ); + CreateAndLoadComponent( const SfxItemSet& rSet ); static SfxObjectShell* GetShellFromComponent( const css::uno::Reference< css::lang::XComponent >& xComp ); static OUString GetServiceNameFromFactory( const OUString& rFact ); bool IsInPlaceActive(); diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index 9b972c83d313..60d45aaea06c 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -120,9 +120,9 @@ public: { mnExtras = nExtras; } - void AllowAsciiOnly(bool i_bAsciiOnly = true) + void AllowAsciiOnly() { - mbAsciiOnly = i_bAsciiOnly; + mbAsciiOnly = true; } void ShowMinLengthText(bool bShow); diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx index 99f42dcab468..1f7d9023c99e 100644 --- a/include/sfx2/request.hxx +++ b/include/sfx2/request.hxx @@ -108,7 +108,7 @@ public: void Ignore(); void Cancel(); bool IsCancelled() const; - void Done(const SfxItemSet &, bool bKeep = true ); + void Done(const SfxItemSet &); void ForgetAllArgs(); diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index dfb0e967c246..ccd59d33d51c 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -96,8 +96,7 @@ public: virtual void Insert( SotClipboardFormatId nFormat, const rtl::OUString & rFormatName ) = 0; virtual void SetObjName( const SvGlobalName & rClass, const rtl::OUString & rObjName ) = 0; virtual SotClipboardFormatId GetFormat( const TransferableDataHelper& aHelper, - const DataFlavorExVector* pFormats=nullptr, - const TransferableObjectDescriptor* pDesc=nullptr ) = 0; + const DataFlavorExVector* pFormats=nullptr ) = 0; }; class SfxAbstractLinksDialog : virtual public VclAbstractDialog @@ -123,14 +122,12 @@ public: vcl::Window* pParent, const SfxItemSet* pAttrSet, SfxViewFrame* pViewFrame, - bool bEditFmt=false, - const rtl::OUString *pUserButtonText=nullptr ) = 0; + bool bEditFmt=false ) = 0; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, vcl::Window* pParent, const SfxItemSet* pAttrSet, const css::uno::Reference< css::frame::XFrame >& xViewFrame, - bool bEditFmt=false, - const rtl::OUString *pUserButtonText=nullptr ) = 0; + bool bEditFmt=false ) = 0; virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0; virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommand, diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 795714e4beb9..16b74a97bd60 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -127,8 +127,7 @@ public: sal_uInt16 AddTabPage( const OString& rName, // Name of the label for the page in the notebook .ui CreateTabPage pCreateFunc, // != 0 - GetTabPageRanges pRangesFunc, // can be 0 - bool bItemsOnDemand = false); + GetTabPageRanges pRangesFunc); // can be 0 sal_uInt16 AddTabPage ( const OString &rName, // Name of the label for the page in the notebook .ui sal_uInt16 nPageCreateId ); // Identifier of the Factory Method to create the page @@ -142,8 +141,7 @@ public: void AddTabPage( sal_uInt16 nId, const OUString &rRiderText, - bool bItemsOnDemand = false, - sal_uInt16 nPos = TAB_APPEND); + bool bItemsOnDemand = false); void RemoveTabPage( const OString& rName ); // Name of the label for the page in the notebook .ui void RemoveTabPage( sal_uInt16 nId ); @@ -236,8 +234,8 @@ public: bool HasExchangeSupport() const { return bHasExchangeSupport; } - void SetExchangeSupport( bool bNew = true ) - { bHasExchangeSupport = bNew; } + void SetExchangeSupport() + { bHasExchangeSupport = true; } enum sfxpg { KEEP_PAGE = 0x0000, // Error handling; page does not change diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 23a461053b45..b960289245b3 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -98,8 +98,8 @@ 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 css::uno::Reference< css::frame::XFrame >& i_rFrameItem, const sal_uInt16 i_nViewId = 0 ); - static SfxViewFrame* DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId = 0 ); + 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 ); static SfxViewFrame* Current(); static SfxViewFrame* GetFirst( const SfxObjectShell* pDoc = nullptr, bool bOnlyVisible = true ); @@ -107,7 +107,7 @@ public: static SfxViewFrame* Get( const css::uno::Reference< css::frame::XController>& i_rController, const SfxObjectShell* i_pDoc = nullptr ); - void DoActivate(bool bMDI, SfxViewFrame *pOld=nullptr); + void DoActivate(bool bMDI); void DoDeactivate(bool bMDI, SfxViewFrame *pOld=nullptr); SfxViewFrame* GetParentViewFrame() const; @@ -201,7 +201,7 @@ public: SAL_DLLPRIVATE bool IsResizeInToOut_Impl() const; SAL_DLLPRIVATE void UpdateDocument_Impl(); - SAL_DLLPRIVATE void LockObjectShell_Impl(bool bLock=true); + SAL_DLLPRIVATE void LockObjectShell_Impl(); SAL_DLLPRIVATE void MakeActive_Impl( bool bActivate ); SAL_DLLPRIVATE void SetQuietMode_Impl( bool ); diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 466ced7776dd..920de992eaed 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -247,7 +247,7 @@ public: // Working set virtual void WriteUserData( OUString&, bool bBrowse = false ); virtual void ReadUserData( const OUString&, bool bBrowse = false ); - virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ); + virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& ); virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false ); virtual void QueryObjAreaPixel( Rectangle& rRect ) const; |