summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-11-04 01:22:43 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2012-11-04 16:33:15 +0100
commit13deb4cd8fca3f222003e0ace9875b80fda433d2 (patch)
tree9d7efb3571943849836d24f814737713219a88c7
parent2a87ed2c3dbd71dcf7d791b5d3fb756872582aa5 (diff)
switch from String to OUString
Change-Id: I755d6e6e9c1118792578de52bd3af484f88072be
-rw-r--r--sc/inc/conditio.hxx2
-rw-r--r--sc/source/core/data/conditio.cxx8
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 72f1fc8ed88c..935f33e96cb0 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -186,7 +186,7 @@ class SC_DLLPUBLIC ScConditionEntry : public ScFormatEntry
void Interpret( const ScAddress& rPos );
bool IsValid( double nArg, const ScAddress& rPos ) const;
- bool IsValidStr( const String& rArg, const ScAddress& rPos ) const;
+ bool IsValidStr( const rtl::OUString& rArg, const ScAddress& rPos ) const;
public:
ScConditionEntry( ScConditionMode eOper,
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index f660b3bf7a06..4e3ffcb7f73d 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1095,7 +1095,7 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const
return bValid;
}
-bool ScConditionEntry::IsValidStr( const String& rArg, const ScAddress& rPos ) const
+bool ScConditionEntry::IsValidStr( const rtl::OUString& rArg, const ScAddress& rPos ) const
{
bool bValid = false;
// Interpret muss schon gerufen sein
@@ -1105,7 +1105,7 @@ bool ScConditionEntry::IsValidStr( const String& rArg, const ScAddress& rPos ) c
if ( eOp == SC_COND_DUPLICATE || eOp == SC_COND_NOTDUPLICATE )
{
- if( pCondFormat && rArg.Len() )
+ if( pCondFormat && !rArg.isEmpty() )
{
bValid = IsDuplicate( 0.0, rArg );
if( eOp == SC_COND_NOTDUPLICATE )
@@ -1122,8 +1122,8 @@ bool ScConditionEntry::IsValidStr( const String& rArg, const ScAddress& rPos ) c
if ( !bIsStr2 )
return false;
- String aUpVal1( aStrVal1 ); //! als Member? (dann auch in Interpret setzen)
- String aUpVal2( aStrVal2 );
+ rtl::OUString aUpVal1( aStrVal1 ); //! als Member? (dann auch in Interpret setzen)
+ rtl::OUString aUpVal2( aStrVal2 );
if ( eOp == SC_COND_BETWEEN || eOp == SC_COND_NOTBETWEEN )
if ( ScGlobal::GetCollator()->compareString( aUpVal1, aUpVal2 )