Kaydet (Commit) 30ec4ce2 authored tarafından Miklos Vajna's avatar Miklos Vajna

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
üst babff102
......@@ -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)
{
......
......@@ -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 );
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment