From 180e1de3f6bad36b00dfe3aeba43172e5e9a735e Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Mon, 9 Mar 2015 23:41:33 +0100 Subject: remove whitespaces Change-Id: Ie9d303a7200cf2a6bfd8c0f5f547cfffccaa0444 --- include/oox/core/contexthandler.hxx | 4 ---- include/oox/core/contexthandler2.hxx | 8 -------- include/oox/core/xmlfilterbase.hxx | 5 +---- oox/inc/drawingml/chart/chartcontextbase.hxx | 10 ---------- oox/source/core/xmlfilterbase.cxx | 1 - 5 files changed, 1 insertion(+), 27 deletions(-) diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx index a65c17e61763..3df0de5ff5d2 100644 --- a/include/oox/core/contexthandler.hxx +++ b/include/oox/core/contexthandler.hxx @@ -42,8 +42,6 @@ class FragmentHandler; struct Relation; class Relations; - - class ContextHandler; typedef ::rtl::Reference< ContextHandler > ContextHandlerRef; @@ -108,8 +106,6 @@ private: FragmentBaseDataRef mxBaseData; ///< Base data of the fragment. }; - - } // namespace core } // namespace oox diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx index 6e4b27d98fb0..048a2eca11f2 100644 --- a/include/oox/core/contexthandler2.hxx +++ b/include/oox/core/contexthandler2.hxx @@ -30,12 +30,8 @@ namespace oox { namespace core { - - const sal_Int32 XML_ROOT_CONTEXT = SAL_MAX_INT32; - - struct ElementInfo; /** Helper class that provides a context stack. @@ -211,8 +207,6 @@ protected: bool mbEnableTrimSpace; ///< True = trim whitespace in characters(). }; - - class OOX_DLLPUBLIC ContextHandler2 : public ContextHandler, public ContextHandler2Helper { public: @@ -264,8 +258,6 @@ public: virtual void onEndRecord() SAL_OVERRIDE; }; - - } // namespace core } // namespace oox diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index c4e4b5666cf7..9fccf1fd1cdc 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -68,8 +68,6 @@ struct TextField { }; typedef std::vector< TextField > TextFieldStack; - - struct XmlFilterBaseImpl; class OOX_DLLPUBLIC XmlFilterBase : public FilterBase @@ -255,12 +253,11 @@ private: ::std::unique_ptr< XmlFilterBaseImpl > mxImpl; sal_Int32 mnRelId; sal_Int32 mnMaxDocId; + bool mbMSO2007; }; typedef ::rtl::Reference< XmlFilterBase > XmlFilterRef; - - } // namespace core } // namespace oox diff --git a/oox/inc/drawingml/chart/chartcontextbase.hxx b/oox/inc/drawingml/chart/chartcontextbase.hxx index 9bf80ce947fc..c160fb907f35 100644 --- a/oox/inc/drawingml/chart/chartcontextbase.hxx +++ b/oox/inc/drawingml/chart/chartcontextbase.hxx @@ -28,8 +28,6 @@ namespace oox { namespace drawingml { namespace chart { - - template< typename ModelType > class ContextBase : public ::oox::core::ContextHandler2 { @@ -42,8 +40,6 @@ protected: ModelType& mrModel; }; - - template< typename ModelType > class FragmentBase : public ::oox::core::FragmentHandler2 { @@ -56,8 +52,6 @@ protected: ModelType& mrModel; }; - - /** Help class for all contexts that have only the c:spPr child element. */ class ShapePrWrapperContext : public ContextBase< Shape > @@ -69,8 +63,6 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; - - struct LayoutModel; /** Handler for a chart layout context (c:layout element). @@ -84,8 +76,6 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; - - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 5c34eade77ff..4920cc62047b 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -780,7 +780,6 @@ writeCustomProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xP pAppProps->endElement( XML_Properties ); } - XmlFilterBase& XmlFilterBase::exportDocumentProperties( Reference< XDocumentProperties > xProperties ) { if( xProperties.is() ) -- cgit