[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/ui/frmdlg/frmdlg.cxx   |    2 +-
 sw/source/uibase/inc/frmpage.hxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 30ec4ce259a26d7cefa2ee1d3c13383e8d86414c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Nov 7 10:57:08 2014 +0100

    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

diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index da504e1..68257b0 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 21d0573..556f7d1 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 );
 };