diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-03-20 21:29:37 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-03-22 21:49:20 -0400 |
| commit | 6de145fdfa60737b4d3c4cb164caab5a44aa6c45 (patch) | |
| tree | 1975b094c380d6c675ad76ac6feada9086472181 /sc/source | |
| parent | 7d1d5f290d42024c4a0c2dd03b722942f7142971 (diff) | |
String to OUString.
Change-Id: Ib31cd61f960a73924988aa35c24e106cf668b78b
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/ui/collab/sendfunc.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/collab/sendfunc.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/inc/docfunc.hxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx index 4c27a3edd77f..f5cde9b36ec1 100644 --- a/sc/source/ui/collab/sendfunc.cxx +++ b/sc/source/ui/collab/sendfunc.cxx @@ -189,7 +189,7 @@ sal_Bool ScDocFuncSend::PutData( const ScAddress& rPos, ScEditEngineDefaulter& r } bool ScDocFuncSend::SetCellText( - const ScAddress& rPos, const String& rText, bool bInterpret, bool bEnglish, bool bApi, + const ScAddress& rPos, const OUString& rText, bool bInterpret, bool bEnglish, bool bApi, const formula::FormulaGrammar::Grammar eGrammar ) { SAL_INFO( "sc.tubes", "SetCellText not implemented!" ); diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx index 9ce2c2cdd4ae..e1866ff4ec3a 100644 --- a/sc/source/ui/collab/sendfunc.hxx +++ b/sc/source/ui/collab/sendfunc.hxx @@ -280,7 +280,7 @@ public: virtual sal_Bool PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, sal_Bool bInterpret, sal_Bool bApi ); virtual bool SetCellText( - const ScAddress& rPos, const String& rText, bool bInterpret, bool bEnglish, + const ScAddress& rPos, const OUString& rText, bool bInterpret, bool bEnglish, bool bApi, const formula::FormulaGrammar::Grammar eGrammar ); virtual bool ShowNote( const ScAddress& rPos, bool bShow = true ); virtual bool SetNoteText( const ScAddress& rPos, const String& rNoteText, sal_Bool bApi ); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 8eec7c19c79b..1357c96736d2 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -1163,7 +1163,7 @@ ScBaseCell* ScDocFunc::InterpretEnglishString( const ScAddress& rPos, bool ScDocFunc::SetCellText( - const ScAddress& rPos, const String& rText, bool bInterpret, bool bEnglish, bool bApi, + const ScAddress& rPos, const OUString& rText, bool bInterpret, bool bEnglish, bool bApi, const formula::FormulaGrammar::Grammar eGrammar ) { if ( bInterpret ) @@ -1196,7 +1196,7 @@ bool ScDocFunc::SetCellText( } // sonst Null behalten -> SetString mit lokalen Formeln/Zahlformat } - else if ( rText.Len() ) + else if (!rText.isEmpty()) { SetStringOrEditCell(rPos, rText, !bApi); } diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index fa2807f705f4..964a83969770 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -103,7 +103,7 @@ public: virtual sal_Bool PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, sal_Bool bInterpret, sal_Bool bApi ); virtual bool SetCellText( - const ScAddress& rPos, const String& rText, bool bInterpret, bool bEnglish, bool bApi, + const ScAddress& rPos, const OUString& rText, bool bInterpret, bool bEnglish, bool bApi, const formula::FormulaGrammar::Grammar eGrammar ); // creates a new cell for use with PutCell |