vcl: let the ModalDialog ctor take an OUString

Change-Id: I839435338f4acf80c40896b6c86f7ef122f5449d

4 files changed, 7 insertions, 7 deletions

diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index ed65fc229e3d..f3507ffe8283 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -177,7 +177,7 @@ public:
     virtual bool        PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
     virtual void        StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
 protected:
-    ScRefHdlModalImpl(vcl::Window* pParent, const OString& rID,
+    ScRefHdlModalImpl(vcl::Window* pParent, const OUString& rID,
         const OUString& rUIXMLDescription);
 
 private:
@@ -264,7 +264,7 @@ void ScRefHdlrImplBase<TWindow, bBindRef>::StateChanged( StateChangedType nState
 class ScAnyRefModalDlg : public ScRefHdlModalImpl
 {
 public:
-    ScAnyRefModalDlg(vcl::Window* pParent, const OString& rID,
+    ScAnyRefModalDlg(vcl::Window* pParent, const OUString& rID,
         const OUString& rUIXMLDescription);
 };
 
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 59387d044e98..32448aa8c707 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -1000,7 +1000,7 @@ void ScRefHandler::RefInputDone( bool bForced )
     m_aHelper.RefInputDone( bForced );
 }
 
-ScRefHdlModalImpl::ScRefHdlModalImpl(vcl::Window* pParent, const OString& rID,
+ScRefHdlModalImpl::ScRefHdlModalImpl(vcl::Window* pParent, const OUString& rID,
     const OUString& rUIXMLDescription)
     : ModalDialog( pParent, rID, rUIXMLDescription)
     , ScRefHandler(dynamic_cast<Window&>(*this), NULL, true)
@@ -1019,7 +1019,7 @@ void ScRefHdlModalImpl::StateChanged( StateChangedType nStateChange )
     ScRefHandler::stateChanged( nStateChange, true );
 }
 
-ScAnyRefModalDlg::ScAnyRefModalDlg(vcl::Window* pParent, const OString& rID,
+ScAnyRefModalDlg::ScAnyRefModalDlg(vcl::Window* pParent, const OUString& rID,
     const OUString& rUIXMLDescription)
     : ScRefHdlModalImpl(pParent, rID, rUIXMLDescription)
 {
diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx
index 47de6c1b1fe9..62b726b41570 100644
--- a/sc/source/ui/miscdlgs/groupdlg.cxx
+++ b/sc/source/ui/miscdlgs/groupdlg.cxx
@@ -25,8 +25,8 @@
 ScGroupDlg::ScGroupDlg(vcl::Window* pParent, bool bUngroup, bool bRows)
     : ModalDialog(pParent,
         bUngroup ?
-            OString("UngroupDialog") :
-            OString("GroupDialog"),
+            OUString("UngroupDialog") :
+            OUString("GroupDialog"),
         bUngroup ?
             OUString("modules/scalc/ui/ungroupdialog.ui") :
             OUString("modules/scalc/ui/groupdialog.ui"))
diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx
index c6782d1a25a2..7651d8310bd8 100644
--- a/sc/source/ui/miscdlgs/mtrindlg.cxx
+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx
@@ -34,7 +34,7 @@ ScMetricInputDlg::ScMetricInputDlg( vcl::Window*         pParent,
                                     long            nFirst,
                                     long            nLast )
 
-    :   ModalDialog(pParent, sDialogName,
+    :   ModalDialog(pParent, OStringToOUString(sDialogName, RTL_TEXTENCODING_UTF8),
             OStringToOUString("modules/scalc/ui/" +
                 sDialogName.toAsciiLowerCase() + ".ui", RTL_TEXTENCODING_UTF8))
 {