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 /reportdesign | |
| parent | 949b6ef2e976926cdc946ff1b0550e3f6d8fec3b (diff) | |
SfxTabDialog ctors: take an OUString
Change-Id: I91b9b2ffd19b2412ac01dd12429d6460b4c4812c
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/dlgpage.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/dlgpage.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index 821648d6b542..10361095e47a 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -37,9 +37,9 @@ namespace rptui |* \************************************************************************/ -ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const OString &rDialog) +ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const OUString &rDialog) : SfxTabDialog (pParent, rDialog, OUString("modules/dbreport/ui/") + - OStringToOUString(rDialog, RTL_TEXTENCODING_UTF8).toAsciiLowerCase() + + rDialog.toAsciiLowerCase() + OUString(".ui"), pAttr) , rOutAttrs(*pAttr) { diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx index ff39900f0a64..a613cbb97326 100644 --- a/reportdesign/source/ui/inc/dlgpage.hxx +++ b/reportdesign/source/ui/inc/dlgpage.hxx @@ -37,7 +37,7 @@ private: void operator =(const ORptPageDialog&); public: - ORptPageDialog(vcl::Window* pParent, const SfxItemSet* pAttr, const OString &rDialog); + ORptPageDialog(vcl::Window* pParent, const SfxItemSet* pAttr, const OUString &rDialog); }; } // namespace rptui diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 2fa10d6fec22..82962b3d427f 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2498,8 +2498,8 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ { // want the dialog to be destroyed before our set ORptPageDialog aDlg(getView(), pDescriptor.get(),_xSection.is() - ? OString("BackgroundDialog") - : OString("PageDialog")); + ? OUString("BackgroundDialog") + : OUString("PageDialog")); if (RET_OK == aDlg.Execute()) { |