INTEGRATION: CWS swlists01 (1.79.12); FILE MERGED

2008/05/08 16:13:15 od 1.79.12.2: RESYNC: (1.79-1.80); FILE MERGED
2008/05/08 14:23:24 od 1.79.12.1: #i86732# changes/adjustments for new list handling
This commit is contained in:
Rüdiger Timm 2008-06-13 08:18:48 +00:00
parent 4d41a86f36
commit f4927f0b44

View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: shapeexport.cxx,v $
* $Revision: 1.80 $
* $Revision: 1.81 $
*
* This file is part of OpenOffice.org.
*
@ -507,6 +507,27 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap
///////////////////////////////////////////////////////////////////////
// --> OD 2008-05-08 #refactorlists#
namespace
{
class NewTextListsHelper
{
public:
NewTextListsHelper( SvXMLExport& rExp )
: mrExport( rExp )
{
mrExport.GetTextParagraphExport()->PushNewTextListsHelper();
}
~NewTextListsHelper()
{
mrExport.GetTextParagraphExport()->PopTextListsHelper();
}
private:
SvXMLExport& mrExport;
};
}
// This method exports the given XShape
void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape,
sal_Int32 nFeatures /* = SEF_DEFAULT */,
@ -531,6 +552,10 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
return;
}
// --> OD 2008-05-08 #refactorlists#
NewTextListsHelper aNewTextListsHelper( mrExport );
// <--
const ImplXMLShapeExportInfo& aShapeInfo = aShapeInfoVector[nZIndex];