summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-11-16 12:13:19 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-11-16 12:37:03 +0100
commit133c295bbe6f746d4c2fd2fe7560206b890cdf1f (patch)
tree994900dd4929319505c49aa13d6f1ca76281c156 /cui
parentb04759db661f35dce41c03dfc7ad00671fc68c55 (diff)
vcl: let the ModalDialog ctor take an OUString
Change-Id: I839435338f4acf80c40896b6c86f7ef122f5449d
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx2
-rw-r--r--cui/source/dialogs/iconcdlg.cxx2
-rw-r--r--cui/source/dialogs/insdlg.cxx2
-rw-r--r--cui/source/inc/cuigrfflt.hxx2
-rw-r--r--cui/source/inc/iconcdlg.hxx2
-rw-r--r--cui/source/inc/insdlg.hxx2
6 files changed, 6 insertions, 6 deletions
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 57a853c7f74a..9eb47497865e 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -137,7 +137,7 @@ void GraphicPreviewWindow::Resize()
}
GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent,
- const OString& rID, const OUString& rUIXMLDescription,
+ const OUString& rID, const OUString& rUIXMLDescription,
const Graphic& rGraphic)
: ModalDialog(pParent, rID, rUIXMLDescription)
, maModifyHdl(LINK( this, GraphicFilterDialog, ImplModifyHdl))
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 835829d77b79..5d558c0807a2 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -173,7 +173,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvtIconChoiceCtrl(vcl:
WB_NODRAGSELECTION | WB_TABSTOP);
}
-IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OString& rID,
+IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OUString& rID,
const OUString& rUIXMLDescription,
const SfxItemSet *pItemSet )
: ModalDialog ( pParent, rID, rUIXMLDescription ),
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 10fa9967c587..bfe8633b1bb1 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -91,7 +91,7 @@ uno::Reference< io::XInputStream > InsertObjectDialog_Impl::GetIconIfIconified(
return uno::Reference< io::XInputStream >();
}
-InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OString& rID,
+InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OUString& rID,
const OUString& rUIXMLDescription,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage)
: ModalDialog(pParent, rID, rUIXMLDescription)
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index f4faabb50960..1fb139375fd7 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -84,7 +84,7 @@ protected:
public:
- GraphicFilterDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic);
+ GraphicFilterDialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic);
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0;
};
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 269e61d3e006..566d4e1e69fb 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -182,7 +182,7 @@ protected :
public :
// the IconChoiceCtrl's could also be set in the Ctor
- IconChoiceDialog ( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
+ IconChoiceDialog ( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription,
const SfxItemSet * pItemSet = 0 );
virtual ~IconChoiceDialog ();
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index f845ea80289a..5307a25986ba 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -44,7 +44,7 @@ protected:
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& m_xStorage;
comphelper::EmbeddedObjectContainer aCnt;
- InsertObjectDialog_Impl(vcl::Window * pParent, const OString& rID,
+ InsertObjectDialog_Impl(vcl::Window * pParent, const OUString& rID,
const OUString& rUIXMLDescription,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage);
public: