sd/source/core/stlsheet.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e662655c6afacc9c67d2381411d838e2be16d3ed
Author: Tobias Lippert <d...@fastmail.fm>
Date: Mon Jul 14 22:16:26 2014 +0200
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 <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 61cf536f0400284a5ff85d1a84c9dee72ead3fbf)
Signed-off-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 980b3fc921b6c22634ea63cd7aa264b520da0ce4)
Reviewed-on: https://gerrit.libreoffice.org/10319
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Eike Rathke <er...@redhat.com>
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 2e26e7b..c597621 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
