diff options
author | Noel Grandin <noel@peralex.com> | 2013-08-30 16:47:42 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:54:17 +0200 |
commit | 75c850aa06cfdaf509b9dfbef707406c9738da13 (patch) | |
tree | 3e5dd17ea3e3830107bbe61d30755b71c0408e56 /include | |
parent | ad5a56abf2d28cd5dc019a5081da41fef6253ed6 (diff) |
convert include/svx/svdouno.hxx from String to OUString
Change-Id: I948492bad239418c328d6c2a3111a82037543f8d
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/svdouno.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index 107ae91b2b1d..b63cfc202757 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -51,23 +51,23 @@ class SVX_DLLPUBLIC SdrUnoObj : public SdrRectObj SdrUnoObjDataHolder* m_pImpl; - String aUnoControlModelTypeName; - String aUnoControlTypeName; + OUString aUnoControlModelTypeName; + OUString aUnoControlTypeName; sal_Bool bOwnUnoControlModel; protected: ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > xUnoControlModel; // kann auch von aussen gesetzt werden private: - SVX_DLLPRIVATE void CreateUnoControlModel(const String& rModelName); - SVX_DLLPRIVATE void CreateUnoControlModel(const String& rModelName, + SVX_DLLPRIVATE void CreateUnoControlModel(const OUString& rModelName); + SVX_DLLPRIVATE void CreateUnoControlModel(const OUString& rModelName, const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac ); public: TYPEINFO(); - explicit SdrUnoObj(const String& rModelName, sal_Bool bOwnsModel = sal_True); - SdrUnoObj(const String& rModelName, + explicit SdrUnoObj(const OUString& rModelName, sal_Bool bOwnsModel = sal_True); + SdrUnoObj(const OUString& rModelName, const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac, sal_Bool bOwnsModel = sal_True); virtual ~SdrUnoObj(); @@ -128,8 +128,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer ) const; - const String& GetUnoControlModelTypeName() const { return aUnoControlTypeName; } - const String& GetUnoControlTypeName() const { return aUnoControlTypeName; } + const OUString& GetUnoControlModelTypeName() const { return aUnoControlTypeName; } + const OUString& GetUnoControlTypeName() const { return aUnoControlTypeName; } virtual void SetUnoControlModel( const ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& xModel ); |