diff options
author | Wastack <btomi96@gmail.com> | 2016-03-31 08:47:40 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-01 06:46:33 +0000 |
commit | 9af411abce1e22d55b73d5bbac3b7a6a8535eb3b (patch) | |
tree | 1f4ae767e429af067f97bd07c305b1f9ed35839f /toolkit | |
parent | cb495d71063d60da46215a2510736eccd910fa7a (diff) |
tdf#97966 Drop 'static' keywords
Including no keywords from extern "C" blocks
Change-Id: Ie3160af9decf04ceeda02dc20a6518afaa80f972
Reviewed-on: https://gerrit.libreoffice.org/23677
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'toolkit')
-rw-r--r-- | toolkit/source/awt/vclxmenu.cxx | 4 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 6 | ||||
-rw-r--r-- | toolkit/source/controls/controlmodelcontainerbase.cxx | 4 | ||||
-rw-r--r-- | toolkit/source/controls/grid/sortablegriddatamodel.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/tree/treedatamodel.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrols.cxx | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index da2a79cd1f58..a56bd915aa08 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -587,7 +587,7 @@ throw (css::uno::RuntimeException, std::exception) namespace { - static Image lcl_XGraphic2VCLImage( + Image lcl_XGraphic2VCLImage( const css::uno::Reference< css::graphic::XGraphic >& xGraphic, bool bResize ) { @@ -622,7 +622,7 @@ namespace } /** Copied from svtools/inc/acceleratorexecute.hxx */ - static css::awt::KeyEvent lcl_VCLKey2AWTKey( + css::awt::KeyEvent lcl_VCLKey2AWTKey( const vcl::KeyCode& aVCLKey) { css::awt::KeyEvent aAWTKey; diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 45a606375984..4230cdb56da1 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -559,7 +559,7 @@ namespace { css::awt::MessageBoxType_MAKE_FIXED_SIZE, nullptr, 0 } }; - static bool lcl_convertMessageBoxType( + bool lcl_convertMessageBoxType( rtl::OUString &sType, css::awt::MessageBoxType eType ) { @@ -584,7 +584,7 @@ namespace static sal_Int32 nVCLToolkitInstanceCount = 0; static bool bInitedByVCLToolkit = false; -static osl::Mutex & getInitMutex() +osl::Mutex & getInitMutex() { static osl::Mutex * pM; if( !pM ) @@ -599,7 +599,7 @@ static osl::Mutex & getInitMutex() return *pM; } -static osl::Condition & getInitCondition() +osl::Condition & getInitCondition() { static osl::Condition * pC = nullptr; if( !pC ) diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 56475ff94e67..5358cc26e8d2 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -83,7 +83,7 @@ struct LanguageDependentProp namespace { - static const Sequence< OUString >& lcl_getLanguageDependentProperties() + const Sequence< OUString >& lcl_getLanguageDependentProperties() { static Sequence< OUString > s_aLanguageDependentProperties; if ( s_aLanguageDependentProperties.getLength() == 0 ) @@ -832,7 +832,7 @@ namespace }; - static sal_Int32 lcl_getDialogStep( const Reference< XControlModel >& _rxModel ) + sal_Int32 lcl_getDialogStep( const Reference< XControlModel >& _rxModel ) { sal_Int32 nStep = 0; try diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index df869e9469fc..9bb92367af24 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -200,7 +200,7 @@ private: namespace { template< class STLCONTAINER > - static void lcl_clear( STLCONTAINER& i_container ) + void lcl_clear( STLCONTAINER& i_container ) { STLCONTAINER empty; empty.swap( i_container ); diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx index 49b757866f2a..e3c44772e896 100644 --- a/toolkit/source/controls/tree/treedatamodel.cxx +++ b/toolkit/source/controls/tree/treedatamodel.cxx @@ -44,7 +44,7 @@ typedef rtl::Reference< MutableTreeNode > MutableTreeNodeRef; typedef std::vector< MutableTreeNodeRef > TreeNodeVector; typedef rtl::Reference< MutableTreeDataModel > MutableTreeDataModelRef; -static void implThrowIllegalArgumentException() throw( IllegalArgumentException ) +void implThrowIllegalArgumentException() throw( IllegalArgumentException ) { throw IllegalArgumentException(); } diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 366b9e4d51db..7fa42777cb70 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -348,7 +348,7 @@ void UnoEditControl::setText( const OUString& aText ) throw(uno::RuntimeExceptio namespace { - static void lcl_normalize( awt::Selection& _rSel ) + void lcl_normalize( awt::Selection& _rSel ) { if ( _rSel.Min > _rSel.Max ) ::std::swap( _rSel.Min, _rSel.Max ); |