Skip to content

C
core
Kaydet (Commit) 369eb9bf authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

TabDialog ctor: take an OUString 

Change-Id: Ie390fb9debe3a80b3ebc5e609119723c78eadba2
üst 6be63430
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
include/vcl/tabdlg.hxx
Dosyayı görüntüle @ 369eb9bf
...@@ -40,7 +40,7 @@ private: ...@@ -40,7 +40,7 @@ private:
public: public:
TabDialog( vcl::Window* pParent, TabDialog( vcl::Window* pParent,
WinBits nStyle = WB_STDTABDIALOG ); WinBits nStyle = WB_STDTABDIALOG );
TabDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); TabDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
virtual ~TabDialog(); virtual ~TabDialog();
virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
......
sfx2/source/dialog/tabdlg.cxx
Dosyayı görüntüle @ 369eb9bf
...@@ -316,7 +316,7 @@ SfxTabDialog::SfxTabDialog ...@@ -316,7 +316,7 @@ SfxTabDialog::SfxTabDialog
// can be NULL, when Pages are onDemand // can be NULL, when Pages are onDemand
bool bEditFmt // when yes -> additional Button for standard bool bEditFmt // when yes -> additional Button for standard
) )
: TabDialog(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription) : TabDialog(pParent, rID, rUIXMLDescription)
, pFrame(pViewFrame) , pFrame(pViewFrame)
, pSet(pItemSet) , pSet(pItemSet)
, pOutSet(0) , pOutSet(0)
...@@ -345,7 +345,7 @@ SfxTabDialog::SfxTabDialog ...@@ -345,7 +345,7 @@ SfxTabDialog::SfxTabDialog
// can be NULL, when Pages are onDemand // can be NULL, when Pages are onDemand
bool bEditFmt // when yes -> additional Button for standard bool bEditFmt // when yes -> additional Button for standard
) )
: TabDialog(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription) : TabDialog(pParent, rID, rUIXMLDescription)
, pFrame(0) , pFrame(0)
, pSet(pItemSet) , pSet(pItemSet)
, pOutSet(0) , pOutSet(0)
......
vcl/source/window/tabdlg.cxx
Dosyayı görüntüle @ 369eb9bf
...@@ -213,8 +213,8 @@ TabDialog::TabDialog( vcl::Window* pParent, WinBits nStyle ) : ...@@ -213,8 +213,8 @@ TabDialog::TabDialog( vcl::Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle ); ImplInit( pParent, nStyle );
} }
TabDialog::TabDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : TabDialog::TabDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ) :
Dialog(pParent, rID, rUIXMLDescription, WINDOW_TABDIALOG) Dialog(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription, WINDOW_TABDIALOG)
{ {
ImplInitTabDialogData(); ImplInitTabDialogData();
} }
......
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