diff options
| author | Tobias Lippert <drtl@fastmail.fm> | 2014-07-14 22:16:26 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-15 11:25:51 +0200 |
| commit | 980b3fc921b6c22634ea63cd7aa264b520da0ce4 (patch) | |
| tree | 93854783a27a300d1e5ea84a0d0956900d4a056c | |
| parent | 5d0673b0f9126f140ffc3d130ee3f04d4f8dcb07 (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>
| -rw-r--r-- | sd/source/core/stlsheet.cxx | 2 |
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 |