mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#97966 Drop 'static' keywords

Browse Source 
Including no keywords from extern "C" blocks

Change-Id: I8bcd7e8a492ee4dbfa5141416c7c038a1391cf20
Reviewed-on: https://gerrit.libreoffice.org/23673
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Wastack 2016-03-31 08:42:46 +02:00 committed by Stephan Bergmann
parent 9e596250a6
commit 20ba5d464a
14 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/source/propctrlr/eventhandler.cxx
View File

@ -1046,7 +1046,7 @@ namespace pcr
namespace namespace
{ {
static bool lcl_endsWith( const OUString& _rText, const OUString& _rCheck ) bool lcl_endsWith( const OUString& _rText, const OUString& _rCheck )
{ {
sal_Int32 nTextLen = _rText.getLength(); sal_Int32 nTextLen = _rText.getLength();
sal_Int32 nCheckLen = _rCheck.getLength(); sal_Int32 nCheckLen = _rCheck.getLength();

2
extensions/source/propctrlr/formgeometryhandler.cxx
View File

@ -611,7 +611,7 @@ namespace pcr
namespace namespace
{ {
static sal_Int32 lcl_getLowerBoundRowOrColumn( const Reference< XIndexAccess >& _rxRowsOrColumns, const bool _bRows, sal_Int32 lcl_getLowerBoundRowOrColumn( const Reference< XIndexAccess >& _rxRowsOrColumns, const bool _bRows,
const css::awt::Point& _rRelativePosition ) const css::awt::Point& _rRelativePosition )
{ {
sal_Int32 nAccumulated = 0; sal_Int32 nAccumulated = 0;

4
extensions/source/propctrlr/pushbuttonnavigation.cxx
View File

@ -54,7 +54,7 @@ namespace pcr
nullptr nullptr
}; };
static sal_Int32 lcl_getNavigationURLIndex( const OUString& _rNavURL ) sal_Int32 lcl_getNavigationURLIndex( const OUString& _rNavURL )
{ {
const sal_Char** pLookup = pNavigationURLs; const sal_Char** pLookup = pNavigationURLs;
while ( *pLookup ) while ( *pLookup )
@ -66,7 +66,7 @@ namespace pcr
return -1; return -1;
} }
static const sal_Char* lcl_getNavigationURL( sal_Int32 _nButtonTypeIndex ) const sal_Char* lcl_getNavigationURL( sal_Int32 _nButtonTypeIndex )
{ {
const sal_Char** pLookup = pNavigationURLs; const sal_Char** pLookup = pNavigationURLs;
while ( _nButtonTypeIndex-- && *pLookup++ ) while ( _nButtonTypeIndex-- && *pLookup++ )

4
filter/source/svg/svgreader.cxx
View File

@ -1373,7 +1373,7 @@ struct AnnotatingVisitor
}; };
/// Annotate svg styles with unique references to state pool /// Annotate svg styles with unique references to state pool
static void annotateStyles( StatePool& rStatePool, void annotateStyles( StatePool& rStatePool,
StateMap& rStateMap, StateMap& rStateMap,
const State& rInitialState, const State& rInitialState,
uno::Reference<xml::dom::XElement>& rElem, uno::Reference<xml::dom::XElement>& rElem,
@ -1943,7 +1943,7 @@ struct ShapeWritingVisitor
}; };
/// Write out shapes from DOM tree /// Write out shapes from DOM tree
static void writeShapes( StatePool& rStatePool, void writeShapes( StatePool& rStatePool,
StateMap& rStateMap, StateMap& rStateMap,
const uno::Reference<xml::dom::XElement>& rElem, const uno::Reference<xml::dom::XElement>& rElem,
const uno::Reference<xml::sax::XDocumentHandler>& xDocHdl, const uno::Reference<xml::sax::XDocumentHandler>& xDocHdl,

2
forms/source/component/DatabaseForm.cxx
View File

@ -565,7 +565,7 @@ Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XContr
namespace namespace
{ {
static void appendDigits( sal_Int32 _nNumber, sal_Int8 nDigits, OUStringBuffer& _rOut ) void appendDigits( sal_Int32 _nNumber, sal_Int8 nDigits, OUStringBuffer& _rOut )
{ {
sal_Int32 nCurLen = _rOut.getLength(); sal_Int32 nCurLen = _rOut.getLength();
_rOut.append( _nNumber ); _rOut.append( _nNumber );

2
forms/source/component/propertybaghelper.cxx
View File

@ -63,7 +63,7 @@ namespace frm
namespace namespace
{ {
static ::comphelper::IPropertyInfoService& lcl_getPropertyInfos() ::comphelper::IPropertyInfoService& lcl_getPropertyInfos()
{ {
static ConcreteInfoService s_aPropInfos; static ConcreteInfoService s_aPropInfos;
return s_aPropInfos; return s_aPropInfos;

2
forms/source/misc/InterfaceContainer.cxx
View File

@ -71,7 +71,7 @@ using namespace ::com::sun::star::util;
namespace namespace
{ {
static void lcl_throwIllegalArgumentException() void lcl_throwIllegalArgumentException()
{ {
throw IllegalArgumentException(); throw IllegalArgumentException();
} }

12
forms/source/richtext/richtextcontrol.cxx
View File

@ -77,7 +77,7 @@ namespace frm
namespace namespace
{ {
static void implAdjustTriStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName, void implAdjustTriStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName,
WinBits& _rAllBits, WinBits _nPositiveFlag, WinBits nNegativeFlag ) WinBits& _rAllBits, WinBits _nPositiveFlag, WinBits nNegativeFlag )
{ {
bool bFlagValue = false; 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; bool bFlagValue = false;
if ( _rValue >>= bFlagValue ) 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 ) WinBits& _rAllBits, WinBits _nFlag, bool _bInvert = false )
{ {
implAdjustTwoStateFlag( _rxProps->getPropertyValue( _rPropertyName ), _rAllBits, _nFlag, _bInvert ); 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(); WinBits nBits = _pWindow->GetStyle();
implAdjustTwoStateFlag( _rValue, nBits, _nFlag, _bInvert ); 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; WinBits nBits = 0;
try try
@ -431,7 +431,7 @@ namespace frm
namespace namespace
{ {
static SfxSlotId lcl_translateConflictingSlot( SfxSlotId _nIDFromPool ) SfxSlotId lcl_translateConflictingSlot( SfxSlotId _nIDFromPool )
{ {
// HACK HACK HACK // HACK HACK HACK
// unfortunately, some of our applications have some conflicting slots, // unfortunately, some of our applications have some conflicting slots,

2
forms/source/richtext/rtattributehandler.cxx
View File

@ -96,7 +96,7 @@ namespace frm
namespace namespace
{ {
static WhichId lcl_implGetWhich( const SfxItemPool& _rPool, AttributeId _nAttributeId ) WhichId lcl_implGetWhich( const SfxItemPool& _rPool, AttributeId _nAttributeId )
{ {
WhichId nWhich = 0; WhichId nWhich = 0;
switch ( _nAttributeId ) switch ( _nAttributeId )

6
forms/source/runtime/formoperations.cxx
View File

@ -407,7 +407,7 @@ namespace frm
namespace namespace
{ {
static bool lcl_needConfirmCommit( sal_Int32 _nFeature ) bool lcl_needConfirmCommit( sal_Int32 _nFeature )
{ {
return ( ( _nFeature == FormFeature::ReloadForm ) return ( ( _nFeature == FormFeature::ReloadForm )
|| ( _nFeature == FormFeature::RemoveFilterAndSort ) || ( _nFeature == FormFeature::RemoveFilterAndSort )
@ -419,11 +419,11 @@ namespace frm
|| ( _nFeature == FormFeature::InteractiveFilter ) || ( _nFeature == FormFeature::InteractiveFilter )
); );
} }
static bool lcl_requiresArguments( sal_Int32 _nFeature ) bool lcl_requiresArguments( sal_Int32 _nFeature )
{ {
return ( _nFeature == FormFeature::MoveAbsolute ); return ( _nFeature == FormFeature::MoveAbsolute );
} }
static bool lcl_isExecutableFeature( sal_Int32 _nFeature ) bool lcl_isExecutableFeature( sal_Int32 _nFeature )
{ {
return ( _nFeature != FormFeature::TotalRecords ); return ( _nFeature != FormFeature::TotalRecords );
} }

2
forms/source/solar/component/navbarcontrol.cxx
View File

@ -85,7 +85,7 @@ namespace frm
namespace namespace
{ {
static WinBits lcl_getWinBits_nothrow( const Reference< XControlModel >& _rxModel ) WinBits lcl_getWinBits_nothrow( const Reference< XControlModel >& _rxModel )
{ {
WinBits nBits = 0; WinBits nBits = 0;
try try

4
forms/source/solar/control/navtoolbar.cxx
View File

@ -47,13 +47,13 @@ namespace frm
namespace namespace
{ {
static bool isArtificialItem( sal_Int16 _nFeatureId ) bool isArtificialItem( sal_Int16 _nFeatureId )
{ {
return ( _nFeatureId == LID_RECORD_LABEL ) return ( _nFeatureId == LID_RECORD_LABEL )
|| ( _nFeatureId == LID_RECORD_FILLER ); || ( _nFeatureId == LID_RECORD_FILLER );
} }
static OUString getLabelString( sal_uInt16 _nResId ) OUString getLabelString( sal_uInt16 _nResId )
{ {
OUString sLabel( " " ); OUString sLabel( " " );
sLabel += FRM_RES_STRING( _nResId ); sLabel += FRM_RES_STRING( _nResId );

4
forms/source/xforms/datatypes.cxx
View File

@ -191,7 +191,7 @@ namespace xforms
namespace 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; UErrorCode nMatchStatus = U_ZERO_ERROR;
UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(_rPattern.getStr()), _rPattern.getLength() ); // UChar != sal_Unicode in MinGW UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(_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 // 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; UErrorCode nMatchStatus = U_ZERO_ERROR;
UnicodeString aInput( reinterpret_cast<const UChar *>(_rText.getStr()), _rText.getLength() ); // UChar != sal_Unicode in MinGW UnicodeString aInput( reinterpret_cast<const UChar *>(_rText.getStr()), _rText.getLength() ); // UChar != sal_Unicode in MinGW

2
fpicker/source/office/iodlg.cxx
View File

@ -270,7 +270,7 @@ namespace
} }
#endif #endif
static OUString lcl_ensureFinalSlash( const OUString& _rDir ) OUString lcl_ensureFinalSlash( const OUString& _rDir )
{ {
INetURLObject aWorkPathObj( _rDir, INetProtocol::File ); INetURLObject aWorkPathObj( _rDir, INetProtocol::File );
aWorkPathObj.setFinalSlash(); aWorkPathObj.setFinalSlash();