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: Id9dd5a53d6ea5134ebb473bd0463f8f42965a211
Reviewed-on: https://gerrit.libreoffice.org/23674
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Wastack 2016-03-31 08:43:53 +02:00 committed by Stephan Bergmann
parent 20ba5d464a
commit 1271eadfac
12 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/source/services/substitutepathvars.cxx
View File

@ -456,7 +456,7 @@ void SubstitutePathVariables_Impl::ImplCommit()
{ {
} }
static inline OperatingSystem GetOperatingSystem() inline OperatingSystem GetOperatingSystem()
{ {
#ifdef SOLARIS #ifdef SOLARIS
return OS_SOLARIS; return OS_SOLARIS;

4
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
View File

@ -238,7 +238,7 @@ static const char RESOURCEURL_PREFIX[] = "private:resource/";
static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17; static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17;
static const char RESOURCEURL_CUSTOM_ELEMENT[] = "custom_"; static const char RESOURCEURL_CUSTOM_ELEMENT[] = "custom_";
static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL ) sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL )
{ {
if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) && if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) &&
@ -260,7 +260,7 @@ static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL )
return ui::UIElementType::UNKNOWN; return ui::UIElementType::UNKNOWN;
} }
static OUString RetrieveNameFromResourceURL( const OUString& aResourceURL ) OUString RetrieveNameFromResourceURL( const OUString& aResourceURL )
{ {
if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) && if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) &&
( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE )) ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))

4
framework/source/uiconfiguration/uiconfigurationmanager.cxx
View File

@ -214,7 +214,7 @@ static const char* UIELEMENTTYPENAMES[] =
static const char RESOURCEURL_PREFIX[] = "private:resource/"; static const char RESOURCEURL_PREFIX[] = "private:resource/";
static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17; static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17;
static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL ) sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL )
{ {
if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) && if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) &&
@ -236,7 +236,7 @@ static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL )
return UIElementType::UNKNOWN; return UIElementType::UNKNOWN;
} }
static OUString RetrieveNameFromResourceURL( const OUString& aResourceURL ) OUString RetrieveNameFromResourceURL( const OUString& aResourceURL )
{ {
if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) && if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) &&
( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE )) ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))

2
framework/source/uielement/popuptoolbarcontroller.cxx
View File

