diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-16 12:13:19 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-16 12:37:03 +0100 |
| commit | 133c295bbe6f746d4c2fd2fe7560206b890cdf1f (patch) | |
| tree | 994900dd4929319505c49aa13d6f1ca76281c156 /include | |
| parent | writerfilter: this is expected to be UTF-8 (diff) | |
| download | core-133c295bbe6f746d4c2fd2fe7560206b890cdf1f.tar.gz core-133c295bbe6f746d4c2fd2fe7560206b890cdf1f.zip | |
vcl: let the ModalDialog ctor take an OUString
Change-Id: I839435338f4acf80c40896b6c86f7ef122f5449d
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/basedlgs.hxx | 6 | ||||
| -rw-r--r-- | include/svtools/wizdlg.hxx | 2 | ||||
| -rw-r--r-- | include/svx/stddlg.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/dialog.hxx | 2 |
4 files changed, 6 insertions, 6 deletions
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; |