include/com/sun/star/uno/Any.hxx | 4 ++--
include/com/sun/star/uno/Reference.h | 2 +-
include/cppuhelper/typeprovider.hxx | 2 +-
include/cppuhelper/weakref.hxx | 4 ++--
include/rtl/byteseq.h | 2 +-
include/svx/svdobj.hxx | 2 +-
svx/source/svdraw/svdobj.cxx | 6 ++++--
7 files changed, 12 insertions(+), 10 deletions(-)
New commits:
commit 339d481688c4d12a05ae79611f7b1b17cfa2826b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Feb 11 16:16:41 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Feb 15 10:32:05 2022 +0100
LIBO_INTERNAL_ONLY stuff does not need to be SAL_CALL
Change-Id: I9d7ccaab19ad20509601642745e3fdaea50304ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129818
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Jenkins
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index f1e5f86c8af2..eb2b5267791a 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -297,7 +297,7 @@ inline void SAL_CALL operator <<= ( Any & rAny, bool const
& value )
#ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
template< class C1, class C2 >
-inline void SAL_CALL operator <<= ( Any & rAny, rtl::OUStringConcat< C1, C2
>&& value )
+inline void operator <<= ( Any & rAny, rtl::OUStringConcat< C1, C2 >&& value )
{
const rtl::OUString str( std::move(value) );
const Type & rType = ::cppu::getTypeFavourUnsigned(&str);
@@ -308,7 +308,7 @@ inline void SAL_CALL operator <<= ( Any & rAny,
rtl::OUStringConcat< C1, C2 >&&
template<typename T1, typename T2>
void operator <<=(Any &, rtl::OUStringConcat<T1, T2> const &) = delete;
template< class C >
-inline void SAL_CALL operator <<= ( Any & rAny, rtl::OUStringNumber< C >&&
value )
+inline void operator <<= ( Any & rAny, rtl::OUStringNumber< C >&& value )
{
const rtl::OUString str( std::move(value) );
const Type & rType = ::cppu::getTypeFavourUnsigned(&str);
diff --git a/include/com/sun/star/uno/Reference.h
b/include/com/sun/star/uno/Reference.h
index da6d4ea9bd6a..85c0d929ea9c 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -545,7 +545,7 @@ public:
@param rRef an interface reference
@return this reference
*/
- inline Reference< interface_type > & SAL_CALL operator = ( Reference<
interface_type > && rRef ) noexcept;
+ inline Reference< interface_type > & operator = ( Reference<
interface_type > && rRef ) noexcept;
#endif
/** Queries given interface reference for type interface_type.
diff --git a/include/cppuhelper/typeprovider.hxx
b/include/cppuhelper/typeprovider.hxx
index 546ffa604ebc..4c3bd99d1bb8 100644
--- a/include/cppuhelper/typeprovider.hxx
+++ b/include/cppuhelper/typeprovider.hxx
@@ -165,7 +165,7 @@ public:
css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
{ return _aTypes; }
#if defined LIBO_INTERNAL_ONLY
- css::uno::Sequence< css::uno::Type > const & SAL_CALL getTypes() const
+ css::uno::Sequence< css::uno::Type > const & getTypes() const
{ return _aTypes; }
#endif
};
diff --git a/include/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx
index 3d27917d57bc..fa1009494510 100644
--- a/include/cppuhelper/weakref.hxx
+++ b/include/cppuhelper/weakref.hxx
@@ -90,7 +90,7 @@ public:
WeakReferenceHelper & SAL_CALL operator = ( const WeakReferenceHelper &
rWeakRef );
#if defined LIBO_INTERNAL_ONLY
- WeakReferenceHelper & SAL_CALL operator =(WeakReferenceHelper && other);
+ WeakReferenceHelper & operator =(WeakReferenceHelper && other);
#endif
/** Releases this reference and takes over hard reference xInt.
@@ -177,7 +177,7 @@ public:
{ WeakReferenceHelper::operator=(xInt); return *this; }
#if defined LIBO_INTERNAL_ONLY
- WeakReference & SAL_CALL operator = (
+ WeakReference & operator = (
css::uno::Reference< interface_type > && xInt )
{ WeakReferenceHelper::operator=(std::move(xInt)); return *this; }
#endif
diff --git a/include/rtl/byteseq.h b/include/rtl/byteseq.h
index 8efa02f2f9a9..2acb9b745d9a 100644
--- a/include/rtl/byteseq.h
+++ b/include/rtl/byteseq.h
@@ -240,7 +240,7 @@ public:
*/
inline ByteSequence & SAL_CALL operator = ( const ByteSequence & rSeq );
#if defined LIBO_INTERNAL_ONLY
- inline ByteSequence & SAL_CALL operator = ( ByteSequence && rSeq )
noexcept;
+ inline ByteSequence & operator = ( ByteSequence && rSeq ) noexcept;
#endif
/** Gets the length of sequence.
commit ddb682f6f7955595065df97b5d13497c08e38389
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Feb 15 09:56:22 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Feb 15 10:31:48 2022 +0100
return by const& from SdrObject::GetName
shaves some small amount off the profile of loading a large chart
Change-Id: I24c99a68382663e52baccd34e22b63bf16fa1eb4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129954
Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index ebcad8a002b4..c6e394d7b539 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -375,7 +375,7 @@ public:
// or SdrOle2Obj.
// It may also have a Title and a Description for accessibility purposes.
void SetName(const OUString& rStr, const bool bSetChanged = true);
- OUString GetName() const;
+ const OUString & GetName() const;
void MakeNameUnique();
void MakeNameUnique(std::unordered_set<OUString>& rNameSet);
void SetTitle(const OUString& rStr);
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index cdae6b949c43..cb89a2fc5555 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -800,14 +800,16 @@ void SdrObject::SetName(const OUString& rStr, const bool
bSetChanged)
}
}
-OUString SdrObject::GetName() const
+const OUString & SdrObject::GetName() const
{
+ static const OUString EMPTY = u"";
+
if(m_pPlusData)
{
return m_pPlusData->aObjName;
}
- return OUString();
+ return EMPTY;
}
void SdrObject::SetTitle(const OUString& rStr)
