Skip to content

C
core
Kaydet (Commit) ab740f43 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

'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
üst e9cd74ad
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 176 deletions
include/rtl/strbuf.hxx
Dosyayı görüntüle @ ab740f43
......@@ -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;
}
......
include/rtl/string.hxx
Dosyayı görüntüle @ ab740f43
......@@ -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;
}
......
include/rtl/stringconcat.hxx
Dosyayı görüntüle @ ab740f43
......@@ -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 );
}
......
include/rtl/stringutils.hxx
Dosyayı görüntüle @ ab740f43
......@@ -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
......
include/rtl/ustrbuf.hxx
Dosyayı görüntüle @ ab740f43
......@@ -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);
}
/**
......
include/rtl/ustring.hxx
Dosyayı görüntüle @ ab740f43
......@@ -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);
}
......
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