[Libreoffice-commits] .: xmloff/inc xmloff/source

[Joseph Powers]

 xmloff/inc/xmloff/txtimp.hxx  |    7 +------
 xmloff/source/text/txtimp.cxx |   16 ++--------------
 2 files changed, 3 insertions(+), 20 deletions(-)

New commits:
commit 1c1f8f88304d2852d6064baeb6037b2c57aadda9
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Fri Jan 7 08:15:35 2011 -0800

    Remove DECLARE_LIST( XMLSectionList_Impl, XMLSectionImportContext* )

diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx
index 7d551d5..109fb12 100644
--- a/xmloff/inc/xmloff/txtimp.hxx
+++ b/xmloff/inc/xmloff/txtimp.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
@@ -375,9 +375,6 @@ enum XMLTextType
 #define XML_TEXT_RENAME_TYPE_FRAME 10
 #define XML_TEXT_RENAME_TYPE_TABLE 20
 
-// create type for section list, XMLSectionList_Impl
-DECLARE_LIST( XMLSectionList_Impl, XMLSectionImportContext* )
-
 class XMLOFF_DLLPUBLIC XMLTextImportHelper : public UniRefBase,
     private boost::noncopyable
 {
@@ -457,8 +454,6 @@ public:
     bool IsOrganizerMode() const;
     bool IsProgress() const;
 
-    XMLSectionList_Impl & GetSectionList();
-
     ::rtl::OUString ConvertStarFonts( const ::rtl::OUString& rChars,
                                       const ::rtl::OUString& rStyleName,
                                       sal_uInt8& rFlags,
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 45541cd..801415d 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.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
@@ -129,7 +129,6 @@ static SvXMLTokenMapEntry aTextElemTokenMap[] =
     { XML_NAMESPACE_DRAW, XML_FRAME, 			XML_TOK_TEXT_FRAME_PAGE 	},
     { XML_NAMESPACE_DRAW, XML_A, 				XML_TOK_DRAW_A_PAGE },
     { XML_NAMESPACE_TABLE,XML_TABLE,			XML_TOK_TABLE_TABLE 		},
-//	{ XML_NAMESPACE_TABLE,XML_SUB_TABLE,		XML_TOK_TABLE_SUBTABLE 		},
     { XML_NAMESPACE_TEXT, XML_VARIABLE_DECLS,	XML_TOK_TEXT_VARFIELD_DECLS },
     { XML_NAMESPACE_TEXT, XML_USER_FIELD_DECLS, XML_TOK_TEXT_USERFIELD_DECLS },
     { XML_NAMESPACE_TEXT, XML_SEQUENCE_DECLS,	XML_TOK_TEXT_SEQUENCE_DECLS },
@@ -545,8 +544,6 @@ struct SAL_DLLPRIVATE XMLTextImportHelper::Impl
     SvXMLImportContextRef m_xAutoStyles;
     SvXMLImportContextRef m_xFontDecls;
 
-    XMLSectionList_Impl m_SectionList;
-
     UniReference< SvXMLImportPropertyMapper > m_xParaImpPrMap;
     UniReference< SvXMLImportPropertyMapper > m_xTextImpPrMap;
     UniReference< SvXMLImportPropertyMapper > m_xFrameImpPrMap;
@@ -703,11 +700,6 @@ bool XMLTextImportHelper::IsProgress() const
     return m_pImpl->m_bProgress;
 }
 
-XMLSectionList_Impl & XMLTextImportHelper::GetSectionList()
-{
-    return m_pImpl->m_SectionList;
-}
-
 uno::Reference<container::XNameContainer> const&
 XMLTextImportHelper::GetParaStyles() const
 {
@@ -1797,7 +1789,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
                         // #i107225# the combined characters need to be inserted first
                         // the selected text has to be removed afterwards
                         m_pImpl->m_xText->insertTextContent( xRange->getStart(), xTextContent, sal_True );
-                        
+
                         if( xRange->getString().getLength() )
                         {
                             try
@@ -2229,7 +2221,6 @@ void XMLTextImportHelper::SetRuby(
                 rImport.GetStyleDisplayName(
                             XML_STYLE_FAMILY_TEXT_TEXT, rTextStyleName ) );
             if( (sDisplayName.getLength() > 0) &&
-//				xPropSetInfo->hasPropertyByName( sRubyCharStyleName ) &&
                 m_pImpl->m_xTextStyles->hasByName( sDisplayName ))
             {
                 xPropSet->setPropertyValue(sRubyCharStyleName, makeAny(sDisplayName));
@@ -2480,9 +2471,6 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext(
         }
     }
 
-//	if( !pContext )
-//		pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-
     // handle open redlines
     if ( (XML_TOK_TEXT_CHANGE != nToken) &&
          (XML_TOK_TEXT_CHANGE_END != nToken) &&