Kaydet (Commit) 9f73517e authored tarafından Noel Grandin's avatar Noel Grandin

convert sw/inc/unotxdoc.hxx from String to OUString

Change-Id: I72387b5ed7e459615250d874c1404220822d57b5
üst 25006b42
...@@ -437,13 +437,13 @@ class SwXLinkTargetSupplier : public cppu::WeakImplHelper2 ...@@ -437,13 +437,13 @@ class SwXLinkTargetSupplier : public cppu::WeakImplHelper2
> >
{ {
SwXTextDocument* pxDoc; SwXTextDocument* pxDoc;
String sTables; OUString sTables;
String sFrames; OUString sFrames;
String sGraphics; OUString sGraphics;
String sOLEs; OUString sOLEs;
String sSections; OUString sSections;
String sOutlines; OUString sOutlines;
String sBookmarks; OUString sBookmarks;
public: public:
SwXLinkTargetSupplier(SwXTextDocument& rxDoc); SwXLinkTargetSupplier(SwXTextDocument& rxDoc);
...@@ -477,17 +477,17 @@ class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper4 ...@@ -477,17 +477,17 @@ class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper4
{ {
css::uno::Reference< css::container::XNameAccess > xRealAccess; css::uno::Reference< css::container::XNameAccess > xRealAccess;
const SfxItemPropertySet* pPropSet; const SfxItemPropertySet* pPropSet;
const String sLinkSuffix; const OUString sLinkSuffix;
const String sLinkDisplayName; const OUString sLinkDisplayName;
css::uno::Reference< css::text::XTextDocument > xDoc; css::uno::Reference< css::text::XTextDocument > xDoc;
SwXTextDocument* pxDoc; SwXTextDocument* pxDoc;
public: public:
SwXLinkNameAccessWrapper(css::uno::Reference< css::container::XNameAccess > xAccess, SwXLinkNameAccessWrapper(css::uno::Reference< css::container::XNameAccess > xAccess,
const String& rLinkDisplayName, String sSuffix); const OUString& rLinkDisplayName, OUString sSuffix);
SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc, SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc,
const String& rLinkDisplayName, String sSuffix); const OUString& rLinkDisplayName, OUString sSuffix);
~SwXLinkNameAccessWrapper(); ~SwXLinkNameAccessWrapper();
//XNameAccess //XNameAccess
...@@ -525,10 +525,10 @@ class SwXOutlineTarget : public cppu::WeakImplHelper2 ...@@ -525,10 +525,10 @@ class SwXOutlineTarget : public cppu::WeakImplHelper2
> >
{ {
const SfxItemPropertySet* pPropSet; const SfxItemPropertySet* pPropSet;
String sOutlineText; OUString sOutlineText;
public: public:
SwXOutlineTarget(const String& rOutlineText); SwXOutlineTarget(const OUString& rOutlineText);
~SwXOutlineTarget(); ~SwXOutlineTarget();
//XPropertySet //XPropertySet
......
...@@ -3488,7 +3488,7 @@ Sequence< OUString > SwXLinkTargetSupplier::getSupportedServiceNames(void) ...@@ -3488,7 +3488,7 @@ Sequence< OUString > SwXLinkTargetSupplier::getSupportedServiceNames(void)
} }
SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper( SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper(
Reference< XNameAccess > xAccess, const String& rLinkDisplayName, String sSuffix ) : Reference< XNameAccess > xAccess, const OUString& rLinkDisplayName, OUString sSuffix ) :
xRealAccess(xAccess), xRealAccess(xAccess),
pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_LINK_TARGET)), pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_LINK_TARGET)),
sLinkSuffix(sSuffix), sLinkSuffix(sSuffix),
...@@ -3498,7 +3498,7 @@ SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper( ...@@ -3498,7 +3498,7 @@ SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper(
} }
SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc, SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc,
const String& rLinkDisplayName, String sSuffix) : const OUString& rLinkDisplayName, OUString sSuffix) :
pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_LINK_TARGET)), pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_LINK_TARGET)),
sLinkSuffix(sSuffix), sLinkSuffix(sSuffix),
sLinkDisplayName(rLinkDisplayName), sLinkDisplayName(rLinkDisplayName),
...@@ -3606,13 +3606,13 @@ sal_Bool SwXLinkNameAccessWrapper::hasByName(const OUString& rName) ...@@ -3606,13 +3606,13 @@ sal_Bool SwXLinkNameAccessWrapper::hasByName(const OUString& rName)
{ {
sal_Bool bRet = sal_False; sal_Bool bRet = sal_False;
String sParam(rName); String sParam(rName);
if(sParam.Len() > sLinkSuffix.Len() ) if(sParam.Len() > sLinkSuffix.getLength() )
{ {
String sCmp = sParam.Copy(sParam.Len() - sLinkSuffix.Len(), String sCmp = sParam.Copy(sParam.Len() - sLinkSuffix.getLength(),
sLinkSuffix.Len()); sLinkSuffix.getLength());
if(sCmp == sLinkSuffix) if(sCmp == sLinkSuffix)
{ {
sParam = sParam.Copy(0, sParam.Len() - sLinkSuffix.Len()); sParam = sParam.Copy(0, sParam.Len() - sLinkSuffix.getLength());
if(pxDoc) if(pxDoc)
{ {
if(!pxDoc->GetDocShell()) if(!pxDoc->GetDocShell())
...@@ -3774,7 +3774,7 @@ Sequence< OUString > SwXLinkNameAccessWrapper::getSupportedServiceNames(void) ...@@ -3774,7 +3774,7 @@ Sequence< OUString > SwXLinkNameAccessWrapper::getSupportedServiceNames(void)
return aRet; return aRet;
} }
SwXOutlineTarget::SwXOutlineTarget(const String& rOutlineText) : SwXOutlineTarget::SwXOutlineTarget(const OUString& rOutlineText) :
pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_LINK_TARGET)), pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_LINK_TARGET)),
sOutlineText(rOutlineText) sOutlineText(rOutlineText)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment