SfxTabDialog ctors: take an OUString

Change-Id: I91b9b2ffd19b2412ac01dd12429d6460b4c4812c

cui/source/tabpages/bbdlg.cxx

@@ -30,8 +30,8 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(vcl::Window *pParent,
     bool bEnableDrawingLayerFillStyles)
     : SfxTabDialog(pParent,
         bEnableDrawingLayerFillStyles
-            ? OString("BorderAreaTransparencyDialog")
-            : OString("BorderBackgroundDialog"),
+            ? OUString("BorderAreaTransparencyDialog")
+            : OUString("BorderBackgroundDialog"),
         bEnableDrawingLayerFillStyles
             ? OUString("cui/ui/borderareatransparencydialog.ui")
             : OUString("cui/ui/borderbackgrounddialog.ui"),

include/sfx2/styledlg.hxx

@@ -37,7 +37,7 @@ protected:
     virtual const SfxItemSet*   GetRefreshedSet() SAL_OVERRIDE;
 
 public:
-    SfxStyleDialog(vcl::Window* pParent, const OString& rID,
+    SfxStyleDialog(vcl::Window* pParent, const OUString& rID,
         const OUString& rUIXMLDescription, SfxStyleSheetBase&);
 
     virtual ~SfxStyleDialog();

include/sfx2/tabdlg.hxx

@@ -124,10 +124,10 @@ protected:
 
 public:
     SfxTabDialog(vcl::Window* pParent,
-                 const OString& rID, const OUString& rUIXMLDescription,
+                 const OUString& rID, const OUString& rUIXMLDescription,
                  const SfxItemSet * = 0, bool bEditFmt = false);
     SfxTabDialog(SfxViewFrame *pViewFrame, vcl::Window* pParent,
-                 const OString& rID, const OUString& rUIXMLDescription,
+                 const OUString& rID, const OUString& rUIXMLDescription,
                  const SfxItemSet * = 0, bool bEditFmt = false);
     virtual ~SfxTabDialog();
 

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)
 {

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

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())
             {
 

sc/source/ui/inc/anyrefdg.hxx

@@ -203,7 +203,7 @@ private:
     ScRefHdlrImplBase( TParentWindow* pParent, TResId nResId, const TArg &rArg, SfxBindings *pB = NULL );
 
     template<class TParentWindow, class TArg>
-    ScRefHdlrImplBase( TParentWindow* pParent, const OString& rID, const OUString& rUIXMLDescription, const TArg &rArg, SfxBindings *pB = NULL );
+    ScRefHdlrImplBase( TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription, const TArg &rArg, SfxBindings *pB = NULL );
 
     virtual ~ScRefHdlrImplBase();
 
@@ -238,7 +238,7 @@ ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent,
 
 template<class TWindow, bool bBindRef >
 template<class TParentWindow, class TArg>
-ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent, const OString& rID, const OUString& rUIXMLDescription, const TArg &rArg, SfxBindings *pB )
+ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription, const TArg &rArg, SfxBindings *pB )
     : TWindow( pParent, rID, rUIXMLDescription, rArg ),
     ScRefHandler( *static_cast<TWindow*>(this), pB, bBindRef )
 {

sc/source/ui/inc/hfedtdlg.hxx

@@ -31,7 +31,7 @@ class ScHFEditDlg : public SfxTabDialog
 protected:
     ScHFEditDlg(SfxViewFrame* pFrame, vcl::Window* pParent,
         const SfxItemSet& rCoreSet, const OUString& rPageStyle,
-        const OString& rID, const OUString& rUIXMLDescription );
+        const OUString& rID, const OUString& rUIXMLDescription );
 public:
     virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) SAL_OVERRIDE;
 };

sc/source/ui/pagedlg/hfedtdlg.cxx

@@ -45,7 +45,7 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame*     pFrameP,
                           vcl::Window*           pParent,
                           const SfxItemSet& rCoreSet,
                           const OUString&   rPageStyle,
-                          const OString& rID, const OUString& rUIXMLDescription )
+                          const OUString& rID, const OUString& rUIXMLDescription )
     :   SfxTabDialog( pFrameP, pParent, rID, rUIXMLDescription, &rCoreSet )
 {
     eNumType = static_cast<const SvxPageItem&>(rCoreSet.Get(ATTR_PAGE)).GetNumType();

sc/source/ui/styleui/styledlg.cxx

@@ -45,8 +45,8 @@ ScStyleDlg::ScStyleDlg( vcl::Window*             pParent,
 
     : SfxStyleDialog  ( pParent,
                         nRscId == RID_SCDLG_STYLES_PAR ?
-                          OString("ParaTemplateDialog") :
-                          OString("PageTemplateDialog"),
+                          OUString("ParaTemplateDialog") :
+                          OUString("PageTemplateDialog"),
                         nRscId == RID_SCDLG_STYLES_PAR ?
                           OUString("modules/scalc/ui/paratemplatedialog.ui") :
                           OUString("modules/scalc/ui/pagetemplatedialog.ui"),

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
 )
 

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)

sw/source/ui/fmtui/tmpdlg.cxx

@@ -74,7 +74,7 @@ SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent,
                              SwWrtShell* pActShell,
                              bool bNew)
     : SfxStyleDialog(pParent,
-                    OString("TemplateDialog") + OString::number(nRegion),
+                    OUString("TemplateDialog") + OUString::number(nRegion),
                     OUString("modules/swriter/ui/templatedialog") +
                         OUString::number(nRegion) + ".ui",
                     rBase)

sw/source/ui/frmdlg/frmdlg.cxx

@@ -53,7 +53,7 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame*       pViewFrame,
                     const OString&      sDefPage,
                     const OUString*     pStr)
 
-    : SfxTabDialog(pViewFrame, pParent, OUStringToOString(sResType, RTL_TEXTENCODING_UTF8),
+    : SfxTabDialog(pViewFrame, pParent, sResType,
         OUString("modules/swriter/ui/") +
         sResType.toAsciiLowerCase() +
         (".ui"), &rCoreSet, pStr != 0)