summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-13 13:50:56 +0200
committerNoel Grandin <noel@peralex.com>2015-04-23 13:08:48 +0200
commit12ba9e3cad05a665aee2150ef831f0dbc92d7e2d (patch)
treedc50f9ee75617fa1e33a2503278501511c97afff /include
parent6d5ae48427d1c59e65f0bfc16cf075eaa4cdca17 (diff)
loplugin:staticmethods
Change-Id: Ib0c0841e48814d1a6e13bcd4575725d86ffa5e5e
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/app.hxx8
-rw-r--r--include/sfx2/filedlghelper.hxx2
-rw-r--r--include/sfx2/linkmgr.hxx8
-rw-r--r--include/sfx2/mailmodelapi.hxx4
-rw-r--r--include/sfx2/mgetempl.hxx2
-rw-r--r--include/sfx2/shell.hxx4
-rw-r--r--include/sfx2/sidebar/CommandInfoProvider.hxx2
-rw-r--r--include/sfx2/sidebar/Theme.hxx8
-rw-r--r--include/sfx2/tbxctrl.hxx2
-rw-r--r--include/sfx2/templatedlg.hxx2
-rw-r--r--include/sfx2/unoctitm.hxx6
-rw-r--r--include/sfx2/viewsh.hxx2
12 files changed, 25 insertions, 25 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 3977dea8f0c4..b9d8d8607773 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -141,7 +141,7 @@ public:
static SfxApplication* Get() { return pApp;}
// Resource Manager
- ResMgr* GetSfxResManager();
+ static ResMgr* GetSfxResManager();
// DDE
#if defined( WNT )
@@ -175,11 +175,11 @@ public:
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 = NULL, SbxValue* i_ret = NULL )
- { return CallBasic( i_macroName, SfxApplication::GetOrCreate()->GetBasicManager(), i_args, i_ret ); }
- BasicManager* GetBasicManager();
+ { return CallBasic( i_macroName, SfxApplication::GetBasicManager(), i_args, i_ret ); }
+ static BasicManager* GetBasicManager();
com::sun::star::script::XLibraryContainer * GetDialogContainer();
com::sun::star::script::XLibraryContainer * GetBasicContainer();
- StarBASIC* GetBasic();
+ static StarBASIC* GetBasic();
sal_uInt16 SaveBasicAndDialogContainer() const;
// misc.
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 34688c14a8c5..6254094fc2a2 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -201,7 +201,7 @@ public:
void SAL_CALL DirectoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent );
virtual void SAL_CALL ControlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent );
void SAL_CALL DialogSizeChanged();
- OUString SAL_CALL HelpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent );
+ static OUString SAL_CALL HelpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent );
// XDialogClosedListener methods
void SAL_CALL DialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& _rEvent );
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index bfe6512905b5..6d4bc03fd6ae 100644
--- a/include/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.hxx
@@ -115,16 +115,16 @@ public:
* @param rServer server document shell instance
* @param rLink link object of the client document
*/
- void LinkServerShell(const OUString& rPath, SfxObjectShell& rServer, ::sfx2::SvBaseLink& rLink) const;
+ static void LinkServerShell(const OUString& rPath, SfxObjectShell& rServer, ::sfx2::SvBaseLink& rLink);
// Obtain the string for the dialog
- bool GetDisplayNames( const SvBaseLink *,
+ static bool GetDisplayNames( const SvBaseLink *,
OUString* pType,
OUString* pFile = NULL,
OUString* pLink = NULL,
- OUString* pFilter = NULL ) const;
+ OUString* pFilter = NULL );
- SvLinkSourceRef CreateObj( SvBaseLink* );
+ static SvLinkSourceRef CreateObj( SvBaseLink* );
void UpdateAllLinks( bool bAskUpdate = true,
bool bCallErrHdl = true,
diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx
index 44b2ef9addd2..cf8183d14ecd 100644
--- a/include/sfx2/mailmodelapi.hxx
+++ b/include/sfx2/mailmodelapi.hxx
@@ -64,7 +64,7 @@ protected:
SAVE_ERROR
};
::std::vector< OUString > maAttachedDocuments;
- SaveResult SaveDocumentAsFormat( const OUString& aSaveFileName,
+ static SaveResult SaveDocumentAsFormat( const OUString& aSaveFileName,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel,
const OUString& rType,
OUString& rFileNamePath );
@@ -79,7 +79,7 @@ private:
bool mbLoadDone;
- SaveResult ShowFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMGR,
+ static SaveResult ShowFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMGR,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel,
const OUString& rFilterName,
const OUString& rType,
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index eded8ba18751..e6f1f8e576ab 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -88,7 +88,7 @@ protected:
virtual bool FillItemSet(SfxItemSet *) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet *) SAL_OVERRIDE;
- bool Execute_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr,
+ static bool Execute_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr,
sal_uInt16 nFamily, sal_uInt16 nMask = 0,
const sal_uInt16* pModifier = NULL );
using TabPage::ActivatePage;
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index b2f88a89dc2d..2f16e6aa8a3d 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -164,7 +164,7 @@ protected:
SAL_DLLPRIVATE void Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId );
SAL_DLLPRIVATE SfxShellObject* GetShellObj_Impl() const;
SAL_DLLPRIVATE void SetShellObj_Impl( SfxShellObject* pObj );
- void HandleOpenXmlFilterSettings(SfxRequest &);
+ static void HandleOpenXmlFilterSettings(SfxRequest &);
public:
TYPEINFO_OVERRIDE();
@@ -445,7 +445,7 @@ public:
void SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs);
const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbs() const;
void VerbExec (SfxRequest&);
- void VerbState (SfxItemSet&);
+ static void VerbState (SfxItemSet&);
SAL_DLLPRIVATE const SfxSlot* GetVerbSlot_Impl(sal_uInt16 nId) const;
void SetHelpId(sal_uIntPtr nId);
diff --git a/include/sfx2/sidebar/CommandInfoProvider.hxx b/include/sfx2/sidebar/CommandInfoProvider.hxx
index 55ce82b8a394..9161b126816a 100644
--- a/include/sfx2/sidebar/CommandInfoProvider.hxx
+++ b/include/sfx2/sidebar/CommandInfoProvider.hxx
@@ -82,7 +82,7 @@ public:
css::uno::Sequence<css::beans::PropertyValue> GetCommandProperties (
const ::rtl::OUString& rsCommandName);
::rtl::OUString GetCommandLabel (const ::rtl::OUString& rsCommandName);
- rtl::OUString RetrieveShortcutsFromConfiguration(
+ static rtl::OUString RetrieveShortcutsFromConfiguration(
const css::uno::Reference<css::ui::XAcceleratorConfiguration>& rxConfiguration,
const rtl::OUString& rsCommandName);
};
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index faaa62360793..e6ee996f7a28 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -258,12 +258,12 @@ private:
ChangeListenerContainer* GetChangeListeners (
const ThemeItem eItem,
const bool bCreate);
- bool DoVetoableListenersVeto (
+ static bool DoVetoableListenersVeto (
const VetoableListenerContainer* pListeners,
- const css::beans::PropertyChangeEvent& rEvent) const;
- void BroadcastPropertyChange (
+ const css::beans::PropertyChangeEvent& rEvent);
+ static void BroadcastPropertyChange (
const ChangeListenerContainer* pListeners,
- const css::beans::PropertyChangeEvent& rEvent) const;
+ const css::beans::PropertyChangeEvent& rEvent);
void ProcessNewValue (
const css::uno::Any& rValue,
const ThemeItem eItem,
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index e6d538874fb8..b76a9d06980b 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -209,7 +209,7 @@ protected:
// helper methods
void createAndPositionSubToolBar( const OUString& rSubToolBarResName );
- ::Size getPersistentFloatingSize( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const OUString& rSubToolBarResName );
+ static ::Size getPersistentFloatingSize( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const OUString& rSubToolBarResName );
bool hasBigImages() const;
public:
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index 8b133f40a042..17ba13a0b432 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -83,7 +83,7 @@ private:
void OnTemplateImport ();
void OnTemplateSearch ();
- void OnTemplateLink ();
+ static void OnTemplateLink ();
void OnTemplateOpen ();
void OnTemplateEdit ();
void OnTemplateProperties ();
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index 70122ee2d3d4..21dd6ca2513f 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -150,9 +150,9 @@ class SfxDispatchController_Impl : public SfxControllerItem
const char* pUnoName;
::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > xFrame;
- void addParametersToArgs( const com::sun::star::util::URL& aURL,
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ) const;
- SfxMapUnit GetCoreMetric( SfxItemPool& rPool, sal_uInt16 nSlot );
+ static void addParametersToArgs( const com::sun::star::util::URL& aURL,
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs );
+ static SfxMapUnit GetCoreMetric( SfxItemPool& rPool, sal_uInt16 nSlot );
public:
SfxDispatchController_Impl( SfxOfficeDispatch* pDisp,
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 5acc75a22414..c0f38d1fe436 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -234,7 +234,7 @@ public:
virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
virtual bool HasPrintOptionsPage() const;
virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions );
- JobSetup GetJobSetup() const;
+ static JobSetup GetJobSetup();
Printer* GetActivePrinter() const;
// Working set