vcl: let the ModalDialog ctor take an OUString

Change-Id: I839435338f4acf80c40896b6c86f7ef122f5449d

25 files changed, 35 insertions, 35 deletions

diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 50fbc2f57daa..2af1b5fa2073 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -46,8 +46,8 @@ SchAxisDlg::SchAxisDlg(vcl::Window* pWindow,
     const InsertAxisOrGridDialogData& rInput, bool bAxisDlg)
     : ModalDialog(pWindow,
           bAxisDlg ?
-              OString("InsertAxisDialog") :
-              OString("InsertGridDialog"),
+              OUString("InsertAxisDialog") :
+              OUString("InsertGridDialog"),
           bAxisDlg ?
               OUString("modules/schart/ui/insertaxisdlg.ui") :
               OUString("modules/schart/ui/insertgriddlg.ui"))
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 57a853c7f74a..9eb47497865e 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -137,7 +137,7 @@ void GraphicPreviewWindow::Resize()
 }
 
 GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent,
-    const OString& rID, const OUString& rUIXMLDescription,
+    const OUString& rID, const OUString& rUIXMLDescription,
     const Graphic& rGraphic)
     : ModalDialog(pParent, rID, rUIXMLDescription)
     , maModifyHdl(LINK( this, GraphicFilterDialog, ImplModifyHdl))
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 835829d77b79..5d558c0807a2 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -173,7 +173,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvtIconChoiceCtrl(vcl:
                             WB_NODRAGSELECTION | WB_TABSTOP);
 }
 
-IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OString& rID,
+IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OUString& rID,
                                      const OUString& rUIXMLDescription,
                                      const SfxItemSet *pItemSet )
 :   ModalDialog         ( pParent, rID, rUIXMLDescription ),
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 10fa9967c587..bfe8633b1bb1 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -91,7 +91,7 @@ uno::Reference< io::XInputStream > InsertObjectDialog_Impl::GetIconIfIconified(
     return uno::Reference< io::XInputStream >();
 }
 
-InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OString& rID,
+InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OUString& rID,
     const OUString& rUIXMLDescription,
     const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage)
     : ModalDialog(pParent, rID, rUIXMLDescription)
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index f4faabb50960..1fb139375fd7 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -84,7 +84,7 @@ protected:
 
 public:
 
-    GraphicFilterDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic);
+    GraphicFilterDialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic);
 
     virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0;
 };
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 269e61d3e006..566d4e1e69fb 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -182,7 +182,7 @@ protected :
 public :
 
     // the IconChoiceCtrl's could also be set in the Ctor
