From 20ba5d464a9fba3090af6a644a331ee237356fea Mon Sep 17 00:00:00 2001 From: Wastack Date: Thu, 31 Mar 2016 08:42:46 +0200 Subject: tdf#97966 Drop 'static' keywords Including no keywords from extern "C" blocks Change-Id: I8bcd7e8a492ee4dbfa5141416c7c038a1391cf20 Reviewed-on: https://gerrit.libreoffice.org/23673 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann --- forms/source/component/DatabaseForm.cxx | 2 +- forms/source/component/propertybaghelper.cxx | 2 +- forms/source/misc/InterfaceContainer.cxx | 2 +- forms/source/richtext/richtextcontrol.cxx | 12 ++++++------ forms/source/richtext/rtattributehandler.cxx | 2 +- forms/source/runtime/formoperations.cxx | 6 +++--- forms/source/solar/component/navbarcontrol.cxx | 2 +- forms/source/solar/control/navtoolbar.cxx | 4 ++-- forms/source/xforms/datatypes.cxx | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) (limited to 'forms/source') diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 4245ff995aa9..e44e90eb29e1 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -565,7 +565,7 @@ Sequence ODatabaseForm::GetDataMultiPartEncoded(const Reference& _rxProps, const OUString& _rPropertyName, + void implAdjustTriStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName, WinBits& _rAllBits, WinBits _nPositiveFlag, WinBits nNegativeFlag ) { bool bFlagValue = false; @@ -86,7 +86,7 @@ namespace frm } - static void implAdjustTwoStateFlag( const Any& _rValue, WinBits& _rAllBits, WinBits _nFlag, bool _bInvert = false ) + void implAdjustTwoStateFlag( const Any& _rValue, WinBits& _rAllBits, WinBits _nFlag, bool _bInvert = false ) { bool bFlagValue = false; if ( _rValue >>= bFlagValue ) @@ -101,14 +101,14 @@ namespace frm } - static void implAdjustTwoStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName, + void implAdjustTwoStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName, WinBits& _rAllBits, WinBits _nFlag, bool _bInvert = false ) { implAdjustTwoStateFlag( _rxProps->getPropertyValue( _rPropertyName ), _rAllBits, _nFlag, _bInvert ); } - static void adjustTwoStateWinBit( vcl::Window* _pWindow, const Any& _rValue, WinBits _nFlag, bool _bInvert = false ) + void adjustTwoStateWinBit( vcl::Window* _pWindow, const Any& _rValue, WinBits _nFlag, bool _bInvert = false ) { WinBits nBits = _pWindow->GetStyle(); implAdjustTwoStateFlag( _rValue, nBits, _nFlag, _bInvert ); @@ -116,7 +116,7 @@ namespace frm } - static WinBits getWinBits( const Reference< XControlModel >& _rxModel ) + WinBits getWinBits( const Reference< XControlModel >& _rxModel ) { WinBits nBits = 0; try @@ -431,7 +431,7 @@ namespace frm namespace { - static SfxSlotId lcl_translateConflictingSlot( SfxSlotId _nIDFromPool ) + SfxSlotId lcl_translateConflictingSlot( SfxSlotId _nIDFromPool ) { // HACK HACK HACK // unfortunately, some of our applications have some conflicting slots, diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index b4793cbeb94a..37037fc182a2 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -96,7 +96,7 @@ namespace frm namespace { - static WhichId lcl_implGetWhich( const SfxItemPool& _rPool, AttributeId _nAttributeId ) + WhichId lcl_implGetWhich( const SfxItemPool& _rPool, AttributeId _nAttributeId ) { WhichId nWhich = 0; switch ( _nAttributeId ) diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 33a2fa1c8720..4f9884f78baf 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -407,7 +407,7 @@ namespace frm namespace { - static bool lcl_needConfirmCommit( sal_Int32 _nFeature ) + bool lcl_needConfirmCommit( sal_Int32 _nFeature ) { return ( ( _nFeature == FormFeature::ReloadForm ) || ( _nFeature == FormFeature::RemoveFilterAndSort ) @@ -419,11 +419,11 @@ namespace frm || ( _nFeature == FormFeature::InteractiveFilter ) ); } - static bool lcl_requiresArguments( sal_Int32 _nFeature ) + bool lcl_requiresArguments( sal_Int32 _nFeature ) { return ( _nFeature == FormFeature::MoveAbsolute ); } - static bool lcl_isExecutableFeature( sal_Int32 _nFeature ) + bool lcl_isExecutableFeature( sal_Int32 _nFeature ) { return ( _nFeature != FormFeature::TotalRecords ); } diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index 6c182cb2f158..cc7be7a83ecb 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -85,7 +85,7 @@ namespace frm namespace { - static WinBits lcl_getWinBits_nothrow( const Reference< XControlModel >& _rxModel ) + WinBits lcl_getWinBits_nothrow( const Reference< XControlModel >& _rxModel ) { WinBits nBits = 0; try diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 8b767e439362..79b75cab1e04 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -47,13 +47,13 @@ namespace frm namespace { - static bool isArtificialItem( sal_Int16 _nFeatureId ) + bool isArtificialItem( sal_Int16 _nFeatureId ) { return ( _nFeatureId == LID_RECORD_LABEL ) || ( _nFeatureId == LID_RECORD_FILLER ); } - static OUString getLabelString( sal_uInt16 _nResId ) + OUString getLabelString( sal_uInt16 _nResId ) { OUString sLabel( " " ); sLabel += FRM_RES_STRING( _nResId ); diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 016243a293a3..8d1c2bc7febe 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -191,7 +191,7 @@ namespace xforms namespace { - static void lcl_initializePatternMatcher( ::std::unique_ptr< RegexMatcher >& _rpMatcher, const OUString& _rPattern ) + void lcl_initializePatternMatcher( ::std::unique_ptr< RegexMatcher >& _rpMatcher, const OUString& _rPattern ) { UErrorCode nMatchStatus = U_ZERO_ERROR; UnicodeString aIcuPattern( reinterpret_cast(_rPattern.getStr()), _rPattern.getLength() ); // UChar != sal_Unicode in MinGW @@ -200,7 +200,7 @@ namespace xforms // if asserts, then something changed our pattern without going to convertFastPropertyValue/checkPropertySanity } - static bool lcl_matchString( RegexMatcher& _rMatcher, const OUString& _rText ) + bool lcl_matchString( RegexMatcher& _rMatcher, const OUString& _rText ) { UErrorCode nMatchStatus = U_ZERO_ERROR; UnicodeString aInput( reinterpret_cast(_rText.getStr()), _rText.getLength() ); // UChar != sal_Unicode in MinGW -- cgit