diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-09 14:41:08 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-09 18:07:05 +0100 |
| commit | 6d3507b02917c97b117e94c83b56cfe442d5f544 (patch) | |
| tree | 14bfa58156460d5dda5e86387946a3590e6b8b61 /sfx2 | |
| parent | 949b6ef2e976926cdc946ff1b0550e3f6d8fec3b (diff) | |
SfxTabDialog ctors: take an OUString
Change-Id: I91b9b2ffd19b2412ac01dd12429d6460b4c4812c
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/styledlg.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 1854b4176302..2b08f1f5b483 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -33,7 +33,7 @@ SfxStyleDialog::SfxStyleDialog ( vcl::Window* pParent, // Parent - const OString& rID, const OUString& rUIXMLDescription, + const OUString& rID, const OUString& rUIXMLDescription, SfxStyleSheetBase& rStyle // stylesheet to be processed ) diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 34338673e9ba..d73ffaad4034 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -311,12 +311,12 @@ SfxTabDialog::SfxTabDialog ( SfxViewFrame* pViewFrame, // Frame, to which the Dialog belongs vcl::Window* pParent, // Parent Window - const OString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path + const OUString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path const SfxItemSet* pItemSet, // Itemset with the data; // can be NULL, when Pages are onDemand bool bEditFmt // when yes -> additional Button for standard ) - : TabDialog(pParent, rID, rUIXMLDescription) + : TabDialog(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription) , pFrame(pViewFrame) , pSet(pItemSet) , pOutSet(0) @@ -340,12 +340,12 @@ SfxTabDialog::SfxTabDialog ( vcl::Window* pParent, // Parent Window - const OString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path + const OUString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path const SfxItemSet* pItemSet, // Itemset with the data; // can be NULL, when Pages are onDemand bool bEditFmt // when yes -> additional Button for standard ) - : TabDialog(pParent, rID, rUIXMLDescription) + : TabDialog(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription) , pFrame(0) , pSet(pItemSet) , pOutSet(0) |