diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-15 15:19:56 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-15 16:00:52 +0100 |
| commit | 369eb9bfba507c72165f2797acd2cd28e692c5d1 (patch) | |
| tree | f64c7e6f9742f00103f669a689f2270cc611d48c | |
| parent | 6be63430c0a73549e0e5d49f6bb4fd1573a854b1 (diff) | |
TabDialog ctor: take an OUString
Change-Id: Ie390fb9debe3a80b3ebc5e609119723c78eadba2
| -rw-r--r-- | include/vcl/tabdlg.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/tabdlg.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx index e4f42482c23a..f02efc726596 100644 --- a/include/vcl/tabdlg.hxx +++ b/include/vcl/tabdlg.hxx @@ -40,7 +40,7 @@ private: public: TabDialog( vcl::Window* pParent, 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 void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 2a70d202ccec..1481fbd7de22 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -316,7 +316,7 @@ SfxTabDialog::SfxTabDialog // can be NULL, when Pages are onDemand bool bEditFmt // when yes -> additional Button for standard ) - : TabDialog(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription) + : TabDialog(pParent, rID, rUIXMLDescription) , pFrame(pViewFrame) , pSet(pItemSet) , pOutSet(0) @@ -345,7 +345,7 @@ SfxTabDialog::SfxTabDialog // can be NULL, when Pages are onDemand bool bEditFmt // when yes -> additional Button for standard ) - : TabDialog(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription) + : TabDialog(pParent, rID, rUIXMLDescription) , pFrame(0) , pSet(pItemSet) , pOutSet(0) diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx index c3258b4f0390..9a2de7549351 100644 --- a/vcl/source/window/tabdlg.cxx +++ b/vcl/source/window/tabdlg.cxx @@ -213,8 +213,8 @@ TabDialog::TabDialog( vcl::Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -TabDialog::TabDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : - Dialog(pParent, rID, rUIXMLDescription, WINDOW_TABDIALOG) +TabDialog::TabDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ) : + Dialog(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription, WINDOW_TABDIALOG) { ImplInitTabDialogData(); } |