From 75c850aa06cfdaf509b9dfbef707406c9738da13 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 30 Aug 2013 16:47:42 +0200
Subject: convert include/svx/svdouno.hxx from String to OUString

Change-Id: I948492bad239418c328d6c2a3111a82037543f8d
---
 include/svx/svdouno.hxx       | 16 ++++++++--------
 svx/source/svdraw/svdouno.cxx | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 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 );
 
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 4991e0895917..927a414da873 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -154,7 +154,7 @@ namespace
 
 TYPEINIT1(SdrUnoObj, SdrRectObj);
 
-SdrUnoObj::SdrUnoObj(const String& rModelName, sal_Bool _bOwnUnoControlModel)
+SdrUnoObj::SdrUnoObj(const OUString& rModelName, sal_Bool _bOwnUnoControlModel)
 :   m_pImpl( new SdrUnoObjDataHolder ),
     bOwnUnoControlModel( _bOwnUnoControlModel )
 {
@@ -163,11 +163,11 @@ SdrUnoObj::SdrUnoObj(const String& rModelName, sal_Bool _bOwnUnoControlModel)
     m_pImpl->pEventListener = new SdrControlEventListenerImpl(this);
 
     // only an owner may create independently
-    if (rModelName.Len())
+    if (!rModelName.isEmpty())
         CreateUnoControlModel(rModelName);
 }
 
-SdrUnoObj::SdrUnoObj(const String& rModelName,
+SdrUnoObj::SdrUnoObj(const OUString& rModelName,
                      const uno::Reference< lang::XMultiServiceFactory >& rxSFac,
                      sal_Bool _bOwnUnoControlModel)
 :   m_pImpl( new SdrUnoObjDataHolder ),
@@ -178,7 +178,7 @@ SdrUnoObj::SdrUnoObj(const String& rModelName,
     m_pImpl->pEventListener = new SdrControlEventListenerImpl(this);
 
     // only an owner may create independently
-    if (rModelName.Len())
+    if (!rModelName.isEmpty())
         CreateUnoControlModel(rModelName,rxSFac);
 }
 
@@ -456,7 +456,7 @@ void SdrUnoObj::NbcSetLayer( SdrLayerID _nLayer )
     }
 }
 
-void SdrUnoObj::CreateUnoControlModel(const String& rModelName)
+void SdrUnoObj::CreateUnoControlModel(const OUString& rModelName)
 {
     DBG_ASSERT(!xUnoControlModel.is(), "model already exists");
 
@@ -464,7 +464,7 @@ void SdrUnoObj::CreateUnoControlModel(const String& rModelName)
 
     uno::Reference< awt::XControlModel >   xModel;
     uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
-    if (aUnoControlModelTypeName.Len() )
+    if (!aUnoControlModelTypeName.isEmpty() )
     {
         xModel = uno::Reference< awt::XControlModel >(xContext->getServiceManager()->createInstanceWithContext(
             aUnoControlModelTypeName, xContext), uno::UNO_QUERY);
@@ -476,7 +476,7 @@ void SdrUnoObj::CreateUnoControlModel(const String& rModelName)
     SetUnoControlModel(xModel);
 }
 
-void SdrUnoObj::CreateUnoControlModel(const String& rModelName,
+void SdrUnoObj::CreateUnoControlModel(const OUString& rModelName,
                                       const uno::Reference< lang::XMultiServiceFactory >& rxSFac)
 {
     DBG_ASSERT(!xUnoControlModel.is(), "model already exists");
@@ -484,7 +484,7 @@ void SdrUnoObj::CreateUnoControlModel(const String& rModelName,
     aUnoControlModelTypeName = rModelName;
 
     uno::Reference< awt::XControlModel >   xModel;
-    if (aUnoControlModelTypeName.Len() && rxSFac.is() )
+    if (!aUnoControlModelTypeName.isEmpty() && rxSFac.is() )
     {
         xModel = uno::Reference< awt::XControlModel >(rxSFac->createInstance(
             aUnoControlModelTypeName), uno::UNO_QUERY);
-- 
cgit