include/svl/sharedstring.hxx | 83 +++++++++++++++++++++++++++++++++++++++
svl/source/misc/sharedstring.cxx | 83 ---------------------------------------
2 files changed, 83 insertions(+), 83 deletions(-)
New commits:
commit 3f66e00c937f787129bac034798b74d5b72ef76f
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Tue Nov 23 14:05:20 2021 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Tue Nov 23 16:07:53 2021 +0100
make a bunch of svl::SharedString functions inline
They are tiny and they are used in performance-critical parts
of Calc.
Change-Id: If227b11ac7929dd1369545a590d8ef1a977185f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125698
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/include/svl/sharedstring.hxx b/include/svl/sharedstring.hxx
index f74824adeec2..050bd8dd9e55 100644
--- a/include/svl/sharedstring.hxx
+++ b/include/svl/sharedstring.hxx
@@ -50,6 +50,89 @@ public:
sal_Int32 getLength() const;
};
+inline SharedString::SharedString() : mpData(nullptr),
mpDataIgnoreCase(nullptr) {}
+
+inline SharedString::SharedString( rtl_uString* pData, rtl_uString*
pDataIgnoreCase ) :
+ mpData(pData), mpDataIgnoreCase(pDataIgnoreCase)
+{
+ if (mpData)
+ rtl_uString_acquire(mpData);
+ if (mpDataIgnoreCase)
+ rtl_uString_acquire(mpDataIgnoreCase);
+}
+
+inline SharedString::SharedString( const OUString& rStr ) :
mpData(rStr.pData), mpDataIgnoreCase(nullptr)
+{
+ rtl_uString_acquire(mpData);
+}
+
+inline SharedString::SharedString( const SharedString& r ) : mpData(r.mpData),
mpDataIgnoreCase(r.mpDataIgnoreCase)
+{
+ if (mpData)
+ rtl_uString_acquire(mpData);
+ if (mpDataIgnoreCase)
+ rtl_uString_acquire(mpDataIgnoreCase);
+}
+
+inline SharedString::SharedString(SharedString&& r) noexcept :
mpData(r.mpData), mpDataIgnoreCase(r.mpDataIgnoreCase)
+{
+ r.mpData = nullptr;
+ r.mpDataIgnoreCase = nullptr;
+}
+
+inline SharedString::~SharedString()
+{
+ if (mpData)
+ rtl_uString_release(mpData);
+ if (mpDataIgnoreCase)
+ rtl_uString_release(mpDataIgnoreCase);
+}
+
+inline bool SharedString::operator!= ( const SharedString& r ) const
+{
+ return !operator== (r);
+}
+
+inline OUString SharedString::getString() const
+{
+ return mpData ? OUString(mpData) : OUString();
+}
+
+inline rtl_uString* SharedString::getData()
+{
+ return mpData;
+}
+
+inline const rtl_uString* SharedString::getData() const
+{
+ return mpData;
+}
+
+inline rtl_uString* SharedString::getDataIgnoreCase()
+{
+ return mpDataIgnoreCase;
+}
+
+inline const rtl_uString* SharedString::getDataIgnoreCase() const
+{
+ return mpDataIgnoreCase;
+}
+
+inline bool SharedString::isValid() const
+{
+ return mpData != nullptr;
+}
+
+inline bool SharedString::isEmpty() const
+{
+ return mpData == nullptr || mpData->length == 0;
+}
+
+inline sal_Int32 SharedString::getLength() const
+{
+ return mpData ? mpData->length : 0;
+}
+
}
#endif
diff --git a/svl/source/misc/sharedstring.cxx b/svl/source/misc/sharedstring.cxx
index d3b2cac051ce..e1f2d4feed0f 100644
--- a/svl/source/misc/sharedstring.cxx
+++ b/svl/source/misc/sharedstring.cxx
@@ -22,44 +22,6 @@ const SharedString & SharedString::getEmptyString()
return EMPTY_SHARED_STRING;
}
-SharedString::SharedString() : mpData(nullptr), mpDataIgnoreCase(nullptr) {}
-
-SharedString::SharedString( rtl_uString* pData, rtl_uString* pDataIgnoreCase )
:
- mpData(pData), mpDataIgnoreCase(pDataIgnoreCase)
-{
- if (mpData)
- rtl_uString_acquire(mpData);
- if (mpDataIgnoreCase)
- rtl_uString_acquire(mpDataIgnoreCase);
-}
-
-SharedString::SharedString( const OUString& rStr ) : mpData(rStr.pData),
mpDataIgnoreCase(nullptr)
-{
- rtl_uString_acquire(mpData);
-}
-
-SharedString::SharedString( const SharedString& r ) : mpData(r.mpData),
mpDataIgnoreCase(r.mpDataIgnoreCase)
-{
- if (mpData)
- rtl_uString_acquire(mpData);
- if (mpDataIgnoreCase)
- rtl_uString_acquire(mpDataIgnoreCase);
-}
-
-SharedString::SharedString(SharedString&& r) noexcept : mpData(r.mpData),
mpDataIgnoreCase(r.mpDataIgnoreCase)
-{
- r.mpData = nullptr;
- r.mpDataIgnoreCase = nullptr;
-}
-
-SharedString::~SharedString()
-{
- if (mpData)
- rtl_uString_release(mpData);
- if (mpDataIgnoreCase)
- rtl_uString_release(mpDataIgnoreCase);
-}
-
SharedString& SharedString::operator= ( const SharedString& r )
{
if(this == &r)
@@ -118,51 +80,6 @@ bool SharedString::operator== ( const SharedString& r )
const
return !r.mpData;
}
-bool SharedString::operator!= ( const SharedString& r ) const
-{
- return !operator== (r);
-}
-
-OUString SharedString::getString() const
-{
- return mpData ? OUString(mpData) : OUString();
-}
-
-rtl_uString* SharedString::getData()
-{
- return mpData;
-}
-
-const rtl_uString* SharedString::getData() const
-{
- return mpData;
-}
-
-rtl_uString* SharedString::getDataIgnoreCase()
-{
- return mpDataIgnoreCase;
-}
-
-const rtl_uString* SharedString::getDataIgnoreCase() const
-{
- return mpDataIgnoreCase;
-}
-
-bool SharedString::isValid() const
-{
- return mpData != nullptr;
-}
-
-bool SharedString::isEmpty() const
-{
- return mpData == nullptr || mpData->length == 0;
-}
-
-sal_Int32 SharedString::getLength() const
-{
- return mpData ? mpData->length : 0;
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
