diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-06-07 15:35:53 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-07 15:36:21 +0100 |
commit | 4129130cab83eb1e7e1ebf153c914524846f7e4b (patch) | |
tree | b9d07f14366605289c311c8beae3e893265737b2 /formula | |
parent | Let us cast pointers to pointer-sized integers (diff) | |
download | core-4129130cab83eb1e7e1ebf153c914524846f7e4b.tar.gz core-4129130cab83eb1e7e1ebf153c914524846f7e4b.zip |
XubString->OUString
Change-Id: I9404ef0d53a74e09a0db9781d004fcd0c573dd78
Diffstat (limited to 'formula')
-rw-r--r-- | formula/source/ui/dlg/ControlHelper.hxx | 16 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcutl.cxx | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 6bed4c71c856..c2d6c8a35bf9 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -31,13 +31,13 @@ class ValWnd : public Window public: ValWnd( Window* pParent, const ResId& rId ); - void SetValue( const String& rStrVal ); + void SetValue( const OUString& rStrVal ); protected: virtual void Paint( const Rectangle& rRect ); private: - String aStrValue; + OUString aStrValue; Rectangle aRectOut; }; @@ -142,15 +142,15 @@ public: ArgEdit* pedArg, RefButton* prefBtn); - void SetArgName(const String &aArg); - String GetArgName(); + void SetArgName(const OUString &aArg); + OUString GetArgName(); void SetArgNameFont(const Font&); - void SetArgVal(const String &aVal); - String GetArgVal(); + void SetArgVal(const OUString &aVal); + OUString GetArgVal(); - void SetArgSelection (const Selection& rSel ); - void ReplaceSelOfArg (const String& rStr ); + void SetArgSelection (const Selection& rSel); + void ReplaceSelOfArg (const OUString& rStr); ArgEdit* GetArgEdPtr() {return pEdArg;} diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 01fc78b45d92..03e9c41fcc95 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -72,7 +72,7 @@ void ValWnd::Paint( const Rectangle& ) //---------------------------------------------------------------------------- -void ValWnd::SetValue( const String& rStrVal ) +void ValWnd::SetValue( const OUString& rStrVal ) { if ( aStrValue != rStrVal ) { @@ -265,7 +265,7 @@ void ArgInput::InitArgInput(FixedText* pftArg, #* Output: --- #* #************************************************************************/ -void ArgInput::SetArgName(const String &aArg) +void ArgInput::SetArgName(const OUString &aArg) { if(pFtArg !=NULL) pFtArg->SetText(aArg ); } @@ -283,7 +283,7 @@ void ArgInput::SetArgName(const String &aArg) #* Output: --- #* #************************************************************************/ -String ArgInput::GetArgName() +OUString ArgInput::GetArgName() { String aPrivArgName; if(pFtArg !=NULL) @@ -342,11 +342,11 @@ void ArgInput::SetArgSelection (const Selection& rSel ) #* Output: --- #* #************************************************************************/ -void ArgInput::SetArgVal(const String &aVal) +void ArgInput::SetArgVal(const OUString &rVal) { if(pEdArg !=NULL) { - pEdArg ->SetRefString(aVal ); + pEdArg ->SetRefString(rVal); } } @@ -363,9 +363,9 @@ void ArgInput::SetArgVal(const String &aVal) #* Output: String #* #************************************************************************/ -String ArgInput::GetArgVal() +OUString ArgInput::GetArgVal() { - String aResult; + OUString aResult; if(pEdArg!=NULL) { aResult=pEdArg->GetText(); @@ -877,7 +877,7 @@ RefEdit::~RefEdit() aTimer.Stop(); } -void RefEdit::SetRefString( const XubString& rStr ) +void RefEdit::SetRefString( const OUString& rStr ) { Edit::SetText( rStr ); } |