diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-05-07 18:18:43 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-05-19 10:26:29 +0200 |
| commit | 4e98ba4ba5c17ab8ae1170662af645b9d2bfde84 (patch) | |
| tree | 645ebd6f8d5daf918190e8fe7d71a456ddfd0d90 /xmloff/source/style/prstylei.cxx | |
| parent | bd03dc39f6f02a875590413378355daa4893a988 (diff) | |
tdf#103602 xmloff,sw: ODF 1.3 import: PageStyle with drawing-page style
Associate a style of family "drawing-page" with a style:master-page.
This fixes the small part of the draw:fill attribute problem that is
covered by OFFICE-3937 in ODF 1.3.
This is the import part.
Change-Id: I4c86fa24c36407b64ce33f0890e5da8c26c5292a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93670
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'xmloff/source/style/prstylei.cxx')
| -rw-r--r-- | xmloff/source/style/prstylei.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index ce40f755e8c9..c005a38873f4 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -537,7 +537,8 @@ bool XMLPropStyleContext::doNewDrawingLayerFillStyleDefinitionsExist( { if(!maProperties.empty() && rFillStyleTag.getLength()) { - const rtl::Reference< XMLPropertySetMapper >& rMapper = GetStyles()->GetImportPropertyMapper(GetFamily())->getPropertySetMapper(); + // no & to avoid non-obvious UAF due to the 2nd temp Reference + const rtl::Reference<XMLPropertySetMapper> rMapper = GetStyles()->GetImportPropertyMapper(GetFamily())->getPropertySetMapper(); if(rMapper.is()) { |