-    IconChoiceDialog ( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
+    IconChoiceDialog ( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription,
                        const SfxItemSet * pItemSet = 0 );
     virtual ~IconChoiceDialog ();
 
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index f845ea80289a..5307a25986ba 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -44,7 +44,7 @@ protected:
     const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& m_xStorage;
     comphelper::EmbeddedObjectContainer aCnt;
 
-    InsertObjectDialog_Impl(vcl::Window * pParent, const OString& rID,
+    InsertObjectDialog_Impl(vcl::Window * pParent, const OUString& rID,
         const OUString& rUIXMLDescription,
         const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage);
 public:
diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx
index f73a1a27e95f..11750ab0917a 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -28,7 +28,7 @@ namespace dbaui
 #define DEF_COL_WIDTH   227
 
 DlgSize::DlgSize( vcl::Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard )
-    : ModalDialog(pParent, bRow ? OString("RowHeightDialog") : OString("ColWidthDialog"),
+    : ModalDialog(pParent, bRow ? OUString("RowHeightDialog") : OUString("ColWidthDialog"),
         bRow ? OUString("dbaccess/ui/rowheightdialog.ui") : OUString("dbaccess/ui/colwidthdialog.ui"))
     , m_nPrevValue(nVal)
     , m_nStandard(bRow ? DEF_ROW_HEIGHT : DEF_COL_WIDTH)
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 441830360750..c7fafe3721ee 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -68,7 +68,7 @@ private:
     SAL_DLLPRIVATE void init();
 
 protected:
-    SfxModalDialog(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription);
+    SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription);
 
     OUString&           GetExtraData()      { return aExtraData; }
     sal_uInt32          GetUniqId() const   { return nUniqId; }
@@ -179,11 +179,11 @@ class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog
 {
 public:
     SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rOptionsSet,
-        const OString& rID = OString("SingleTabDialog"),
+        const OUString& rID = OUString("SingleTabDialog"),
         const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui"));
 
     SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet* pInSet = 0,
-        const OString& rID = OString("SingleTabDialog"),
+        const OUString& rID = OUString("SingleTabDialog"),
         const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui"));
 
     virtual             ~SfxSingleTabDialog();
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index a4ab0027cc81..8ff5f3c224a5 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -239,7 +239,7 @@ private:
 
 public:
     WizardDialog( vcl::Window* pParent, WinBits nStyle = WB_STDTABDIALOG );
-    WizardDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
+    WizardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
     virtual ~WizardDialog();
 
     virtual void        Resize() SAL_OVERRIDE;
diff --git a/include/svx/stddlg.hxx b/include/svx/stddlg.hxx
index 9251475d4194..85cdf46c5b52 100644
--- a/include/svx/stddlg.hxx
+++ b/include/svx/stddlg.hxx
@@ -27,7 +27,7 @@
 class SVX_DLLPUBLIC SvxStandardDialog: public SfxModalDialog
 {
 public:
-    SvxStandardDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
+    SvxStandardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
     virtual ~SvxStandardDialog();
 
     short           Execute() SAL_OVERRIDE;
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 73c05759d1ee..11b862541bfa 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -139,7 +139,7 @@ class VCL_DLLPUBLIC ModalDialog : public Dialog
 {
 public:
     explicit        ModalDialog( vcl::Window* pParent, WinBits nStyle = WB_STDMODAL );
-    explicit        ModalDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
+    explicit        ModalDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
 
 protected:
     using Window::Show;
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))
 {
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 49fe75135c88..07e18cb68302 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -152,7 +152,7 @@ void SfxModalDialog::init()
     GetDialogData_Impl();
 }
 
-SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription )
+SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription )
 :   ModalDialog(pParent, rID, rUIXMLDescription),
     nUniqId(0), //todo: remove this member when the ResId using ctor is removed
     pInputSet(0),
@@ -674,7 +674,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl)
 
 
 SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rSet,
-    const OString& rID, const OUString& rUIXMLDescription)
+    const OUString& rID, const OUString& rUIXMLDescription)
     : SfxModalDialog(pParent, rID, rUIXMLDescription)
     , fnGetRanges(NULL)
     , pImpl(new SingleTabDlgImpl)
@@ -687,7 +687,7 @@ SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& r
 }
 
 SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window* pParent, const SfxItemSet* pInSet,
-    const OString& rID, const OUString& rUIXMLDescription)
+    const OUString& rID, const OUString& rUIXMLDescription)
     : SfxModalDialog(pParent, rID, rUIXMLDescription)
     , fnGetRanges(NULL)
     , pImpl(new SingleTabDlgImpl)
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 8b0b3d5ede1e..6a6a4b60b01c 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -355,7 +355,7 @@ WizardDialog::WizardDialog( vcl::Window* pParent, WinBits nStyle ) :
 
 
 
-WizardDialog::WizardDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) :
+WizardDialog::WizardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ) :
     ModalDialog( pParent, rID, rUIXMLDescription )
 {
     ImplInitData();
diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx
index c1ba57d229ac..d06e5245f306 100644
--- a/svx/source/dialog/stddlg.cxx
+++ b/svx/source/dialog/stddlg.cxx
@@ -30,7 +30,7 @@ short SvxStandardDialog::Execute()
     return nRet;
 }
 
