diff options
author | Noel Grandin <noel@peralex.com> | 2013-09-18 12:59:13 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-09-19 10:54:42 +0200 |
commit | 9f73517e50e464761c60666d9ca930d63ec34efe (patch) | |
tree | f5d5bfa9c2ffccd3c9238145fa6ff653233b2c02 | |
parent | 25006b42e09e1df52f733aaefa51937e07cd7c38 (diff) |
convert sw/inc/unotxdoc.hxx from String to OUString
Change-Id: I72387b5ed7e459615250d874c1404220822d57b5
-rw-r--r-- | sw/inc/unotxdoc.hxx | 26 | ||||
-rw-r--r-- | sw/source/ui/uno/unotxdoc.cxx | 14 |
2 files changed, 20 insertions, 20 deletions
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 79d9f303ffb5..0c2378cc89dc 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -437,13 +437,13 @@ class SwXLinkTargetSupplier : public cppu::WeakImplHelper2 > { SwXTextDocument* pxDoc; - String sTables; - String sFrames; - String sGraphics; - String sOLEs; - String sSections; - String sOutlines; - String sBookmarks; + OUString sTables; + OUString sFrames; + OUString sGraphics; + OUString sOLEs; + OUString sSections; + OUString sOutlines; + OUString sBookmarks; public: SwXLinkTargetSupplier(SwXTextDocument& rxDoc); @@ -477,17 +477,17 @@ class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper4 { css::uno::Reference< css::container::XNameAccess > xRealAccess; const SfxItemPropertySet* pPropSet; - const String sLinkSuffix; - const String sLinkDisplayName; + const OUString sLinkSuffix; + const OUString sLinkDisplayName; css::uno::Reference< css::text::XTextDocument > xDoc; SwXTextDocument* pxDoc; public: SwXLinkNameAccessWrapper(css::uno::Reference< css::container::XNameAccess > xAccess, - const String& rLinkDisplayName, String sSuffix); + const OUString& rLinkDisplayName, OUString sSuffix); SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc, - const String& rLinkDisplayName, String sSuffix); + const OUString& rLinkDisplayName, OUString sSuffix); ~SwXLinkNameAccessWrapper(); //XNameAccess @@ -525,10 +525,10 @@ class SwXOutlineTarget : public cppu::WeakImplHelper2 > { const SfxItemPropertySet* pPropSet; - String sOutlineText; + OUString sOutlineText; public: - SwXOutlineTarget(const String& rOutlineText); + SwXOutlineTarget(const OUString& rOutlineText); ~SwXOutlineTarget(); //XPropertySet diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index dd2ee425a031..1b3e57d027cd 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -3488,7 +3488,7 @@ Sequence< OUString > SwXLinkTargetSupplier::getSupportedServiceNames(void) } SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper( - Reference< XNameAccess > xAccess, const String& rLinkDisplayName, String sSuffix ) : + Reference< XNameAccess > xAccess, const OUString& rLinkDisplayName, OUString sSuffix ) : xRealAccess(xAccess), pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_LINK_TARGET)), sLinkSuffix(sSuffix), @@ -3498,7 +3498,7 @@ SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper( } SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc, - const String& rLinkDisplayName, String sSuffix) : + const OUString& rLinkDisplayName, OUString sSuffix) : pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_LINK_TARGET)), sLinkSuffix(sSuffix), sLinkDisplayName(rLinkDisplayName), @@ -3606,13 +3606,13 @@ sal_Bool SwXLinkNameAccessWrapper::hasByName(const OUString& rName) { sal_Bool bRet = sal_False; String sParam(rName); - if(sParam.Len() > sLinkSuffix.Len() ) + if(sParam.Len() > sLinkSuffix.getLength() ) { - String sCmp = sParam.Copy(sParam.Len() - sLinkSuffix.Len(), - sLinkSuffix.Len()); + String sCmp = sParam.Copy(sParam.Len() - sLinkSuffix.getLength(), + sLinkSuffix.getLength()); if(sCmp == sLinkSuffix) { - sParam = sParam.Copy(0, sParam.Len() - sLinkSuffix.Len()); + sParam = sParam.Copy(0, sParam.Len() - sLinkSuffix.getLength()); if(pxDoc) { if(!pxDoc->GetDocShell()) @@ -3774,7 +3774,7 @@ Sequence< OUString > SwXLinkNameAccessWrapper::getSupportedServiceNames(void) return aRet; } -SwXOutlineTarget::SwXOutlineTarget(const String& rOutlineText) : +SwXOutlineTarget::SwXOutlineTarget(const OUString& rOutlineText) : pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_LINK_TARGET)), sOutlineText(rOutlineText) { |