summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWastack <btomi96@gmail.com>2016-03-31 08:43:53 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-01 06:45:46 +0000
commit1271eadfac7e77ff7b249e64be3857ffdc0a261c (patch)
treebebb8924d3efea223eef40a85c5a239195b18330
parent20ba5d464a9fba3090af6a644a331ee237356fea (diff)
tdf#97966 Drop 'static' keywords
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>
-rw-r--r--framework/source/services/substitutepathvars.cxx2
-rw-r--r--framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx4
-rw-r--r--framework/source/uiconfiguration/uiconfigurationmanager.cxx4
-rw-r--r--framework/source/uielement/popuptoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/statusbarmanager.cxx2
-rw-r--r--framework/source/uielement/statusbarmerger.cxx10
-rw-r--r--i18nlangtag/qa/cppunit/test_languagetag.cxx2
-rw-r--r--l10ntools/source/export.cxx4
-rw-r--r--l10ntools/source/lngmerge.cxx2
-rw-r--r--l10ntools/source/treemerge.cxx6
-rw-r--r--l10ntools/source/xmlparse.cxx6
-rw-r--r--oox/source/mathml/importutils.cxx2
12 files changed, 23 insertions, 23 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 3827e3233247..6263417ca285 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -456,7 +456,7 @@ void SubstitutePathVariables_Impl::ImplCommit()
{
}
-static inline OperatingSystem GetOperatingSystem()
+inline OperatingSystem GetOperatingSystem()
{
#ifdef SOLARIS
return OS_SOLARIS;
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index b862ad810164..15b26bae1bfb 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -238,7 +238,7 @@ static const char RESOURCEURL_PREFIX[] = "private:resource/";
static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17;
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 ) ) &&
@@ -260,7 +260,7 @@ static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL )
return ui::UIElementType::UNKNOWN;
}
-static OUString RetrieveNameFromResourceURL( const OUString& aResourceURL )
+OUString RetrieveNameFromResourceURL( const OUString& aResourceURL )
{
if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) &&
( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index f90ef07d18bd..1bcb6ce67449 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -214,7 +214,7 @@ static const char* UIELEMENTTYPENAMES[] =
static const char RESOURCEURL_PREFIX[] = "private:resource/";
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 ) ) &&
@@ -236,7 +236,7 @@ static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL )
return UIElementType::UNKNOWN;
}
-static OUString RetrieveNameFromResourceURL( const OUString& aResourceURL )
+OUString RetrieveNameFromResourceURL( const OUString& aResourceURL )
{
if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) &&
( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE ))
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index b64ff51a26d4..23c81d72453a 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -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.
sal_False - otherwhise.
*/
-static bool Impl_ExistURLInMenu(
+bool Impl_ExistURLInMenu(
const css::uno::Reference< css::awt::XPopupMenu > &rPopupMenu,
OUString &sURL,
OUString &sFallback,
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index fc47cd237af6..cdc77f7bd09b 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -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 );
diff --git a/framework/source/uielement/statusbarmerger.cxx b/framework/source/uielement/statusbarmerger.cxx
index 6946e9ac6be2..f056500d9934 100644
--- a/framework/source/uielement/statusbarmerger.cxx
+++ b/framework/source/uielement/statusbarmerger.cxx
@@ -48,7 +48,7 @@ static const char MERGEFALLBACK_ADDLAST[] = "AddLast";
static const char MERGEFALLBACK_ADDFIRST[] = "AddFirst";
static const char MERGEFALLBACK_IGNORE[] = "Ignore";
-static void lcl_ConvertSequenceToValues(
+void lcl_ConvertSequenceToValues(
const Sequence< PropertyValue > &rSequence,
AddonStatusbarItem &rItem )
{
@@ -95,7 +95,7 @@ static void lcl_ConvertSequenceToValues(
rItem.nItemBits = nItemBits;
}
-static void lcl_CreateStatusbarItem( StatusBar* pStatusbar,
+void lcl_CreateStatusbarItem( StatusBar* pStatusbar,
sal_uInt16 nPos,
sal_uInt16 nItemId,
const AddonStatusbarItem& rAddonItem )
@@ -116,7 +116,7 @@ static void lcl_CreateStatusbarItem( StatusBar* pStatusbar,
pStatusbar->SetItemData( nItemId, pUserData );
}
-static bool lcl_MergeItems( StatusBar* pStatusbar,
+bool lcl_MergeItems( StatusBar* pStatusbar,
sal_uInt16 nPos,
sal_uInt16 nModIndex,
sal_uInt16& rItemId,
@@ -141,7 +141,7 @@ static bool lcl_MergeItems( StatusBar* pStatusbar,
return true;
}
-static bool lcl_ReplaceItem( StatusBar* pStatusbar,
+bool lcl_ReplaceItem( StatusBar* pStatusbar,
sal_uInt16 nPos,
sal_uInt16& rItemId,
const ::rtl::OUString& rModuleIdentifier,
@@ -151,7 +151,7 @@ static bool lcl_ReplaceItem( StatusBar* pStatusbar,
return lcl_MergeItems( pStatusbar, nPos, 0, rItemId, rModuleIdentifier, rAddonToolbarItems );
}
-static bool lcl_RemoveItems( StatusBar* pStatusbar,
+bool lcl_RemoveItems( StatusBar* pStatusbar,
sal_uInt16 nPos,
const ::rtl::OUString& rMergeCommandParameter )
{
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 86964080af2d..125c22b72c78 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -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 == "tzm-Latn-DZ" ) return rStr2 == "kab-DZ";
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 26b3fe511cef..d8dbaaea2e8d 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -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;
switch (nTyp)
@@ -176,7 +176,7 @@ bool ResData::SetId( const OString& rId, sal_uInt16 nLevel )
namespace
{
-static sal_Int32 lcl_countOccurrences(const OString& text, char c)
+sal_Int32 lcl_countOccurrences(const OString& text, char c)
{
sal_Int32 n = 0;
for (sal_Int32 i = 0;; ++i) {
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index da26398d710d..1d33c929278a 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -33,7 +33,7 @@ OString getBracketedContent(const OString& text) {
return text.getToken(1, '[').getToken(0, ']');
}
-static void lcl_RemoveUTF8ByteOrderMarker( OString &rString )
+void lcl_RemoveUTF8ByteOrderMarker( OString &rString )
{
if( rString.getLength() >= 3 && rString[0] == '\xEF' &&
rString[1] == '\xBB' && rString[2] == '\xBF' )
diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx
index b98b0621e952..978d393854c0 100644
--- a/l10ntools/source/treemerge.cxx
+++ b/l10ntools/source/treemerge.cxx
@@ -27,7 +27,7 @@
namespace
{
// Extract strings from nodes on all level recursively
- static void lcl_ExtractLevel(
+ void lcl_ExtractLevel(
const xmlDocPtr pSource, const xmlNodePtr pRoot,
const xmlChar* pNodeName, PoOfstream& rPOStream )
{
@@ -59,7 +59,7 @@ namespace
}
// Update id and content of the topic
- static xmlNodePtr lcl_UpdateTopic(
+ xmlNodePtr lcl_UpdateTopic(
const xmlNodePtr pCurrent, const OString& rXhpRoot )
{
xmlNodePtr pReturn = pCurrent;
@@ -139,7 +139,7 @@ namespace
return pReturn;
}
// Localize title attribute of help_section and node tags
- static void lcl_MergeLevel(
+ void lcl_MergeLevel(
xmlDocPtr io_pSource, const xmlNodePtr pRoot,
const xmlChar * pNodeName, MergeDataFile* pMergeDataFile,
const OString& rLang, const OString& rXhpRoot )
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 97d6012d812f..3f23923216fb 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -764,7 +764,7 @@ void XMLElement::Print(XMLNode *pCur, OStringBuffer& rBuffer, bool bRootelement
namespace
{
-static OUString lcl_pathnameToAbsoluteUrl(const OString& rPathname)
+OUString lcl_pathnameToAbsoluteUrl(const OString& rPathname)
{
OUString sPath = OStringToOUString(rPathname, RTL_TEXTENCODING_UTF8 );
OUString sUrl;
@@ -1034,7 +1034,7 @@ XMLFile *SimpleXMLParser::Execute( const OString &rFileName, XMLFile* pXMLFileIn
namespace
{
-static icu::UnicodeString lcl_QuotRange(
+icu::UnicodeString lcl_QuotRange(
const icu::UnicodeString& rString, const sal_Int32 nStart,
const sal_Int32 nEnd, bool bInsideTag = false )
{
@@ -1072,7 +1072,7 @@ static icu::UnicodeString lcl_QuotRange(
return sReturn;
}
-static bool lcl_isTag( const icu::UnicodeString& rString )
+bool lcl_isTag( const icu::UnicodeString& rString )
{
static const int nSize = 13;
static const icu::UnicodeString vTags[nSize] = {
diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx
index 463372a4b9e2..e3f4d90db563 100644
--- a/oox/source/mathml/importutils.cxx
+++ b/oox/source/mathml/importutils.cxx
@@ -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 );
OString tokenname( reinterpret_cast< const char* >( aTokenNameSeq.getConstArray() ), aTokenNameSeq.getLength() );