sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx | 3 ++-
sw/source/writerfilter/dmapper/DomainMapper_Impl.hxx | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit bfd5670ab7dd87167ba47905857bc0b9958395a5
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jul 20 19:18:34 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Jul 20 21:38:10 2024 +0200
cid#1610739 COPY_INSTEAD_OF_MOVE
Change-Id: I618fbda65c66985c3179578d1fa106514c5aef30
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170800
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
index d814ab4ee603..62b7849f8a56 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
@@ -1460,8 +1460,9 @@ OUString DomainMapper_Impl::GetDefaultParaStyleName()
return m_sDefaultParaStyleName;
}
-uno::Any DomainMapper_Impl::GetPropertyFromStyleSheet(PropertyIds eId,
StyleSheetEntryPtr pEntry, const bool bDocDefaults, const bool bPara, bool*
pIsDocDefault)
+uno::Any DomainMapper_Impl::GetPropertyFromStyleSheet(PropertyIds eId, const
StyleSheetEntryPtr& pInitEntry, const bool bDocDefaults, const bool bPara,
bool* pIsDocDefault)
{
+ StyleSheetEntryPtr pEntry = pInitEntry;
while(pEntry)
{
if(pEntry->m_pProperties)
diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.hxx
b/sw/source/writerfilter/dmapper/DomainMapper_Impl.hxx
index 5646d8cf13b2..a22574fa3292 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.hxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.hxx
@@ -897,7 +897,8 @@ public:
OUString GetDefaultParaStyleName();
// specified style - including inherited properties. Indicate whether
paragraph defaults should be checked.
- css::uno::Any GetPropertyFromStyleSheet(PropertyIds eId,
StyleSheetEntryPtr pEntry, const bool bDocDefaults, const bool bPara, bool*
bIsDocDefault = nullptr);
+ css::uno::Any GetPropertyFromStyleSheet(PropertyIds eId, const
StyleSheetEntryPtr& pEntry,
+ const bool bDocDefaults, const
bool bPara, bool* bIsDocDefault = nullptr);
// current paragraph style - including inherited properties
css::uno::Any GetPropertyFromParaStyleSheet(PropertyIds eId);
// only get inherited property