@ -675,7 +675,7 @@ void NewToolbarController::functionExecuted( const OUString &rCommand )
@return sal_True - if URL could be located as an item of the popup menu. @return sal_True - if URL could be located as an item of the popup menu.
sal_False - otherwhise. sal_False - otherwhise.
*/ */
static bool Impl_ExistURLInMenu( bool Impl_ExistURLInMenu(
const css::uno::Reference< css::awt::XPopupMenu > &rPopupMenu, const css::uno::Reference< css::awt::XPopupMenu > &rPopupMenu,
OUString &sURL, OUString &sURL,
OUString &sFallback, OUString &sFallback,

2
framework/source/uielement/statusbarmanager.cxx
View File

@ -100,7 +100,7 @@ struct lcl_RemoveController : public std::unary_function< typename MAP::value_ty
} }
}; };
static sal_uInt16 impl_convertItemStyleToItemBits( sal_Int16 nStyle ) sal_uInt16 impl_convertItemStyleToItemBits( sal_Int16 nStyle )
{ {
sal_uInt16 nItemBits( 0 ); sal_uInt16 nItemBits( 0 );

10
framework/source/uielement/statusbarmerger.cxx
View File

@ -48,7 +48,7 @@ static const char MERGEFALLBACK_ADDLAST[] = "AddLast";
static const char MERGEFALLBACK_ADDFIRST[] = "AddFirst"; static const char MERGEFALLBACK_ADDFIRST[] = "AddFirst";
static const char MERGEFALLBACK_IGNORE[] = "Ignore"; static const char MERGEFALLBACK_IGNORE[] = "Ignore";
static void lcl_ConvertSequenceToValues( void lcl_ConvertSequenceToValues(
const Sequence< PropertyValue > &rSequence, const Sequence< PropertyValue > &rSequence,
AddonStatusbarItem &rItem ) AddonStatusbarItem &rItem )
{ {
@ -95,7 +95,7 @@ static void lcl_ConvertSequenceToValues(
rItem.nItemBits = nItemBits; rItem.nItemBits = nItemBits;
} }
static void lcl_CreateStatusbarItem( StatusBar* pStatusbar, void lcl_CreateStatusbarItem( StatusBar* pStatusbar,
sal_uInt16 nPos, sal_uInt16 nPos,
sal_uInt16 nItemId, sal_uInt16 nItemId,
const AddonStatusbarItem& rAddonItem ) const AddonStatusbarItem& rAddonItem )
@ -116,7 +116,7 @@ static void lcl_CreateStatusbarItem( StatusBar* pStatusbar,
pStatusbar->SetItemData( nItemId, pUserData ); pStatusbar->SetItemData( nItemId, pUserData );
} }
static bool lcl_MergeItems( StatusBar* pStatusbar, bool lcl_MergeItems( StatusBar* pStatusbar,
sal_uInt16 nPos, sal_uInt16 nPos,
sal_uInt16 nModIndex, sal_uInt16 nModIndex,
sal_uInt16& rItemId, sal_uInt16& rItemId,
@ -141,7 +141,7 @@ static bool lcl_MergeItems( StatusBar* pStatusbar,
return true; return true;
} }
static bool lcl_ReplaceItem( StatusBar* pStatusbar, bool lcl_ReplaceItem( StatusBar* pStatusbar,
sal_uInt16 nPos, sal_uInt16 nPos,
sal_uInt16& rItemId, sal_uInt16& rItemId,
const ::rtl::OUString& rModuleIdentifier, const ::rtl::OUString& rModuleIdentifier,
@ -151,7 +151,7 @@ static bool lcl_ReplaceItem( StatusBar* pStatusbar,
return lcl_MergeItems( pStatusbar, nPos, 0, rItemId, rModuleIdentifier, rAddonToolbarItems ); return lcl_MergeItems( pStatusbar, nPos, 0, rItemId, rModuleIdentifier, rAddonToolbarItems );
} }
static bool lcl_RemoveItems( StatusBar* pStatusbar, bool lcl_RemoveItems( StatusBar* pStatusbar,
sal_uInt16 nPos, sal_uInt16 nPos,
const ::rtl::OUString& rMergeCommandParameter ) const ::rtl::OUString& rMergeCommandParameter )
{ {

2
i18nlangtag/qa/cppunit/test_languagetag.cxx
View File

@ -630,7 +630,7 @@ void TestLanguageTag::testAllTags()
} }
} }
static bool checkMapping( const OUString& rStr1, const OUString& rStr2 ) bool checkMapping( const OUString& rStr1, const OUString& rStr2 )
{ {
if (rStr1 == "la-Latn" ) return rStr2 == "la"; if (rStr1 == "la-Latn" ) return rStr2 == "la";
if (rStr1 == "tzm-Latn-DZ" ) return rStr2 == "kab-DZ"; if (rStr1 == "tzm-Latn-DZ" ) return rStr2 == "kab-DZ";

4
l10ntools/source/export.cxx
View File

@ -48,7 +48,7 @@ std::unique_ptr< Export > exporter;
} }
static OString lcl_GetListTyp( const sal_uInt16 nTyp, const bool bUpperCamelCase ) OString lcl_GetListTyp( const sal_uInt16 nTyp, const bool bUpperCamelCase )
{ {
OString sType; OString sType;
switch (nTyp) switch (nTyp)
@ -176,7 +176,7 @@ bool ResData::SetId( const OString& rId, sal_uInt16 nLevel )
namespace namespace
{ {
static sal_Int32 lcl_countOccurrences(const OString& text, char c) sal_Int32 lcl_countOccurrences(const OString& text, char c)
{ {
sal_Int32 n = 0; sal_Int32 n = 0;
for (sal_Int32 i = 0;; ++i) { for (sal_Int32 i = 0;; ++i) {

2
l10ntools/source/lngmerge.cxx
View File

@ -33,7 +33,7 @@ OString getBracketedContent(const OString& text) {
return text.getToken(1, '[').getToken(0, ']'); return text.getToken(1, '[').getToken(0, ']');
} }
static void lcl_RemoveUTF8ByteOrderMarker( OString &rString ) void lcl_RemoveUTF8ByteOrderMarker( OString &rString )
{ {
if( rString.getLength() >= 3 && rString[0] == '\xEF' && if( rString.getLength() >= 3 && rString[0] == '\xEF' &&
rString[1] == '\xBB' && rString[2] == '\xBF' ) rString[1] == '\xBB' && rString[2] == '\xBF' )

6
l10ntools/source/treemerge.cxx
View File

@ -27,7 +27,7 @@
namespace namespace
{ {
// Extract strings from nodes on all level recursively // Extract strings from nodes on all level recursively
static void lcl_ExtractLevel( void lcl_ExtractLevel(
const xmlDocPtr pSource, const xmlNodePtr pRoot, const xmlDocPtr pSource, const xmlNodePtr pRoot,
const xmlChar* pNodeName, PoOfstream& rPOStream ) const xmlChar* pNodeName, PoOfstream& rPOStream )
{ {
@ -59,7 +59,7 @@ namespace
} }
// Update id and content of the topic // Update id and content of the topic
static xmlNodePtr lcl_UpdateTopic( xmlNodePtr lcl_UpdateTopic(
const xmlNodePtr pCurrent, const OString& rXhpRoot ) const xmlNodePtr pCurrent, const OString& rXhpRoot )
{ {
xmlNodePtr pReturn = pCurrent; xmlNodePtr pReturn = pCurrent;
@ -139,7 +139,7 @@ namespace
return pReturn; return pReturn;
} }
// Localize title attribute of help_section and node tags // Localize title attribute of help_section and node tags
static void lcl_MergeLevel( void lcl_MergeLevel(
xmlDocPtr io_pSource, const xmlNodePtr pRoot, xmlDocPtr io_pSource, const xmlNodePtr pRoot,
const xmlChar * pNodeName, MergeDataFile* pMergeDataFile, const xmlChar * pNodeName, MergeDataFile* pMergeDataFile,
const OString& rLang, const OString& rXhpRoot ) const OString& rLang, const OString& rXhpRoot )

6
l10ntools/source/xmlparse.cxx
View File

@ -764,7 +764,7 @@ void XMLElement::Print(XMLNode *pCur, OStringBuffer& rBuffer, bool bRootelement
namespace namespace
{ {
static OUString lcl_pathnameToAbsoluteUrl(const OString& rPathname) OUString lcl_pathnameToAbsoluteUrl(const OString& rPathname)
{ {
OUString sPath = OStringToOUString(rPathname, RTL_TEXTENCODING_UTF8 ); OUString sPath = OStringToOUString(rPathname, RTL_TEXTENCODING_UTF8 );
OUString sUrl; OUString sUrl;
@ -1034,7 +1034,7 @@ XMLFile *SimpleXMLParser::Execute( const OString &rFileName, XMLFile* pXMLFileIn
namespace namespace
{ {
static icu::UnicodeString lcl_QuotRange( icu::UnicodeString lcl_QuotRange(
const icu::UnicodeString& rString, const sal_Int32 nStart, const icu::UnicodeString& rString, const sal_Int32 nStart,
const sal_Int32 nEnd, bool bInsideTag = false ) const sal_Int32 nEnd, bool bInsideTag = false )
{ {
@ -1072,7 +1072,7 @@ static icu::UnicodeString lcl_QuotRange(
return sReturn; return sReturn;
} }
static bool lcl_isTag( const icu::UnicodeString& rString ) bool lcl_isTag( const icu::UnicodeString& rString )
{ {
static const int nSize = 13; static const int nSize = 13;
static const icu::UnicodeString vTags[nSize] = { static const icu::UnicodeString vTags[nSize] = {

2
oox/source/mathml/importutils.cxx
View File

@ -54,7 +54,7 @@ AttributeListBuilder::AttributeListBuilder( const uno::Reference< xml::sax::XFas
} }
} }
static OString tokenToString( int token ) OString tokenToString( int token )
{ {
const uno::Sequence< sal_Int8 > aTokenNameSeq = StaticTokenMap::get().getUtf8TokenName( token & TOKEN_MASK ); const uno::Sequence< sal_Int8 > aTokenNameSeq = StaticTokenMap::get().getUtf8TokenName( token & TOKEN_MASK );
OString tokenname( reinterpret_cast< const char* >( aTokenNameSeq.getConstArray() ), aTokenNameSeq.getLength() ); OString tokenname( reinterpret_cast< const char* >( aTokenNameSeq.getConstArray() ), aTokenNameSeq.getLength() );