summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Lippert <drtl@fastmail.fm>2014-07-14 22:16:26 +0200
committerEike Rathke <erack@redhat.com>2014-07-15 14:42:06 +0000
commite662655c6afacc9c67d2381411d838e2be16d3ed (patch)
tree4c07e700bc1cfca541ea5d2b9726b32b744ffb03
parenta90c1bbb74b4dd13b8b3879740ad596a4cedd69a (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> (cherry picked from commit 61cf536f0400284a5ff85d1a84c9dee72ead3fbf) Signed-off-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 980b3fc921b6c22634ea63cd7aa264b520da0ce4) Reviewed-on: https://gerrit.libreoffice.org/10319 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@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 2e26e7b57e21..c59762127b5b 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -967,7 +967,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