summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-24 15:57:34 +0200
committerNoel Grandin <noel@peralex.com>2015-05-05 09:30:39 +0200
commit89945a90590e2c9a3bea7a387cf8d9d2f5591728 (patch)
treeed9fa948888f9642fe429a6efd7cd0ea394a9f87 /cui
parentadd1351e5974a74e76f9095af1bc9c80ab543cf2 (diff)
loplugin:staticmethods
Change-Id: I3d61c1c64f7e781c032a77d5d35998e953bf5c0c
Diffstat (limited to 'cui')
-rw-r--r--cui/source/customize/acccfg.cxx2
-rw-r--r--cui/source/dialogs/colorpicker.cxx2
-rw-r--r--cui/source/inc/SpellDialog.hxx2
-rw-r--r--cui/source/inc/about.hxx4
-rw-r--r--cui/source/inc/acccfg.hxx4
-rw-r--r--cui/source/inc/autocdlg.hxx2
-rw-r--r--cui/source/inc/cfg.hxx2
-rw-r--r--cui/source/inc/cfgutil.hxx4
-rw-r--r--cui/source/inc/cuicharmap.hxx2
-rw-r--r--cui/source/inc/cuigaldlg.hxx2
-rw-r--r--cui/source/inc/cuitabarea.hxx6
-rw-r--r--cui/source/inc/hldoctp.hxx2
-rw-r--r--cui/source/inc/iconcdlg.hxx10
-rw-r--r--cui/source/inc/macropg.hxx4
-rw-r--r--cui/source/inc/optlingu.hxx2
-rw-r--r--cui/source/inc/scriptdlg.hxx12
-rw-r--r--cui/source/inc/selector.hxx2
-rw-r--r--cui/source/inc/swpossizetabpage.hxx6
-rw-r--r--cui/source/inc/treeopt.hxx8
-rw-r--r--cui/source/options/fontsubs.cxx6
-rw-r--r--cui/source/options/fontsubs.hxx4
-rw-r--r--cui/source/options/optaboutconfig.hxx4
-rw-r--r--cui/source/options/optfltr.cxx2
-rw-r--r--cui/source/options/optfltr.hxx2
-rw-r--r--cui/source/options/optlingu.cxx2
-rw-r--r--cui/source/options/optopencl.hxx4
-rw-r--r--cui/source/tabpages/autocdlg.cxx2
27 files changed, 52 insertions, 52 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 9fbd9516a908..d929cf009976 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1554,7 +1554,7 @@ OUString SfxAcceleratorConfigPage::GetLabel4Command(const OUString& sCommand)
// may be it's a style URL .. they must be handled special
SfxStyleInfo_Impl aStyle;
aStyle.sCommand = sCommand;
- if (m_aStylesInfo.parseStyleCommand(aStyle))
+ if (SfxStylesInfo_Impl::parseStyleCommand(aStyle))
{
m_aStylesInfo.getLabel4Style(aStyle);
return aStyle.sLabel;
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index bad1390a024f..5d61f213e8c7 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -142,7 +142,7 @@ public:
sal_Int32 GetColor();
private:
- bool ImplProcessKeyInput( const KeyEvent& rKEv );
+ static bool ImplProcessKeyInput( const KeyEvent& rKEv );
};
HexColorControl::HexColorControl( vcl::Window* pParent, const WinBits& nStyle )
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:
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 86b7ae073114..6885694dfcea 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -179,8 +179,8 @@ bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
SubstitutionStruct aAdd;
aAdd.sFont = SvTabListBox::GetEntryText(pEntry, 0);
aAdd.sReplaceBy = SvTabListBox::GetEntryText(pEntry, 1);
- aAdd.bReplaceAlways = m_pCheckLB->IsChecked(pEntry, 0);
- aAdd.bReplaceOnScreenOnly = m_pCheckLB->IsChecked(pEntry, 1);
+ aAdd.bReplaceAlways = SvxFontSubstCheckListBox::IsChecked(pEntry, 0);
+ aAdd.bReplaceOnScreenOnly = SvxFontSubstCheckListBox::IsChecked(pEntry, 1);
pConfig->AddSubstitution(aAdd);
pEntry = m_pCheckLB->Next(pEntry);
}
@@ -525,7 +525,7 @@ void SvxFontSubstCheckListBox::SetCheckButtonState( SvTreeListEntry* pEntry, sal
}
}
-SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const
+SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvTreeListEntry* pEntry, sal_uInt16 nCol )
{
SvButtonState eState = SV_BUTTON_UNCHECKED;
SvLBoxButton* pItem = static_cast<SvLBoxButton*>(pEntry->GetItem(nCol + 1));
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 27847da31464..f89b173245d9 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -50,10 +50,10 @@ class SvxFontSubstCheckListBox : public SvSimpleTable
inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0);
- bool IsChecked(SvTreeListEntry* pEntry, sal_uInt16 nCol = 0);
+ static bool IsChecked(SvTreeListEntry* pEntry, sal_uInt16 nCol = 0);
void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked);
void CheckEntry(SvTreeListEntry* pEntry, 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 );
void setColSizes();
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index b9ead63ef7e5..8d4f2f16e107 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -57,7 +57,7 @@ private:
SvTreeListEntries m_prefBoxEntries;
void AddToModifiedVector( const boost::shared_ptr< Prop_Impl >& rProp );
- std::vector< OUString > commaStringToSequence( const OUString& rCommaSepString );
+ static std::vector< OUString > commaStringToSequence( const OUString& rCommaSepString );
DECL_LINK( StandardHdl_Impl, void * );
DECL_LINK( ResetBtnHdl_Impl, void * );
@@ -70,7 +70,7 @@ public:
void InsertEntry(const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue);
void Reset();
void FillItems(const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& xNameAccess);
- com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess( const OUString& sNodePath, bool bUpdate );
+ static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess( const OUString& sNodePath, bool bUpdate );
bool FillItemSet();
};
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index cd6858228f3c..ce4fa1422d6f 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -415,7 +415,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState(
}
SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState(
- SvTreeListEntry* pEntry, sal_uInt16 nCol ) const
+ SvTreeListEntry* pEntry, sal_uInt16 nCol )
{
SvButtonState eState = SV_BUTTON_UNCHECKED;
SvLBoxButton* pItem = static_cast<SvLBoxButton*>(pEntry->GetItem(nCol + 1));
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 221c705f3ae1..2abda52cb46e 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -60,7 +60,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage
using SvSimpleTable::SetTabs;
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 );
protected:
virtual void SetTabs() SAL_OVERRIDE;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 54d4fe51598f..1f780e4c7f3a 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -512,7 +512,7 @@ class SvxLinguData_Impl
uno::Reference< XLinguServiceManager2 > xLinguSrvcMgr;
- bool AddRemove( Sequence< OUString > &rConfigured,
+ static bool AddRemove( Sequence< OUString > &rConfigured,
const OUString &rImplName, bool bAdd );
public:
diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx
index 09eb097609fd..99886acbe038 100644
--- a/cui/source/options/optopencl.hxx
+++ b/cui/source/options/optopencl.hxx
@@ -64,9 +64,9 @@ private:
long EditHdl(SvSimpleTable* pListBox, OpenCLConfig::ImplMatcherSet& rSet, const OString& rTag);
long AddHdl(SvSimpleTable* pListBox, OpenCLConfig::ImplMatcherSet& rSet, const OString& rTag);
- long DeleteHdl(SvSimpleTable* pListBox, OpenCLConfig::ImplMatcherSet& rSet);
+ static long DeleteHdl(SvSimpleTable* pListBox, OpenCLConfig::ImplMatcherSet& rSet);
- void EnableOpenCLHdl(VclFrame* pFrame, bool aEnable);
+ static void EnableOpenCLHdl(VclFrame* pFrame, bool aEnable);
public:
SvxOpenCLTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index d297d9ca4a5b..32191b143978 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -820,7 +820,7 @@ void OfaACorrCheckListBox::SetCheckButtonState( SvTreeListEntry* pEntry, sal_uIn
}
}
-SvButtonState OfaACorrCheckListBox::GetCheckButtonState( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const
+SvButtonState OfaACorrCheckListBox::GetCheckButtonState( SvTreeListEntry* pEntry, sal_uInt16 nCol )
{
SvButtonState eState = SV_BUTTON_UNCHECKED;
SvLBoxButton* pItem = static_cast<SvLBoxButton*>(pEntry->GetItem(nCol + 1));