[Libreoffice-commits] .: xmloff/source
Joseph Powers
jpowers at kemper.freedesktop.org
Fri Jan 7 08:29:12 PST 2011
xmloff/source/draw/ximpstyl.cxx | 135 ++++++++++++++++++++--------------------
xmloff/source/draw/ximpstyl.hxx | 67 ++++++++++---------
2 files changed, 102 insertions(+), 100 deletions(-)
New commits:
commit cd6a825d2ea8198c6571119f6360f46fdc74bdb5
Author: Joseph Powers <jpowers27 at cox.net>
Date: Fri Jan 7 08:29:08 2011 -0800
Remove DECLARE_LIST(ImpMasterPageList, SdXMLMasterPageContext*)
Plus a lot of white space cleanup (tailing type)
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index af9ed40..237df6d 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -99,7 +99,7 @@ SdXMLDrawingPagePropertySetContext::SdXMLDrawingPagePropertySetContext(
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
::std::vector< XMLPropertyState > &rProps,
const UniReference < SvXMLImportPropertyMapper > &rMap ) :
- SvXMLPropertySetContext( rImport, nPrfx, rLName, xAttrList,
+ SvXMLPropertySetContext( rImport, nPrfx, rLName, xAttrList,
XML_TYPE_PROP_DRAWING_PAGE, rProps, rMap )
{
}
@@ -137,12 +137,12 @@ SvXMLImportContext *SdXMLDrawingPagePropertySetContext::CreateChildContext(
break;
}
}
-
+
if( !pContext )
pContext = SvXMLPropertySetContext::CreateChildContext( p_nPrefix, rLocalName,
- xAttrList,
+ xAttrList,
rProperties, rProp );
-
+
return pContext;
}
@@ -154,9 +154,9 @@ public:
TYPEINFO();
SdXMLDrawingPageStyleContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const rtl::OUString& rLName,
+ SvXMLImport& rImport,
+ sal_uInt16 nPrfx,
+ const rtl::OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList,
SvXMLStylesContext& rStyles,
sal_uInt16 nFamily = XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID);
@@ -178,9 +178,9 @@ public:
TYPEINIT1( SdXMLDrawingPageStyleContext, XMLPropStyleContext );
SdXMLDrawingPageStyleContext::SdXMLDrawingPageStyleContext(
- SvXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLName,
+ SvXMLImport& rImport,
+ sal_uInt16 nPrfx,
+ const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
SvXMLStylesContext& rStyles,
sal_uInt16 nFamily)
@@ -210,7 +210,7 @@ SvXMLImportContext *SdXMLDrawingPageStyleContext::CreateChildContext(
GetProperties(),
xImpPrMap );
}
-
+
if( !pContext )
pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName,
xAttrList );
@@ -243,12 +243,12 @@ void SdXMLDrawingPageStyleContext::Finish( sal_Bool bOverwrite )
sal_Int32 nStyle = 0;
SdXMLNumberFormatImportContext* pSdNumStyle =
- PTR_CAST( SdXMLNumberFormatImportContext,
+ PTR_CAST( SdXMLNumberFormatImportContext,
GetStyles()->FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE, sStyleName, sal_True ) );
if( pSdNumStyle )
nStyle = pSdNumStyle->GetDrawKey();
-
+
(*property).maValue <<= nStyle;
}
break;
@@ -322,11 +322,11 @@ void SdXMLDrawingPageStyleContext::FillPropertySet(
TYPEINIT1( SdXMLPageMasterStyleContext, SvXMLStyleContext );
-SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
+SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
SdXMLImport& rImport,
- sal_uInt16 nPrfx,
+ sal_uInt16 nPrfx,
const OUString& rLName,
- const uno::Reference< xml::sax::XAttributeList>& xAttrList)
+ const uno::Reference< xml::sax::XAttributeList>& xAttrList)
: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PAGEMASTERSTYLECONEXT_ID),
mnBorderBottom( 0L ),
mnBorderLeft( 0L ),
@@ -336,7 +336,7 @@ SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext(
mnHeight( 0L ),
meOrientation(GetSdImport().IsDraw() ? view::PaperOrientation_PORTRAIT : view::PaperOrientation_LANDSCAPE)
{
- // set family to something special at SvXMLStyleContext
+ // set family to something special at SvXMLStyleContext
// for differences in search-methods
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -403,15 +403,15 @@ SdXMLPageMasterStyleContext::~SdXMLPageMasterStyleContext()
TYPEINIT1( SdXMLPageMasterContext, SvXMLStyleContext );
-SdXMLPageMasterContext::SdXMLPageMasterContext(
+SdXMLPageMasterContext::SdXMLPageMasterContext(
SdXMLImport& rImport,
- sal_uInt16 nPrfx,
+ sal_uInt16 nPrfx,
const OUString& rLName,
- const uno::Reference< xml::sax::XAttributeList>& xAttrList)
+ const uno::Reference< xml::sax::XAttributeList>& xAttrList)
: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PAGEMASTERCONEXT_ID),
mpPageMasterStyle( 0L )
{
- // set family to something special at SvXMLStyleContext
+ // set family to something special at SvXMLStyleContext
// for differences in search-methods
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -448,8 +448,8 @@ SdXMLPageMasterContext::~SdXMLPageMasterContext()
//////////////////////////////////////////////////////////////////////////////
-SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
- sal_uInt16 nPrefix,
+SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
+ sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
@@ -467,7 +467,7 @@ SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
mpPageMasterStyle = (SdXMLPageMasterStyleContext*)pContext;
}
}
-
+
// call base class
if(!pContext)
pContext = SvXMLStyleContext::CreateChildContext(nPrefix, rLocalName, xAttrList);
@@ -481,14 +481,14 @@ SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
TYPEINIT1( SdXMLPresentationPageLayoutContext, SvXMLStyleContext );
SdXMLPresentationPageLayoutContext::SdXMLPresentationPageLayoutContext(
- SdXMLImport& rImport,
- sal_uInt16 nPrfx,
- const OUString& rLName,
+ SdXMLImport& rImport,
+ sal_uInt16 nPrfx,
+ const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList, XML_STYLE_FAMILY_SD_PRESENTATIONPAGELAYOUT_ID),
mnTypeId( 20 ) // AUTOLAYOUT_NONE
{
- // set family to somethiong special at SvXMLStyleContext
+ // set family to somethiong special at SvXMLStyleContext
// for differences in search-methods
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -509,8 +509,8 @@ SdXMLPresentationPageLayoutContext::~SdXMLPresentationPageLayoutContext()
{
}
-SvXMLImportContext *SdXMLPresentationPageLayoutContext::CreateChildContext(
- sal_uInt16 nPrefix,
+SvXMLImportContext *SdXMLPresentationPageLayoutContext::CreateChildContext(
+ sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
@@ -519,7 +519,7 @@ SvXMLImportContext *SdXMLPresentationPageLayoutContext::CreateChildContext(
if(nPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_PLACEHOLDER ) )
{
// presentation:placeholder inside style:presentation-page-layout context
- pContext = new SdXMLPresentationPlaceholderContext(
+ pContext = new SdXMLPresentationPlaceholderContext(
GetSdImport(), nPrefix, rLocalName, xAttrList);
// remember SdXMLPresentationPlaceholderContext for later evaluation
@@ -587,7 +587,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
case 2:
{
SdXMLPresentationPlaceholderContext* pObj1 = maList.GetObject(1);
-
+
if(pObj1->GetName().equals(
OUString(RTL_CONSTASCII_USTRINGPARAM("subtitle"))))
{
@@ -690,7 +690,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
OUString(RTL_CONSTASCII_USTRINGPARAM("vertical_outline"))))
{
// AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART
- mnTypeId = 27;
+ mnTypeId = 27;
}
else
{
@@ -744,7 +744,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
break;
}
- case 7:
+ case 7:
{
mnTypeId = 33; // AUTOLAYOUT_6CLIPART
break;
@@ -766,9 +766,9 @@ void SdXMLPresentationPageLayoutContext::EndElement()
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-SdXMLPresentationPlaceholderContext::SdXMLPresentationPlaceholderContext(
- SdXMLImport& rImport,
- sal_uInt16 nPrfx, const
+SdXMLPresentationPlaceholderContext::SdXMLPresentationPlaceholderContext(
+ SdXMLImport& rImport,
+ sal_uInt16 nPrfx, const
OUString& rLName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList)
: SvXMLImportContext( rImport, nPrfx, rLName),
@@ -828,12 +828,12 @@ SdXMLPresentationPlaceholderContext::~SdXMLPresentationPlaceholderContext()
TYPEINIT1( SdXMLMasterPageContext, SdXMLGenericPageContext );
-SdXMLMasterPageContext::SdXMLMasterPageContext(
+SdXMLMasterPageContext::SdXMLMasterPageContext(
SdXMLImport& rImport,
- sal_uInt16 nPrfx,
+ sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList,
- uno::Reference< drawing::XShapes >& rShapes)
+ uno::Reference< drawing::XShapes >& rShapes)
: SdXMLGenericPageContext( rImport, nPrfx, rLName, xAttrList, rShapes )
{
const sal_Bool bHandoutMaster = IsXMLToken( rLName, XML_HANDOUT_MASTER );
@@ -944,7 +944,7 @@ void SdXMLMasterPageContext::EndElement()
//////////////////////////////////////////////////////////////////////////////
-SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
+SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
@@ -960,11 +960,11 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext(
if(GetSdImport().GetShapeImport()->GetStylesContext())
{
// style:style inside master-page context -> presentation style
- XMLShapeStyleContext* pNew = new XMLShapeStyleContext(
- GetSdImport(), nPrefix, rLocalName, xAttrList,
- *GetSdImport().GetShapeImport()->GetStylesContext(),
+ XMLShapeStyleContext* pNew = new XMLShapeStyleContext(
+ GetSdImport(), nPrefix, rLocalName, xAttrList,
+ *GetSdImport().GetShapeImport()->GetStylesContext(),
XML_STYLE_FAMILY_SD_PRESENTATION_ID);
-
+
// add this style to the outer StylesContext class for later processing
if(pNew)
{
@@ -1011,10 +1011,10 @@ TYPEINIT1( SdXMLStylesContext, SvXMLStyleContext );
SdXMLStylesContext::SdXMLStylesContext(
SdXMLImport& rImport,
- sal_uInt16 nPrfx,
+ sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
- sal_Bool bIsAutoStyle)
+ sal_Bool bIsAutoStyle)
: SvXMLStylesContext(rImport, nPrfx, rLName, xAttrList),
mbIsAutoStyle(bIsAutoStyle)
{
@@ -1039,8 +1039,8 @@ SdXMLStylesContext::~SdXMLStylesContext()
//////////////////////////////////////////////////////////////////////////////
-SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext(
- sal_uInt16 nPrefix,
+SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext(
+ sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
{
@@ -1110,9 +1110,9 @@ SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext(
//////////////////////////////////////////////////////////////////////////////
-SvXMLStyleContext* SdXMLStylesContext::CreateStyleStyleChildContext(
+SvXMLStyleContext* SdXMLStylesContext::CreateStyleStyleChildContext(
sal_uInt16 nFamily,
- sal_uInt16 nPrefix,
+ sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList)
{
@@ -1191,7 +1191,7 @@ UniReference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropertyM
{
UniReference < SvXMLImportPropertyMapper > xMapper;
-// if(XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily
+// if(XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily
// || XML_STYLE_FAMILY_SD_PRESENTATION_ID == nFamily
// || XML_STYLE_FAMILY_SD_POOL_ID == nFamily)
// {
@@ -1218,7 +1218,7 @@ UniReference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropertyM
xMapper = xPresImpPropMapper;
break;
}
-
+
case XML_STYLE_FAMILY_TABLE_COLUMN:
case XML_STYLE_FAMILY_TABLE_ROW:
case XML_STYLE_FAMILY_TABLE_CELL:
@@ -1326,7 +1326,7 @@ void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) co
}
//////////////////////////////////////////////////////////////////////////////
-// Process styles list:
+// Process styles list:
// set graphic styles (all with family="graphics"). Remember xStyle at list element.
//
void SdXMLStylesContext::ImpSetGraphicStyles() const
@@ -1471,7 +1471,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAc
catch( Exception& e)
{
uno::Sequence<OUString> aSeq(0);
- const_cast<SdXMLImport*>(&GetSdImport())->SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL );
+ const_cast<SdXMLImport*>(&GetSdImport())->SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL );
}
}
@@ -1511,7 +1511,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAc
catch( Exception& e )
{
uno::Sequence<OUString> aSeq(0);
- const_cast<SdXMLImport*>(&GetSdImport())->SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL );
+ const_cast<SdXMLImport*>(&GetSdImport())->SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL );
}
}
}
@@ -1542,8 +1542,8 @@ uno::Reference< container::XNameAccess > SdXMLStylesContext::getPageLayouts() co
//
TYPEINIT1( SdXMLMasterStylesContext, SvXMLImportContext );
-SdXMLMasterStylesContext::SdXMLMasterStylesContext(
- SdXMLImport& rImport,
+SdXMLMasterStylesContext::SdXMLMasterStylesContext(
+ SdXMLImport& rImport,
sal_uInt16 nPrfx,
const rtl::OUString& rLName)
: SvXMLImportContext( rImport, nPrfx, rLName)
@@ -1552,13 +1552,14 @@ SdXMLMasterStylesContext::SdXMLMasterStylesContext(
SdXMLMasterStylesContext::~SdXMLMasterStylesContext()
{
- while(maMasterPageList.Count())
- maMasterPageList.Remove(maMasterPageList.Count() - 1)->ReleaseRef();
+ for ( size_t i = maMasterPageList.size(); i > 0; )
+ maMasterPageList[ --i ]->ReleaseRef();
+ maMasterPageList.clear();
}
-SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext(
- sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
+SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext(
+ sal_uInt16 nPrefix,
+ const rtl::OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
{
SvXMLImportContext* pContext = 0;
@@ -1591,13 +1592,13 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext(
uno::Reference< drawing::XShapes > xNewShapes(xNewMasterPage, uno::UNO_QUERY);
if(xNewShapes.is() && GetSdImport().GetShapeImport()->GetStylesContext())
{
- pContext = new SdXMLMasterPageContext(GetSdImport(),
+ pContext = new SdXMLMasterPageContext(GetSdImport(),
nPrefix, rLocalName, xAttrList, xNewShapes);
if(pContext)
{
pContext->AddRef();
- maMasterPageList.Insert((SdXMLMasterPageContext*)pContext, LIST_APPEND);
+ maMasterPageList.push_back( (SdXMLMasterPageContext*)pContext );
}
}
}
@@ -1612,7 +1613,7 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext(
uno::Reference< drawing::XShapes > xHandoutPage( xHandoutSupp->getHandoutMasterPage(), uno::UNO_QUERY );
if(xHandoutPage.is() && GetSdImport().GetShapeImport()->GetStylesContext())
{
- pContext = new SdXMLMasterPageContext(GetSdImport(),
+ pContext = new SdXMLMasterPageContext(GetSdImport(),
nPrefix, rLocalName, xAttrList, xHandoutPage);
}
}
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index 0f661a3..245791e 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -34,6 +34,7 @@
#include "ximppage.hxx"
#include <xmloff/xmlstyle.hxx>
#include <com/sun/star/view/PaperOrientation.hpp>
+#include <vector>
class SvNumberFormatter;
class SvXMLNumFmtHelper;
@@ -57,10 +58,10 @@ class SdXMLPageMasterStyleContext: public SvXMLStyleContext
public:
TYPEINFO();
- SdXMLPageMasterStyleContext(
- SdXMLImport& rImport,
+ SdXMLPageMasterStyleContext(
+ SdXMLImport& rImport,
sal_uInt16 nPrfx,
- const rtl::OUString& rLName,
+ const rtl::OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
virtual ~SdXMLPageMasterStyleContext();
@@ -87,14 +88,14 @@ class SdXMLPageMasterContext: public SvXMLStyleContext
public:
TYPEINFO();
- SdXMLPageMasterContext(
- SdXMLImport& rImport,
+ SdXMLPageMasterContext(
+ SdXMLImport& rImport,
sal_uInt16 nPrfx,
- const rtl::OUString& rLName,
+ const rtl::OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
virtual ~SdXMLPageMasterContext();
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -115,15 +116,15 @@ class SdXMLMasterPageContext: public SdXMLGenericPageContext
public:
TYPEINFO();
- SdXMLMasterPageContext(
- SdXMLImport& rImport,
+ SdXMLMasterPageContext(
+ SdXMLImport& rImport,
sal_uInt16 nPrfx,
- const rtl::OUString& rLName,
+ const rtl::OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList,
com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes);
virtual ~SdXMLMasterPageContext();
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -134,7 +135,7 @@ public:
const rtl::OUString& GetDisplayName() const { return msDisplayName; }
};
-DECLARE_LIST(ImpMasterPageList, SdXMLMasterPageContext*)
+typedef ::std::vector< SdXMLMasterPageContext* > ImpMasterPageList;
//////////////////////////////////////////////////////////////////////////////
// presentation:placeholder context
@@ -151,10 +152,10 @@ class SdXMLPresentationPlaceholderContext: public SvXMLImportContext
SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
public:
- SdXMLPresentationPlaceholderContext(
- SdXMLImport& rImport,
+ SdXMLPresentationPlaceholderContext(
+ SdXMLImport& rImport,
sal_uInt16 nPrfx,
- const rtl::OUString& rLName,
+ const rtl::OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
virtual ~SdXMLPresentationPlaceholderContext();
@@ -182,13 +183,13 @@ public:
TYPEINFO();
SdXMLPresentationPageLayoutContext(
- SdXMLImport& rImport,
- sal_uInt16 nPrfx,
- const rtl::OUString& rLName,
+ SdXMLImport& rImport,
+ sal_uInt16 nPrfx,
+ const rtl::OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
virtual ~SdXMLPresentationPageLayoutContext();
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
@@ -211,18 +212,18 @@ class SdXMLStylesContext : public SvXMLStylesContext
void ImpSetGraphicStyles() const;
void ImpSetCellStyles() const;
- void ImpSetGraphicStyles( com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xPageStyles,
+ void ImpSetGraphicStyles( com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xPageStyles,
sal_uInt16 nFamily, const UniString& rPrefix) const;
protected:
- virtual SvXMLStyleContext* CreateStyleChildContext(
- sal_uInt16 nPrefix,
+ virtual SvXMLStyleContext* CreateStyleChildContext(
+ sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
- virtual SvXMLStyleContext *CreateStyleStyleChildContext(
+ virtual SvXMLStyleContext *CreateStyleStyleChildContext(
sal_uInt16 nFamily,
- sal_uInt16 nPrefix,
+ sal_uInt16 nPrefix,
const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
@@ -235,8 +236,8 @@ public:
TYPEINFO();
SdXMLStylesContext(
- SdXMLImport& rImport,
- sal_uInt16 nPrfx,
+ SdXMLImport& rImport,
+ sal_uInt16 nPrfx,
const rtl::OUString& rLName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList,
sal_Bool bIsAutoStyle);
@@ -260,19 +261,19 @@ class SdXMLMasterStylesContext : public SvXMLImportContext
const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); }
SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
-
+
public:
TYPEINFO();
- SdXMLMasterStylesContext(
- SdXMLImport& rImport,
+ SdXMLMasterStylesContext(
+ SdXMLImport& rImport,
sal_uInt16 nPrfx,
const rtl::OUString& rLName);
virtual ~SdXMLMasterStylesContext();
- virtual SvXMLImportContext* CreateChildContext(
- sal_uInt16 nPrefix,
- const rtl::OUString& rLocalName,
+ virtual SvXMLImportContext* CreateChildContext(
+ sal_uInt16 nPrefix,
+ const rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
const ImpMasterPageList& GetMasterPageList() const { return maMasterPageList; }
More information about the Libreoffice-commits
mailing list