diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-03 08:40:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:54:24 +0200 |
| commit | 0a76e5679c21fc061708f7afc8b34c8879a92143 (patch) | |
| tree | 4d373d11c940359e6422912a6a0f22e6edf41f4f | |
| parent | 976430ba8ed7cf24813cbf1aab502847ab925bde (diff) | |
convert includes/vx/rubydialog.hxx from String to OUString
Change-Id: I5b43080ffce00370d095b8c125457f5fbb8fcaac
| -rw-r--r-- | include/svx/rubydialog.hxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/rubydialog.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index d0154ec7cdca..afd1127994c0 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -156,7 +156,7 @@ class SvxRubyDialog : public SfxModelessDialog void EnableControls(bool bEnable); - void GetCurrentText(String& rBase, String& rRuby); + void GetCurrentText(OUString& rBase, OUString& rRuby); void UpdateColors( void ); protected: diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 23778c8dbc8c..6435b0ac0e07 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -503,7 +503,7 @@ void SvxRubyDialog::Update() ScrollHdl_Impl(m_pScrollSB); } -void SvxRubyDialog::GetCurrentText(String& rBase, String& rRuby) +void SvxRubyDialog::GetCurrentText(OUString& rBase, OUString& rRuby) { rBase = aEditArr[nCurrentEdit * 2]->GetText(); rRuby = aEditArr[nCurrentEdit * 2 + 1]->GetText(); @@ -777,7 +777,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ ) SetFillColor( aSaveFont.GetFillColor() ); DrawRect(aRect); - String sBaseText, sRubyText; + OUString sBaseText, sRubyText; m_pParentDlg->GetCurrentText(sBaseText, sRubyText); long nTextHeight = GetTextHeight(); |