Kaydet (Commit) 01d0f0f6 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

"unnamed namespaces don't work well yet" is no longer true

Change-Id: I7a04c2d04e3fc52982d83119755e0b349d232a47
üst e3813015
...@@ -46,9 +46,6 @@ ...@@ -46,9 +46,6 @@
#include <sax/tools/converter.hxx> #include <sax/tools/converter.hxx>
#include <rtl/uri.hxx> #include <rtl/uri.hxx>
namespace unnamed_tools_urlobj {} using namespace unnamed_tools_urlobj;
// unnamed namespaces don't work well yet...
using namespace css; using namespace css;
// INetURLObject // INetURLObject
...@@ -420,7 +417,7 @@ inline void INetURLObject::appendEscape(OUStringBuffer & rTheText, ...@@ -420,7 +417,7 @@ inline void INetURLObject::appendEscape(OUStringBuffer & rTheText,
rTheText.append( (sal_Unicode)INetMIME::getHexDigit(int(nOctet & 15)) ); rTheText.append( (sal_Unicode)INetMIME::getHexDigit(int(nOctet & 15)) );
} }
namespace unnamed_tools_urlobj { namespace {
enum enum
{ {
...@@ -616,7 +613,7 @@ std::unique_ptr<SvMemoryStream> INetURLObject::getData() ...@@ -616,7 +613,7 @@ std::unique_ptr<SvMemoryStream> INetURLObject::getData()
return nullptr; return nullptr;
} }
namespace unnamed_tools_urlobj { namespace {
INetURLObject::FSysStyle guessFSysStyleByCounting(sal_Unicode const * pBegin, INetURLObject::FSysStyle guessFSysStyleByCounting(sal_Unicode const * pBegin,
sal_Unicode const * pEnd, sal_Unicode const * pEnd,
......
...@@ -27,10 +27,7 @@ ...@@ -27,10 +27,7 @@
#include <tools/inetmime.hxx> #include <tools/inetmime.hxx>
#include <rtl/character.hxx> #include <rtl/character.hxx>
namespace unnamed_tools_inetmime {} using namespace unnamed_tools_inetmime; namespace {
// unnamed namespaces don't work well yet
namespace unnamed_tools_inetmime {
class Charset class Charset
{ {
...@@ -98,7 +95,7 @@ inline INetMIMECharsetList_Impl::Node::Node(const Charset & rTheCharset, ...@@ -98,7 +95,7 @@ inline INetMIMECharsetList_Impl::Node::Node(const Charset & rTheCharset,
m_pNext(pTheNext) m_pNext(pTheNext)
{} {}
namespace unnamed_tools_inetmime { namespace {
struct Parameter struct Parameter
{ {
...@@ -174,7 +171,7 @@ bool Charset::contains(sal_uInt32 nChar) const ...@@ -174,7 +171,7 @@ bool Charset::contains(sal_uInt32 nChar) const
// appendISO88591 // appendISO88591
namespace unnamed_tools_inetmime { namespace {
void appendISO88591(OUString & rText, sal_Char const * pBegin, void appendISO88591(OUString & rText, sal_Char const * pBegin,
sal_Char const * pEnd) sal_Char const * pEnd)
...@@ -251,7 +248,7 @@ Parameter ** ParameterList::find(const OString& rAttribute, ...@@ -251,7 +248,7 @@ Parameter ** ParameterList::find(const OString& rAttribute,
// parseParameters // parseParameters
namespace unnamed_tools_inetmime { namespace {
bool parseParameters(ParameterList const & rInput, bool parseParameters(ParameterList const & rInput,
INetContentTypeParameterList * pOutput) INetContentTypeParameterList * pOutput)
...@@ -1025,7 +1022,7 @@ const sal_Char * INetMIME::getCharsetName(rtl_TextEncoding eEncoding) ...@@ -1025,7 +1022,7 @@ const sal_Char * INetMIME::getCharsetName(rtl_TextEncoding eEncoding)
} }
} }
namespace unnamed_tools_inetmime { namespace {
struct EncodingEntry struct EncodingEntry
{ {
......
...@@ -27,9 +27,6 @@ ...@@ -27,9 +27,6 @@
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <rtl/ustring.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 com::sun::star;
using namespace ucb_impl; using namespace ucb_impl;
...@@ -56,7 +53,7 @@ inline Regexp::Regexp(Kind eTheKind, OUString const & rThePrefix, ...@@ -56,7 +53,7 @@ inline Regexp::Regexp(Kind eTheKind, OUString const & rThePrefix,
} }
namespace unnamed_ucb_regexp { namespace {
bool matchStringIgnoreCase(sal_Unicode const ** pBegin, bool matchStringIgnoreCase(sal_Unicode const ** pBegin,
sal_Unicode const * pEnd, sal_Unicode const * pEnd,
...@@ -174,7 +171,7 @@ bool Regexp::matches(OUString const & rString, ...@@ -174,7 +171,7 @@ bool Regexp::matches(OUString const & rString,
} }
namespace unnamed_ucb_regexp { namespace {
bool isScheme(OUString const & rString, bool bColon) bool isScheme(OUString const & rString, bool bColon)
{ {
...@@ -292,7 +289,7 @@ OUString Regexp::getRegexp(bool bReverse) const ...@@ -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, bool matchString(sal_Unicode const ** pBegin, sal_Unicode const * pEnd,
sal_Char const * pString, size_t nStringLength) sal_Char const * pString, size_t nStringLength)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment