summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Lippert <drtl@fastmail.fm>2014-07-14 22:16:26 +0200
committerMichael Stahl <mstahl@redhat.com>2014-07-15 09:24:37 +0000
commit61cf536f0400284a5ff85d1a84c9dee72ead3fbf (patch)
tree8de7e3651671e82280e6650afc0f4e724f546cb0
parent165075e0d705cbd146463c94b027e728db864ab2 (diff)
fdo#80020 Fix regression for style sheet inheritance
The inheritance relationship of styles in Draw was lost when writing files. Change-Id: I81588a031bf4c649338fad9b7342fbbe11df9aef Reviewed-on: https://gerrit.libreoffice.org/10309 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sd/source/core/stlsheet.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index dacc6ae2a129..54925994da00 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -921,7 +921,7 @@ void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName ) throw
if( !rParentName.isEmpty() )
{
- SfxStyleSheetIteratorPtr aSSSI = boost::make_shared<SfxStyleSheetIterator>(mxPool.get(), nFamily, SFX_STYLE_FAMILY_ALL);
+ boost::shared_ptr<SfxStyleSheetIterator> aSSSI = boost::make_shared<SfxStyleSheetIterator>(mxPool.get(), nFamily);
for (SfxStyleSheetBase *pStyle = aSSSI->First(); pStyle; pStyle = aSSSI->Next())
{
// we hope that we have only sd style sheets