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 /svx/source | |
| parent | ad5a56abf2d28cd5dc019a5081da41fef6253ed6 (diff) | |
convert include/svx/svdouno.hxx from String to OUString
Change-Id: I948492bad239418c328d6c2a3111a82037543f8d
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/svdraw/svdouno.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
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); |