diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-07 10:57:08 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-07 11:14:24 +0100 |
| commit | 30ec4ce259a26d7cefa2ee1d3c13383e8d86414c (patch) | |
| tree | 6f8c356898990932d8df5f5e3eed213c370d7962 /sw/source | |
| parent | babff1023a9dbfb35069b332b456f4d22986518a (diff) | |
SwFrmPage::SetFrmType: take an OUString
Currently these values are ASCII, but it's better to convert it to
OUString from the string literals directly than trying to guess their
encoding later.
Change-Id: I2629329a84c89410bd6d81d871b564988394e74e
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/ui/frmdlg/frmdlg.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/frmpage.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index da504e1daaf4..68257b09bbe2 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -148,7 +148,7 @@ void SwFrmDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { ((SwFrmPage&)rPage).SetNewFrame(m_bNew); ((SwFrmPage&)rPage).SetFormatUsed(m_bFormat); - ((SwFrmPage&)rPage).SetFrmType(OUStringToOString(m_sDlgType, RTL_TEXTENCODING_UTF8)); + ((SwFrmPage&)rPage).SetFrmType(m_sDlgType); } else if (nId == m_nAddId) { diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 21d057391644..556f7d129486 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -104,7 +104,7 @@ class SwFrmPage: public SfxTabPage bool bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged bool bHtmlMode; sal_uInt16 nHtmlMode; - OString sDlgType; + OUString sDlgType; Size aGrfSize; SwTwips nUpperBorder; SwTwips nLowerBorder; @@ -192,7 +192,7 @@ public: void SetNewFrame(bool bNewFrame) { bNew = bNewFrame; } void SetFormatUsed(bool bFmt); - void SetFrmType(const OString &rType) { sDlgType = rType; } + void SetFrmType(const OUString &rType) { sDlgType = rType; } inline bool IsInGraficMode( void ) { return sDlgType == "PictureDialog" || sDlgType == "ObjectDialog"; } void EnableVerticalPositioning( bool bEnable ); }; |