sw/source/core/unocore/unostyle.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 358f0313846da3b41aaea87be6fe0b286a25cef1
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue Aug 1 09:18:13 2023 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Aug 1 10:20:28 2023 +0200
sw: fix build
/home/vmiklos/git/libreoffice/co-23.05/sw/source/core/unocore/unostyle.cxx:
In member function ‘virtual
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyState>
{anonymous}::SwXStyle::getPropertyStates(const
com::sun::star::uno::Sequence<rtl::OUString>&)’:
/home/vmiklos/git/libreoffice/co-23.05/sw/source/core/unocore/unostyle.cxx:2554:30:
error: ‘SfxStyleFamily {anonymous}::StyleFamilyEntry::m_eFamily’ is private
within this context
if (m_rEntry.m_eFamily == SfxStyleFamily::Frame
^~~~~~~~~
/home/vmiklos/git/libreoffice/co-23.05/sw/source/core/unocore/unostyle.cxx:201:20:
note: declared private here
SfxStyleFamily m_eFamily;
^~~~~~~~~
make[1]: ***
[/home/vmiklos/git/libreoffice/co-23.05/solenv/gbuild/LinkTarget.mk:337:
/home/vmiklos/git/libreoffice/co-23.05/workdir/CxxObject/sw/source/core/unocore/unostyle.o]
Error 1
Change-Id: I3674834ad13efd070f057a981297c6c4d05d10e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155123
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index bfc39c11992b..5f2bd6207894 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -2551,7 +2551,7 @@ uno::Sequence<beans::PropertyState>
SwXStyle::getPropertyStates(const uno::Seque
break;
case XATTR_FILLSTYLE:
{
- if (m_rEntry.m_eFamily == SfxStyleFamily::Frame
+ if (m_rEntry.family() == SfxStyleFamily::Frame
&& xStyle->GetFrameFormat()->DerivedFrom() ==
GetDoc()->GetDfltFrameFormat())
{ // tdf#156155 mpDfltFrameFormat is the parent, but because
// it IsDefault() it is not enumerated/exported as a style
