[Libreoffice-commits] core.git: 5 commits - configmgr/source embedserv/Library_emser.mk extensions/Library_oleautobridge.mk extensions/Library_so_activex.mk extensions/Library_so_activex_x64.mk i18npool/source include/rtl include/tools shell/source winaccessibility/Library_uacccom.mk
Tor Lillqvist
tml at collabora.com
Mon Jul 7 16:38:28 PDT 2014
configmgr/source/nodemap.hxx | 4
embedserv/Library_emser.mk | 2
extensions/Library_oleautobridge.mk | 2
extensions/Library_so_activex.mk | 2
extensions/Library_so_activex_x64.mk | 2
i18npool/source/calendar/calendar_gregorian.cxx | 1
i18npool/source/localedata/LocaleNode.cxx | 1
include/rtl/strbuf.hxx | 36 ++---
include/rtl/string.hxx | 100 +++++++--------
include/rtl/stringconcat.hxx | 16 +-
include/rtl/stringutils.hxx | 2
include/rtl/ustrbuf.hxx | 40 +++---
include/rtl/ustring.hxx | 158 ++++++++++++------------
include/tools/gen.hxx | 1
shell/source/win32/SysShExec.cxx | 2
winaccessibility/Library_uacccom.mk | 2
16 files changed, 188 insertions(+), 183 deletions(-)
New commits:
commit 1a400f39e8cb23b316565dd116b194a99689630d
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jul 8 02:35:00 2014 +0300
WaE: Unreachable code
Not sure if the intent is that clearCache() should be called, but the
calls have just accidentally been placed after the return statements,
or whether the code works correctly and as intended as it is now,
i.e. with the unreachable calls to clearCache().
Warning emitted by VS 2013, why don't other compilers warn? Perhaps
these functions are never called?
Change-Id: I16b0bc1b836753ef5579dadba211cbce4f50cbc3
diff --git a/configmgr/source/nodemap.hxx b/configmgr/source/nodemap.hxx
index 068a471..dcfac2b 100644
--- a/configmgr/source/nodemap.hxx
+++ b/configmgr/source/nodemap.hxx
@@ -52,8 +52,8 @@ class NodeMap
iterator end() { return maImpl.end(); }
const_iterator end() const { return maImpl.end(); }
- rtl::Reference<Node> &operator[](const OUString &aStr) { return maImpl[aStr]; clearCache(); }
- std::pair<iterator,bool> insert(const value_type &vt) { return maImpl.insert(vt); clearCache(); }
+ rtl::Reference<Node> &operator[](const OUString &aStr) { return maImpl[aStr]; /* clearCache(); */ }
+ std::pair<iterator,bool> insert(const value_type &vt) { return maImpl.insert(vt); /* clearCache(); */ }
void clear() { maImpl.clear(); clearCache(); }
void erase(const iterator &it) { maImpl.erase(it); clearCache(); }
void erase(const OUString &aStr) { maImpl.erase(aStr); clearCache(); }
commit ab740f43d0a3b96a719d13f28a427d20a4da0e2b
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jul 8 02:19:25 2014 +0300
'internal' is a keyword in current C++/CLI
Using it as a namespace in our rtl string headers breaks compilation
of cli_ure/source/climaker/climaker_emit.cxx (and other C++/CLI
sources we might have that include rtl string headers). Rename it to
'libreoffice_internal'.
Change-Id: Ieae68bd612b05d326d570945c1d08a54bf011852
diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx
index 1a2539ff..1a59f0e 100644
--- a/include/rtl/strbuf.hxx
+++ b/include/rtl/strbuf.hxx
@@ -157,7 +157,7 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- OStringBuffer( const T& value, typename internal::CharPtrDetector< T, internal::Dummy >::Type = internal::Dummy())
+ OStringBuffer( const T& value, typename libreoffice_internal::CharPtrDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy())
: pData(NULL)
{
sal_Int32 length = rtl_str_getLength( value );
@@ -166,7 +166,7 @@ public:
}
template< typename T >
- OStringBuffer( T& value, typename internal::NonConstCharArrayDetector< T, internal::Dummy >::Type = internal::Dummy())
+ OStringBuffer( T& value, typename libreoffice_internal::NonConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy())
: pData(NULL)
{
sal_Int32 length = rtl_str_getLength( value );
@@ -186,12 +186,12 @@ public:
@param literal a string literal
*/
template< typename T >
- OStringBuffer( T& literal, typename internal::ConstCharArrayDetector< T, internal::Dummy >::Type = internal::Dummy())
+ OStringBuffer( T& literal, typename libreoffice_internal::ConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy())
: pData(NULL)
- , nCapacity( internal::ConstCharArrayDetector< T, void >::size - 1 + 16 )
+ , nCapacity( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 + 16 )
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- rtl_string_newFromLiteral( &pData, literal, internal::ConstCharArrayDetector< T, void >::size - 1, 16 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ rtl_string_newFromLiteral( &pData, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, 16 );
#ifdef RTL_STRING_UNITTEST
rtl_string_unittest_const_literal = true;
#endif
@@ -451,13 +451,13 @@ public:
@return this string buffer.
*/
template< typename T >
- typename internal::CharPtrDetector< T, OStringBuffer& >::Type append( const T& str )
+ typename libreoffice_internal::CharPtrDetector< T, OStringBuffer& >::Type append( const T& str )
{
return append( str, rtl_str_getLength( str ) );
}
template< typename T >
- typename internal::NonConstCharArrayDetector< T, OStringBuffer& >::Type append( T& str )
+ typename libreoffice_internal::NonConstCharArrayDetector< T, OStringBuffer& >::Type append( T& str )
{
return append( str, rtl_str_getLength( str ) );
}
@@ -468,11 +468,11 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, OStringBuffer& >::Type append( T& literal )
+ typename libreoffice_internal::ConstCharArrayDetector< T, OStringBuffer& >::Type append( T& literal )
{
RTL_STRING_CONST_FUNCTION
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- rtl_stringbuffer_insert( &pData, &nCapacity, getLength(), literal, internal::ConstCharArrayDetector< T, void >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ rtl_stringbuffer_insert( &pData, &nCapacity, getLength(), literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 );
return *this;
}
@@ -556,8 +556,8 @@ public:
// Explicitly delete all pointer append() overloads to prevent this
// (except for char* overload, which is handled elsewhere).
template< typename T >
- typename internal::Enable< void,
- !internal::CharPtrDetector< T* >::ok >::Type
+ typename libreoffice_internal::Enable< void,
+ !libreoffice_internal::CharPtrDetector< T* >::ok >::Type
append( T* ) SAL_DELETED_FUNCTION;
/// @endcond
@@ -684,13 +684,13 @@ public:
@return this string buffer.
*/
template< typename T >
- typename internal::CharPtrDetector< T, OStringBuffer& >::Type insert( sal_Int32 offset, const T& str )
+ typename libreoffice_internal::CharPtrDetector< T, OStringBuffer& >::Type insert( sal_Int32 offset, const T& str )
{
return insert( offset, str, rtl_str_getLength( str ) );
}
template< typename T >
- typename internal::NonConstCharArrayDetector< T, OStringBuffer& >::Type insert( sal_Int32 offset, T& str )
+ typename libreoffice_internal::NonConstCharArrayDetector< T, OStringBuffer& >::Type insert( sal_Int32 offset, T& str )
{
return insert( offset, str, rtl_str_getLength( str ) );
}
@@ -701,11 +701,11 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, OStringBuffer& >::Type insert( sal_Int32 offset, T& literal )
+ typename libreoffice_internal::ConstCharArrayDetector< T, OStringBuffer& >::Type insert( sal_Int32 offset, T& literal )
{
RTL_STRING_CONST_FUNCTION
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- rtl_stringbuffer_insert( &pData, &nCapacity, offset, literal, internal::ConstCharArrayDetector< T, void >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ rtl_stringbuffer_insert( &pData, &nCapacity, offset, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 );
return *this;
}
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index cd853e8..9a16386 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -156,14 +156,14 @@ public:
@param value a NULL-terminated character array.
*/
template< typename T >
- OString( const T& value, typename internal::CharPtrDetector< T, internal::Dummy >::Type = internal::Dummy() )
+ OString( const T& value, typename libreoffice_internal::CharPtrDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy() )
{
pData = 0;
rtl_string_newFromStr( &pData, value );
}
template< typename T >
- OString( T& value, typename internal::NonConstCharArrayDetector< T, internal::Dummy >::Type = internal::Dummy() )
+ OString( T& value, typename libreoffice_internal::NonConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy() )
{
pData = 0;
rtl_string_newFromStr( &pData, value );
@@ -180,14 +180,14 @@ public:
@param literal a string literal
*/
template< typename T >
- OString( T& literal, typename internal::ConstCharArrayDetector< T, internal::Dummy >::Type = internal::Dummy() )
+ OString( T& literal, typename libreoffice_internal::ConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy() )
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
pData = 0;
- if( internal::ConstCharArrayDetector< T, void >::size - 1 == 0 ) // empty string
+ if( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 == 0 ) // empty string
rtl_string_new( &pData );
else
- rtl_string_newFromLiteral( &pData, literal, internal::ConstCharArrayDetector< T, void >::size - 1, 0 );
+ rtl_string_newFromLiteral( &pData, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, 0 );
#ifdef RTL_STRING_UNITTEST
rtl_string_unittest_const_literal = true;
#endif
@@ -276,14 +276,14 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, OString& >::Type operator=( T& literal )
+ typename libreoffice_internal::ConstCharArrayDetector< T, OString& >::Type operator=( T& literal )
{
RTL_STRING_CONST_FUNCTION
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- if( internal::ConstCharArrayDetector< T, void >::size - 1 == 0 ) // empty string
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ if( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 == 0 ) // empty string
rtl_string_new( &pData );
else
- rtl_string_newFromLiteral( &pData, literal, internal::ConstCharArrayDetector< T, void >::size - 1, 0 );
+ rtl_string_newFromLiteral( &pData, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, 0 );
return *this;
}
@@ -513,13 +513,13 @@ public:
false, otherwise.
*/
template< typename T >
- typename internal::CharPtrDetector< T, bool >::Type equalsIgnoreAsciiCase( const T& asciiStr ) const
+ typename libreoffice_internal::CharPtrDetector< T, bool >::Type equalsIgnoreAsciiCase( const T& asciiStr ) const
{
return rtl_str_compareIgnoreAsciiCase( pData->buffer, asciiStr ) == 0;
}
template< typename T >
- typename internal::NonConstCharArrayDetector< T, bool >::Type equalsIgnoreAsciiCase( T& asciiStr ) const
+ typename libreoffice_internal::NonConstCharArrayDetector< T, bool >::Type equalsIgnoreAsciiCase( T& asciiStr ) const
{
return rtl_str_compareIgnoreAsciiCase( pData->buffer, asciiStr ) == 0;
}
@@ -530,14 +530,14 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, bool >::Type equalsIgnoreAsciiCase( T& literal ) const
+ typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type equalsIgnoreAsciiCase( T& literal ) const
{
RTL_STRING_CONST_FUNCTION
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- if ( pData->length != internal::ConstCharArrayDetector< T, void >::size - 1 )
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ if ( pData->length != libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 )
return false;
return rtl_str_compareIgnoreAsciiCase_WithLength( pData->buffer, pData->length,
- literal, internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0;
+ literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0;
}
/**
@@ -595,13 +595,13 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, bool >::Type match( T& literal, sal_Int32 fromIndex = 0 ) const
+ typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type match( T& literal, sal_Int32 fromIndex = 0 ) const
{
RTL_STRING_CONST_FUNCTION
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
return rtl_str_shortenedCompare_WithLength(
pData->buffer + fromIndex, pData->length - fromIndex,
- literal, internal::ConstCharArrayDetector< T, void >::size - 1, internal::ConstCharArrayDetector< T, void >::size - 1) == 0;
+ literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1) == 0;
}
/**
@@ -668,12 +668,12 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, bool >::Type matchIgnoreAsciiCase( T& literal, sal_Int32 fromIndex = 0 ) const
+ typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type matchIgnoreAsciiCase( T& literal, sal_Int32 fromIndex = 0 ) const
{
RTL_STRING_CONST_FUNCTION
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
return rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( pData->buffer+fromIndex, pData->length-fromIndex,
- literal, internal::ConstCharArrayDetector< T, void >::size - 1, internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0;
+ literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0;
}
/**
@@ -704,13 +704,13 @@ public:
@since LibreOffice 4.0
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, bool >::Type startsWith(
+ typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type startsWith(
T & literal, OString * rest = 0) const
{
RTL_STRING_CONST_FUNCTION
bool b = match(literal, 0);
if (b && rest != 0) {
- *rest = copy(internal::ConstCharArrayDetector< T, void >::size - 1);
+ *rest = copy(libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1);
}
return b;
}
@@ -744,18 +744,18 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, bool >::Type endsWith(
+ typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type endsWith(
T & literal, OString * rest = 0) const
{
RTL_STRING_CONST_FUNCTION
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- bool b = internal::ConstCharArrayDetector< T, void >::size - 1 <= getLength()
- && match(literal, getLength() - ( internal::ConstCharArrayDetector< T, void >::size - 1 ));
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ bool b = libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 <= getLength()
+ && match(literal, getLength() - ( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ));
if (b && rest != 0) {
*rest = copy(
0,
(getLength()
- - (internal::ConstCharArrayDetector< T, void >::size - 1)));
+ - (libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1)));
}
return b;
}
@@ -792,25 +792,25 @@ public:
{ return rStr1.compareTo( rStr2 ) >= 0; }
template< typename T >
- friend typename internal::CharPtrDetector< T, bool >::Type operator==( const OString& rStr1, const T& value )
+ friend typename libreoffice_internal::CharPtrDetector< T, bool >::Type operator==( const OString& rStr1, const T& value )
{
return rStr1.compareTo( value ) == 0;
}
template< typename T >
- friend typename internal::NonConstCharArrayDetector< T, bool >::Type operator==( const OString& rStr1, T& value )
+ friend typename libreoffice_internal::NonConstCharArrayDetector< T, bool >::Type operator==( const OString& rStr1, T& value )
{
return rStr1.compareTo( value ) == 0;
}
template< typename T >
- friend typename internal::CharPtrDetector< T, bool >::Type operator==( const T& value, const OString& rStr2 )
+ friend typename libreoffice_internal::CharPtrDetector< T, bool >::Type operator==( const T& value, const OString& rStr2 )
{
return rStr2.compareTo( value ) == 0;
}
template< typename T >
- friend typename internal::NonConstCharArrayDetector< T, bool >::Type operator==( T& value, const OString& rStr2 )
+ friend typename libreoffice_internal::NonConstCharArrayDetector< T, bool >::Type operator==( T& value, const OString& rStr2 )
{
return rStr2.compareTo( value ) == 0;
}
@@ -821,13 +821,13 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- friend typename internal::ConstCharArrayDetector< T, bool >::Type operator==( const OString& rStr, T& literal )
+ friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( const OString& rStr, T& literal )
{
RTL_STRING_CONST_FUNCTION
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- return rStr.getLength() == internal::ConstCharArrayDetector< T, void >::size - 1
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ return rStr.getLength() == libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1
&& rtl_str_compare_WithLength( rStr.pData->buffer, rStr.pData->length, literal,
- internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0;
+ libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0;
}
/**
@@ -836,35 +836,35 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- friend typename internal::ConstCharArrayDetector< T, bool >::Type operator==( T& literal, const OString& rStr )
+ friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( T& literal, const OString& rStr )
{
RTL_STRING_CONST_FUNCTION
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- return rStr.getLength() == internal::ConstCharArrayDetector< T, void >::size - 1
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ return rStr.getLength() == libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1
&& rtl_str_compare_WithLength( rStr.pData->buffer, rStr.pData->length, literal,
- internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0;
+ libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0;
}
template< typename T >
- friend typename internal::CharPtrDetector< T, bool >::Type operator!=( const OString& rStr1, const T& value )
+ friend typename libreoffice_internal::CharPtrDetector< T, bool >::Type operator!=( const OString& rStr1, const T& value )
{
return !(operator == ( rStr1, value ));
}
template< typename T >
- friend typename internal::NonConstCharArrayDetector< T, bool >::Type operator!=( const OString& rStr1, T& value )
+ friend typename libreoffice_internal::NonConstCharArrayDetector< T, bool >::Type operator!=( const OString& rStr1, T& value )
{
return !(operator == ( rStr1, value ));
}
template< typename T >
- friend typename internal::CharPtrDetector< T, bool >::Type operator!=( const T& value, const OString& rStr2 )
+ friend typename libreoffice_internal::CharPtrDetector< T, bool >::Type operator!=( const T& value, const OString& rStr2 )
{
return !(operator == ( value, rStr2 ));
}
template< typename T >
- friend typename internal::NonConstCharArrayDetector< T, bool >::Type operator!=( T& value, const OString& rStr2 )
+ friend typename libreoffice_internal::NonConstCharArrayDetector< T, bool >::Type operator!=( T& value, const OString& rStr2 )
{
return !(operator == ( value, rStr2 ));
}
@@ -875,7 +875,7 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- friend typename internal::ConstCharArrayDetector< T, bool >::Type operator!=( const OString& rStr, T& literal )
+ friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( const OString& rStr, T& literal )
{
return !( rStr == literal );
}
@@ -886,7 +886,7 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- friend typename internal::ConstCharArrayDetector< T, bool >::Type operator!=( T& literal, const OString& rStr )
+ friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( T& literal, const OString& rStr )
{
return !( literal == rStr );
}
@@ -981,12 +981,12 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, sal_Int32 >::Type indexOf( T& literal, sal_Int32 fromIndex = 0 ) const
+ typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type indexOf( T& literal, sal_Int32 fromIndex = 0 ) const
{
RTL_STRING_CONST_FUNCTION
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
sal_Int32 n = rtl_str_indexOfStr_WithLength(
- pData->buffer + fromIndex, pData->length - fromIndex, literal, internal::ConstCharArrayDetector< T, void >::size - 1);
+ pData->buffer + fromIndex, pData->length - fromIndex, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1);
return n < 0 ? n : n + fromIndex;
}
diff --git a/include/rtl/stringconcat.hxx b/include/rtl/stringconcat.hxx
index 8ab2ffc..089948c 100644
--- a/include/rtl/stringconcat.hxx
+++ b/include/rtl/stringconcat.hxx
@@ -201,7 +201,7 @@ struct ToStringHelper< OUStringConcat< T1, T2 > >
template< typename T1, typename T2 >
inline
SAL_WARN_UNUSED_RESULT
-typename internal::Enable< OStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOStringConcat && ToStringHelper< T2 >::allowOStringConcat >::Type operator+( const T1& left, const T2& right )
+typename libreoffice_internal::Enable< OStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOStringConcat && ToStringHelper< T2 >::allowOStringConcat >::Type operator+( const T1& left, const T2& right )
{
return OStringConcat< T1, T2 >( left, right );
}
@@ -210,7 +210,7 @@ typename internal::Enable< OStringConcat< T1, T2 >, ToStringHelper< T1 >::allowO
template< typename T, int N >
inline
SAL_WARN_UNUSED_RESULT
-typename internal::Enable< OStringConcat< T, const char[ N ] >, ToStringHelper< T >::allowOStringConcat >::Type operator+( const T& left, const char (&right)[ N ] )
+typename libreoffice_internal::Enable< OStringConcat< T, const char[ N ] >, ToStringHelper< T >::allowOStringConcat >::Type operator+( const T& left, const char (&right)[ N ] )
{
return OStringConcat< T, const char[ N ] >( left, right );
}
@@ -218,7 +218,7 @@ typename internal::Enable< OStringConcat< T, const char[ N ] >, ToStringHelper<
template< typename T, int N >
inline
SAL_WARN_UNUSED_RESULT
-typename internal::Enable< OStringConcat< const char[ N ], T >, ToStringHelper< T >::allowOStringConcat >::Type operator+( const char (&left)[ N ], const T& right )
+typename libreoffice_internal::Enable< OStringConcat< const char[ N ], T >, ToStringHelper< T >::allowOStringConcat >::Type operator+( const char (&left)[ N ], const T& right )
{
return OStringConcat< const char[ N ], T >( left, right );
}
@@ -226,7 +226,7 @@ typename internal::Enable< OStringConcat< const char[ N ], T >, ToStringHelper<
template< typename T, int N >
inline
SAL_WARN_UNUSED_RESULT
-typename internal::Enable< OStringConcat< T, char[ N ] >, ToStringHelper< T >::allowOStringConcat >::Type operator+( const T& left, char (&right)[ N ] )
+typename libreoffice_internal::Enable< OStringConcat< T, char[ N ] >, ToStringHelper< T >::allowOStringConcat >::Type operator+( const T& left, char (&right)[ N ] )
{
return OStringConcat< T, char[ N ] >( left, right );
}
@@ -234,28 +234,28 @@ typename internal::Enable< OStringConcat< T, char[ N ] >, ToStringHelper< T >::a
template< typename T, int N >
inline
SAL_WARN_UNUSED_RESULT
-typename internal::Enable< OStringConcat< char[ N ], T >, ToStringHelper< T >::allowOStringConcat >::Type operator+( char (&left)[ N ], const T& right )
+typename libreoffice_internal::Enable< OStringConcat< char[ N ], T >, ToStringHelper< T >::allowOStringConcat >::Type operator+( char (&left)[ N ], const T& right )
{
return OStringConcat< char[ N ], T >( left, right );
}
template< typename T1, typename T2 >
inline
-typename internal::Enable< OUStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOUStringConcat && ToStringHelper< T2 >::allowOUStringConcat >::Type operator+( const T1& left, const T2& right )
+typename libreoffice_internal::Enable< OUStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOUStringConcat && ToStringHelper< T2 >::allowOUStringConcat >::Type operator+( const T1& left, const T2& right )
{
return OUStringConcat< T1, T2 >( left, right );
}
template< typename T1, typename T2 >
inline
-typename internal::Enable< OUStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOUStringConcat && ToStringHelper< T2 >::allowOUStringConcat && internal::ConstCharArrayDetector< T1, void >::ok >::Type operator+( T1& left, const T2& right )
+typename libreoffice_internal::Enable< OUStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOUStringConcat && ToStringHelper< T2 >::allowOUStringConcat && libreoffice_internal::ConstCharArrayDetector< T1, void >::ok >::Type operator+( T1& left, const T2& right )
{
return OUStringConcat< T1, T2 >( left, right );
}
template< typename T1, typename T2 >
inline
-typename internal::Enable< OUStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOUStringConcat && ToStringHelper< T2 >::allowOUStringConcat && internal::ConstCharArrayDetector< T2, void >::ok >::Type operator+( const T1& left, T2& right )
+typename libreoffice_internal::Enable< OUStringConcat< T1, T2 >, ToStringHelper< T1 >::allowOUStringConcat && ToStringHelper< T2 >::allowOUStringConcat && libreoffice_internal::ConstCharArrayDetector< T2, void >::ok >::Type operator+( const T1& left, T2& right )
{
return OUStringConcat< T1, T2 >( left, right );
}
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx
index 114cb5d..88034d3 100644
--- a/include/rtl/stringutils.hxx
+++ b/include/rtl/stringutils.hxx
@@ -38,7 +38,7 @@ namespace rtl
#undef rtl
#endif
-namespace internal
+namespace libreoffice_internal
{
/*
These templates use SFINAE (Substitution failure is not an error) to help distinguish the various
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index f6b1fe5..9d304b6 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -147,12 +147,12 @@ public:
}
template< typename T >
- OUStringBuffer( T& literal, typename internal::ConstCharArrayDetector< T, internal::Dummy >::Type = internal::Dummy() )
+ OUStringBuffer( T& literal, typename libreoffice_internal::ConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy() )
: pData(NULL)
- , nCapacity( internal::ConstCharArrayDetector< T, void >::size - 1 + 16 )
+ , nCapacity( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 + 16 )
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- rtl_uString_newFromLiteral( &pData, literal, internal::ConstCharArrayDetector< T, void >::size - 1, 16 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ rtl_uString_newFromLiteral( &pData, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, 16 );
#ifdef RTL_STRING_UNITTEST
rtl_string_unittest_const_literal = true;
#endif
@@ -164,7 +164,7 @@ public:
* @internal
*/
template< typename T >
- OUStringBuffer( T&, typename internal::ExceptConstCharArrayDetector< T >::Type = internal::Dummy() )
+ OUStringBuffer( T&, typename libreoffice_internal::ExceptConstCharArrayDetector< T >::Type = libreoffice_internal::Dummy() )
{
pData = 0;
nCapacity = 10;
@@ -176,7 +176,7 @@ public:
* @internal
*/
template< typename T >
- OUStringBuffer( const T&, typename internal::ExceptCharArrayDetector< T >::Type = internal::Dummy() )
+ OUStringBuffer( const T&, typename libreoffice_internal::ExceptCharArrayDetector< T >::Type = libreoffice_internal::Dummy() )
{
pData = 0;
nCapacity = 10;
@@ -485,11 +485,11 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, OUStringBuffer& >::Type append( T& literal )
+ typename libreoffice_internal::ConstCharArrayDetector< T, OUStringBuffer& >::Type append( T& literal )
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
rtl_uStringbuffer_insert_ascii( &pData, &nCapacity, getLength(), literal,
- internal::ConstCharArrayDetector< T, void >::size - 1 );
+ libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 );
return *this;
}
@@ -581,8 +581,8 @@ public:
// Explicitly delete all pointer append() overloads to prevent this
// (except for char* and sal_Unicode* overloads, which are handled elsewhere).
template< typename T >
- typename internal::Enable< void,
- !internal::CharPtrDetector< T* >::ok && !internal::SalUnicodePtrDetector< T* >::ok >::Type
+ typename libreoffice_internal::Enable< void,
+ !libreoffice_internal::CharPtrDetector< T* >::ok && !libreoffice_internal::SalUnicodePtrDetector< T* >::ok >::Type
append( T* ) SAL_DELETED_FUNCTION;
/// @endcond
@@ -806,11 +806,11 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, OUStringBuffer& >::Type insert( sal_Int32 offset, T& literal )
+ typename libreoffice_internal::ConstCharArrayDetector< T, OUStringBuffer& >::Type insert( sal_Int32 offset, T& literal )
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
rtl_uStringbuffer_insert_ascii( &pData, &nCapacity, offset, literal,
- internal::ConstCharArrayDetector< T, void >::size - 1 );
+ libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 );
return *this;
}
@@ -1189,12 +1189,12 @@ public:
@since LibreOffice 4.0
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, sal_Int32 >::Type indexOf( T& literal, sal_Int32 fromIndex = 0 ) const
+ typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type indexOf( T& literal, sal_Int32 fromIndex = 0 ) const
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
sal_Int32 ret = rtl_ustr_indexOfAscii_WithLength(
pData->buffer + fromIndex, pData->length - fromIndex, literal,
- internal::ConstCharArrayDetector< T, void >::size - 1);
+ libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1);
return ret < 0 ? ret : ret + fromIndex;
}
@@ -1252,11 +1252,11 @@ public:
@since LibreOffice 4.0
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, sal_Int32 >::Type lastIndexOf( T& literal ) const
+ typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type lastIndexOf( T& literal ) const
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
return rtl_ustr_lastIndexOfAscii_WithLength(
- pData->buffer, pData->length, literal, internal::ConstCharArrayDetector< T, void >::size - 1);
+ pData->buffer, pData->length, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1);
}
/**
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 3f3db53..f59d646 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -180,14 +180,14 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- OUString( T& literal, typename internal::ConstCharArrayDetector< T, internal::Dummy >::Type = internal::Dummy() )
+ OUString( T& literal, typename libreoffice_internal::ConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy() )
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
pData = 0;
- if( internal::ConstCharArrayDetector< T, void >::size - 1 == 0 ) // empty string
+ if( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 == 0 ) // empty string
rtl_uString_new( &pData );
else
- rtl_uString_newFromLiteral( &pData, literal, internal::ConstCharArrayDetector< T, void >::size - 1, 0 );
+ rtl_uString_newFromLiteral( &pData, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, 0 );
#ifdef RTL_STRING_UNITTEST
rtl_string_unittest_const_literal = true;
#endif
@@ -199,7 +199,7 @@ public:
* @internal
*/
template< typename T >
- OUString( T&, typename internal::ExceptConstCharArrayDetector< T >::Type = internal::Dummy() )
+ OUString( T&, typename libreoffice_internal::ExceptConstCharArrayDetector< T >::Type = libreoffice_internal::Dummy() )
{
pData = 0;
rtl_uString_newFromLiteral( &pData, "!!br0ken!!", 10, 0 ); // set to garbage
@@ -210,7 +210,7 @@ public:
* @internal
*/
template< typename T >
- OUString( const T&, typename internal::ExceptCharArrayDetector< T >::Type = internal::Dummy() )
+ OUString( const T&, typename libreoffice_internal::ExceptCharArrayDetector< T >::Type = libreoffice_internal::Dummy() )
{
pData = 0;
rtl_uString_newFromLiteral( &pData, "!!br0ken!!", 10, 0 ); // set to garbage
@@ -335,13 +335,13 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, OUString& >::Type operator=( T& literal )
+ typename libreoffice_internal::ConstCharArrayDetector< T, OUString& >::Type operator=( T& literal )
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- if( internal::ConstCharArrayDetector< T, void >::size - 1 == 0 ) // empty string
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ if( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 == 0 ) // empty string
rtl_uString_new( &pData );
else
- rtl_uString_newFromLiteral( &pData, literal, internal::ConstCharArrayDetector< T, void >::size - 1, 0 );
+ rtl_uString_newFromLiteral( &pData, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, 0 );
return *this;
}
@@ -485,11 +485,11 @@ public:
@since LibreOffice 4.1
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, sal_Int32 >::Type reverseCompareTo( T& literal ) const
+ typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type reverseCompareTo( T& literal ) const
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
return rtl_ustr_asciil_reverseCompare_WithLength( pData->buffer, pData->length,
- literal, internal::ConstCharArrayDetector< T, void >::size - 1 );
+ literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 );
}
/**
@@ -565,10 +565,10 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, bool >::Type equalsIgnoreAsciiCase( T& literal ) const
+ typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type equalsIgnoreAsciiCase( T& literal ) const
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- if ( pData->length != internal::ConstCharArrayDetector< T, void >::size - 1 )
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ if ( pData->length != libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 )
return false;
return rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( pData->buffer, pData->length, literal ) == 0;
@@ -601,11 +601,11 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, bool >::Type match( T& literal, sal_Int32 fromIndex = 0 ) const
+ typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type match( T& literal, sal_Int32 fromIndex = 0 ) const
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
return rtl_ustr_ascii_shortenedCompare_WithLength( pData->buffer+fromIndex, pData->length-fromIndex,
- literal, internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0;
+ literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0;
}
/**
@@ -639,11 +639,11 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, bool >::Type matchIgnoreAsciiCase( T& literal, sal_Int32 fromIndex = 0 ) const
+ typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type matchIgnoreAsciiCase( T& literal, sal_Int32 fromIndex = 0 ) const
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
return rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( pData->buffer+fromIndex, pData->length-fromIndex,
- literal, internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0;
+ literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0;
}
/**
@@ -945,15 +945,15 @@ public:
@since LibreOffice 4.0
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, bool >::Type startsWith(
+ typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type startsWith(
T & literal, OUString * rest = 0) const
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- bool b = internal::ConstCharArrayDetector< T, void >::size - 1 <= pData->length
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ bool b = libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 <= pData->length
&& rtl_ustr_asciil_reverseEquals_WithLength( pData->buffer, literal,
- internal::ConstCharArrayDetector< T, void >::size - 1);
+ libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1);
if (b && rest != 0) {
- *rest = copy(internal::ConstCharArrayDetector< T, void >::size - 1);
+ *rest = copy(libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1);
}
return b;
}
@@ -994,17 +994,17 @@ public:
@since LibreOffice 4.0
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, bool >::Type
+ typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type
startsWithIgnoreAsciiCase(T & literal, OUString * rest = 0) const
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
bool b = (rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(
pData->buffer,
- internal::ConstCharArrayDetector< T, void >::size - 1, literal,
- internal::ConstCharArrayDetector< T, void >::size - 1)
+ libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, literal,
+ libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1)
== 0);
if (b && rest != 0) {
- *rest = copy(internal::ConstCharArrayDetector< T, void >::size - 1);
+ *rest = copy(libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1);
}
return b;
}
@@ -1038,19 +1038,19 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, bool >::Type
+ typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type
endsWith(T & literal, OUString * rest = 0) const
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- bool b = internal::ConstCharArrayDetector< T, void >::size - 1 <= pData->length
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ bool b = libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 <= pData->length
&& rtl_ustr_asciil_reverseEquals_WithLength(
- pData->buffer + pData->length - ( internal::ConstCharArrayDetector< T, void >::size - 1 ), literal,
- internal::ConstCharArrayDetector< T, void >::size - 1);
+ pData->buffer + pData->length - ( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ), literal,
+ libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1);
if (b && rest != 0) {
*rest = copy(
0,
(getLength()
- - (internal::ConstCharArrayDetector< T, void >::size - 1)));
+ - (libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1)));
}
return b;
}
@@ -1111,21 +1111,21 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, bool >::Type
+ typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type
endsWithIgnoreAsciiCase(T & literal, OUString * rest = 0) const
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- bool b = internal::ConstCharArrayDetector< T, void >::size - 1 <= pData->length
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ bool b = libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 <= pData->length
&& (rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(
- pData->buffer + pData->length - ( internal::ConstCharArrayDetector< T, void >::size - 1 ),
- internal::ConstCharArrayDetector< T, void >::size - 1, literal,
- internal::ConstCharArrayDetector< T, void >::size - 1)
+ pData->buffer + pData->length - ( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ),
+ libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, literal,
+ libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1)
== 0);
if (b && rest != 0) {
*rest = copy(
0,
(getLength()
- - (internal::ConstCharArrayDetector< T, void >::size - 1)));
+ - (libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1)));
}
return b;
}
@@ -1181,10 +1181,10 @@ public:
* @since LibreOffice 3.6
*/
template< typename T >
- friend inline typename internal::ConstCharArrayDetector< T, bool >::Type operator==( const OUString& string, T& literal )
+ friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( const OUString& string, T& literal )
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- return string.equalsAsciiL( literal, internal::ConstCharArrayDetector< T, void >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ return string.equalsAsciiL( literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 );
}
/**
* Compare string to an ASCII string literal.
@@ -1194,10 +1194,10 @@ public:
* @since LibreOffice 3.6
*/
template< typename T >
- friend inline typename internal::ConstCharArrayDetector< T, bool >::Type operator==( T& literal, const OUString& string )
+ friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( T& literal, const OUString& string )
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- return string.equalsAsciiL( literal, internal::ConstCharArrayDetector< T, void >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ return string.equalsAsciiL( literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 );
}
/**
* Compare string to an ASCII string literal.
@@ -1207,10 +1207,10 @@ public:
* @since LibreOffice 3.6
*/
template< typename T >
- friend inline typename internal::ConstCharArrayDetector< T, bool >::Type operator!=( const OUString& string, T& literal )
+ friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( const OUString& string, T& literal )
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- return !string.equalsAsciiL( literal, internal::ConstCharArrayDetector< T, void >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ return !string.equalsAsciiL( literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 );
}
/**
* Compare string to an ASCII string literal.
@@ -1220,10 +1220,10 @@ public:
* @since LibreOffice 3.6
*/
template< typename T >
- friend inline typename internal::ConstCharArrayDetector< T, bool >::Type operator!=( T& literal, const OUString& string )
+ friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( T& literal, const OUString& string )
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
- return !string.equalsAsciiL( literal, internal::ConstCharArrayDetector< T, void >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ return !string.equalsAsciiL( literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 );
}
/**
@@ -1316,12 +1316,12 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, sal_Int32 >::Type indexOf( T& literal, sal_Int32 fromIndex = 0 ) const
+ typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type indexOf( T& literal, sal_Int32 fromIndex = 0 ) const
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
sal_Int32 ret = rtl_ustr_indexOfAscii_WithLength(
pData->buffer + fromIndex, pData->length - fromIndex, literal,
- internal::ConstCharArrayDetector< T, void >::size - 1);
+ libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1);
return ret < 0 ? ret : ret + fromIndex;
}
@@ -1414,11 +1414,11 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- typename internal::ConstCharArrayDetector< T, sal_Int32 >::Type lastIndexOf( T& literal ) const
+ typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type lastIndexOf( T& literal ) const
{
- assert( strlen( literal ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
return rtl_ustr_lastIndexOfAscii_WithLength(
- pData->buffer, pData->length, literal, internal::ConstCharArrayDetector< T, void >::size - 1);
+ pData->buffer, pData->length, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1);
}
/**
@@ -1591,14 +1591,14 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- SAL_WARN_UNUSED_RESULT typename internal::ConstCharArrayDetector< T, OUString >::Type replaceFirst( T& from, OUString const & to,
+ SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T, OUString >::Type replaceFirst( T& from, OUString const & to,
sal_Int32 * index = 0) const
{
rtl_uString * s = 0;
sal_Int32 i = 0;
- assert( strlen( from ) == internal::ConstCharArrayDetector< T >::size - 1 );
+ assert( strlen( from ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
rtl_uString_newReplaceFirstAsciiL(
- &s, pData, from, internal::ConstCharArrayDetector< T, void >::size - 1, to.pData, index == 0 ? &i : index);
+ &s, pData, from, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, to.pData, index == 0 ? &i : index);
return OUString(s, SAL_NO_ACQUIRE);
}
@@ -1621,16 +1621,16 @@ public:
@since LibreOffice 3.6
*/
template< typename T1, typename T2 >
- SAL_WARN_UNUSED_RESULT typename internal::ConstCharArrayDetector< T1, typename internal::ConstCharArrayDetector< T2, OUString >::Type >::Type
+ SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T1, typename libreoffice_internal::ConstCharArrayDetector< T2, OUString >::Type >::Type
replaceFirst( T1& from, T2& to, sal_Int32 * index = 0) const
{
rtl_uString * s = 0;
sal_Int32 i = 0;
- assert( strlen( from ) == internal::ConstCharArrayDetector< T1 >::size - 1 );
- assert( strlen( to ) == internal::ConstCharArrayDetector< T2 >::size - 1 );
+ assert( strlen( from ) == libreoffice_internal::ConstCharArrayDetector< T1 >::size - 1 );
+ assert( strlen( to ) == libreoffice_internal::ConstCharArrayDetector< T2 >::size - 1 );
rtl_uString_newReplaceFirstAsciiLAsciiL(
- &s, pData, from, internal::ConstCharArrayDetector< T1, void >::size - 1, to,
- internal::ConstCharArrayDetector< T2, void >::size - 1, index == 0 ? &i : index);
+ &s, pData, from, libreoffice_internal::ConstCharArrayDetector< T1, void >::size - 1, to,
+ libreoffice_internal::ConstCharArrayDetector< T2, void >::size - 1, index == 0 ? &i : index);
return OUString(s, SAL_NO_ACQUIRE);
}
@@ -1671,11 +1671,11 @@ public:
@since LibreOffice 3.6
*/
template< typename T >
- SAL_WARN_UNUSED_RESULT typename internal::ConstCharArrayDetector< T, OUString >::Type replaceAll( T& from, OUString const & to) const
+ SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T, OUString >::Type replaceAll( T& from, OUString const & to) const
{
rtl_uString * s = 0;
- assert( strlen( from ) == internal::ConstCharArrayDetector< T >::size - 1 );
- rtl_uString_newReplaceAllAsciiL(&s, pData, from, internal::ConstCharArrayDetector< T, void >::size - 1, to.pData);
+ assert( strlen( from ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
+ rtl_uString_newReplaceAllAsciiL(&s, pData, from, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, to.pData);
return OUString(s, SAL_NO_ACQUIRE);
}
@@ -1693,15 +1693,15 @@ public:
@since LibreOffice 3.6
*/
template< typename T1, typename T2 >
- SAL_WARN_UNUSED_RESULT typename internal::ConstCharArrayDetector< T1, typename internal::ConstCharArrayDetector< T2, OUString >::Type >::Type
+ SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T1, typename libreoffice_internal::ConstCharArrayDetector< T2, OUString >::Type >::Type
replaceAll( T1& from, T2& to ) const
{
rtl_uString * s = 0;
- assert( strlen( from ) == internal::ConstCharArrayDetector< T1 >::size - 1 );
- assert( strlen( to ) == internal::ConstCharArrayDetector< T2 >::size - 1 );
+ assert( strlen( from ) == libreoffice_internal::ConstCharArrayDetector< T1 >::size - 1 );
+ assert( strlen( to ) == libreoffice_internal::ConstCharArrayDetector< T2 >::size - 1 );
rtl_uString_newReplaceAllAsciiLAsciiL(
- &s, pData, from, internal::ConstCharArrayDetector< T1, void >::size - 1,
- to, internal::ConstCharArrayDetector< T2, void >::size - 1);
+ &s, pData, from, libreoffice_internal::ConstCharArrayDetector< T1, void >::size - 1,
+ to, libreoffice_internal::ConstCharArrayDetector< T2, void >::size - 1);
return OUString(s, SAL_NO_ACQUIRE);
}
commit e9cd74adcb86d2e1e687421ef188b72780e0afce
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jul 8 02:18:41 2014 +0300
No atlsd.lib in VS 2013
Instead, atls.lib should be used also with code compiled to use the
debugging runtime. See
http://msdn.microsoft.com/en-us/library/bb531344.aspx which says
"Atls.lib no longer has character-set dependencies or code that's
specific for debug/release. Because it works the same for Unicode/ANSI
and debug/release, only one version of the library is required."
Change-Id: Ie39ea271513dec1084cae8d1bbf93afa286f357a
diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk
index a85e4c7..6ff4223 100644
--- a/embedserv/Library_emser.mk
+++ b/embedserv/Library_emser.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_system_win32_libs,emser,\
))
$(eval $(call gb_Library_add_libs,emser,\
- $(ATL_LIB)/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \
+ $(ATL_LIB)/$(if $(filter 120,$(VCVER)),atls.lib,$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib)) \
))
$(eval $(call gb_Library_add_ldflags,emser,\
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk
index 069434c..7bf936e 100644
--- a/extensions/Library_oleautobridge.mk
+++ b/extensions/Library_oleautobridge.mk
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_system_win32_libs,oleautobridge,\
ifeq ($(COM),MSC)
$(eval $(call gb_Library_add_libs,oleautobridge,\
- $(ATL_LIB)/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \
+ $(ATL_LIB)/$(if $(filter 120,$(VCVER)),atls.lib,$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib)) \
))
endif
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk
index cc6d96a..cd2fd901 100644
--- a/extensions/Library_so_activex.mk
+++ b/extensions/Library_so_activex.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex,\
))
$(eval $(call gb_Library_add_libs,so_activex,\
- $(ATL_LIB)/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \
+ $(ATL_LIB)/$(if $(filter 120,$(VCVER)),atls.lib,$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib)) \
))
# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index 6d9363a..0951d7b 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -50,7 +50,7 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\
))
$(eval $(call gb_Library_add_libs,so_activex_x64,\
- $(ATL_LIB)/amd64/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \
+ $(ATL_LIB)/amd64/$(if $(filter 120,$(VCVER)),atls.lib,$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib)) \
))
# vim:set noet sw=4 ts=4:
diff --git a/winaccessibility/Library_uacccom.mk b/winaccessibility/Library_uacccom.mk
index fb72fce..5dd86b0 100644
--- a/winaccessibility/Library_uacccom.mk
+++ b/winaccessibility/Library_uacccom.mk
@@ -77,7 +77,7 @@ $(eval $(call gb_Library_use_system_win32_libs,UAccCOM,\
))
$(eval $(call gb_Library_add_libs,UAccCOM,\
- $(ATL_LIB)/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \
+ $(ATL_LIB)/$(if $(filter 120,$(VCVER)),atls.lib,$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib)) \
))
# vim:set noet sw=4 ts=4:
commit 7182db5a675d5e331281c536e15da5a82f87692e
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jul 8 02:16:01 2014 +0300
Include <algorithm> for std::min() and max()
Change-Id: I6a46e6466ab56aea14e16902cb51f9c3f088f30e
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index 1722a48..ee90844 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <algorithm>
#include "calendar_gregorian.hxx"
#include "localedata.hxx"
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 58bce7f..6f72cc2 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -20,6 +20,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <algorithm>
#include <iostream>
#include <set>
#include <vector>
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index e152495..9dd0efd 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <algorithm>
+
#include <osl/diagnose.h>
#include "SysShExec.hxx"
#include <osl/file.hxx>
commit 771075301a1f3322657d47a77c24c4e16b71be51
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Jul 8 01:05:33 2014 +0300
Include <algorithm> for std::min() and max()
Change-Id: I339577c5b34de0cf3e5dcc644ec1dc080c35d01c
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index c1cffcb..af046df 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -22,6 +22,7 @@
#include <tools/toolsdllapi.h>
#include <limits.h>
+#include <algorithm>
#include <ostream>
#include <cstdlib>
More information about the Libreoffice-commits
mailing list