summaryrefslogtreecommitdiffstats
path: root/include/rtl
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2020-11-10 14:41:56 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-11-11 06:33:40 +0100
commitcc1e6ee2dd4609c27cb7a09aa47a779592a3e22c (patch)
treee0155415dcdbb86078d47100d088689542b98a66 /include/rtl
parentloplugin:xmlimport add more checks (diff)
downloadcore-cc1e6ee2dd4609c27cb7a09aa47a779592a3e22c.tar.gz
core-cc1e6ee2dd4609c27cb7a09aa47a779592a3e22c.zip
disable O(U)String::concat for internal code
in favour of the more widely used, and better optimised, operator+ Change-Id: I6a1b37e0f3d253af1f7a0892443f59b620efea63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105523 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/rtl')
-rw-r--r--include/rtl/string.hxx2
-rw-r--r--include/rtl/ustring.hxx2
2 files changed, 4 insertions, 0 deletions
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index d9422c696059..be78e199c412 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -1393,6 +1393,7 @@ public:
return OString( pNew, SAL_NO_ACQUIRE );
}
+#ifndef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
/**
Concatenates the specified string to the end of this string.
@@ -1407,6 +1408,7 @@ public:
rtl_string_newConcat( &pNew, pData, str.pData );
return OString( pNew, SAL_NO_ACQUIRE );
}
+#endif
#ifndef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
friend OString operator+( const OString & str1, const OString & str2 )
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 707bbf6e66d6..f3006847de1e 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -2300,6 +2300,7 @@ public:
return OUString( pNew, SAL_NO_ACQUIRE );
}
+#ifndef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
/**
Concatenates the specified string to the end of this string.
@@ -2314,6 +2315,7 @@ public:
rtl_uString_newConcat( &pNew, pData, str.pData );
return OUString( pNew, SAL_NO_ACQUIRE );
}
+#endif
#ifndef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
friend OUString operator+( const OUString& rStr1, const OUString& rStr2 )