l10ntools/source/export.cxx | 4 ++--
l10ntools/source/lngmerge.cxx | 2 +-
l10ntools/source/merge.cxx | 4 ++--
l10ntools/source/po.cxx | 27 ++++-----------------------
l10ntools/source/treemerge.cxx | 6 +++---
l10ntools/source/xmlparse.cxx | 6 +++---
6 files changed, 15 insertions(+), 34 deletions(-)
New commits:
commit 7732ab4f7d913a5ec7d3b6acc0f101c31020c17c
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Apr 5 08:11:29 2016 +0300
loplugin:staticanonymous
Change-Id: I4bf258c6db0d4994b4ffa2088c9963921a5e61fa
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 26b3fe5..d8dbaae 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 da26398..1d33c92 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 b98b0621..978d393 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 97d6012..3f23923 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] = {
commit 9473274d41e8645b9aa82e1ba5f2d2a41e2485b0
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Apr 5 07:56:33 2016 +0300
Bin noise comments and superfluous vertical whitespace
Change-Id: I21620816a80e542fe9771ef22322c4bc42ce50bd
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 1d8223e..7881be3 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -25,7 +25,6 @@
#pragma warning (pop)
#endif
-
#include "po.hxx"
#include "helper.hxx"
@@ -37,7 +36,6 @@
class GenPoEntry
{
private:
-
OString m_sExtractCom;
OString m_sReference;
OString m_sMsgCtxt;
@@ -47,7 +45,6 @@ private:
bool m_bNull;
public:
-
GenPoEntry();
virtual ~GenPoEntry();
// Default copy constructor and copy operator work well
@@ -219,10 +216,6 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream)
}
}
-
-// Class PoEntry
-
-
PoEntry::PoEntry()
: m_bIsInitialized( false )
{
@@ -399,10 +392,6 @@ OString PoEntry::genKeyId(const OString& rGenerator)
return OString(sKeyId);
}
-
-// Class PoHeader
-
-
namespace
{
// Get actual time in "YEAR-MO-DA HO:MI+ZONE" form
@@ -442,10 +431,6 @@ PoHeader::~PoHeader()
delete m_pGenPo;
}
-
-// Class PoOfstream
-
-
PoOfstream::PoOfstream()
: m_aOutPut()
, m_bIsAfterHeader( false )
@@ -503,10 +488,6 @@ void PoOfstream::writeEntry( const PoEntry& rPoEntry )
rPoEntry.m_pGenPo->writeToFile( m_aOutPut );
}
-
-// Class PoIfstream
-
-
namespace
{
commit 08b8de7c93a80f6c5a0d131fa07da8b1eb622ff9
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Apr 5 07:54:52 2016 +0300
loplugin:staticanonymous
Change-Id: If86e2df6d24766c5685466c4c6fc63ecba798000
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 7789e3b..7ee2360 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -29,7 +29,7 @@
namespace
{
- static OString lcl_NormalizeFilename(const OString& rFilename)
+ OString lcl_NormalizeFilename(const OString& rFilename)
{
return rFilename.copy(
std::max(
@@ -37,7 +37,7 @@ namespace
rFilename.lastIndexOf( '/' ))+1);
};
- static bool lcl_ReadPoChecked(
+ bool lcl_ReadPoChecked(
PoEntry& o_rPoEntry, PoIfstream& rPoFile,
const OString& rFileName)
{
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 6aa7c1d..1d8223e 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -87,7 +87,7 @@ public:
namespace
{
// Convert a normal string to msg/po output string
- static OString lcl_GenMsgString(const OString& rString)
+ OString lcl_GenMsgString(const OString& rString)
{
if ( rString.isEmpty() )
return "\"\"";
@@ -114,7 +114,7 @@ namespace
}
// Convert msg string to normal form
- static OString lcl_GenNormString(const OString& rString)
+ OString lcl_GenNormString(const OString& rString)
{
return
helper::unEscapeAll(
@@ -406,7 +406,7 @@ OString PoEntry::genKeyId(const OString& rGenerator)
namespace
{
// Get actual time in "YEAR-MO-DA HO:MI+ZONE" form
- static OString lcl_GetTime()
+ OString lcl_GetTime()
{
time_t aNow = time(nullptr);
struct tm* pNow = localtime(&aNow);
@@ -511,7 +511,7 @@ namespace
{
// Check the validity of read entry
-static bool lcl_CheckInputEntry(const GenPoEntry& rEntry)
+bool lcl_CheckInputEntry(const GenPoEntry& rEntry)
{
const OString sMsgCtxt = rEntry.getMsgCtxt();
const sal_Int32 nFirstEndLine = sMsgCtxt.indexOf('\n');
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
