diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-09-17 14:31:07 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-09-17 14:31:07 +0200 |
commit | 01d0f0f6adf7e3a340dd44690db5d7d7ed08d3e5 (patch) | |
tree | 3dd1b4829f028b4e5a5ae98e2f10a2cc3792a825 /ucb | |
parent | add test case for CVE-2015-2523 (diff) | |
download | core-01d0f0f6adf7e3a340dd44690db5d7d7ed08d3e5.tar.gz core-01d0f0f6adf7e3a340dd44690db5d7d7ed08d3e5.zip |
"unnamed namespaces don't work well yet" is no longer true
Change-Id: I7a04c2d04e3fc52982d83119755e0b349d232a47
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/regexp/regexp.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index 41254c95f1d9..5856dbf7a6f7 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) |