diff options
Diffstat (limited to 'cui/source/inc')
-rw-r--r-- | cui/source/inc/SpellDialog.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/about.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/acccfg.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/autocdlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/cfg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/cfgutil.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/cuicharmap.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/cuigaldlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/cuitabarea.hxx | 6 | ||||
-rw-r--r-- | cui/source/inc/hldoctp.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/iconcdlg.hxx | 10 | ||||
-rw-r--r-- | cui/source/inc/macropg.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/optlingu.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/scriptdlg.hxx | 12 | ||||
-rw-r--r-- | cui/source/inc/selector.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/swpossizetabpage.hxx | 6 | ||||
-rw-r--r-- | cui/source/inc/treeopt.hxx | 8 |
17 files changed, 37 insertions, 37 deletions
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 9e6d219ad0e7..d60ec62b9d7c 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -205,7 +205,7 @@ private: bool GetNextSentence_Impl(bool bUseSavedSentence, bool bRechek /*for rechecking the current sentence*/); /** Corrects all errors that have been selected to be changed always */ - bool ApplyChangeAllList_Impl(SpellPortions& rSentence, bool& bHasReplaced); + static bool ApplyChangeAllList_Impl(SpellPortions& rSentence, bool& bHasReplaced); void SetTitle_Impl(LanguageType nLang); protected: diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index beecb6fc890a..9593063a7857 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -54,10 +54,10 @@ private: void StyleControls(); void SetLogo(); - OUString GetBuildId(); + static OUString GetBuildId(); OUString GetVersionString(); OUString GetCopyrightString(); - OUString GetLocaleString(); + static OUString GetLocaleString(); protected: virtual bool Close() SAL_OVERRIDE; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 6c487cabc80f..a41bb4f773fe 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -163,13 +163,13 @@ private: OUString GetLabel4Command(const OUString& rCommand); void InitAccCfg(); sal_uLong MapKeyCodeToPos( const vcl::KeyCode &rCode ) const; - css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const OUString& sName); + static css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const OUString& sName); void StartFileDialog( WinBits nBits, const OUString& rTitle ); void Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr); void ResetConfig(); - void CreateCustomItems( SvTreeListEntry* pEntry, const OUString& aCol1, const OUString& aCol2 ); + static void CreateCustomItems( SvTreeListEntry* pEntry, const OUString& aCol1, const OUString& aCol2 ); public: SfxAcceleratorConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index fa2224a45802..db8bc8a84323 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -84,7 +84,7 @@ class OfaACorrCheckListBox : public SvSimpleTable bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0); void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked); - SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const; + static SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ); void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState ); }; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index fc52ab86fc77..35c8b40baaa5 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -772,7 +772,7 @@ public: vcl::Window *pWindow, const OUString& aMessage ); - OUString ReplaceIconName( const OUString& ); + static OUString ReplaceIconName( const OUString& ); sal_uInt16 ShowDialog(); }; //added for issue83555 diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index 984e8e9e4c80..478559bf26b4 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -65,7 +65,7 @@ struct SfxStylesInfo_Impl SfxStylesInfo_Impl(); void setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel); - bool parseStyleCommand(SfxStyleInfo_Impl& aStyle); + static bool parseStyleCommand(SfxStyleInfo_Impl& aStyle); void getLabel4Style(SfxStyleInfo_Impl& aStyle); ::std::vector< SfxStyleInfo_Impl > getStyleFamilies(); @@ -144,7 +144,7 @@ class SfxConfigGroupListBox : public SvTreeListBox bool bIsRootNode ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, OUString& docName ); diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index c89d46249c16..74a964100d7a 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -89,7 +89,7 @@ private: DECL_LINK(CharHighlightHdl, void *); DECL_LINK(CharPreSelectHdl, void *); - void fillAllSubsets(ListBox &rListBox); + static void fillAllSubsets(ListBox &rListBox); public: SvxCharacterMap( vcl::Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 ); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index e58997fb5d93..134b6533b33b 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -274,7 +274,7 @@ class TPGalleryThemeProperties : public SfxTabPage virtual void Reset( const SfxItemSet* /*rSet*/ ) SAL_OVERRIDE {} virtual bool FillItemSet( SfxItemSet* /*rSet*/ ) SAL_OVERRIDE { return true; } - OUString addExtension( const OUString&, const OUString& ); + static OUString addExtension( const OUString&, const OUString& ); void FillFilterList(); void SearchFiles(); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 956ddb88f917..871b5be5d692 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -715,9 +715,9 @@ private: Color aCurrentColor; - void ConvertColorValues (Color& rColor, ColorModel eModell); - void RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK ); - void CmykToRgb_Impl( Color& rColor, const sal_uInt16 nKey ); + static void ConvertColorValues (Color& rColor, ColorModel eModell); + static void RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK ); + static void CmykToRgb_Impl( Color& rColor, const sal_uInt16 nKey ); sal_uInt16 ColorToPercent_Impl( sal_uInt16 nColor ); sal_uInt16 PercentToColor_Impl( sal_uInt16 nPercent ); diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 457cf1e0ea28..19c69ba16ba7 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -54,7 +54,7 @@ private: enum EPathType { Type_Unknown, Type_Invalid, Type_ExistsFile, Type_File, Type_ExistsDir, Type_Dir }; - EPathType GetPathType ( const OUString& rStrPath ); + static EPathType GetPathType ( const OUString& rStrPath ); protected: void FillDlgFields(const OUString& rStrURL) SAL_OVERRIDE; diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 74b686d17ca5..1944cb459106 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -161,15 +161,15 @@ private : void FocusOnIcon ( sal_uInt16 nId ); protected : - void ShowPageImpl ( IconChoicePageData* pData ); - void HidePageImpl ( IconChoicePageData* pData ); + static void ShowPageImpl ( IconChoicePageData* pData ); + static void HidePageImpl ( IconChoicePageData* pData ); virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ); - SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); + static SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); inline SfxItemSet* GetInputSetImpl() { return const_cast<SfxItemSet*>(pSet); } inline IconChoicePage* GetTabPage( sal_uInt16 nPageId ) - { return ( GetPageData (nPageId)->pPage?GetPageData (nPageId)->pPage.get():NULL); } - void RefreshInputSet(); + { return ( GetPageData (nPageId)->pPage ? GetPageData (nPageId)->pPage.get() : NULL); } + static void RefreshInputSet(); void ActivatePageImpl (); bool DeActivatePageImpl (); diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index befe9e3607f9..a5a9eb501530 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -76,8 +76,8 @@ protected: _SvxMacroTabPage( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemSet ); void EnableButtons(); - ::com::sun::star::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash ); - ::std::pair< OUString, OUString > GetPairFromAny( ::com::sun::star::uno::Any aAny ); + static ::com::sun::star::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash ); + static ::std::pair< OUString, OUString > GetPairFromAny( ::com::sun::star::uno::Any aAny ); public: diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index f99e3bb7ba46..73d9aceac4f4 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -134,7 +134,7 @@ private: SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); void AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); - sal_uLong GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); + static sal_uLong GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); DECL_LINK( SelectHdl_Impl, SvxCheckListBox * ); DECL_LINK( ClickHdl_Impl, PushButton * ); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index d3847dc6de62..94f888191036 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -59,11 +59,11 @@ private: OUString m_sMyMacros; OUString m_sProdMacros; - ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > + static ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > getLangNodeFromRootNode( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& root, OUString& language ); - void delUserData( SvTreeListEntry* pEntry ); + static void delUserData( SvTreeListEntry* pEntry ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, OUString& docName ); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, OUString& docName ); protected: void ExpandTree( SvTreeListEntry* pRootEntry ); @@ -159,16 +159,16 @@ protected: DECL_LINK( MacroSelectHdl, SvTreeListBox * ); DECL_LINK( ScriptSelectHdl, SvTreeListBox * ); DECL_LINK( ButtonHdl, Button * ); - bool getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, OUString& propName ); + static bool getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, OUString& propName ); void CheckButtons( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node ); void createEntry( SvTreeListEntry* pEntry ); void renameEntry( SvTreeListEntry* pEntry ); void deleteEntry( SvTreeListEntry* pEntry ); - ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > + static ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > getBrowseNode( SvTreeListEntry* pEntry ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvTreeListEntry* pEntry ); + static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvTreeListEntry* pEntry ); OUString getListOfChildren( ::com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node, int depth ); void StoreCurrentSelection(); void RestorePreviousSelection(); diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 7f17f842c009..0cfa71112b74 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -144,7 +144,7 @@ class SvxConfigGroupListBox : public SvTreeListBox bool bIsRootNode ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, OUString& docName ); diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 3be2b26fe0cd..67f416ee1c63 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -110,9 +110,9 @@ class SvxSwPosSizeTabPage : public SfxTabPage sal_uInt16 nV, sal_uInt16 nVRel, long nX, long nY); sal_uInt16 GetMapPos(FrmMap *pMap, ListBox &rAlignLB); - short GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB); - short GetRelation(FrmMap *pMap, ListBox &rRelationLB); - short GetAnchorType(bool* pbHasChanged = 0); + static short GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB); + static short GetRelation(FrmMap *pMap, ListBox &rRelationLB); + short GetAnchorType(bool* pbHasChanged = 0); sal_uLong FillRelLB(FrmMap *pMap, sal_uInt16 nLBSelPos, sal_uInt16 nAlign, sal_uInt16 nRel, ListBox &rLB, FixedText &rFT); sal_uInt16 FillPosLB(FrmMap *pMap, sal_uInt16 nAlign, const sal_uInt16 _nRel, ListBox &rLB); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 78b63bd68761..bc85919aad8a 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -171,16 +171,16 @@ private: static LastPageSaver* pLastPageSaver; SfxItemSet* CreateItemSet( sal_uInt16 nId ); - void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ); + static void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ); void InitTreeAndHandler(); void Initialize( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame ); void InitWidgets(); void LoadExtensionOptions( const OUString& rExtensionId ); - OUString GetModuleIdentifier( const com::sun::star::uno::Reference< + static OUString GetModuleIdentifier( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame ); - Module* LoadModule( const OUString& rModuleIdentifier ); - VectorOfNodes LoadNodes( Module* pModule, const OUString& rExtensionId ); + static Module* LoadModule( const OUString& rModuleIdentifier ); + static VectorOfNodes LoadNodes( Module* pModule, const OUString& rExtensionId ); void InsertNodes( const VectorOfNodes& rNodeList ); protected: |