vcl: let the ModelessDialog ctor take an OUString

Change-Id: Iae88a9889c674337fb999a23a799d8730d2793d5

include/sfx2/basedlgs.hxx

@@ -100,7 +100,7 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog
 
 protected:
     SfxModelessDialog( SfxBindings*, SfxChildWindow*,
-        vcl::Window*, const OString& rID, const OUString& rUIXMLDescription );
+        vcl::Window*, const OUString& rID, const OUString& rUIXMLDescription );
     virtual ~SfxModelessDialog();
     virtual bool            Close() SAL_OVERRIDE;
     virtual void            Resize() SAL_OVERRIDE;

include/vcl/dialog.hxx

@@ -131,7 +131,7 @@ class VCL_DLLPUBLIC ModelessDialog : public Dialog
     SAL_DLLPRIVATE         ModelessDialog & operator= (const ModelessDialog &);
 
 public:
-    explicit        ModelessDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
+    explicit        ModelessDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
 };
 
 // - ModalDialog -

sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx

@@ -53,7 +53,7 @@ namespace
 
 ScMatrixComparisonGenerator::ScMatrixComparisonGenerator(
                                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-                                    vcl::Window* pParent, ScViewData* pViewData, const OString& rID,
+                                    vcl::Window* pParent, ScViewData* pViewData, const OUString& rID,
                                     const OUString& rUiXmlDescription) :
     ScStatisticsInputOutputDialog(pSfxBindings, pChildWindow, pParent, pViewData, rID, rUiXmlDescription)
 {}

sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx

@@ -55,7 +55,7 @@ ScRangeList ScStatisticsInputOutputDialog::MakeRowRangeList(SCTAB aTab, ScAddres
 
 ScStatisticsInputOutputDialog::ScStatisticsInputOutputDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-                    vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) :
+                    vcl::Window* pParent, ScViewData* pViewData, const OUString& rID, const OUString& rUIXMLDescription ) :
     ScAnyRefDlg     ( pSfxBindings, pChildWindow, pParent, rID, rUIXMLDescription ),
     mViewData       ( pViewData ),
     mDocument       ( pViewData->GetDocument() ),

sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx

@@ -27,7 +27,7 @@
 
 ScStatisticsTwoVariableDialog::ScStatisticsTwoVariableDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-                    vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) :
+                    vcl::Window* pParent, ScViewData* pViewData, const OUString& rID, const OUString& rUIXMLDescription ) :
     ScAnyRefDlg     ( pSfxBindings, pChildWindow, pParent, rID, rUIXMLDescription ),
     mViewData       ( pViewData ),
     mDocument       ( pViewData->GetDocument() ),

sc/source/ui/inc/MatrixComparisonGenerator.hxx

@@ -27,7 +27,7 @@ public:
     ScMatrixComparisonGenerator(
         SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
         vcl::Window* pParent, ScViewData* pViewData,
-        const OString& rID, const OUString& rUiXmlDescription );
+        const OUString& rID, const OUString& rUiXmlDescription );
 
     virtual ~ScMatrixComparisonGenerator();
 

sc/source/ui/inc/StatisticsInputOutputDialog.hxx

@@ -30,7 +30,7 @@ public:
     ScStatisticsInputOutputDialog(
         SfxBindings* pB, SfxChildWindow* pCW,
         vcl::Window* pParent, ScViewData* pViewData,
-        const OString& rID, const OUString& rUIXMLDescription );
+        const OUString& rID, const OUString& rUIXMLDescription );
 
     virtual ~ScStatisticsInputOutputDialog();
 

sc/source/ui/inc/StatisticsTwoVariableDialog.hxx

@@ -30,7 +30,7 @@ public:
     ScStatisticsTwoVariableDialog(
         SfxBindings* pB, SfxChildWindow* pCW,
         vcl::Window* pParent, ScViewData* pViewData,
-        const OString& rID, const OUString& rUIXMLDescription );
+        const OUString& rID, const OUString& rUIXMLDescription );
 
     virtual ~ScStatisticsTwoVariableDialog();
 

sc/source/ui/inc/anyrefdg.hxx

@@ -197,7 +197,7 @@ private:
 
     template<class TBindings, class TChildWindow, class TParentWindow >
     ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW,
-        TParentWindow* pParent, const OString& rID, const OUString& rUIXMLDescription );
+        TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription );
 
     template<class TParentWindow, class TResId, class TArg>
     ScRefHdlrImplBase( TParentWindow* pParent, TResId nResId, const TArg &rArg, SfxBindings *pB = NULL );
@@ -222,7 +222,7 @@ ScRefHdlrImplBase<TWindow, bBindRef>::ScRefHdlrImplBase( TBindings* pB, TChildWi
 template<class TWindow, bool bBindRef>
 template<class TBindings, class TChildWindow, class TParentWindow>
 ScRefHdlrImplBase<TWindow, bBindRef>::ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW,
-                 TParentWindow* pParent, const OString& rID, const OUString& rUIXMLDescription )
+                 TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription )
     : TWindow(pB, pCW, pParent, rID, rUIXMLDescription )
     , ScRefHandler( *static_cast<TWindow*>(this), pB, bBindRef )
 {

sfx2/source/dialog/basedlgs.cxx

@@ -302,7 +302,7 @@ IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl)
 }
 
 SfxModelessDialog::SfxModelessDialog(SfxBindings* pBindinx,
-    SfxChildWindow *pCW, vcl::Window *pParent, const OString& rID,
+    SfxChildWindow *pCW, vcl::Window *pParent, const OUString& rID,
     const OUString& rUIXMLDescription)
     : ModelessDialog(pParent, rID, rUIXMLDescription)
 {

sw/source/uibase/dbui/dbui.cxx

@@ -78,7 +78,7 @@ void CreateMonitor::SetCurrentPosition( sal_Int32 nCurrent )
 }
 
 CancelableModelessDialog::CancelableModelessDialog( vcl::Window *pParent,
-        const OString& rID, const OUString& rUIXMLDescription )
+        const OUString& rID, const OUString& rUIXMLDescription )
     : ModelessDialog( pParent , rID, rUIXMLDescription )
 {
     get(m_pCancelButton, "cancel");

sw/source/uibase/inc/dbui.hxx

@@ -28,7 +28,7 @@ class SW_DLLPUBLIC CancelableModelessDialog : public ModelessDialog
 {
 protected:
     CancelButton* m_pCancelButton;
-    CancelableModelessDialog( vcl::Window *pParent, const OString& rID,
+    CancelableModelessDialog( vcl::Window *pParent, const OUString& rID,
                               const OUString& rUIXMLDescription );
 
 public:

vcl/source/window/dialog.cxx

@@ -1152,8 +1152,8 @@ VclBuilderContainer::~VclBuilderContainer()
     delete m_pUIBuilder;
 }
 
-ModelessDialog::ModelessDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription)
-    : Dialog(pParent, OStringToOUString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription, WINDOW_MODELESSDIALOG)
+ModelessDialog::ModelessDialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription)
+    : Dialog(pParent, rID, rUIXMLDescription, WINDOW_MODELESSDIALOG)
 {
 }