-SvxStandardDialog::SvxStandardDialog(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription )
+SvxStandardDialog::SvxStandardDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription )
     : SfxModalDialog(pParent, rID, rUIXMLDescription)
 {
 }
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index 3a83b7ab97dd..c812fcd37a1a 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -173,7 +173,7 @@ void SwCustomizeAddressListDialog::UpdateButtons()
 
 
 SwAddRenameEntryDialog::SwAddRenameEntryDialog(
-        vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
+        vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription,
         const std::vector< OUString >& rCSVHeader)
     : SfxModalDialog(pParent, rID, rUIXMLDescription)
     , m_rCSVHeader(rCSVHeader)
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
index 176debe9a26d..e0592085047f 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
@@ -61,7 +61,7 @@ class SwAddRenameEntryDialog : public SfxModalDialog
 
     DECL_LINK(ModifyHdl_Impl, Edit*);
 protected:
-    SwAddRenameEntryDialog(vcl::Window* pParent, const OString& rID,
+    SwAddRenameEntryDialog(vcl::Window* pParent, const OUString& rID,
         const OUString& rUIXMLDescription, const std::vector< OUString >& rCSVHeader);
 public:
     void                SetFieldName(const OUString& rName) {m_pFieldNameED->SetText(rName);}
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 0034007605a6..1cb5613982fa 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -135,7 +135,7 @@ class SwSendQueryBox_Impl : public SwMessageAndEditDialog
     bool            bIsEmptyAllowed;
     DECL_LINK( ModifyHdl, Edit*);
 public:
-    SwSendQueryBox_Impl(vcl::Window* pParent, const OString& rID,
+    SwSendQueryBox_Impl(vcl::Window* pParent, const OUString& rID,
         const OUString& rUIXMLDescription);
 
     void SetValue(const OUString& rSet)
@@ -176,7 +176,7 @@ IMPL_LINK( SwSaveWarningBox_Impl, ModifyHdl, Edit*, pEdit)
     return 0;
 }
 
-SwSendQueryBox_Impl::SwSendQueryBox_Impl(vcl::Window* pParent, const OString& rID,
+SwSendQueryBox_Impl::SwSendQueryBox_Impl(vcl::Window* pParent, const OUString& rID,
         const OUString& rUIXMLDescription)
     : SwMessageAndEditDialog(pParent, rID, rUIXMLDescription)
     , bIsEmptyAllowed(true)
diff --git a/sw/source/ui/dialog/swmessdialog.cxx b/sw/source/ui/dialog/swmessdialog.cxx
index 00d277b135da..2e085f464686 100644
--- a/sw/source/ui/dialog/swmessdialog.cxx
+++ b/sw/source/ui/dialog/swmessdialog.cxx
@@ -15,7 +15,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/vclmedit.hxx>
 
-SwMessageAndEditDialog::SwMessageAndEditDialog(vcl::Window* pParent, const OString& rID,
+SwMessageAndEditDialog::SwMessageAndEditDialog(vcl::Window* pParent, const OUString& rID,
         const OUString& rUIXMLDescription)
     : ModalDialog(pParent, rID, rUIXMLDescription)
 {
diff --git a/sw/source/uibase/inc/swmessdialog.hxx b/sw/source/uibase/inc/swmessdialog.hxx
index 4382f574431e..da9c8afe32fd 100644
--- a/sw/source/uibase/inc/swmessdialog.hxx
+++ b/sw/source/uibase/inc/swmessdialog.hxx
@@ -26,7 +26,7 @@ protected:
     VclMultiLineEdit* m_pSecondaryMessage;
     Edit*             m_pEdit;
 public:
-    SwMessageAndEditDialog(vcl::Window* pParent, const OString& rID,
+    SwMessageAndEditDialog(vcl::Window* pParent, const OUString& rID,
         const OUString& rUIXMLDescription);
 };
 
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index a3002a807c75..99ceec2f0f4f 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1163,8 +1163,8 @@ ModalDialog::ModalDialog( vcl::Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-ModalDialog::ModalDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) :
-    Dialog(pParent, OStringToOUString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription, WINDOW_MODALDIALOG)
+ModalDialog::ModalDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ) :
+    Dialog(pParent, rID, rUIXMLDescription, WINDOW_MODALDIALOG)
 {
 }