[Libreoffice-commits] core.git: tools/source ucb/source

[Stephan Bergmann]

 tools/source/fsys/urlobj.cxx   |    7 ++-----
 tools/source/inet/inetmime.cxx |   13 +++++--------
 ucb/source/regexp/regexp.cxx   |    9 +++------
 3 files changed, 10 insertions(+), 19 deletions(-)

New commits:
commit 01d0f0f6adf7e3a340dd44690db5d7d7ed08d3e5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 17 14:31:07 2015 +0200

    "unnamed namespaces don't work well yet" is no longer true
    
    Change-Id: I7a04c2d04e3fc52982d83119755e0b349d232a47

diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 65f451c..51887b7 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -46,9 +46,6 @@
 #include <sax/tools/converter.hxx>
 #include <rtl/uri.hxx>
 
-namespace unnamed_tools_urlobj {} using namespace unnamed_tools_urlobj;
-    // unnamed namespaces don't work well yet...
-
 using namespace css;
 
 //  INetURLObject
@@ -420,7 +417,7 @@ inline void INetURLObject::appendEscape(OUStringBuffer & rTheText,
     rTheText.append( (sal_Unicode)INetMIME::getHexDigit(int(nOctet & 15)) );
 }
 
-namespace unnamed_tools_urlobj {
+namespace {
 
 enum
 {
@@ -616,7 +613,7 @@ std::unique_ptr<SvMemoryStream> INetURLObject::getData()
     return nullptr;
 }
 
-namespace unnamed_tools_urlobj {
+namespace {
 
 INetURLObject::FSysStyle guessFSysStyleByCounting(sal_Unicode const * pBegin,
                                                   sal_Unicode const * pEnd,
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 88e2cf9..44c0fdf 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -27,10 +27,7 @@
 #include <tools/inetmime.hxx>
 #include <rtl/character.hxx>
 
-namespace unnamed_tools_inetmime {} using namespace unnamed_tools_inetmime;
-    // unnamed namespaces don't work well yet
-
-namespace unnamed_tools_inetmime {
+namespace {
 
 class Charset
 {
@@ -98,7 +95,7 @@ inline INetMIMECharsetList_Impl::Node::Node(const Charset & rTheCharset,
     m_pNext(pTheNext)
 {}
 
-namespace unnamed_tools_inetmime {
+namespace {
 
 struct Parameter
 {
@@ -174,7 +171,7 @@ bool Charset::contains(sal_uInt32 nChar) const
 
 //  appendISO88591
 
-namespace unnamed_tools_inetmime {
+namespace {
 
 void appendISO88591(OUString & rText, sal_Char const * pBegin,
                     sal_Char const * pEnd)
@@ -251,7 +248,7 @@ Parameter ** ParameterList::find(const OString& rAttribute,
 
 //  parseParameters
 
-namespace unnamed_tools_inetmime {
+namespace {
 
 bool parseParameters(ParameterList const & rInput,
                      INetContentTypeParameterList * pOutput)
@@ -1025,7 +1022,7 @@ const sal_Char * INetMIME::getCharsetName(rtl_TextEncoding eEncoding)
         }
 }
 
-namespace unnamed_tools_inetmime {
+namespace {
 
 struct EncodingEntry
 {
diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx
index 41254c9..5856dbf 100644
--- a/ucb/source/regexp/regexp.cxx
+++ b/ucb/source/regexp/regexp.cxx
@@ -27,9 +27,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 
-namespace unnamed_ucb_regexp {} using namespace unnamed_ucb_regexp;
-    // unnamed namespaces don't work well yet...
-
 using namespace com::sun::star;
 using namespace ucb_impl;
 
@@ -56,7 +53,7 @@ inline Regexp::Regexp(Kind eTheKind, OUString const & rThePrefix,
 }
 
 
-namespace unnamed_ucb_regexp {
+namespace {
 
 bool matchStringIgnoreCase(sal_Unicode const ** pBegin,
                            sal_Unicode const * pEnd,
@@ -174,7 +171,7 @@ bool Regexp::matches(OUString const & rString,
 }
 
 
-namespace unnamed_ucb_regexp {
+namespace {
 
 bool isScheme(OUString const & rString, bool bColon)
 {
@@ -292,7 +289,7 @@ OUString Regexp::getRegexp(bool bReverse) const
 }
 
 
-namespace unnamed_ucb_regexp {
+namespace {
 
 bool matchString(sal_Unicode const ** pBegin, sal_Unicode const * pEnd,
                  sal_Char const * pString, size_t nStringLength)