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 | |
parent | 949b6ef2e976926cdc946ff1b0550e3f6d8fec3b (diff) |
SfxTabDialog ctors: take an OUString
Change-Id: I91b9b2ffd19b2412ac01dd12429d6460b4c4812c
-rw-r--r-- | cui/source/tabpages/bbdlg.cxx | 4 | ||||
-rw-r--r-- | include/sfx2/styledlg.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/tabdlg.hxx | 4 | ||||
-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 | ||||
-rw-r--r-- | sc/source/ui/inc/anyrefdg.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/hfedtdlg.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/hfedtdlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/styleui/styledlg.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/styledlg.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/frmdlg.cxx | 2 |
14 files changed, 23 insertions, 23 deletions
diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index 2116a64364be..e3e89f40e980 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/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"), diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx index e428d9abe58b..f3b0448a4c93 100644 --- a/include/sfx2/styledlg.hxx +++ b/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(); diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index c4f0e989afa1..f91e01132fb0 100644 --- a/include/sfx2/tabdlg.hxx +++ b/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(); 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()) { diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 6fcff6bd3752..32157a6132d7 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/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 ) { diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index dfc68829613a..64887a9e25c9 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/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; }; diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index 745aa4e72bec..b2383f2b7943 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/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(); diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index c834d8467904..1c1dc170b61d 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/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"), diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 1854b4176302..2b08f1f5b483 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/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 ) diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 34338673e9ba..d73ffaad4034 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/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) diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index c6255cd7872a..998e0d1ee43e 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/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) diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 4a4bdf73b01b..ca6f722e8a95 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/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) |