diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-15 15:20:42 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-15 16:00:53 +0100 |
| commit | 31bf4242a4eeac718ef4fa8a99eaacfb198249b9 (patch) | |
| tree | f03218641424c063c191d8fd276411d06ecf211b /include | |
| parent | 27b1ae5bb8aae0a2368799367e56b2f0b95a6cd9 (diff) | |
vcl: let the Dialog ctor take an OUString
To make the conversion in the TabDialog ctor unnecessary. Put
conversions to other subclasses till they are properly adapted.
Change-Id: I6152b6229ce9c840262739cf11812538c9e0a532
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/dialog.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index c967c95dc43d..0636d699c801 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -69,7 +69,7 @@ public: protected: explicit Dialog( WindowType nType ); - explicit Dialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType ); + explicit Dialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, WindowType nType ); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void settingOptimalLayoutSize(VclBox *pBox) SAL_OVERRIDE; @@ -80,7 +80,7 @@ protected: public: explicit Dialog( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG ); - explicit Dialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit Dialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ); virtual ~Dialog(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; |