remove whitespaces

Change-Id: Ie14ba3dcb97f20479a04538748ef2c1c9e6c5dac

172 files changed, 0 insertions, 1470 deletions

diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx
index 471c92d47f05..2a2289e0d64d 100644
--- a/oox/source/core/binarycodec.cxx
+++ b/oox/source/core/binarycodec.cxx
@@ -31,8 +31,6 @@ using namespace ::com::sun::star;
 namespace oox {
 namespace core {
 
-
-
 namespace {
 
 /** Rotates rnValue left by nBits bits. */
@@ -106,8 +104,6 @@ sal_uInt16 lclGetHash( const sal_uInt8* pnPassData, sal_Int32 nBufferSize )
 
 } // namespace
 
-
-
 sal_uInt16 CodecHelper::getPasswordHash( const AttributeList& rAttribs, sal_Int32 nElement )
 {
     sal_Int32 nPasswordHash = rAttribs.getIntegerHex( nElement, 0 );
@@ -115,8 +111,6 @@ sal_uInt16 CodecHelper::getPasswordHash( const AttributeList& rAttribs, sal_Int3
     return static_cast< sal_uInt16 >( ((0 <= nPasswordHash) && (nPasswordHash <= SAL_MAX_UINT16)) ? nPasswordHash : 0 );
 }
 
-
-
 BinaryCodec_XOR::BinaryCodec_XOR( CodecType eCodecType ) :
     meCodecType( eCodecType ),
     mnOffset( 0 ),
@@ -259,8 +253,6 @@ bool BinaryCodec_XOR::skip( sal_Int32 nBytes )
     return true;
 }
 
-
-
 BinaryCodec_RCF::BinaryCodec_RCF()
 {
     mhCipher = rtl_cipher_create( rtl_Cipher_AlgorithmARCFOUR, rtl_Cipher_ModeStream );
@@ -413,8 +405,6 @@ bool BinaryCodec_RCF::skip( sal_Int32 nBytes )
     return bResult;
 }
 
-
-
 } // namespace core
 } // namespace oox
 
diff --git a/oox/source/core/contexthandler.cxx b/oox/source/core/contexthandler.cxx
index 806d97503330..80986314d6a6 100644
--- a/oox/source/core/contexthandler.cxx
+++ b/oox/source/core/contexthandler.cxx
@@ -24,14 +24,9 @@
 namespace oox {
 namespace core {
 
-
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 
-
-
-
 ContextHandler::ContextHandler( const ContextHandler& rParent ) :
     ContextHandler_BASE(),
     mxBaseData( rParent.mxBaseData )
@@ -142,8 +137,6 @@ void ContextHandler::endRecord( sal_Int32 )
 {
 }
 
-
-
 } // namespace core
 } // namespace oox
 
diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx
index 0d74d66a8519..1201aed900ce 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -23,14 +23,9 @@
 namespace oox {
 namespace core {
 
-
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 
-
-
-
 /** Information about a processed element. */
 struct ElementInfo
 {
@@ -41,8 +36,6 @@ struct ElementInfo
     inline explicit     ElementInfo() : maChars( 0), mnElement( XML_TOKEN_INVALID ), mbTrimSpaces( false ) {}
 };
 
-
-
 ContextHandler2Helper::ContextHandler2Helper( bool bEnableTrimSpace ) :
     mxContextStack( new ContextStack ),
     mnRootStackSize( 0 ),
@@ -178,8 +171,6 @@ void ContextHandler2Helper::processCollectedChars()
     }
 }
 
-
-
 ContextHandler2::ContextHandler2( ContextHandler2Helper& rParent ) :
     ContextHandler( dynamic_cast< ContextHandler& >( rParent ) ),
     ContextHandler2Helper( rParent )
@@ -263,8 +254,6 @@ void ContextHandler2::onEndRecord()
 {
 }
 
-
-
 } // namespace core
 } // namespace oox
 
diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx
index 42306a9d15a2..b1e24304f97f 100644
--- a/oox/source/core/fastparser.cxx
+++ b/oox/source/core/fastparser.cxx
@@ -33,16 +33,11 @@
 namespace oox {
 namespace core {
 
-
-
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 
-
-
-
 namespace {
 
 class InputStreamCloseGuard
@@ -68,8 +63,6 @@ InputStreamCloseGuard::~InputStreamCloseGuard()
 
 } // namespace
 
-
-
 FastParser::FastParser( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
     mrNamespaceMap( StaticNamespaceMap::get() ),
     mpParser(NULL)
@@ -171,8 +164,6 @@ sal_Int32 FastParser::getNamespaceId( const OUString& rUrl )
     return 0;
 }
 
-
-
 } // namespace core
 } // namespace oox
 
diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx
index 9764ff3de4ff..91fb38a78fe5 100644
--- a/oox/source/core/fasttokenhandler.cxx
+++ b/oox/source/core/fasttokenhandler.cxx
@@ -99,8 +99,6 @@ sal_Int32 FastTokenHandler::getTokenDirect( const char *pToken, sal_Int32 nLengt
     return mrTokenMap.getTokenFromUTF8( pToken, nLength );
 }
 
-
-
 } // namespace core
 } // namespace oox
 
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index fb2d14d45d0d..c4f7a5db178c 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -306,7 +306,6 @@ comphelper::DocPasswordVerifierResult PasswordVerifier::verifyEncryptionData( co
 
 } // namespace
 
-
 Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescriptor& rMediaDescriptor ) const
 {
     // try the plain input stream
@@ -441,8 +440,6 @@ OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& rMediaDescSeq
     return aFilterName;
 }
 
-
-
 } // namespace core
 } // namespace oox
 
diff --git a/oox/source/core/fragmenthandler.cxx b/oox/source/core/fragmenthandler.cxx
index f19f0f1c4295..641e0cbc4ef9 100644
--- a/oox/source/core/fragmenthandler.cxx
+++ b/oox/source/core/fragmenthandler.cxx
@@ -24,15 +24,10 @@
 namespace oox {
 namespace core {
 
-
-
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 
-
-
-
 FragmentBaseData::FragmentBaseData( XmlFilterBase& rFilter, const OUString& rFragmentPath, RelationsRef xRelations ) :
     mrFilter( rFilter ),
     maFragmentPath( rFragmentPath ),
@@ -40,8 +35,6 @@ FragmentBaseData::FragmentBaseData( XmlFilterBase& rFilter, const OUString& rFra
 {
 }
 
-
-
 FragmentHandler::FragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath ) :
     FragmentHandler_BASE( FragmentBaseDataRef( new FragmentBaseData( rFilter, rFragmentPath, rFilter.importRelations( rFragmentPath ) ) ) )
 {
@@ -126,8 +119,6 @@ const RecordInfo* FragmentHandler::getRecordInfos() const
     return 0;
 }
 
-
-
 } // namespace core
 } // namespace oox
 
diff --git a/oox/source/core/fragmenthandler2.cxx b/oox/source/core/fragmenthandler2.cxx
index 6a305d16da02..aae320640375 100644
--- a/oox/source/core/fragmenthandler2.cxx
+++ b/oox/source/core/fragmenthandler2.cxx
@@ -23,17 +23,11 @@
 namespace oox {
 namespace core {
 
-
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 
-
-
 using ::com::sun::star::uno::Sequence;
 
-
-
 FragmentHandler2::FragmentHandler2( XmlFilterBase& rFilter, const OUString& rFragmentPath, bool bEnableTrimSpace ) :
     FragmentHandler( rFilter, rFragmentPath ),
     ContextHandler2Helper( bEnableTrimSpace )
@@ -101,8 +95,6 @@ bool FragmentHandler2::prepareMceContext( sal_Int32 nElement, const AttributeLis
     return true;
 }
 
-
-
 // com.sun.star.xml.sax.XFastContextHandler interface -------------------------
 
 Reference< XFastContextHandler > SAL_CALL FragmentHandler2::createFastChildContext(
@@ -200,8 +192,6 @@ void FragmentHandler2::finalizeImport()
 {
 }
 
-
-
 } // namespace core
 } // namespace oox
 
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index 2432f88fbc93..2e73390175b5 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -28,16 +28,11 @@
 namespace oox {
 namespace core {
 
-
-
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 
-
-
-
 namespace prv {
 
 class Locator : public ::cppu::WeakImplHelper1< XLocator >
@@ -59,8 +54,6 @@ private:
     RecordParser*           mpParser;
 };
 
-
-
 void Locator::dispose()
 {
     mpParser = 0;
@@ -94,8 +87,6 @@ OUString SAL_CALL Locator::getSystemId() throw( RuntimeException, std::exception
     return mpParser->getInputSource().maSystemId;
 }
 
-
-
 class ContextStack
 {
 public:
@@ -118,8 +109,6 @@ private:
     ContextInfoVec      maStack;
 };
 
-
-
 ContextStack::ContextStack( FragmentHandlerRef xHandler ) :
     mxHandler( xHandler )
 {
@@ -163,8 +152,6 @@ void ContextStack::popContext()
 
 } // namespace prv
 
-
-
 namespace {
 
 /** Reads a byte from the passed stream, returns true on success. */
@@ -213,8 +200,6 @@ bool lclReadNextRecord( sal_Int32& ornRecId, StreamDataSequence& orData, BinaryI
 
 } // namespace
 
-
-
 RecordParser::RecordParser()
 {
     mxLocator.set( new prv::Locator( this ) );
@@ -335,8 +320,6 @@ const RecordInfo* RecordParser::getEndRecordInfo( sal_Int32 nRecId ) const
     return (aIt == maEndMap.end()) ? 0 : &aIt->second;
 }
 
-
-
 } // namespace core
 } // namespace oox
 
diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx
index b5eace0cf69e..20adc05cfb64 100644
--- a/oox/source/core/relationshandler.cxx
+++ b/oox/source/core/relationshandler.cxx
@@ -25,14 +25,9 @@
 namespace oox {
 namespace core {
 
-
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 
-
-
-
 namespace {
 
 /*  Build path to relations file from passed fragment path, e.g.:
@@ -53,8 +48,6 @@ OUString lclGetRelationsPath( const OUString& rFragmentPath )
 
 } // namespace
 
-
-
 RelationsFragment::RelationsFragment( XmlFilterBase& rFilter, RelationsRef xRelations ) :
     FragmentHandler( rFilter, lclGetRelationsPath( xRelations->getFragmentPath() ), xRelations ),
     mxRelations( xRelations )
@@ -94,8 +87,6 @@ Reference< XFastContextHandler > RelationsFragment::createFastChildContext(
     return xRet;
 }
 
-
-
 } // namespace core
 } // namespace oox
 
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 8dd5cfe99f65..486946cedad6 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -214,8 +214,6 @@ XmlFilterBase::~XmlFilterBase()
     mxImpl->maFastParser.setDocumentHandler( 0 );
 }
 
-
-
 void XmlFilterBase::importDocumentProperties()
 {
     Reference< XMultiServiceFactory > xFactory( getComponentContext()->getServiceManager(), UNO_QUERY );
@@ -781,8 +779,6 @@ StorageRef XmlFilterBase::implCreateStorage( const Reference< XStream >& rxOutSt
     return StorageRef( new ZipStorage( getComponentContext(), rxOutStream ) );
 }
 
-
-
 } // namespace core
 } // namespace oox
 
diff --git a/oox/source/crypto/AgileEngine.cxx b/oox/source/crypto/AgileEngine.cxx
index 480953dc5270..3ae847a9994a 100644
--- a/oox/source/crypto/AgileEngine.cxx
+++ b/oox/source/crypto/AgileEngine.cxx
@@ -41,7 +41,6 @@ AgileEngine::AgileEngine() :
 AgileEngine::~AgileEngine()
 {}
 
-
 Crypto::CryptoType AgileEngine::cryptoType(const AgileEncryptionInfo& rInfo)
 {
     if (rInfo.keyBits == 128 && rInfo.cipherAlgorithm == "AES" && rInfo.cipherChaining == "ChainingModeCBC")
@@ -208,7 +207,6 @@ bool AgileEngine::encrypt(
     return false; // Agile encrypting is not supported for now
 }
 
-
 } // namespace core
 } // namespace oox
 
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
index 76fa8b4dfc4c..d792f6b810bf 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -274,7 +274,6 @@ bool DocumentDecryption::readStandard2007EncryptionInfo(BinaryInputStream& rStre
     mEngine.reset(engine);
     StandardEncryptionInfo& info = engine->getInfo();
 
-
     rStream >> info.header.flags;
     if( getFlag( info.header.flags, ENCRYPTINFO_EXTERNAL ) )
         return false;
diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx
index 1e769a03a013..c59e840c7b3d 100644
--- a/oox/source/crypto/Standard2007Engine.cxx
+++ b/oox/source/crypto/Standard2007Engine.cxx
@@ -66,7 +66,6 @@ Standard2007Engine::Standard2007Engine() :
 Standard2007Engine::~Standard2007Engine()
 {}
 
-
 bool Standard2007Engine::generateVerifier()
 {
     // only support key of size 128 bit (16 byte)
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index 0e63245e660c..5182b99d1aca 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star;
 namespace oox {
 namespace docprop {
 
-
 OOXMLDocPropHandler::OOXMLDocPropHandler( const uno::Reference< uno::XComponentContext >& xContext,
                                           const uno::Reference< document::XDocumentProperties > xDocProp )
     : m_xContext( xContext )
@@ -50,12 +49,10 @@ OOXMLDocPropHandler::OOXMLDocPropHandler( const uno::Reference< uno::XComponentC
         throw uno::RuntimeException();
 }
 
-
 OOXMLDocPropHandler::~OOXMLDocPropHandler()
 {
 }
 
-
 void OOXMLDocPropHandler::InitNew()
 {
     m_nState = 0;
@@ -65,7 +62,6 @@ void OOXMLDocPropHandler::InitNew()
     m_nInBlock = 0;
 }
 
-
 void OOXMLDocPropHandler::AddCustomProperty( const uno::Any& aAny )
 {
     if ( !m_aCustomPropertyName.isEmpty() )
@@ -91,7 +87,6 @@ void OOXMLDocPropHandler::AddCustomProperty( const uno::Any& aAny )
     }
 }
 
-
 util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const OUString& aChars )
 {
     oslDateTime aOslDTime = { 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -189,7 +184,6 @@ util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const OUString& aChar
             aOslDTime.Day, aOslDTime.Month, aOslDTime.Year, false);
 }
 
-
 uno::Sequence< OUString > OOXMLDocPropHandler::GetKeywordsSet( const OUString& aChars )
 {
     if ( !aChars.isEmpty() )
@@ -212,7 +206,6 @@ uno::Sequence< OUString > OOXMLDocPropHandler::GetKeywordsSet( const OUString& a
     return uno::Sequence< OUString >();
 }
 
-
 void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars )
 {
     uno::Sequence< beans::NamedValue > aSet = m_xDocProp->getDocumentStatistics();
@@ -264,7 +257,6 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars )
     }
 }
 
-
 // com.sun.star.xml.sax.XFastDocumentHandler
 
 void SAL_CALL OOXMLDocPropHandler::startDocument()
@@ -272,20 +264,17 @@ void SAL_CALL OOXMLDocPropHandler::startDocument()
 {
 }
 
-
 void SAL_CALL OOXMLDocPropHandler::endDocument()
     throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     InitNew();
 }
 
-
 void SAL_CALL OOXMLDocPropHandler::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& )
     throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
 }
 
-
 // com.sun.star.xml.sax.XFastContextHandler
 
 void SAL_CALL OOXMLDocPropHandler::startFastElement( ::sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList >& xAttribs )
@@ -329,7 +318,6 @@ void SAL_CALL OOXMLDocPropHandler::startFastElement( ::sal_Int32 nElement, const
     m_nInBlock++;
 }
 
-
 void SAL_CALL OOXMLDocPropHandler::startUnknownElement( const OUString& aNamespace, const OUString& aName, const uno::Reference< xml::sax::XFastAttributeList >& )
     throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
@@ -341,7 +329,6 @@ void SAL_CALL OOXMLDocPropHandler::startUnknownElement( const OUString& aNamespa
     m_nInBlock++;
 }
 
-
 void SAL_CALL OOXMLDocPropHandler::endFastElement( ::sal_Int32 )
     throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
@@ -361,7 +348,6 @@ void SAL_CALL OOXMLDocPropHandler::endFastElement( ::sal_Int32 )
     }
 }
 
-
 void SAL_CALL OOXMLDocPropHandler::endUnknownElement( const OUString&, const OUString& )
     throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
@@ -369,7 +355,6 @@ void SAL_CALL OOXMLDocPropHandler::endUnknownElement( const OUString&, const OUS
         m_nInBlock--;
 }
 
-
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLDocPropHandler::createFastChildContext( ::sal_Int32, const uno::Reference< xml::sax::XFastAttributeList >& )
     throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
@@ -377,14 +362,12 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLDocPropHandler::cr
     return uno::Reference< xml::sax::XFastContextHandler >( static_cast< xml::sax::XFastContextHandler* >( this ) );
 }
 
-
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLDocPropHandler::createUnknownChildContext( const OUString&, const OUString&, const uno::Reference< xml::sax::XFastAttributeList >& )
     throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
     return uno::Reference< xml::sax::XFastContextHandler >( static_cast< xml::sax::XFastContextHandler* >( this ) );
 }
 
-
 void SAL_CALL OOXMLDocPropHandler::characters( const OUString& aChars )
     throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
@@ -668,13 +651,11 @@ void SAL_CALL OOXMLDocPropHandler::characters( const OUString& aChars )
     }
 }
 
-
 void SAL_CALL OOXMLDocPropHandler::ignorableWhitespace( const OUString& )
     throw (xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
-
 void SAL_CALL OOXMLDocPropHandler::processingInstruction( const OUString&, const OUString& )
     throw (xml::sax::SAXException, uno::RuntimeException)
 {
diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx
index a978e977ce72..985d3f0defa2 100644
--- a/oox/source/docprop/docprophandler.hxx
+++ b/oox/source/docprop/docprophandler.hxx
@@ -84,8 +84,6 @@ public:
 
 };
 
-
-
 } // namespace core
 } // namespace oox
 
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx
index ef8f8a65b72f..e274143af283 100644
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -171,8 +171,6 @@ void SAL_CALL DocumentPropertiesImport::importProperties(
     }
 }
 
-
-
 } // namespace docprop
 } // namespace oox
 
diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx
index 0dd4e5360853..861825a5dd5d 100644
--- a/oox/source/docprop/ooxmldocpropimport.hxx
+++ b/oox/source/docprop/ooxmldocpropimport.hxx
@@ -29,8 +29,6 @@
 namespace oox {
 namespace docprop {
 
-
-
 class DocumentPropertiesImport :
     public ::cppu::WeakImplHelper2<
         ::com::sun::star::lang::XServiceInfo,
@@ -55,8 +53,6 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
 };
 
-
-
 } // namespace docprop
 } // namespace oox
 
diff --git a/oox/source/drawingml/chart/axiscontext.cxx b/oox/source/drawingml/chart/axiscontext.cxx
index 783afb2b9ded..b91bbe57b08d 100644
--- a/oox/source/drawingml/chart/axiscontext.cxx
+++ b/oox/source/drawingml/chart/axiscontext.cxx
@@ -28,13 +28,9 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using ::oox::core::ContextHandlerRef;
 using ::oox::core::ContextHandler2Helper;
 
-
-
 AxisDispUnitsContext::AxisDispUnitsContext( ContextHandler2Helper& rParent, AxisDispUnitsModel& rModel ) :
     ContextBase< AxisDispUnitsModel >( rParent, rModel )
 {
@@ -79,8 +75,6 @@ ContextHandlerRef AxisDispUnitsContext::onCreateContext( sal_Int32 nElement, con
     return 0;
 }
 
-
-
 AxisContextBase::AxisContextBase( ContextHandler2Helper& rParent, AxisModel& rModel ) :
     ContextBase< AxisModel >( rParent, rModel )
 {
@@ -166,8 +160,6 @@ ContextHandlerRef AxisContextBase::onCreateContext( sal_Int32 nElement, const At
     return 0;
 }
 
-
-
 CatAxisContext::CatAxisContext( ContextHandler2Helper& rParent, AxisModel& rModel ) :
     AxisContextBase( rParent, rModel )
 {
@@ -208,8 +200,6 @@ ContextHandlerRef CatAxisContext::onCreateContext( sal_Int32 nElement, const Att
     return AxisContextBase::onCreateContext( nElement, rAttribs );
 }
 
-
-
 DateAxisContext::DateAxisContext( ContextHandler2Helper& rParent, AxisModel& rModel ) :
     AxisContextBase( rParent, rModel )
 {
@@ -249,8 +239,6 @@ ContextHandlerRef DateAxisContext::onCreateContext( sal_Int32 nElement, const At
     return AxisContextBase::onCreateContext( nElement, rAttribs );
 }
 
-
-
 SerAxisContext::SerAxisContext( ContextHandler2Helper& rParent, AxisModel& rModel ) :
     AxisContextBase( rParent, rModel )
 {
@@ -274,8 +262,6 @@ ContextHandlerRef SerAxisContext::onCreateContext( sal_Int32 nElement, const Att
     return AxisContextBase::onCreateContext( nElement, rAttribs );
 }
 
-
-
 ValAxisContext::ValAxisContext( ContextHandler2Helper& rParent, AxisModel& rModel ) :
     AxisContextBase( rParent, rModel )
 {
@@ -304,8 +290,6 @@ ContextHandlerRef ValAxisContext::onCreateContext( sal_Int32 nElement, const Att
     return AxisContextBase::onCreateContext( nElement, rAttribs );
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index 6767c3ee9f45..26cd5871dd34 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -42,14 +42,10 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::chart2;
 using namespace ::com::sun::star::uno;
 
-
-
 namespace {
 
 inline void lclSetValueOrClearAny( Any& orAny, const OptValue< double >& rofValue )
@@ -109,8 +105,6 @@ sal_Int32 lclGetTickMark( sal_Int32 nToken )
 
 } // namespace
 
-
-
 AxisConverter::AxisConverter( const ConverterRoot& rParent, AxisModel& rModel ) :
     ConverterBase< AxisModel >( rParent, rModel )
 {
@@ -362,8 +356,6 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
     }
 }
 
-
-
 AxisDispUnitsConverter::AxisDispUnitsConverter( const ConverterRoot& rParent, AxisDispUnitsModel& rModel ) :
     ConverterBase< AxisDispUnitsModel >( rParent, rModel )
 {
@@ -383,7 +375,6 @@ void AxisDispUnitsConverter::convertFromModel( const Reference< XAxis >& rxAxis
     }
 }
 
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/axismodel.cxx b/oox/source/drawingml/chart/axismodel.cxx
index 244741459718..e655f91786db 100644
--- a/oox/source/drawingml/chart/axismodel.cxx
+++ b/oox/source/drawingml/chart/axismodel.cxx
@@ -23,8 +23,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 AxisDispUnitsModel::AxisDispUnitsModel() :
     mfCustomUnit( 0.0 )
 {
@@ -34,8 +32,6 @@ AxisDispUnitsModel::~AxisDispUnitsModel()
 {
 }
 
-
-
 AxisModel::AxisModel( sal_Int32 nTypeId ) :
     mnAxisId( -1 ),
     mnAxisPos( XML_TOKEN_INVALID ),
@@ -63,8 +59,6 @@ AxisModel::~AxisModel()
 {
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/chartcontextbase.cxx b/oox/source/drawingml/chart/chartcontextbase.cxx
index c4567c8cbcdd..858a3af642d3 100644
--- a/oox/source/drawingml/chart/chartcontextbase.cxx
+++ b/oox/source/drawingml/chart/chartcontextbase.cxx
@@ -26,13 +26,9 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using ::oox::core::ContextHandler2Helper;
 using ::oox::core::ContextHandlerRef;
 
-
-
 ShapePrWrapperContext::ShapePrWrapperContext( ContextHandler2Helper& rParent, Shape& rModel ) :
     ContextBase< Shape >( rParent, rModel )
 {
@@ -47,8 +43,6 @@ ContextHandlerRef ShapePrWrapperContext::onCreateContext( sal_Int32 nElement, co
     return (isRootElement() && (nElement == C_TOKEN( spPr ))) ? new ShapePropertiesContext( *this, mrModel ) : 0;
 }
 
-
-
 LayoutContext::LayoutContext( ContextHandler2Helper& rParent, LayoutModel& rModel ) :
     ContextBase< LayoutModel >( rParent, rModel )
 {
@@ -107,8 +101,6 @@ ContextHandlerRef LayoutContext::onCreateContext( sal_Int32 nElement, const Attr
     return 0;
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx
index b320e8aa9796..4fc8e3b7650e 100644
--- a/oox/source/drawingml/chart/chartconverter.cxx
+++ b/oox/source/drawingml/chart/chartconverter.cxx
@@ -31,8 +31,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 using namespace ::com::sun::star::chart2::data;
@@ -41,8 +39,6 @@ using namespace ::com::sun::star::uno;
 
 using ::oox::core::XmlFilterBase;
 
-
-
 static const sal_Unicode API_TOKEN_ARRAY_OPEN      = '{';
 static const sal_Unicode API_TOKEN_ARRAY_CLOSE     = '}';
 static const sal_Unicode API_TOKEN_ARRAY_ROWSEP    = '|';
@@ -85,8 +81,6 @@ static OUString lclGenerateApiArray( const Matrix< Any >& rMatrix )
     return aBuffer.makeStringAndClear();
 }
 
-
-
 ChartConverter::ChartConverter()
 {
 }
@@ -152,8 +146,6 @@ Reference< XDataSequence > ChartConverter::createDataSequence( const Reference<
     return 0;
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx b/oox/source/drawingml/chart/chartdrawingfragment.cxx
index 929f70c9be13..73056f1f7715 100644
--- a/oox/source/drawingml/chart/chartdrawingfragment.cxx
+++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx
@@ -29,15 +29,11 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::uno;
 using namespace ::oox::core;
 
-
-
 ShapeAnchor::ShapeAnchor( bool bRelSize ) :
     mbRelSize( bRelSize )
 {
@@ -110,7 +106,6 @@ EmuRectangle ShapeAnchor::calcAnchorRectEmu( const EmuRectangle& rChartRect ) co
     return aAnchorRect;
 }
 
-
 ChartDrawingFragment::ChartDrawingFragment( XmlFilterBase& rFilter,
         const OUString& rFragmentPath, const Reference< XShapes >& rxDrawPage,
         const awt::Size& rChartSize, const awt::Point& rShapesOffset, bool bOleSupport ) :
@@ -223,8 +218,6 @@ void ChartDrawingFragment::onEndElement()
     }
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index e24388d5c00f..e5705361df24 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -50,8 +50,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::chart2;
 using namespace ::com::sun::star::chart2::data;
@@ -59,8 +57,6 @@ using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 
-
-
 ChartSpaceConverter::ChartSpaceConverter( const ConverterRoot& rParent, ChartSpaceModel& rModel ) :
     ConverterBase< ChartSpaceModel >( rParent, rModel )
 {
@@ -221,8 +217,6 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern
     }
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx
index eec0f1c79bb7..66e9d986d48e 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -29,12 +29,8 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using namespace ::oox::core;
 
-
-
 ChartSpaceFragment::ChartSpaceFragment( XmlFilterBase& rFilter, const OUString& rFragmentPath, ChartSpaceModel& rModel ) :
     FragmentBase< ChartSpaceModel >( rFilter, rFragmentPath, rModel ),
     mpFilterBase(rFilter)
@@ -118,8 +114,6 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( sal_Int32 nElement, const
     return 0;
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/chartspacemodel.cxx b/oox/source/drawingml/chart/chartspacemodel.cxx
index d6e920d85488..47f1cb07da92 100644
--- a/oox/source/drawingml/chart/chartspacemodel.cxx
+++ b/oox/source/drawingml/chart/chartspacemodel.cxx
@@ -23,8 +23,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 ChartSpaceModel::ChartSpaceModel() :
     mnDispBlanksAs( XML_gap ),  // not zero as specified
     mnStyle( 2 ),
@@ -39,8 +37,6 @@ ChartSpaceModel::~ChartSpaceModel()
 {
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx
index c2d3771457b0..c3c5844c522e 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -40,8 +40,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 namespace cssc = ::com::sun::star::chart;
 
 using namespace ::com::sun::star;
@@ -53,8 +51,6 @@ using namespace ::com::sun::star::uno;
 
 using ::oox::core::XmlFilterBase;
 
-
-
 namespace {
 
 struct TitleKey : public ::std::pair< ObjectType, ::std::pair< sal_Int32, sal_Int32 > >
@@ -63,8 +59,6 @@ struct TitleKey : public ::std::pair< ObjectType, ::std::pair< sal_Int32, sal_In
                             { first = eObjType; second.first = nMainIdx; second.second = nSubIdx; }
 };
 
-
-
 /** A helper structure to store all data related to title objects. Needed for
     the conversion of manual title positions that needs the old Chart1 API.
  */
@@ -103,8 +97,6 @@ void TitleLayoutInfo::convertTitlePos( ConverterRoot& rRoot, const Reference< cs
     }
 }
 
-
-
 /*  The following local functions implement getting the XShape interface of all
     supported title objects (chart and axes). This needs some effort due to the
     design of the old Chart1 API used to access these objects. */
@@ -143,8 +135,6 @@ OOX_DEFINEFUNC_GETAXISTITLESHAPE( lclGetSecYAxisTitleShape, XSecondAxisTitleSupp
 
 } // namespace
 
-
-
 struct ConverterData
 {
     typedef ::std::map< TitleKey, TitleLayoutInfo > TitleMap;
@@ -165,8 +155,6 @@ struct ConverterData
                         ~ConverterData();
 };
 
-
-
 ConverterData::ConverterData(
         XmlFilterBase& rFilter,
         ChartConverter& rChartConverter,
@@ -210,8 +198,6 @@ ConverterData::~ConverterData()
     }
 }
 
-
-
 ConverterRoot::ConverterRoot(
         XmlFilterBase& rFilter,
         ChartConverter& rChartConverter,
@@ -295,8 +281,6 @@ void ConverterRoot::convertTitlePositions()
     }
 }
 
-
-
 namespace {
 
 /** Returns a position value in the chart area in 1/100 mm. */
@@ -350,8 +334,6 @@ double lclCalcRelSize( double fPos, double fSize, sal_Int32 nSizeMode )
 
 } // namespace
 
-
-
 LayoutConverter::LayoutConverter( const ConverterRoot& rParent, LayoutModel& rModel ) :
     ConverterBase< LayoutModel >( rParent, rModel )
 {
@@ -430,8 +412,6 @@ bool LayoutConverter::convertFromModel( const Reference< XShape >& rxShape, doub
     return false;
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx
index b6aed1936a8d..0529849e8837 100644
--- a/oox/source/drawingml/chart/datasourcecontext.cxx
+++ b/oox/source/drawingml/chart/datasourcecontext.cxx
@@ -25,13 +25,9 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using ::oox::core::ContextHandler2Helper;
 using ::oox::core::ContextHandlerRef;
 
-
-
 DoubleSequenceContext::DoubleSequenceContext( ContextHandler2Helper& rParent, DataSequenceModel& rModel ) :
     DataSequenceContextBase( rParent, rModel ),
     mnPtIndex( -1 )
@@ -108,8 +104,6 @@ void DoubleSequenceContext::onCharacters( const OUString& rChars )
     }
 }
 
-
-
 StringSequenceContext::StringSequenceContext( ContextHandler2Helper& rParent, DataSequenceModel& rModel )
     : DataSequenceContextBase( rParent, rModel )
     , mnPtIndex(-1)
@@ -179,8 +173,6 @@ void StringSequenceContext::onCharacters( const OUString& rChars )
     }
 }
 
-
-
 DataSourceContext::DataSourceContext( ContextHandler2Helper& rParent, DataSourceModel& rModel ) :
     ContextBase< DataSourceModel >( rParent, rModel )
 {
@@ -228,8 +220,6 @@ ContextHandlerRef DataSourceContext::onCreateContext( sal_Int32 nElement, const
     return 0;
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/datasourceconverter.cxx b/oox/source/drawingml/chart/datasourceconverter.cxx
index 93166fbfd8be..40e536b71b27 100644
--- a/oox/source/drawingml/chart/datasourceconverter.cxx
+++ b/oox/source/drawingml/chart/datasourceconverter.cxx
@@ -28,13 +28,9 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using namespace ::com::sun::star::chart2::data;
 using namespace ::com::sun::star::uno;
 
-
-
 DataSequenceConverter::DataSequenceConverter( const ConverterRoot& rParent, DataSequenceModel& rModel ) :
     ConverterBase< DataSequenceModel >( rParent, rModel )
 {
@@ -87,8 +83,6 @@ Reference< XDataSequence > DataSequenceConverter::createDataSequence( const OUSt
     return xDataSeq;
 }
 
-
-
 DataSourceConverter::DataSourceConverter( const ConverterRoot& rParent, DataSourceModel& rModel ) :
     ConverterBase< DataSourceModel >( rParent, rModel )
 {
@@ -109,8 +103,6 @@ Reference< XDataSequence > DataSourceConverter::createDataSequence( const OUStri
     return xDataSeq;
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/datasourcemodel.cxx b/oox/source/drawingml/chart/datasourcemodel.cxx
index 190cce2e785f..5d56bddb538f 100644
--- a/oox/source/drawingml/chart/datasourcemodel.cxx
+++ b/oox/source/drawingml/chart/datasourcemodel.cxx
@@ -23,8 +23,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 DataSequenceModel::DataSequenceModel() :
     mnPointCount( -1 )
 {
@@ -34,8 +32,6 @@ DataSequenceModel::~DataSequenceModel()
 {
 }
 
-
-
 DataSourceModel::DataSourceModel()
 {
 }
@@ -44,8 +40,6 @@ DataSourceModel::~DataSourceModel()
 {
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/modelbase.cxx b/oox/source/drawingml/chart/modelbase.cxx
index d1e87ebb7830..d3e6961aa1b3 100644
--- a/oox/source/drawingml/chart/modelbase.cxx
+++ b/oox/source/drawingml/chart/modelbase.cxx
@@ -25,7 +25,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
 NumberFormat::NumberFormat() :
     mbSourceLinked( true )
 {
@@ -38,8 +37,6 @@ void NumberFormat::setAttributes( const AttributeList& rAttribs )
     mbSourceLinked = rAttribs.getBool( XML_sourceLinked, false );
 }
 
-
-
 LayoutModel::LayoutModel() :
     mfX( 0.0 ),
     mfY( 0.0 ),
@@ -58,8 +55,6 @@ LayoutModel::~LayoutModel()
 {
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index bfcd5f2eeb15..b3787dc06c4c 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -37,8 +37,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using namespace ::com::sun::star::chart2;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::graphic;
@@ -48,8 +46,6 @@ using namespace ::com::sun::star::util;
 
 using ::oox::core::XmlFilterBase;
 
-
-
 namespace {
 
 struct AutoFormatPatternEntry
@@ -116,8 +112,6 @@ static const AutoFormatPatternEntry spAutoFormatPattern4[] =
 #undef AUTOFORMAT_PATTERN_COLORMOD
 #undef AUTOFORMAT_PATTERN_END
 
-
-
 struct AutoFormatEntry
 {
     sal_Int32           mnFirstStyleIdx;    /// First chart style index.
@@ -409,8 +403,6 @@ const AutoFormatEntry* lclGetAutoFormatEntry( const AutoFormatEntry* pEntries, s
     return 0;
 }
 
-
-
 struct AutoTextEntry
 {
     sal_Int32           mnFirstStyleIdx;    /// First chart style index.
@@ -460,8 +452,6 @@ const AutoTextEntry* lclGetAutoTextEntry( const AutoTextEntry* pEntries, sal_Int
     return 0;
 }
 
-
-
 /** Property identifiers for common chart objects, to be used in ShapePropertyInfo. */
 static const sal_Int32 spnCommonPropIds[] =
 {
@@ -520,8 +510,6 @@ static const ShapePropertyInfo saLinearPropInfo( spnLinearPropIds, false, true,
 /** Property info for filled data series, to be used in ShapePropertyMap. */
 static const ShapePropertyInfo saFilledPropInfo( spnFilledPropIds, false, true, true, true );
 
-
-
 /** Contains information about formatting of a specific chart object type. */
 struct ObjectTypeFormatEntry
 {
@@ -574,8 +562,6 @@ static const ObjectTypeFormatEntry spObjTypeFormatEntries[] =
 #undef TYPEFORMAT_FRAME
 #undef TYPEFORMAT_LINE
 
-
-
 void lclConvertPictureOptions( FillProperties& orFillProps, const PictureOptionsModel& rPicOptions )
 {
     bool bStacked = (rPicOptions.mnPictureFormat == XML_stack) || (rPicOptions.mnPictureFormat == XML_stackScale);
@@ -584,12 +570,8 @@ void lclConvertPictureOptions( FillProperties& orFillProps, const PictureOptions
 
 } // namespace
 
-
-
 struct ObjectFormatterData;
 
-
-
 class DetailFormatterBase
 {
 public:
@@ -616,8 +598,6 @@ protected:
     ColorPatternVec     maColorPattern;     /// Different cycling colors for data series.
 };
 
-
-
 class LineFormatter : public DetailFormatterBase
 {
 public:
@@ -635,8 +615,6 @@ private:
     LinePropertiesPtr   mxAutoLine;         /// Automatic line properties.
 };
 
-
-
 class FillFormatter : public DetailFormatterBase
 {
 public:
@@ -655,8 +633,6 @@ private:
     FillPropertiesPtr   mxAutoFill;         /// Automatic fill properties.
 };
 
-
-
 class EffectFormatter : public DetailFormatterBase
 {
 public:
@@ -671,8 +647,6 @@ public:
                             sal_Int32 nSeriesIdx ) const;
 };
 
-
-
 class TextFormatter : public DetailFormatterBase
 {
 public:
@@ -694,8 +668,6 @@ private:
     TextCharacterPropertiesPtr mxAutoText;  /// Automatic text properties.
 };
 
-
-
 /** Formatter for a specific object type. */
 class ObjectTypeFormatter
 {
@@ -742,8 +714,6 @@ private:
     const ObjectTypeFormatEntry& mrEntry;   /// Additional settings.
 };
 
-
-
 struct ObjectFormatterData
 {
     typedef RefMap< ObjectType, ObjectTypeFormatter > ObjectTypeFormatterMap;
@@ -765,8 +735,6 @@ struct ObjectFormatterData
     ObjectTypeFormatter* getTypeFormatter( ObjectType eObjType );
 };
 
-
-
 DetailFormatterBase::DetailFormatterBase( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry ) :
     mrData( rData ),
     mnPhClr( -1 )
@@ -857,8 +825,6 @@ sal_Int32 DetailFormatterBase::getSchemeColor( sal_Int32 nColorToken, sal_Int32
     return aColor.getColor( mrData.mrFilter.getGraphicHelper() );
 }
 
-
-
 LineFormatter::LineFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry ) :
     DetailFormatterBase( rData, pAutoFormatEntry )
 {
@@ -885,8 +851,6 @@ void LineFormatter::convertFormatting( ShapePropertyMap& rPropMap, const ModelRe
     aLineProps.pushToPropMap( rPropMap, mrData.mrFilter.getGraphicHelper(), getPhColor( nSeriesIdx ) );
 }
 
-
-
 FillFormatter::FillFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry ) :
     DetailFormatterBase( rData, pAutoFormatEntry )
 {
@@ -911,8 +875,6 @@ void FillFormatter::convertFormatting( ShapePropertyMap& rPropMap, const ModelRe
     aFillProps.pushToPropMap( rPropMap, mrData.mrFilter.getGraphicHelper(), 0, getPhColor( nSeriesIdx ) );
 }
 
-
-
 EffectFormatter::EffectFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry ) :
     DetailFormatterBase( rData, pAutoFormatEntry )
 {
@@ -922,8 +884,6 @@ void EffectFormatter::convertFormatting( ShapePropertyMap& /*rPropMap*/, const M
 {
 }
 
-
-
 namespace {
 
 const TextCharacterProperties* lclGetTextProperties( const ModelRef< TextBody >& rxTextProp )
@@ -973,8 +933,6 @@ void TextFormatter::convertFormatting( PropertySet& rPropSet, const ModelRef< Te
     convertFormatting( rPropSet, lclGetTextProperties( rxTextProp ) );
 }
 
-
-
 ObjectTypeFormatter::ObjectTypeFormatter( ObjectFormatterData& rData, const ObjectTypeFormatEntry& rEntry, const ChartSpaceModel& rChartSpace ) :
     maLineFormatter(   rData, lclGetAutoFormatEntry( rEntry.mpAutoLines,   rChartSpace.mnStyle ) ),
     maFillFormatter(   rData, lclGetAutoFormatEntry( rEntry.mpAutoFills,   rChartSpace.mnStyle ) ),
@@ -1020,8 +978,6 @@ void ObjectTypeFormatter::convertAutomaticFill( PropertySet& rPropSet, sal_Int32
     rPropSet.setProperties( aPropMap );
 }
 
-
-
 ObjectFormatterData::ObjectFormatterData( const XmlFilterBase& rFilter, const Reference< XChartDocument >& rxChartDoc, const ChartSpaceModel& rChartSpace ) :
     mrFilter( rFilter ),
     maModelObjHelper( Reference< XMultiServiceFactory >( rxChartDoc, UNO_QUERY ) ),
@@ -1050,8 +1006,6 @@ ObjectTypeFormatter* ObjectFormatterData::getTypeFormatter( ObjectType eObjType
     return maTypeFormatters.get( eObjType ).get();
 }
 
-
-
 ObjectFormatter::ObjectFormatter( const XmlFilterBase& rFilter, const Reference< XChartDocument >& rxChartDoc, const ChartSpaceModel& rChartSpace ) :
     mxData( new ObjectFormatterData( rFilter, rxChartDoc, rChartSpace ) )
 {
@@ -1162,8 +1116,6 @@ bool ObjectFormatter::isAutomaticFill( const ModelRef< Shape >& rxShapeProp )
     return !rxShapeProp || !rxShapeProp->getFillProperties().moFillType.has();
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/plotareacontext.cxx b/oox/source/drawingml/chart/plotareacontext.cxx
index 184bad7ce033..96b082b0181f 100644
--- a/oox/source/drawingml/chart/plotareacontext.cxx
+++ b/oox/source/drawingml/chart/plotareacontext.cxx
@@ -30,13 +30,9 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using ::oox::core::ContextHandler2Helper;
 using ::oox::core::ContextHandlerRef;
 
-
-
 View3DContext::View3DContext( ContextHandler2Helper& rParent, View3DModel& rModel ) :
     ContextBase< View3DModel >( rParent, rModel )
 {
@@ -80,8 +76,6 @@ ContextHandlerRef View3DContext::onCreateContext( sal_Int32 nElement, const Attr
     return 0;
 }
 
-
-
 WallFloorContext::WallFloorContext( ContextHandler2Helper& rParent, WallFloorModel& rModel ) :
     ContextBase< WallFloorModel >( rParent, rModel )
 {
@@ -110,9 +104,6 @@ ContextHandlerRef WallFloorContext::onCreateContext( sal_Int32 nElement, const A
     return 0;
 }
 
-
-
-
 DataTableContext::DataTableContext( ContextHandler2Helper& rParent, DataTableModel& rModel ) :
     ContextBase< DataTableModel >( rParent, rModel )
 {
@@ -144,9 +135,6 @@ ContextHandlerRef DataTableContext::onCreateContext( sal_Int32 nElement, const A
     return 0;
 }
 
-
-
-
 PlotAreaContext::PlotAreaContext( ContextHandler2Helper& rParent, PlotAreaModel& rModel ) :
     ContextBase< PlotAreaModel >( rParent, rModel )
 {
@@ -209,8 +197,6 @@ ContextHandlerRef PlotAreaContext::onCreateContext( sal_Int32 nElement, const At
     return 0;
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx
index b405a9c5916d..257f6e0710a1 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -35,14 +35,10 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 using namespace ::com::sun::star::uno;
 
-
-
 namespace {
 
 /** Axes set model. This is a helper for the plot area converter collecting all
@@ -59,8 +55,6 @@ struct AxesSetModel
     inline              ~AxesSetModel() {}
 };
 
-
-
 /** Axes set converter. This is a helper class for the plot area converter. */
 class AxesSetConverter : public ConverterBase< AxesSetModel >
 {
@@ -92,8 +86,6 @@ private:
     bool                mbPieChart;
 };
 
-
-
 AxesSetConverter::AxesSetConverter( const ConverterRoot& rParent, AxesSetModel& rModel ) :
     ConverterBase< AxesSetModel >( rParent, rModel ),
     mb3dChart( false ),
@@ -194,8 +186,6 @@ void AxesSetConverter::convertFromModel( const Reference< XDiagram >& rxDiagram,
 
 } // namespace
 
-
-
 View3DConverter::View3DConverter( const ConverterRoot& rParent, View3DModel& rModel ) :
     ConverterBase< View3DModel >( rParent, rModel )
 {
@@ -270,8 +260,6 @@ void View3DConverter::convertFromModel( const Reference< XDiagram >& rxDiagram,
     aPropSet.setProperty( PROP_D3DSceneLightDirection2, cssd::Direction3D( 0.2, 0.4, 1.0 ) );
 }
 
-
-
 WallFloorConverter::WallFloorConverter( const ConverterRoot& rParent, WallFloorModel& rModel ) :
     ConverterBase< WallFloorModel >( rParent, rModel )
 {
@@ -297,8 +285,6 @@ void WallFloorConverter::convertFromModel( const Reference< XDiagram >& rxDiagra
     }
 }
 
-
-
 DataTableConverter::DataTableConverter( const ConverterRoot& rParent, DataTableModel& rModel ) :
         ConverterBase< DataTableModel >( rParent, rModel )
 {
@@ -319,8 +305,6 @@ void DataTableConverter::convertFromModel( const Reference< XDiagram >& rxDiagra
         aPropSet.setProperty( PROP_DataTableOutline, mrModel.mbShowOutline );
 }
 
-
-
 PlotAreaConverter::PlotAreaConverter( const ConverterRoot& rParent, PlotAreaModel& rModel ) :
     ConverterBase< PlotAreaModel >( rParent, rModel ),
     mb3dChart( false ),
@@ -459,8 +443,6 @@ void PlotAreaConverter::convertPositionFromModel()
     }
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/plotareamodel.cxx b/oox/source/drawingml/chart/plotareamodel.cxx
index 1bcdd3ddcc98..4c199107c702 100644
--- a/oox/source/drawingml/chart/plotareamodel.cxx
+++ b/oox/source/drawingml/chart/plotareamodel.cxx
@@ -23,8 +23,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 View3DModel::View3DModel() :
     mnDepthPercent( 100 ),
     mnPerspective( 30 ),
@@ -36,8 +34,6 @@ View3DModel::~View3DModel()
 {
 }
 
-
-
 WallFloorModel::WallFloorModel()
 {
 }
@@ -46,8 +42,6 @@ WallFloorModel::~WallFloorModel()
 {
 }
 
-
-
 DataTableModel::DataTableModel() :
         mbShowHBorder(false),
         mbShowVBorder(false),
@@ -59,8 +53,6 @@ DataTableModel::~DataTableModel()
 {
 }
 
-
-
 PlotAreaModel::PlotAreaModel()
 {
 }
@@ -69,8 +61,6 @@ PlotAreaModel::~PlotAreaModel()
 {
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx
index fde29520cb1e..5070f26df9c8 100644
--- a/oox/source/drawingml/chart/seriescontext.cxx
+++ b/oox/source/drawingml/chart/seriescontext.cxx
@@ -29,14 +29,10 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using ::oox::core::ContextHandler2;
 using ::oox::core::ContextHandler2Helper;
 using ::oox::core::ContextHandlerRef;
 
-
-
 namespace {
 
 ContextHandlerRef lclDataLabelSharedCreateContext( ContextHandler2& rContext,
@@ -91,8 +87,6 @@ void lclDataLabelSharedCharacters( ContextHandler2& rContext, const OUString& rC
 
 } // namespace
 
-
-
 DataLabelContext::DataLabelContext( ContextHandler2Helper& rParent, DataLabelModel& rModel ) :
     ContextBase< DataLabelModel >( rParent, rModel )
 {
@@ -122,8 +116,6 @@ void DataLabelContext::onCharacters( const OUString& rChars )
     lclDataLabelSharedCharacters( *this, rChars, mrModel );
 }
 
-
-
 DataLabelsContext::DataLabelsContext( ContextHandler2Helper& rParent, DataLabelsModel& rModel ) :
     ContextBase< DataLabelsModel >( rParent, rModel )
 {
@@ -154,8 +146,6 @@ void DataLabelsContext::onCharacters( const OUString& rChars )
     lclDataLabelSharedCharacters( *this, rChars, mrModel );
 }
 
-
-
 PictureOptionsContext::PictureOptionsContext( ContextHandler2Helper& rParent, PictureOptionsModel& rModel ) :
     ContextBase< PictureOptionsModel >( rParent, rModel )
 {
@@ -191,8 +181,6 @@ ContextHandlerRef PictureOptionsContext::onCreateContext( sal_Int32 nElement, co
     return 0;
 }
 
-
-
 ErrorBarContext::ErrorBarContext( ContextHandler2Helper& rParent, ErrorBarModel& rModel ) :
     ContextBase< ErrorBarModel >( rParent, rModel )
 {
@@ -232,8 +220,6 @@ ContextHandlerRef ErrorBarContext::onCreateContext( sal_Int32 nElement, const At
     return 0;
 }
 
-
-
 TrendlineLabelContext::TrendlineLabelContext( ContextHandler2Helper& rParent, TrendlineLabelModel& rModel ) :
     ContextBase< TrendlineLabelModel >( rParent, rModel )
 {
@@ -262,8 +248,6 @@ ContextHandlerRef TrendlineLabelContext::onCreateContext( sal_Int32 nElement, co
     return 0;
 }
 
-
-
 TrendlineContext::TrendlineContext( ContextHandler2Helper& rParent, TrendlineModel& rModel ) :
     ContextBase< TrendlineModel >( rParent, rModel )
 {
@@ -319,8 +303,6 @@ void TrendlineContext::onCharacters( const OUString& rChars )
         mrModel.maName = rChars;
 }
 
-
-
 DataPointContext::DataPointContext( ContextHandler2Helper& rParent, DataPointModel& rModel ) :
     ContextBase< DataPointModel >( rParent, rModel )
 {
@@ -377,8 +359,6 @@ ContextHandlerRef DataPointContext::onCreateContext( sal_Int32 nElement, const A
     return 0;
 }
 
-
-
 SeriesContextBase::SeriesContextBase( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
     ContextBase< SeriesModel >( rParent, rModel )
 {
@@ -425,8 +405,6 @@ ContextHandlerRef SeriesContextBase::onCreateContext( sal_Int32 nElement, const
     return 0;
 }
 
-
-
 AreaSeriesContext::AreaSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
     SeriesContextBase( rParent, rModel )
 {
@@ -461,8 +439,6 @@ ContextHandlerRef AreaSeriesContext::onCreateContext( sal_Int32 nElement, const
     return SeriesContextBase::onCreateContext( nElement, rAttribs );
 }
 
-
-
 BarSeriesContext::BarSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
     SeriesContextBase( rParent, rModel )
 {
@@ -507,8 +483,6 @@ ContextHandlerRef BarSeriesContext::onCreateContext( sal_Int32 nElement, const A
     return SeriesContextBase::onCreateContext( nElement, rAttribs );
 }
 
-
-
 BubbleSeriesContext::BubbleSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
     SeriesContextBase( rParent, rModel )
 {
@@ -553,8 +527,6 @@ ContextHandlerRef BubbleSeriesContext::onCreateContext( sal_Int32 nElement, cons
     return SeriesContextBase::onCreateContext( nElement, rAttribs );
 }
 
-
-
 LineSeriesContext::LineSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
     SeriesContextBase( rParent, rModel )
 {
@@ -596,8 +568,6 @@ ContextHandlerRef LineSeriesContext::onCreateContext( sal_Int32 nElement, const
     return SeriesContextBase::onCreateContext( nElement, rAttribs );
 }
 
-
-
 PieSeriesContext::PieSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
     SeriesContextBase( rParent, rModel )
 {
@@ -631,8 +601,6 @@ ContextHandlerRef PieSeriesContext::onCreateContext( sal_Int32 nElement, const A
     return SeriesContextBase::onCreateContext( nElement, rAttribs );
 }
 
-
-
 RadarSeriesContext::RadarSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
     SeriesContextBase( rParent, rModel )
 {
@@ -670,8 +638,6 @@ ContextHandlerRef RadarSeriesContext::onCreateContext( sal_Int32 nElement, const
     return SeriesContextBase::onCreateContext( nElement, rAttribs );
 }
 
-
-
 ScatterSeriesContext::ScatterSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
     SeriesContextBase( rParent, rModel )
 {
@@ -713,8 +679,6 @@ ContextHandlerRef ScatterSeriesContext::onCreateContext( sal_Int32 nElement, con
     return SeriesContextBase::onCreateContext( nElement, rAttribs );
 }
 
-
-
 SurfaceSeriesContext::SurfaceSeriesContext( ContextHandler2Helper& rParent, SeriesModel& rModel ) :
     SeriesContextBase( rParent, rModel )
 {
@@ -741,8 +705,6 @@ ContextHandlerRef SurfaceSeriesContext::onCreateContext( sal_Int32 nElement, con
     return SeriesContextBase::onCreateContext( nElement, rAttribs );
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/seriesmodel.cxx b/oox/source/drawingml/chart/seriesmodel.cxx
index fb67e2d9fd7f..6888d6e105ee 100644
--- a/oox/source/drawingml/chart/seriesmodel.cxx
+++ b/oox/source/drawingml/chart/seriesmodel.cxx
@@ -23,8 +23,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 DataLabelModelBase::DataLabelModelBase() :
     mbDeleted( false )
 {
@@ -34,8 +32,6 @@ DataLabelModelBase::~DataLabelModelBase()
 {
 }
 
-
-
 DataLabelModel::DataLabelModel() :
     mnIndex( -1 )
 {
@@ -45,8 +41,6 @@ DataLabelModel::~DataLabelModel()
 {
 }
 
-
-
 DataLabelsModel::DataLabelsModel() :
     mbShowLeaderLines( false )
 {
@@ -56,8 +50,6 @@ DataLabelsModel::~DataLabelsModel()
 {
 }
 
-
-
 PictureOptionsModel::PictureOptionsModel() :
     mfStackUnit( 1.0 ),
     mnPictureFormat( XML_stretch ),
@@ -71,8 +63,6 @@ PictureOptionsModel::~PictureOptionsModel()
 {
 }
 
-
-
 ErrorBarModel::ErrorBarModel() :
     mfValue( 0.0 ),
     mnDirection( XML_y ),
@@ -86,8 +76,6 @@ ErrorBarModel::~ErrorBarModel()
 {
 }
 
-
-
 TrendlineLabelModel::TrendlineLabelModel()
 {
 }
@@ -96,8 +84,6 @@ TrendlineLabelModel::~TrendlineLabelModel()
 {
 }
 
-
-
 TrendlineModel::TrendlineModel() :
     mnOrder( 2 ),
     mnPeriod( 2 ),
@@ -111,8 +97,6 @@ TrendlineModel::~TrendlineModel()
 {
 }
 
-
-
 DataPointModel::DataPointModel() :
     mnIndex( -1 ),
     mbInvertNeg( false )
@@ -123,8 +107,6 @@ DataPointModel::~DataPointModel()
 {
 }
 
-
-
 SeriesModel::SeriesModel() :
     mnExplosion( 0 ),
     mnIndex( -1 ),
@@ -141,8 +123,6 @@ SeriesModel::~SeriesModel()
 {
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx
index ded50ca237ce..f2760bfb1456 100644
--- a/oox/source/drawingml/chart/titlecontext.cxx
+++ b/oox/source/drawingml/chart/titlecontext.cxx
@@ -30,13 +30,9 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using ::oox::core::ContextHandler2Helper;
 using ::oox::core::ContextHandlerRef;
 
-
-
 TextContext::TextContext( ContextHandler2Helper& rParent, TextModel& rModel ) :
     ContextBase< TextModel >( rParent, rModel )
 {
@@ -79,8 +75,6 @@ void TextContext::onCharacters( const OUString& rChars )
     }
 }
 
-
-
 TitleContext::TitleContext( ContextHandler2Helper& rParent, TitleModel& rModel ) :
     ContextBase< TitleModel >( rParent, rModel )
 {
@@ -115,8 +109,6 @@ ContextHandlerRef TitleContext::onCreateContext( sal_Int32 nElement, const Attri
     return 0;
 }
 
-
-
 LegendContext::LegendContext( ContextHandler2Helper& rParent, LegendModel& rModel ) :
     ContextBase< LegendModel >( rParent, rModel )
 {
@@ -152,8 +144,6 @@ ContextHandlerRef LegendContext::onCreateContext( sal_Int32 nElement, const Attr
     return 0;
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx
index 2cf3e1279a13..13c39780aaf1 100644
--- a/oox/source/drawingml/chart/titleconverter.cxx
+++ b/oox/source/drawingml/chart/titleconverter.cxx
@@ -39,8 +39,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::chart2;
 using namespace ::com::sun::star::chart2::data;
@@ -49,8 +47,6 @@ using namespace ::com::sun::star::uno;
 
 using ::oox::core::XmlFilterBase;
 
-
-
 TextConverter::TextConverter( const ConverterRoot& rParent, TextModel& rModel ) :
     ConverterBase< TextModel >( rParent, rModel )
 {
@@ -134,8 +130,6 @@ Reference< XFormattedString > TextConverter::appendFormattedString(
     return xFmtStr;
 }
 
-
-
 TitleConverter::TitleConverter( const ConverterRoot& rParent, TitleModel& rModel ) :
     ConverterBase< TitleModel >( rParent, rModel )
 {
@@ -178,8 +172,6 @@ void TitleConverter::convertFromModel( const Reference< XTitled >& rxTitled, con
     }
 }
 
-
-
 LegendConverter::LegendConverter( const ConverterRoot& rParent, LegendModel& rModel ) :
     ConverterBase< LegendModel >( rParent, rModel )
 {
@@ -260,8 +252,6 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram )
     }
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/titlemodel.cxx b/oox/source/drawingml/chart/titlemodel.cxx
index e34e92c74423..3a903fd7c107 100644
--- a/oox/source/drawingml/chart/titlemodel.cxx
+++ b/oox/source/drawingml/chart/titlemodel.cxx
@@ -23,8 +23,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 TextModel::TextModel()
 {
 }
@@ -33,8 +31,6 @@ TextModel::~TextModel()
 {
 }
 
-
-
 TitleModel::TitleModel() :
     mbOverlay( false )
 {
@@ -44,8 +40,6 @@ TitleModel::~TitleModel()
 {
 }
 
-
-
 LegendModel::LegendModel() :
     mnPosition( XML_r ),
     mbOverlay( false )
@@ -56,8 +50,6 @@ LegendModel::~LegendModel()
 {
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
index 5127bbcac4d8..5b271e1547f5 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -42,15 +42,11 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::chart2;
 using namespace ::com::sun::star::chart2::data;
 using namespace ::com::sun::star::uno;
 
-
-
 namespace {
 
 // chart type service names
@@ -100,8 +96,6 @@ const TypeGroupInfo& lclGetTypeInfoFromTypeId( TypeId eTypeId )
 
 } // namespace
 
-
-
 UpDownBarsConverter::UpDownBarsConverter( const ConverterRoot& rParent, UpDownBarsModel& rModel ) :
     ConverterBase< UpDownBarsModel >( rParent, rModel )
 {
@@ -132,8 +126,6 @@ void UpDownBarsConverter::convertFromModel( const Reference< XChartType >& rxCha
     }
 }
 
-
-
 TypeGroupConverter::TypeGroupConverter( const ConverterRoot& rParent, TypeGroupModel& rModel ) :
     ConverterBase< TypeGroupModel >( rParent, rModel ),
     mb3dChart( false )
@@ -198,7 +190,6 @@ bool TypeGroupConverter::isPercent() const
     return maTypeInfo.mbSupportsStacking && (mrModel.mnGrouping == XML_percentStacked);
 }
 
-
 bool TypeGroupConverter::isWall3dChart() const
 {
     return mb3dChart && (maTypeInfo.meTypeCategory != TYPECATEGORY_PIE);
@@ -573,8 +564,6 @@ void TypeGroupConverter::insertDataSeries( const Reference< XChartType >& rxChar
     }
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/chart/typegroupmodel.cxx b/oox/source/drawingml/chart/typegroupmodel.cxx
index ae3e1f218f45..bc3e6d1988cc 100644
--- a/oox/source/drawingml/chart/typegroupmodel.cxx
+++ b/oox/source/drawingml/chart/typegroupmodel.cxx
@@ -23,8 +23,6 @@ namespace oox {
 namespace drawingml {
 namespace chart {
 
-
-
 UpDownBarsModel::UpDownBarsModel() :
     mnGapWidth( 150 )
 {
@@ -34,8 +32,6 @@ UpDownBarsModel::~UpDownBarsModel()
 {
 }
 
-
-
 TypeGroupModel::TypeGroupModel( sal_Int32 nTypeId ) :
     mfSplitPos( 0.0 ),
     mnBarDir( XML_col ),
@@ -67,8 +63,6 @@ TypeGroupModel::~TypeGroupModel()
 {
 }
 
-
-
 } // namespace chart
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/source/drawingml/clrscheme.cxx b/oox/source/drawingml/clrscheme.cxx
index d1018017ef4e..e4a7a8e84975 100644
--- a/oox/source/drawingml/clrscheme.cxx
+++ b/oox/source/drawingml/clrscheme.cxx
@@ -43,8 +43,6 @@ void ClrMap::setColorMap( sal_Int32 nClrToken, sal_Int32 nMappedClrToken )
     maClrMap[ nClrToken ] = nMappedClrToken;
 }
 
-
-
 ClrScheme::ClrScheme()
 {
 }
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index 0703cd07cadf..ffbca223332d 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -29,8 +29,6 @@
 namespace oox {
 namespace drawingml {
 
-
-
 namespace {
 
 /** Global storage for predefined color values used in OOXML file formats. */
@@ -44,8 +42,6 @@ struct PresetColorsPool
     explicit            PresetColorsPool();
 };
 
-
-
 PresetColorsPool::PresetColorsPool() :
     maDmlColors( static_cast< size_t >( XML_TOKEN_COUNT ), API_RGB_TRANSPARENT ),
     maVmlColors( static_cast< size_t >( XML_TOKEN_COUNT ), API_RGB_TRANSPARENT )
@@ -143,17 +139,11 @@ PresetColorsPool::PresetColorsPool() :
         maVmlColors[ static_cast< size_t >( pnEntry[ 0 ] ) ] = pnEntry[ 1 ];
 }
 
-
-
 struct StaticPresetColorsPool : public ::rtl::Static< PresetColorsPool, StaticPresetColorsPool > {};
 
-
-
 const double DEC_GAMMA          = 2.3;
 const double INC_GAMMA          = 1.0 / DEC_GAMMA;
 
-
-
 inline void lclRgbToRgbComponents( sal_Int32& ornR, sal_Int32& ornG, sal_Int32& ornB, sal_Int32 nRgb )
 {
     ornR = (nRgb >> 16) & 0xFF;
@@ -202,8 +192,6 @@ void lclOffValue( sal_Int32& ornValue, sal_Int32 nOff, sal_Int32 nMax = MAX_PERC
 
 } // namespace
 
-
-
 Color::Color() :
     meMode( COLOR_UNUSED ),
     mnC1( 0 ),
@@ -340,7 +328,6 @@ void Color::clearTransformations()
     clearTransparence();
 }
 
-
 OUString Color::getColorTransformationName( sal_Int32 nElement )
 {
     switch( nElement )
@@ -762,8 +749,6 @@ void Color::toHsl() const
     }
 }
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/drawingml/colorchoicecontext.cxx b/oox/source/drawingml/colorchoicecontext.cxx
index 1ee3129ba91c..7c38409d7f5f 100644
--- a/oox/source/drawingml/colorchoicecontext.cxx
+++ b/oox/source/drawingml/colorchoicecontext.cxx
@@ -32,8 +32,6 @@ using ::oox::core::ContextHandler;
 namespace oox {
 namespace drawingml {
 
-
-
 ColorValueContext::ColorValueContext( ContextHandler2Helper& rParent, Color& rColor ) :
     ContextHandler2( rParent ),
     mrColor( rColor )
@@ -124,8 +122,6 @@ void ColorValueContext::onStartElement( const AttributeList& rAttribs )
     return 0;
 }
 
-
-
 ColorContext::ColorContext( ContextHandler2Helper& rParent, Color& rColor ) :
     ContextHandler2( rParent ),
     mrColor( rColor )
@@ -148,8 +144,6 @@ ColorContext::ColorContext( ContextHandler2Helper& rParent, Color& rColor ) :
     return 0;
 }
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index ce730d5468f9..87d330447fa5 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -86,7 +86,6 @@ typedef boost::unordered_map< OUString, FormularCommand, OUStringHash > FormulaC
 
 static const FormulaCommandHMap* pCommandHashMap;
 
-
 OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter )
 {
     OUString aRet;
@@ -220,8 +219,6 @@ OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter )
     return aRet;
 }
 
-
-
 static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCustomShapeProperties, const OUString& rValue, bool bNoSymbols = true )
 {
     com::sun::star::drawing::EnhancedCustomShapeParameter aRet;
@@ -260,7 +257,6 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
             }
             break;
 
-
             case XML_hd10 :   // !!PASSTHROUGH INTENDED
                 nIntVal += 2; // */ h 1.0 10.0
             case XML_hd8 :    // */ h 1.0 8.0
@@ -437,7 +433,6 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
     return aRet;
 }
 
-
 // CT_GeomGuideList
 class GeomGuideListContext : public ContextHandler2
 {
@@ -635,14 +630,11 @@ ContextHandlerRef GeomGuideListContext::onCreateContext( sal_Int32 aElementToken
     return this;
 }
 
-
-
 static const OUString GetGeomGuideName( const OUString& rValue )
 {
     return rValue;
 }
 
-
 // CT_AdjPoint2D
 class AdjPoint2DContext : public ContextHandler2
 {
@@ -657,7 +649,6 @@ AdjPoint2DContext::AdjPoint2DContext( ContextHandler2Helper& rParent, const Attr
     rAdjPoint2D.Second = GetAdjCoordinate( rCustomShapeProperties, rAttribs.getString( XML_y ).get(), true );
 }
 
-
 // CT_XYAdjustHandle
 class XYAdjustHandleContext : public ContextHandler2
 {
@@ -709,7 +700,6 @@ ContextHandlerRef XYAdjustHandleContext::onCreateContext( sal_Int32 aElementToke
     return 0;
 }
 
-
 // CT_PolarAdjustHandle
 class PolarAdjustHandleContext : public ContextHandler2
 {
@@ -761,7 +751,6 @@ ContextHandlerRef PolarAdjustHandleContext::onCreateContext( sal_Int32 aElementT
     return 0;
 }
 
-
 // CT_AdjustHandleList
 class AdjustHandleListContext : public ContextHandler2
 {
@@ -798,7 +787,6 @@ ContextHandlerRef AdjustHandleListContext::onCreateContext( sal_Int32 aElementTo
     return 0;
 }
 
-
 // CT_ConnectionSite
 class ConnectionSiteContext : public ContextHandler2
 {
@@ -826,7 +814,6 @@ ContextHandlerRef ConnectionSiteContext::onCreateContext( sal_Int32 aElementToke
     return 0;
 }
 
-
 // CT_Path2DMoveTo
 class Path2DMoveToContext : public ContextHandler2
 {
@@ -853,7 +840,6 @@ ContextHandlerRef Path2DMoveToContext::onCreateContext( sal_Int32 aElementToken,
     return 0;
 }
 
-
 // CT_Path2DLineTo
 class Path2DLineToContext : public ContextHandler2
 {
@@ -880,7 +866,6 @@ ContextHandlerRef Path2DLineToContext::onCreateContext( sal_Int32 aElementToken,
     return 0;
 }
 
-
 // CT_Path2DQuadBezierTo
 class Path2DQuadBezierToContext : public ContextHandler2
 {
@@ -914,7 +899,6 @@ ContextHandlerRef Path2DQuadBezierToContext::onCreateContext( sal_Int32 aElement
     return 0;
 }
 
-
 // CT_Path2DCubicBezierTo
 class Path2DCubicBezierToContext : public ContextHandler2
 {
@@ -952,7 +936,6 @@ ContextHandlerRef Path2DCubicBezierToContext::onCreateContext( sal_Int32 aElemen
     return 0;
 }
 
-
 // CT_Path2DContext
 class Path2DContext : public ContextHandler2
 {
@@ -1151,7 +1134,6 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken,
     return 0;
 }
 
-
 // CT_Path2DList
 class Path2DListContext : public ContextHandler2
 {
@@ -1188,7 +1170,6 @@ ContextHandlerRef Path2DListContext::onCreateContext( sal_Int32 aElementToken, c
     return 0;
 }
 
-
 // CT_CustomGeometry2D
 CustomShapeGeometryContext::CustomShapeGeometryContext( ContextHandler2Helper& rParent, const AttributeList& /* rAttribs */, CustomShapeProperties& rCustomShapeProperties )
 : ContextHandler2( rParent )
@@ -1232,7 +1213,6 @@ ContextHandlerRef CustomShapeGeometryContext::onCreateContext( sal_Int32 aElemen
     return 0;
 }
 
-
 // CT_PresetGeometry2D
 PresetShapeGeometryContext::PresetShapeGeometryContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties )
 : ContextHandler2( rParent )
@@ -1251,7 +1231,6 @@ ContextHandlerRef PresetShapeGeometryContext::onCreateContext( sal_Int32 aElemen
         return this;
 }
 
-
 // CT_PresetTextShape
 PresetTextShapeContext::PresetTextShapeContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties )
 : ContextHandler2( rParent )
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 81171a37fc74..5dcc12202bf1 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -109,7 +109,6 @@ static OUString GetConnectorShapeType( sal_Int32 nType )
     return sType;
 }
 
-
 void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFilterBase */,
     const Reference < XPropertySet >& xPropSet, const Reference < XShape > & xShape, const awt::Size &aSize )
 {
diff --git a/oox/source/drawingml/diagram/constraintlistcontext.cxx b/oox/source/drawingml/diagram/constraintlistcontext.cxx
index b93ac3d09582..04b14fb5c285 100644
--- a/oox/source/drawingml/diagram/constraintlistcontext.cxx
+++ b/oox/source/drawingml/diagram/constraintlistcontext.cxx
@@ -36,7 +36,6 @@ ConstraintListContext::ConstraintListContext( ContextHandler2Helper& rParent,
     OSL_ENSURE( pNode, "Node must NOT be NULL" );
 }
 
-
 ConstraintListContext::~ConstraintListContext()
 {
 }
@@ -72,7 +71,6 @@ ConstraintListContext::onCreateContext( ::sal_Int32 aElement,
     return this;
 }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx
index dba149e018e6..ef8f9e4ab9cd 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.cxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.cxx
@@ -76,7 +76,6 @@ private:
     dgm::Connections& mrConnection;
 };
 
-
 // CT_presLayoutVars
 class PresLayoutVarsContext
     : public ContextHandler2
@@ -130,7 +129,6 @@ private:
     dgm::Point& mrPoint;
 };
 
-
 // CT_prSet
 class PropertiesContext
     : public ContextHandler2
@@ -197,7 +195,6 @@ private:
     dgm::Point& mrPoint;
 };
 
-
 // CL_Pt
 class PtContext
     : public ContextHandler2
@@ -220,7 +217,6 @@ public:
             mrPoint.msCnxId = rAttribs.getString( XML_cxnId ).get();
     }
 
-
     virtual ContextHandlerRef
     onCreateContext( sal_Int32 aElementToken,
                      const AttributeList& rAttribs ) SAL_OVERRIDE
@@ -256,8 +252,6 @@ private:
     dgm::Point& mrPoint;
 };
 
-
-
 // CT_PtList
 class PtListContext
     : public ContextHandler2
@@ -330,8 +324,6 @@ private:
     DiagramDataPtr mpDataModel;
 };
 
-
-
 DataModelContext::DataModelContext( ContextHandler2Helper& rParent,
                                     const DiagramDataPtr & pDataModel )
     : ContextHandler2( rParent )
@@ -340,7 +332,6 @@ DataModelContext::DataModelContext( ContextHandler2Helper& rParent,
     OSL_ENSURE( pDataModel, "Data Model must not be NULL" );
 }
 
-
 DataModelContext::~DataModelContext()
 {
     // some debug
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index a4ad2798a309..9f29bd68ed07 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <functional>
 #include <boost/bind.hpp>
 
@@ -86,13 +85,11 @@ void DiagramData::dump()
                   boost::bind( &dgm::Point::dump, _1 ) );
 }
 
-
 void Diagram::setData( const DiagramDataPtr & pData)
 {
     mpData = pData;
 }
 
-
 void Diagram::setLayout( const DiagramLayoutPtr & pLayout)
 {
     mpLayout = pLayout;
@@ -143,12 +140,10 @@ static sal_Int32 calcDepth( const OUString& rNodeName,
     return 0;
 }
 
-
 void Diagram::build(  )
 {
     // build name-object maps
 
-
 #if OSL_DEBUG_LEVEL > 1
     std::ofstream output("/tmp/tree.dot");
 
@@ -423,7 +418,6 @@ void loadDiagram( ShapePtr& pShape,
         pDiagram->getDataRelsMap() = pShape->resolveRelationshipsOfTypeFromOfficeDoc( rFilter,
                 xRefDataModel->getFragmentPath(), "image" );
 
-
         // Pass the info to pShape
         for( ::std::vector<OUString>::const_iterator aIt = pData->getExtDrawings().begin(), aEnd = pData->getExtDrawings().end();
                 aIt != aEnd; ++aIt )
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index 1218187d1474..2b811f91f408 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -65,7 +65,6 @@ struct Connection
 
 typedef std::vector< Connection > Connections;
 
-
 /** A point
  */
 struct Point
@@ -152,13 +151,9 @@ typedef std::vector< Point >        Points;
 class LayoutNode;
 typedef boost::shared_ptr< LayoutNode > LayoutNodePtr;
 
-
-
 typedef std::map< OUString, css::uno::Reference<css::xml::dom::XDocument> > DiagramDomMap;
 typedef css::uno::Sequence< css::uno::Sequence< css::uno::Any > > DiagramRelsMap;
 
-
-
 class DiagramData
 {
 public:
@@ -200,10 +195,6 @@ private:
 
 typedef boost::shared_ptr< DiagramData > DiagramDataPtr;
 
-
-
-
-
 class DiagramLayout
 {
 public:
@@ -250,8 +241,6 @@ private:
 
 typedef boost::shared_ptr< DiagramLayout > DiagramLayoutPtr;
 
-
-
 struct DiagramStyle
 {
     ShapeStyleRef maFillStyle;
@@ -274,8 +263,6 @@ struct DiagramColor
 
 typedef std::map<OUString,DiagramColor> DiagramColorMap;
 
-
-
 class Diagram
 {
 public:
@@ -310,7 +297,6 @@ private:
     DiagramRelsMap                 maDataRelsMap;
 };
 
-
 typedef boost::shared_ptr< Diagram > DiagramPtr;
 
 } }
diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
index d5d5411bb0a0..cd304b93d81c 100644
--- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
+++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
@@ -27,7 +27,6 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace drawingml {
 
-
 // CT_DiagramDefinition
 DiagramDefinitionContext::DiagramDefinitionContext( ContextHandler2Helper& rParent,
                                                     const AttributeList& rAttributes,
@@ -46,7 +45,6 @@ DiagramDefinitionContext::DiagramDefinitionContext( ContextHandler2Helper& rPare
     mpLayout->setUniqueId( rAttributes.getString( XML_uniqueId ).get() );
 }
 
-
 DiagramDefinitionContext::~DiagramDefinitionContext()
 {
     mpLayout->getNode()->dump(0);
@@ -92,7 +90,6 @@ DiagramDefinitionContext::onCreateContext( ::sal_Int32 aElement,
     return this;
 }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
index 7c132340340e..59b183634e97 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx
@@ -50,7 +50,6 @@ void SAL_CALL DiagramDataFragmentHandler::endDocument()
 
 }
 
-
 ContextHandlerRef
 DiagramDataFragmentHandler::onCreateContext( ::sal_Int32 aElement,
                                              const AttributeList& )
@@ -66,8 +65,6 @@ DiagramDataFragmentHandler::onCreateContext( ::sal_Int32 aElement,
     return this;
 }
 
-
-
 DiagramLayoutFragmentHandler::DiagramLayoutFragmentHandler( XmlFilterBase& rFilter,
                                                         const OUString& rFragmentPath,
                                                         const DiagramLayoutPtr pDataPtr )
@@ -88,7 +85,6 @@ void SAL_CALL DiagramLayoutFragmentHandler::endDocument()
 
 }
 
-
 ContextHandlerRef
 DiagramLayoutFragmentHandler::onCreateContext( ::sal_Int32 aElement,
                                                const AttributeList& rAttribs )
@@ -104,8 +100,6 @@ DiagramLayoutFragmentHandler::onCreateContext( ::sal_Int32 aElement,
     return this;
 }
 
-
-
 DiagramQStylesFragmentHandler::DiagramQStylesFragmentHandler( XmlFilterBase& rFilter,
                                                               const OUString& rFragmentPath,
                                                               DiagramQStyleMap& rStylesMap ) :
@@ -163,7 +157,6 @@ DiagramQStylesFragmentHandler::DiagramQStylesFragmentHandler( XmlFilterBase& rFi
     return 0;
 }
 
-
 void DiagramQStylesFragmentHandler::onStartElement( const AttributeList& rAttribs )
 {
     if( getCurrentElement() == DGM_TOKEN( styleLbl ) )
@@ -173,8 +166,6 @@ void DiagramQStylesFragmentHandler::onStartElement( const AttributeList& rAttrib
     }
 }
 
-
-
 void DiagramQStylesFragmentHandler::onEndElement( )
 {
     if( getCurrentElement() == DGM_TOKEN(styleLbl) )
@@ -231,7 +222,6 @@ ColorFragmentHandler::ColorFragmentHandler( ::oox::core::XmlFilterBase& rFilter,
     return 0;
 }
 
-
 void ColorFragmentHandler::onStartElement( const AttributeList& rAttribs )
 {
     if( getCurrentElement() == DGM_TOKEN(styleLbl) )
@@ -247,7 +237,6 @@ void ColorFragmentHandler::onEndElement( )
         mrColorsMap[maColorName] = maColorEntry;
 }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
index 6c2ffd6183b9..9d38870fcacf 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
@@ -25,7 +25,6 @@
 
 namespace oox { namespace drawingml {
 
-
 class DiagramDataFragmentHandler : public ::oox::core::FragmentHandler2
 {
 public:
@@ -40,8 +39,6 @@ private:
     DiagramDataPtr	mpDataPtr;
 };
 
-
-
 class DiagramLayoutFragmentHandler : public ::oox::core::FragmentHandler2
 {
 public:
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index ba1f8574961e..f1692ec30fb0 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -40,7 +40,6 @@ using namespace ::oox::core;
 
 namespace oox { namespace drawingml {
 
-
 IteratorAttr::IteratorAttr( )
     : mnAxis( 0 )
     , mnCnt( -1 )
@@ -62,8 +61,6 @@ void IteratorAttr::loadFromXAttr( const Reference< XFastAttributeList >& xAttr )
     mnStep = attr.getInteger( XML_step, 1 );
 }
 
-
-
 ConditionAttr::ConditionAttr()
     : mnFunc( 0 )
     , mnArg( 0 )
@@ -72,7 +69,6 @@ ConditionAttr::ConditionAttr()
 
 }
 
-
 void ConditionAttr::loadFromXAttr( const Reference< XFastAttributeList >& xAttr )
 {
     mnFunc = xAttr->getOptionalValueToken( XML_func, 0 );
@@ -82,7 +78,6 @@ void ConditionAttr::loadFromXAttr( const Reference< XFastAttributeList >& xAttr
     msVal = xAttr->getOptionalValue( XML_val );
 }
 
-
 void LayoutAtom::dump(int level)
 {
     OSL_TRACE( "level = %d - %s of type %s", level,
@@ -93,7 +88,6 @@ void LayoutAtom::dump(int level)
                    boost::bind( &LayoutAtom::dump, _1, level + 1 ) );
 }
 
-
 ForEachAtom::ForEachAtom(const Reference< XFastAttributeList >& xAttributes)
 {
     maIter.loadFromXAttr(xAttributes);
@@ -506,11 +500,8 @@ bool LayoutNode::setupShape( const ShapePtr& rShape, const Diagram& rDgm, sal_uI
     return false;
 }
 
-
-
 // Visitation
 
-
 class ShapeLayoutingVisitor : public LayoutAtomVisitor
 {
     ShapePtr mpParentShape;
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index ade9bde96bdd..6d57510d090c 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -32,7 +32,6 @@
 #include "oox/drawingml/shape.hxx"
 #include "diagram.hxx"
 
-
 namespace oox { namespace drawingml {
 
 class DiagramLayout;
@@ -194,7 +193,6 @@ private:
 
 typedef boost::shared_ptr< ForEachAtom > ForEachAtomPtr;
 
-
 class ConditionAtom
     : public LayoutAtom
 {
@@ -221,7 +219,6 @@ private:
 
 typedef boost::shared_ptr< ConditionAtom > ConditionAtomPtr;
 
-
 /** "choose" statements. Atoms will be tested in order. */
 class ChooseAtom
     : public LayoutAtom
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index 10de2df161e7..1d092dc663a9 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -43,8 +43,6 @@ public:
     {}
 };
 
-
-
 class AlgorithmContext
     : public ContextHandler2
 {
@@ -84,7 +82,6 @@ private:
     AlgAtomPtr mpNode;
 };
 
-
 class ChooseContext
     : public ContextHandler2
 {
@@ -135,9 +132,6 @@ private:
     ConditionAtomPtr mpConditionNode;
 };
 
-
-
-
 class ForEachContext
     : public LayoutNodeContext
 {
@@ -150,7 +144,6 @@ public:
         }
 };
 
-
 // CT_LayoutVariablePropertySet
 class LayoutVariablePropertySetContext
     : public ContextHandler2
@@ -181,7 +174,6 @@ private:
     LayoutNode::VarMap & mVariables;
 };
 
-
 // CT_LayoutNode
 LayoutNodeContext::LayoutNodeContext( ContextHandler2Helper& rParent,
                                       const AttributeList& rAttribs,
@@ -193,7 +185,6 @@ LayoutNodeContext::LayoutNodeContext( ContextHandler2Helper& rParent,
     mpNode->setName( rAttribs.getString( XML_name ).get() );
 }
 
-
 LayoutNodeContext::~LayoutNodeContext()
 {
 }
@@ -240,7 +231,6 @@ sal_Int32 LayoutNodeContext::tagToVarIdx( sal_Int32 aTag )
     return nIdx;
 }
 
-
 ContextHandlerRef
 LayoutNodeContext::onCreateContext( ::sal_Int32 aElement,
                                     const AttributeList& rAttribs )
@@ -346,7 +336,6 @@ LayoutNodeContext::onCreateContext( ::sal_Int32 aElement,
     return this;
 }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx
index b3c646eb2dcb..c2fb438ba2e9 100644
--- a/oox/source/drawingml/drawingmltypes.cxx
+++ b/oox/source/drawingml/drawingmltypes.cxx
@@ -35,8 +35,6 @@ using namespace ::com::sun::star::style;
 namespace oox {
 namespace drawingml {
 
-
-
 /** converts EMUs into 1/100th mmm */
 sal_Int32 GetCoordinate( sal_Int32 nValue )
 {
@@ -68,16 +66,12 @@ double GetPositiveFixedPercentage( const OUString& sValue )
     return fPercent;
 }
 
-
-
 /** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */
 awt::Point GetPointPercent( const Reference< XFastAttributeList >& xAttribs )
 {
     return awt::Point( GetPercent( xAttribs->getOptionalValue( XML_x ) ), GetCoordinate( xAttribs->getOptionalValue( XML_y ) ) );
 }
 
-
-
 /** converts the ST_TextFontSize to point */
 float GetTextSize( const OUString& sValue )
 {
@@ -88,7 +82,6 @@ float GetTextSize( const OUString& sValue )
     return fRet;
 }
 
-
 /** converts the ST_TextSpacingPoint to 1/100mm */
 sal_Int32 GetTextSpacingPoint( const OUString& sValue )
 {
@@ -383,8 +376,6 @@ IntegerRectangle2D GetRelativeRect( const Reference< XFastAttributeList >& xAttr
     return r;
 }
 
-
-
 /** converts the attributes from an CT_Size2D into an awt Size with 1/100thmm */
 awt::Size GetSize2D( const Reference< XFastAttributeList >& xAttribs )
 {
@@ -399,8 +390,6 @@ IndexRange GetIndexRange( const Reference< XFastAttributeList >& xAttributes )
     return range;
 }
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/drawingml/effectproperties.cxx b/oox/source/drawingml/effectproperties.cxx
index f195932aed5a..da94669561ab 100644
--- a/oox/source/drawingml/effectproperties.cxx
+++ b/oox/source/drawingml/effectproperties.cxx
@@ -18,8 +18,6 @@
 namespace oox {
 namespace drawingml {
 
-
-
 void EffectShadowProperties::assignUsed(const EffectShadowProperties& rSourceProps)
 {
     moShadowDist.assignIfUsed( rSourceProps.moShadowDist );
@@ -84,8 +82,6 @@ css::beans::PropertyValue Effect::getEffect()
     return pRet;
 }
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/drawingml/effectproperties.hxx b/oox/source/drawingml/effectproperties.hxx
index 0b3527ec5f85..dae858c82db4 100644
--- a/oox/source/drawingml/effectproperties.hxx
+++ b/oox/source/drawingml/effectproperties.hxx
@@ -17,8 +17,6 @@
 namespace oox {
 namespace drawingml {
 
-
-
 struct EffectShadowProperties
 {
     OptValue< sal_Int64 > moShadowDist;
@@ -30,8 +28,6 @@ struct EffectShadowProperties
     void                assignUsed( const EffectShadowProperties& rSourceProps );
 };
 
-
-
 struct Effect
 {
     OUString msName;
@@ -41,8 +37,6 @@ struct Effect
     css::beans::PropertyValue getEffect();
 };
 
-
-
 struct EffectProperties
 {
     EffectShadowProperties maShadow;
@@ -59,8 +53,6 @@ struct EffectProperties
                             const GraphicHelper& rGraphicHelper ) const;
 };
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx
index e803644fb16d..c99d364c83c6 100644
--- a/oox/source/drawingml/effectpropertiescontext.cxx
+++ b/oox/source/drawingml/effectpropertiescontext.cxx
@@ -21,7 +21,6 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace drawingml {
 
-
 EffectPropertiesContext::EffectPropertiesContext( ContextHandler2Helper& rParent,
     EffectProperties& rEffectProperties ) throw()
 : ContextHandler2( rParent )
diff --git a/oox/source/drawingml/embeddedwavaudiofile.cxx b/oox/source/drawingml/embeddedwavaudiofile.cxx
index 327a0e71d746..6b2f29ef8fd4 100644
--- a/oox/source/drawingml/embeddedwavaudiofile.cxx
+++ b/oox/source/drawingml/embeddedwavaudiofile.cxx
@@ -24,10 +24,8 @@ using namespace ::oox::core;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 
-
 namespace oox { namespace drawingml {
 
-
     // CT_EmbeddedWAVAudioFile
     void getEmbeddedWAVAudioFile( const Relations& rRelations,
             const Reference< XFastAttributeList >& xAttribs, EmbeddedWAVAudioFile & aAudio )
@@ -40,7 +38,6 @@ namespace oox { namespace drawingml {
         aAudio.msName = xAttribs->getOptionalValue( XML_name );
     }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index 7abd50089d46..6507e6fac8ff 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -48,8 +48,6 @@ using ::com::sun::star::geometry::IntegerRectangle2D;
 namespace oox {
 namespace drawingml {
 
-
-
 namespace {
 
 Reference< XGraphic > lclCheckAndApplyDuotoneTransform( const BlipFillProperties& aBlipProps, Reference< XGraphic > xGraphic,
@@ -105,7 +103,6 @@ Reference< XGraphic > applyBrightnessContrast( Reference< XGraphic > xGraphic, s
     return xGraphic;
 }
 
-
 BitmapMode lclGetBitmapMode( sal_Int32 nToken )
 {
     OSL_ASSERT((nToken & sal_Int32(0xFFFF0000))==0);
@@ -159,8 +156,6 @@ const awt::Size lclGetOriginalSize( const GraphicHelper& rGraphicHelper, const R
 
 } // namespace
 
-
-
 void GradientFillProperties::assignUsed( const GradientFillProperties& rSourceProps )
 {
     if( !rSourceProps.maGradientStops.empty() )
@@ -174,8 +169,6 @@ void GradientFillProperties::assignUsed( const GradientFillProperties& rSourcePr
     moRotateWithShape.assignIfUsed( rSourceProps.moRotateWithShape );
 }
 
-
-
 void PatternFillProperties::assignUsed( const PatternFillProperties& rSourceProps )
 {
     maPattFgColor.assignIfUsed( rSourceProps.maPattFgColor );
@@ -183,8 +176,6 @@ void PatternFillProperties::assignUsed( const PatternFillProperties& rSourceProp
     moPattPreset.assignIfUsed( rSourceProps.moPattPreset );
 }
 
-
-
 void BlipFillProperties::assignUsed( const BlipFillProperties& rSourceProps )
 {
     if( rSourceProps.mxGraphic.is() )
@@ -208,8 +199,6 @@ void BlipFillProperties::assignUsed( const BlipFillProperties& rSourceProps )
     maEffect.assignUsed( rSourceProps.maEffect );
 }
 
-
-
 void FillProperties::assignUsed( const FillProperties& rSourceProps )
 {
     moFillType.assignIfUsed( rSourceProps.moFillType );
@@ -528,8 +517,6 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap,
     }
 }
 
-
-
 void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const GraphicHelper& rGraphicHelper, sal_Int32 nPhClr ) const
 {
     sal_Int16 nBrightness = getLimitedValue< sal_Int16, sal_Int32 >( maBlipProps.moBrightness.get( 0 ) / PER_PERCENT, -100, 100 );
@@ -801,8 +788,6 @@ sal_Int32 ArtisticEffectProperties::getEffectToken( const OUString& sName )
     return XML_none;
 }
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index 8f016be3bede..8adc9c61f618 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -50,7 +50,6 @@ using namespace ::oox::core;
 namespace oox {
 namespace drawingml {
 
-
 // CT_Picture
 
 GraphicShapeContext::GraphicShapeContext( ContextHandler2Helper& rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr )
@@ -99,7 +98,6 @@ ContextHandlerRef GraphicShapeContext::onCreateContext( sal_Int32 aElementToken,
     return ShapeContext::onCreateContext( aElementToken, rAttribs );
 }
 
-
 // CT_GraphicalObjectFrameContext
 
 GraphicalObjectFrameContext::GraphicalObjectFrameContext( ContextHandler2Helper& rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr, bool bEmbedShapesInChart ) :
@@ -218,8 +216,6 @@ ContextHandlerRef OleObjectGraphicDataContext::onCreateContext( sal_Int32 nEleme
     return 0;
 }
 
-
-
 DiagramGraphicDataContext::DiagramGraphicDataContext( ContextHandler2Helper& rParent, ShapePtr pShapePtr )
 : ShapeContext( rParent, ShapePtr(), pShapePtr )
 {
@@ -263,8 +259,6 @@ ContextHandlerRef DiagramGraphicDataContext::onCreateContext( ::sal_Int32 aEleme
     return ShapeContext::onCreateContext( aElementToken, rAttribs );
 }
 
-
-
 ChartGraphicDataContext::ChartGraphicDataContext( ContextHandler2Helper& rParent, const ShapePtr& rxShape, bool bEmbedShapes ) :
     ShapeContext( rParent, ShapePtr(), rxShape ),
     mrChartShapeInfo( rxShape->setChartType( bEmbedShapes ) )
@@ -280,8 +274,6 @@ ContextHandlerRef ChartGraphicDataContext::onCreateContext( ::sal_Int32 nElement
     return 0;
 }
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx
index 372740b36006..e8199815669b 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -45,8 +45,6 @@ using ::com::sun::star::container::XNameContainer;
 namespace oox {
 namespace drawingml {
 
-
-
 namespace {
 
 void lclSetDashData( LineDash& orLineDash, sal_Int16 nDots, sal_Int32 nDotLen,
@@ -175,8 +173,6 @@ sal_Int32 lclGetArrowSize( sal_Int32 nToken )
     return OOX_ARROWSIZE_MEDIUM;
 }
 
-
-
 void lclPushMarkerProperties( ShapePropertyMap& rPropMap,
         const LineArrowProperties& rArrowProps, sal_Int32 nLineWidth, bool bLineEnd )
 {
@@ -342,8 +338,6 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap,
 
 } // namespace
 
-
-
 void LineArrowProperties::assignUsed( const LineArrowProperties& rSourceProps )
 {
     moArrowType.assignIfUsed( rSourceProps.moArrowType );
@@ -351,8 +345,6 @@ void LineArrowProperties::assignUsed( const LineArrowProperties& rSourceProps )
     moArrowLength.assignIfUsed( rSourceProps.moArrowLength );
 }
 
-
-
 void LineProperties::assignUsed( const LineProperties& rSourceProps )
 {
     maStartArrow.assignUsed( rSourceProps.maStartArrow );
@@ -449,8 +441,6 @@ sal_Int32 LineProperties::getLineWidth() const
     return convertEmuToHmm( moLineWidth.get( 0 ) );
 }
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/drawingml/linepropertiescontext.cxx b/oox/source/drawingml/linepropertiescontext.cxx
index ee49fbaddbb5..45a4a0eb8abb 100644
--- a/oox/source/drawingml/linepropertiescontext.cxx
+++ b/oox/source/drawingml/linepropertiescontext.cxx
@@ -31,7 +31,6 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace drawingml {
 
-
 LinePropertiesContext::LinePropertiesContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs,
     LineProperties& rLineProperties ) throw()
 : ContextHandler2( rParent )
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 7b16832440c6..db2fa16ca00b 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -150,7 +150,6 @@ Shape::Shape( const ShapePtr& pSourceShape )
 , maDiagramDoms( pSourceShape->maDiagramDoms )
 {}
 
-
 Shape::~Shape()
 {
 }
@@ -215,7 +214,6 @@ void Shape::setServiceName( const sal_Char* pServiceName )
         msServiceName = OUString::createFromAscii( pServiceName );
 }
 
-
 const ShapeStyleRef* Shape::getShapeStyleRef( sal_Int32 nRefType ) const
 {
     ShapeStyleRefMap::const_iterator aIt = maShapeStyleRefs.find( nRefType );
@@ -251,7 +249,6 @@ void Shape::addShape(
             if ( xShapes.is() )
                 addChildren( rFilterBase, *this, pTheme, xShapes, pShapeRect ? *pShapeRect : awt::Rectangle( maPosition.X, maPosition.Y, maSize.Width, maSize.Height ), pShapeMap, aMatrix );
 
-
             if( meFrameType == FRAMETYPE_DIAGRAM )
             {
                 if( !SvtFilterOptions::Get().IsSmartArt2Shape() )
@@ -270,13 +267,11 @@ void Shape::setLockedCanvas(bool bLockedCanvas)
     mbLockedCanvas = bLockedCanvas;
 }
 
-
 void Shape::setWps(bool bWps)
 {
     mbWps = bWps;
 }
 
-
 void Shape::setTextBox(bool bTextBox)
 {
     mbTextBox = bTextBox;
@@ -507,7 +502,6 @@ Reference< XShape > Shape::createAndInsert(
         // now set transformation for this object
         HomogenMatrix3 aMatrix;
 
-
         aMatrix.Line1.Column1 = aTransformation.get(0,0);
         aMatrix.Line1.Column2 = aTransformation.get(0,1);
         aMatrix.Line1.Column3 = aTransformation.get(0,2);
@@ -1171,8 +1165,6 @@ void Shape::setTextBody(const TextBodyPtr & pTextBody)
     mpTextBody = pTextBody;
 }
 
-
-
 void Shape::setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle )
 {
     SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "set master text list style to shape id: " << msId);
diff --git a/oox/source/drawingml/shape3dproperties.cxx b/oox/source/drawingml/shape3dproperties.cxx
index e3f39b6267a9..2060f18c52ff 100644
--- a/oox/source/drawingml/shape3dproperties.cxx
+++ b/oox/source/drawingml/shape3dproperties.cxx
@@ -46,7 +46,6 @@ using ::oox::core::XmlFilterBase;
 namespace oox {
 namespace drawingml {
 
-
 OUString Shape3DProperties::getCameraPrstName( sal_Int32 nElement )
 {
     switch( nElement )
@@ -406,8 +405,6 @@ css::uno::Sequence< css::beans::PropertyValue > Shape3DProperties::getShape3DAtt
     return aSeq;
 }
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx
index 1b709ba201b0..536bbc7d4d4a 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -58,7 +58,6 @@ ShapeContext::~ShapeContext()
         mpMasterShapePtr->addChild( mpShapePtr );
 }
 
-
 ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
 {
     switch( getBaseToken( aElementToken ) )
@@ -128,7 +127,6 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 aElementToken, const
     return this;
 }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx
index e5b19249e62c..9eb71b2ba08a 100644
--- a/oox/source/drawingml/shapepropertiescontext.cxx
+++ b/oox/source/drawingml/shapepropertiescontext.cxx
@@ -41,8 +41,6 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace drawingml {
 
-
-
 // CT_ShapeProperties
 ShapePropertiesContext::ShapePropertiesContext( ContextHandler2Helper& rParent, Shape& rShape )
 : ContextHandler2( rParent )
@@ -50,8 +48,6 @@ ShapePropertiesContext::ShapePropertiesContext( ContextHandler2Helper& rParent,
 {
 }
 
-
-
 ContextHandlerRef ShapePropertiesContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
 {
     switch( aElementToken )
diff --git a/oox/source/drawingml/shapepropertymap.cxx b/oox/source/drawingml/shapepropertymap.cxx
index 21281cdd5664..25b0bcc241f4 100644
--- a/oox/source/drawingml/shapepropertymap.cxx
+++ b/oox/source/drawingml/shapepropertymap.cxx
@@ -28,15 +28,11 @@
 namespace oox {
 namespace drawingml {
 
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::uno;
 
-
-
 namespace {
 
 static const sal_Int32 spnDefaultShapeIds[ SHAPEPROP_END + 1 ] = // one for the PROP_END_LIST
@@ -74,8 +70,6 @@ ShapePropertyInfo::ShapePropertyInfo( const sal_Int32* pnPropertyIds,
     }
 }
 
-
-
 ShapePropertyMap::ShapePropertyMap( ModelObjectHelper& rModelObjHelper, const ShapePropertyInfo& rShapePropInfo ) :
     mrModelObjHelper( rModelObjHelper ),
     maShapePropInfo( rShapePropInfo )
@@ -217,8 +211,6 @@ bool ShapePropertyMap::setFillBitmapNameFromUrl( sal_Int32 /*nPropId*/, const An
     return false;
 }
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/drawingml/shapestylecontext.cxx b/oox/source/drawingml/shapestylecontext.cxx
index 4d54a9ab736a..aeb6278b3ec7 100644
--- a/oox/source/drawingml/shapestylecontext.cxx
+++ b/oox/source/drawingml/shapestylecontext.cxx
@@ -28,7 +28,6 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace drawingml {
 
-
 // CT_ShapeStyle
 
 ShapeStyleContext::ShapeStyleContext( ContextHandler2Helper& rParent, Shape& rShape )
diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx
index 3dbc8145ebcb..c7c6fff1a417 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::table;
 
-
 namespace oox { namespace drawingml { namespace table {
 
 TableProperties::TableProperties()
diff --git a/oox/source/drawingml/textbody.cxx b/oox/source/drawingml/textbody.cxx
index c90e4826e6e0..9e9d0ddd2c99 100644
--- a/oox/source/drawingml/textbody.cxx
+++ b/oox/source/drawingml/textbody.cxx
@@ -29,7 +29,6 @@ using namespace ::com::sun::star::frame;
 
 namespace oox { namespace drawingml {
 
-
 TextBody::TextBody()
 {
 }
diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx
index 69b23960e7f2..9cfffdc186f9 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -33,8 +33,6 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace drawingml {
 
-
-
 // CT_TextParagraph
 class TextParagraphContext : public ContextHandler2
 {
@@ -47,7 +45,6 @@ protected:
     TextParagraph& mrParagraph;
 };
 
-
 TextParagraphContext::TextParagraphContext( ContextHandler2Helper& rParent, TextParagraph& rPara )
 : ContextHandler2( rParent )
 , mrParagraph( rPara )
@@ -55,8 +52,6 @@ TextParagraphContext::TextParagraphContext( ContextHandler2Helper& rParent, Text
     mbEnableTrimSpace = false;
 }
 
-
-
 ContextHandlerRef TextParagraphContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
 {
     // EG_TextRun
@@ -102,7 +97,6 @@ ContextHandlerRef TextParagraphContext::onCreateContext( sal_Int32 aElementToken
     return 0;
 }
 
-
 RegularTextRunContext::RegularTextRunContext( ContextHandler2Helper& rParent, TextRunPtr pRunPtr )
 : ContextHandler2( rParent )
 , mpRunPtr( pRunPtr )
@@ -110,8 +104,6 @@ RegularTextRunContext::RegularTextRunContext( ContextHandler2Helper& rParent, Te
 {
 }
 
-
-
 void RegularTextRunContext::onEndElement( )
 {
     switch( getCurrentElement() )
@@ -130,8 +122,6 @@ void RegularTextRunContext::onEndElement( )
     }
 }
 
-
-
 void RegularTextRunContext::onCharacters( const OUString& aChars )
 {
     if( mbIsInText )
@@ -140,8 +130,6 @@ void RegularTextRunContext::onCharacters( const OUString& aChars )
     }
 }
 
-
-
 ContextHandlerRef RegularTextRunContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs)
 {
     switch( aElementToken )
@@ -163,16 +151,12 @@ ContextHandlerRef RegularTextRunContext::onCreateContext( sal_Int32 aElementToke
     return this;
 }
 
-
-
 TextBodyContext::TextBodyContext( ContextHandler2Helper& rParent, TextBody& rTextBody )
 : ContextHandler2( rParent )
 , mrTextBody( rTextBody )
 {
 }
 
-
-
 ContextHandlerRef TextBodyContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
 {
     switch( aElementToken )
@@ -199,8 +183,6 @@ ContextHandlerRef TextBodyContext::onCreateContext( sal_Int32 aElementToken, con
     return 0;
 }
 
-
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/textbodyproperties.cxx b/oox/source/drawingml/textbodyproperties.cxx
index dfa3d6007bb5..1c1b4f2f861c 100644
--- a/oox/source/drawingml/textbodyproperties.cxx
+++ b/oox/source/drawingml/textbodyproperties.cxx
@@ -29,8 +29,6 @@ using namespace ::com::sun::star::text;
 namespace oox {
 namespace drawingml {
 
-
-
 TextBodyProperties::TextBodyProperties()
     : mbAnchorCtr(false)
     , meVA( TextVerticalAdjust_TOP )
@@ -96,8 +94,6 @@ void TextBodyProperties::pushRotationAdjustments( sal_Int32 nRotation )
     }
 }
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
index 3ade36328702..d91988246695 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -37,8 +37,6 @@ using namespace ::com::sun::star::beans;
 namespace oox {
 namespace drawingml {
 
-
-
 void TextCharacterProperties::assignUsed( const TextCharacterProperties& rSourceProps )
 {
     // overwrite all properties exisiting in rSourceProps
@@ -197,8 +195,6 @@ float TextCharacterProperties::getCharHeightPoints( float fDefault ) const
     return moHeight.has() ? GetFontHeight( moHeight.get() ) : fDefault;
 }
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/drawingml/textfont.cxx b/oox/source/drawingml/textfont.cxx
index e5706c9c32e1..2bda567cc115 100644
--- a/oox/source/drawingml/textfont.cxx
+++ b/oox/source/drawingml/textfont.cxx
@@ -29,8 +29,6 @@ using ::oox::core::XmlFilterBase;
 namespace oox {
 namespace drawingml {
 
-
-
 namespace {
 
 sal_Int16 lclGetFontPitch( sal_Int32 nOoxValue )
@@ -49,8 +47,6 @@ sal_Int16 lclGetFontFamily( sal_Int32 nOoxValue )
 
 } // namespace
 
-
-
 TextFont::TextFont() :
     mnPitch( 0 ),
     mnCharset( WINDOWS_CHARSET_ANSI )
@@ -95,8 +91,6 @@ bool TextFont::implGetFontData( OUString& rFontName, sal_Int16& rnFontPitch, sal
     return !rFontName.isEmpty();
 }
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/drawingml/textliststylecontext.cxx b/oox/source/drawingml/textliststylecontext.cxx
index 41db7b43d863..117351bea284 100644
--- a/oox/source/drawingml/textliststylecontext.cxx
+++ b/oox/source/drawingml/textliststylecontext.cxx
@@ -38,8 +38,6 @@ TextListStyleContext::~TextListStyleContext()
 {
 }
 
-
-
 ContextHandlerRef TextListStyleContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
 {
     switch( aElementToken )
@@ -73,8 +71,6 @@ ContextHandlerRef TextListStyleContext::onCreateContext( sal_Int32 aElementToken
     return this;
 }
 
-
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx
index e22096619745..f76631c03fbf 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -136,7 +136,6 @@ void TextParagraph::insertAt(
     }
 }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index 76e162218240..924a5e4d14e8 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -245,7 +245,6 @@ void BulletList::setBulletSize(sal_Int16 nSize)
     mnSize <<= nSize;
 }
 
-
 void BulletList::setFontSize(sal_Int16 nSize)
 {
     mnFontSize <<= nSize;
diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index e592841000e2..035f99ac2a0f 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -126,7 +126,6 @@ TextParagraphPropertiesContext::TextParagraphPropertiesContext( ContextHandler2H
     }
 }
 
-
 TextParagraphPropertiesContext::~TextParagraphPropertiesContext()
 {
     PropertyMap& rPropertyMap( mrTextParagraphProperties.getTextParagraphPropertyMap() );
@@ -135,7 +134,6 @@ TextParagraphPropertiesContext::~TextParagraphPropertiesContext()
     else
         rPropertyMap.setProperty( PROP_ParaLineSpacing, ::com::sun::star::style::LineSpacing( ::com::sun::star::style::LineSpacingMode::PROP, 100 ));
 
-
     ::std::list< TabStop >::size_type nTabCount = maTabList.size();
     if( nTabCount != 0 )
     {
@@ -159,8 +157,6 @@ TextParagraphPropertiesContext::~TextParagraphPropertiesContext()
         rPropertyMap.setProperty( PROP_ParaAdjust, mrTextParagraphProperties.getParaAdjust().get());
 }
 
-
-
 ContextHandlerRef TextParagraphPropertiesContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
 {
     Reference< XFastContextHandler > xRet;
diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx
index 953794810e2e..fae5d26c5bc3 100644
--- a/oox/source/drawingml/textrun.cxx
+++ b/oox/source/drawingml/textrun.cxx
@@ -173,7 +173,6 @@ sal_Int32 TextRun::insertAt(
     return nCharHeight;
 }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/textspacingcontext.cxx b/oox/source/drawingml/textspacingcontext.cxx
index 2c14530196db..8ef0caec6a83 100644
--- a/oox/source/drawingml/textspacingcontext.cxx
+++ b/oox/source/drawingml/textspacingcontext.cxx
@@ -25,7 +25,6 @@ using namespace ::oox::core;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::uno;
 
-
 namespace oox { namespace drawingml {
 
     TextSpacingContext::TextSpacingContext( ContextHandler2Helper& rParent, TextSpacing & aSpacing )
diff --git a/oox/source/drawingml/theme.cxx b/oox/source/drawingml/theme.cxx
index 859488f25105..31c3c1bd12cf 100644
--- a/oox/source/drawingml/theme.cxx
+++ b/oox/source/drawingml/theme.cxx
@@ -22,8 +22,6 @@
 namespace oox {
 namespace drawingml {
 
-
-
 Theme::Theme()
 {
 }
@@ -106,8 +104,6 @@ const TextFont* Theme::resolveFont( const OUString& rName ) const
     return 0;
 }
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/drawingml/themeelementscontext.cxx b/oox/source/drawingml/themeelementscontext.cxx
index cc1c10e3b8e4..0b6ab7a6b127 100644
--- a/oox/source/drawingml/themeelementscontext.cxx
+++ b/oox/source/drawingml/themeelementscontext.cxx
@@ -35,8 +35,6 @@ using namespace ::com::sun::star::xml::sax;
 namespace oox {
 namespace drawingml {
 
-
-
 class FillStyleListContext : public ContextHandler2
 {
 public:
@@ -69,8 +67,6 @@ ContextHandlerRef FillStyleListContext::onCreateContext( sal_Int32 nElement, con
     return 0;
 }
 
-
-
 class LineStyleListContext : public ContextHandler2
 {
 public:
@@ -98,8 +94,6 @@ ContextHandlerRef LineStyleListContext::onCreateContext( sal_Int32 nElement, con
     return 0;
 }
 
-
-
 class EffectStyleListContext : public ContextHandler2
 {
 public:
@@ -132,8 +126,6 @@ ContextHandlerRef EffectStyleListContext::onCreateContext( sal_Int32 nElement, c
     return 0;
 }
 
-
-
 class FontSchemeContext : public ContextHandler2
 {
 public:
@@ -192,8 +184,6 @@ void FontSchemeContext::onEndElement()
     }
 }
 
-
-
 ThemeElementsContext::ThemeElementsContext( ContextHandler2Helper& rParent, Theme& rTheme ) :
     ContextHandler2( rParent ),
     mrTheme( rTheme )
@@ -226,8 +216,6 @@ ContextHandlerRef ThemeElementsContext::onCreateContext( sal_Int32 nElement, con
     return 0;
 }
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/drawingml/themefragmenthandler.cxx b/oox/source/drawingml/themefragmenthandler.cxx
index 48693830e036..b0f4f85a3a8d 100644
--- a/oox/source/drawingml/themefragmenthandler.cxx
+++ b/oox/source/drawingml/themefragmenthandler.cxx
@@ -27,8 +27,6 @@ using namespace ::oox::core;
 namespace oox {
 namespace drawingml {
 
-
-
 ThemeFragmentHandler::ThemeFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, Theme& rTheme ) :
     FragmentHandler2( rFilter, rFragmentPath ),
     mrTheme( rTheme )
@@ -71,8 +69,6 @@ ContextHandlerRef ThemeFragmentHandler::onCreateContext( sal_Int32 nElement, con
     return 0;
 }
 
-
-
 } // namespace drawingml
 } // namespace oox
 
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index 1589a1c46125..c4c73ac70e2e 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -24,9 +24,6 @@
 namespace oox {
 namespace dump {
 
-
-
-
 namespace {
 
 const sal_uInt16 DFF_ID_BSE                 = 0xF007;   /// BLIP store entry.
@@ -48,8 +45,6 @@ const sal_uInt16 DFF_OPT_FLAGSMASK          = 0x003F;
 
 } // namespace
 
-
-
 bool DffStreamObject::implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize )
 {
     sal_uInt16 nRecId;
@@ -276,8 +271,6 @@ sal_uInt16 DffStreamObject::dumpDffOptPropHeader()
     return dumpHex< sal_uInt16 >( "id", "DFFOPT-PROPERTY-ID" );
 }
 
-
-
 } // namespace dump
 } // namespace oox
 
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 7e748bac65fe..59711c0a4fd5 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -38,8 +38,6 @@
 namespace oox {
 namespace dump {
 
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::io;
@@ -64,9 +62,6 @@ const sal_Int64 OOX_DUMP_MAXARRAY       = 16;
 
 } // namespace
 
-
-
-
 // file names -----------------------------------------------------------------
 
 OUString InputOutputHelper::convertFileNameToUrl( const OUString& rFileName )
@@ -149,9 +144,6 @@ Reference< XTextOutputStream2 > InputOutputHelper::openTextOutputStream(
     return openTextOutputStream( rxContext, openOutputStream( rxContext, rFileName ), eTextEnc );
 }
 
-
-
-
 ItemFormat::ItemFormat() :
     meDataType( DATATYPE_VOID ),
     meFmtType( FORMATTYPE_NONE )
@@ -199,9 +191,6 @@ OUStringVector ItemFormat::parse( const OUString& rFormatStr )
     return OUStringVector( aIt, const_cast< const OUStringVector& >( aFormatVec ).end() );
 }
 
-
-
-
 // append string to string ----------------------------------------------------
 
 void StringHelper::appendChar( OUStringBuffer& rStr, sal_Unicode cChar, sal_Int32 nCount )
@@ -798,16 +787,10 @@ void StringHelper::convertStringToIntList( Int64Vector& orVec, const OUString& r
     }
 }
 
-
-
-
 Base::~Base()
 {
 }
 
-
-
-
 ConfigItemBase::~ConfigItemBase()
 {
 }
@@ -881,8 +864,6 @@ void ConfigItemBase::processConfigItem(
         implProcessConfigItemStr( rStrm, rKey, rData );
 }
 
-
-
 NameListBase::~NameListBase()
 {
 }
@@ -951,8 +932,6 @@ void NameListBase::exclude( const OUString& rKeys )
         maMap.erase( *aIt );
 }
 
-
-
 void ItemFormatMap::insertFormats( const NameListRef& rxNameList )
 {
     if( Base::isValid( rxNameList ) )
@@ -960,8 +939,6 @@ void ItemFormatMap::insertFormats( const NameListRef& rxNameList )
             (*this)[ aIt->first ].parse( aIt->second );
 }
 
-
-
 ConstList::ConstList( const SharedConfigData& rCfgData ) :
     NameListBase( rCfgData ),
     maDefName( OOX_DUMP_ERR_NONAME ),
@@ -1012,8 +989,6 @@ void ConstList::implIncludeList( const NameListBase& rList )
     }
 }
 
-
-
 MultiList::MultiList( const SharedConfigData& rCfgData ) :
     ConstList( rCfgData ),
     mbIgnoreEmpty( true )
@@ -1044,8 +1019,6 @@ void MultiList::implSetName( sal_Int64 nKey, const OUString& rName )
     setNamesFromVec( nKey, aNames );
 }
 
-
-
 FlagsList::FlagsList( const SharedConfigData& rCfgData ) :
     NameListBase( rCfgData ),
     mnIgnore( 0 )
@@ -1137,8 +1110,6 @@ void FlagsList::implIncludeList( const NameListBase& rList )
         mnIgnore = pFlagsList->mnIgnore;
 }
 
-
-
 bool CombiList::ExtItemFormatKey::operator<( const ExtItemFormatKey& rRight ) const
 {
     return (mnKey < rRight.mnKey) || ((mnKey == rRight.mnKey) && (maFilter < rRight.maFilter));
@@ -1250,8 +1221,6 @@ void CombiList::implIncludeList( const NameListBase& rList )
     FlagsList::implIncludeList( rList );
 }
 
-
-
 UnitConverter::UnitConverter( const SharedConfigData& rCfgData ) :
     NameListBase( rCfgData ),
     mfFactor( 1.0 )
@@ -1280,16 +1249,11 @@ void UnitConverter::implIncludeList( const NameListBase& /*rList*/ )
 {
 }
 
-
-
 NameListRef NameListWrapper::getNameList( const Config& rCfg ) const
 {
     return mxList.get() ? mxList : (mxList = rCfg.getNameList( maName ));
 }
 
-
-
-
 SharedConfigData::SharedConfigData( const OUString& rFileName,
         const Reference< XComponentContext >& rxContext, const StorageRef& rxRootStrg,
         const OUString& rSysFileName ) :
@@ -1429,8 +1393,6 @@ void SharedConfigData::createUnitConverter( const OUString& rData )
     }
 }
 
-
-
 Config::Config( const Config& rParent ) :
     Base()  // c'tor needs to be called explicitly to avoid compiler warning
 {
@@ -1521,9 +1483,6 @@ NameListRef Config::implGetNameList( const OUString& rListName ) const
     return mxCfgData->getNameList( rListName );
 }
 
-
-
-
 Output::Output( const Reference< XComponentContext >& rxContext, const OUString& rFileName ) :
     mxStrm( InputOutputHelper::openTextOutputStream( rxContext, rFileName, RTL_TEXTENCODING_UTF8 ) ),
     mnCol( 0 ),
@@ -1536,8 +1495,6 @@ Output::Output( const Reference< XComponentContext >& rxContext, const OUString&
         mxStrm->writeString( OUString( OOX_DUMP_BOM ) );
 }
 
-
-
 void Output::newLine()
 {
     if( maLine.getLength() > 0 )
@@ -1692,8 +1649,6 @@ void Output::endMultiItems()
         newLine();
 }
 
-
-
 void Output::writeChar( sal_Unicode cChar, sal_Int32 nCount )
 {
     StringHelper::appendEncChar( maLine, cChar, nCount );
@@ -1741,8 +1696,6 @@ void Output::writeDateTime( const util::DateTime& rDateTime )
     writeDec( rDateTime.Seconds, 2, '0' );
 }
 
-
-
 bool Output::implIsValid() const
 {
     return mxStrm.is();
@@ -1759,8 +1712,6 @@ void Output::writeItemName( const String& rItemName )
         writeString( rItemName );
 }
 
-
-
 StorageIterator::StorageIterator( const StorageRef& rxStrg ) :
     mxStrg( rxStrg )
 {
@@ -1806,9 +1757,6 @@ bool StorageIterator::implIsValid() const
     return mxStrg.get() && mxStrg->isStorage() && (maIt != maNames.end());
 }
 
-
-
-
 ObjectBase::~ObjectBase()
 {
 }
@@ -1838,9 +1786,6 @@ void ObjectBase::implDump()
 {
 }
 
-
-
-
 void StorageObjectBase::construct( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath )
 {
     ObjectBase::construct( rParent );
@@ -1990,9 +1935,6 @@ void StorageObjectBase::extractItem( const StorageRef& rxStrg, const OUString& r
     }
 }
 
-
-
-
 OutputObjectBase::~OutputObjectBase()
 {
 }
@@ -2069,9 +2011,6 @@ void OutputObjectBase::writeGuidItem( const String& rName, const OUString& rGuid
     mxOut->writeString( cfg().getStringOption( rGuid, OUString() ) );
 }
 
-
-
-
 InputObjectBase::~InputObjectBase()
 {
 }
@@ -2354,9 +2293,6 @@ void InputObjectBase::dumpItem( const ItemFormat& rItemFmt )
     }
 }
 
-
-
-
 BinaryStreamObject::BinaryStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName )
 {
     InputObjectBase::construct( rParent, rxStrm, rSysFileName );
@@ -2374,9 +2310,6 @@ void BinaryStreamObject::implDump()
     dumpBinaryStream();
 }
 
-
-
-
 void TextStreamObjectBase::construct( const ObjectBase& rParent,
         const BinaryInputStreamRef& rxStrm, rtl_TextEncoding eTextEnc, const OUString& rSysFileName )
 {
@@ -2407,8 +2340,6 @@ void TextStreamObjectBase::constructTextStrmObj( rtl_TextEncoding eTextEnc )
         mxTextStrm.reset( new TextInputStream( getContext(), *mxStrm, eTextEnc ) );
 }
 
-
-
 TextLineStreamObject::TextLineStreamObject( const ObjectBase& rParent,
         const BinaryInputStreamRef& rxStrm, rtl_TextEncoding eTextEnc, const OUString& rSysFileName )
 {
@@ -2441,8 +2372,6 @@ void TextLineStreamObject::implDumpLine( const OUString& rLine, sal_uInt32 nLine
     mxOut->newLine();
 }
 
-
-
 XmlStreamObject::XmlStreamObject( const ObjectBase& rParent,
         const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName )
 {
@@ -2529,9 +2458,6 @@ void XmlStreamObject::implDumpText( TextInputStream& rTextStrm )
     }
 }
 
-
-
-
 void RecordObjectBase::construct( const ObjectBase& rParent,
         const BinaryInputStreamRef& rxBaseStrm, const OUString& rSysFileName,
         const BinaryInputStreamRef& rxRecStrm, const String& rRecNames, const String& rSimpleRecs )
@@ -2609,8 +2535,6 @@ void RecordObjectBase::writeHeader()
     addNameToItem( mnRecId, maRecNames );
 }
 
-
-
 void SequenceRecordObjectBase::construct( const ObjectBase& rParent,
         const BinaryInputStreamRef& rxBaseStrm, const OUString& rSysFileName,
         const String& rRecNames, const String& rSimpleRecs )
@@ -2644,9 +2568,6 @@ bool SequenceRecordObjectBase::implStartRecord( BinaryInputStream& rBaseStrm, sa
     return bValid;
 }
 
-
-
-
 DumperBase::~DumperBase()
 {
 }
@@ -2667,9 +2588,6 @@ void DumperBase::construct( const ConfigRef& rxConfig )
         ObjectBase::construct( rxConfig );
 }
 
-
-
-
 } // namespace dump
 } // namespace oox
 
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index 510e3e361ab1..7a50b82b7daa 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -34,13 +34,9 @@
 namespace oox {
 namespace dump {
 
-
-
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 
-
-
 OUString OleInputObjectBase::dumpAnsiString32( const String& rName )
 {
     return dumpCharArray( rName, mxStrm->readInt32(), RTL_TEXTENCODING_MS_1252 );
@@ -81,9 +77,6 @@ sal_uInt32 OleInputObjectBase::dumpOleColor( const String& rName )
     return nOleColor;
 }
 
-
-
-
 StdFontObject::StdFontObject( const InputObjectBase& rParent )
 {
     construct( rParent );
@@ -99,8 +92,6 @@ void StdFontObject::implDump()
     dumpCharArray( "name", mxStrm->readuInt8(), RTL_TEXTENCODING_ASCII_US );
 }
 
-
-
 StdPicObject::StdPicObject( const InputObjectBase& rParent )
 {
     construct( rParent );
@@ -113,16 +104,11 @@ void StdPicObject::implDump()
     dumpBinary( "image-data", nSize );
 }
 
-
-
-
 OleStreamObject::OleStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName )
 {
     construct( rParent, rxStrm, rSysFileName );
 }
 
-
-
 OleCompObjObject::OleCompObjObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ) :
     OleStreamObject( rParent, rxStrm, rSysFileName )
 {
@@ -154,9 +140,6 @@ void OleCompObjObject::implDump()
     dumpRemainingStream();
 }
 
-
-
-
 namespace {
 
 const sal_Int32 OLEPROP_ID_DICTIONARY   = 0;
@@ -195,8 +178,6 @@ const sal_uInt32 AX_STRING_COMPRESSED   = 0x80000000;
 
 } // namespace
 
-
-
 OlePropertyStreamObject::OlePropertyStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName )
 {
     construct( rParent, rxStrm, rSysFileName );
@@ -515,8 +496,6 @@ void OlePropertyStreamObject::writePropertyHeader( sal_Int32 nPropId, sal_uInt32
     writeDecItem( "id", nPropId, mxPropIds );
 }
 
-
-
 OleStorageObject::OleStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath )
 {
     construct( rParent, rxStrg, rSysPath );
@@ -537,9 +516,6 @@ void OleStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm,
         BinaryStreamObject( *this, rxStrm, rSysFileName ).dump();
 }
 
-
-
-
 ComCtlObjectBase::ComCtlObjectBase( const InputObjectBase& rParent,
         sal_uInt32 nDataId5, sal_uInt32 nDataId6, sal_uInt16 nVersion, bool bCommonPart, bool bComplexPart ) :
     mnDataId5( nDataId5 ),
@@ -646,8 +622,6 @@ bool ComCtlObjectBase::dumpComCtlComplex()
     return false;
 }
 
-
-
 ComCtlScrollBarObject::ComCtlScrollBarObject( const InputObjectBase& rParent, sal_uInt16 nVersion ) :
     ComCtlObjectBase( rParent, SAL_MAX_UINT32, 0x99470A83, nVersion, true, true )
 {
@@ -663,8 +637,6 @@ void ComCtlScrollBarObject::implDumpProperties()
     dumpDec< sal_Int32 >( "value" );
 }
 
-
-
 ComCtlProgressBarObject::ComCtlProgressBarObject( const InputObjectBase& rParent, sal_uInt16 nVersion ) :
     ComCtlObjectBase( rParent, 0xE6E17E84, 0x97AB8A01, nVersion, true, true )
 {
@@ -681,8 +653,6 @@ void ComCtlProgressBarObject::implDumpProperties()
     }
 }
 
-
-
 ComCtlSliderObject::ComCtlSliderObject( const InputObjectBase& rParent, sal_uInt16 nVersion ) :
     ComCtlObjectBase( rParent, 0xE6E17E86, 0x0A2BAE11, nVersion, true, true )
 {
@@ -706,8 +676,6 @@ void ComCtlSliderObject::implDumpProperties()
         dumpBool< sal_Int32 >( "tooltip-below" );
 }
 
-
-
 ComCtlUpDownObject::ComCtlUpDownObject( const InputObjectBase& rParent, sal_uInt16 nVersion ) :
     ComCtlObjectBase( rParent, 0xFF3626A0, 0xFF3626A0, nVersion, false, false )
 {
@@ -728,8 +696,6 @@ void ComCtlUpDownObject::implDumpProperties()
     dumpUnknown( 4 );
 }
 
-
-
 ComCtlImageListObject::ComCtlImageListObject( const InputObjectBase& rParent, sal_uInt16 nVersion ) :
     ComCtlObjectBase( rParent, 0xE6E17E80, 0xE6E17E80, nVersion, true, false )
 {
@@ -774,8 +740,6 @@ void ComCtlImageListObject::implDumpCommonTrailing()
     }
 }
 
-
-
 ComCtlTabStripObject::ComCtlTabStripObject( const InputObjectBase& rParent, sal_uInt16 nVersion ) :
     ComCtlObjectBase( rParent, 0xE6E17E8A, 0xD12A7AC1, nVersion, true, true )
 {
@@ -815,8 +779,6 @@ void ComCtlTabStripObject::implDumpCommonExtra( sal_Int64 /*nEndPos*/ )
     }
 }
 
-
-
 ComCtlTreeViewObject::ComCtlTreeViewObject( const InputObjectBase& rParent, sal_uInt16 nVersion ) :
     ComCtlObjectBase( rParent, 0xE6E17E8E, 0x6AC13CB1, nVersion, true, true ),
     mnStringFlags( 0 )
@@ -842,8 +804,6 @@ void ComCtlTreeViewObject::implDumpCommonExtra( sal_Int64 /*nEndPos*/ )
     dumpUniString32( "path-separator" );
 }
 
-
-
 ComCtlStatusBarObject::ComCtlStatusBarObject( const InputObjectBase& rParent, sal_uInt16 nVersion ) :
     ComCtlObjectBase( rParent, 0xE6E17E88, SAL_MAX_UINT32, nVersion, true, true )
 {
@@ -891,9 +851,6 @@ void ComCtlStatusBarObject::implDumpCommonTrailing()
     }
 }
 
-
-
-
 void AxPropertyObjectBase::construct( const ObjectBase& rParent,
         const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName, const String& rPropNameList, bool b64BitPropFlags )
 {
@@ -1198,8 +1155,6 @@ void AxPropertyObjectBase::dumpLargeProperties()
     }
 }
 
-
-
 AxCFontNewObject::AxCFontNewObject( const InputObjectBase& rParent )
 {
     AxPropertyObjectBase::construct( rParent, "AX-CFONTNEW-PROPERTIES" );
@@ -1217,8 +1172,6 @@ void AxCFontNewObject::implDumpShortProperties()
     dumpDecProperty< sal_uInt16 >( 400, "FONT-WEIGHT" );
 }
 
-
-
 AxColumnInfoObject::AxColumnInfoObject( const InputObjectBase& rParent )
 {
     AxPropertyObjectBase::construct( rParent, "AX-COLUMNINFO-PROPERTIES" );
@@ -1229,8 +1182,6 @@ void AxColumnInfoObject::implDumpShortProperties()
     dumpDecProperty< sal_Int32 >( -1, "CONV-HMM-TO-CM" );
 }
 
-
-
 AxCommandButtonObject::AxCommandButtonObject( const InputObjectBase& rParent )
 {
     AxPropertyObjectBase::construct( rParent, "AX-COMMANDBUTTON-PROPERTIES" );
@@ -1256,8 +1207,6 @@ void AxCommandButtonObject::implDumpExtended()
     dumpEmbeddedFont();
 }
 
-
-
 AxMorphControlObject::AxMorphControlObject( const InputObjectBase& rParent )
 {
     AxPropertyObjectBase::construct( rParent, "AX-MORPH-PROPERTIES", true );
@@ -1320,8 +1269,6 @@ void AxMorphControlObject::dumpColumnInfos()
     }
 }
 
-
-
 AxLabelObject::AxLabelObject( const InputObjectBase& rParent )
 {
     AxPropertyObjectBase::construct( rParent, "AX-LABEL-PROPERTIES" );
@@ -1349,8 +1296,6 @@ void AxLabelObject::implDumpExtended()
     dumpEmbeddedFont();
 }
 
-
-
 AxImageObject::AxImageObject( const InputObjectBase& rParent )
 {
     AxPropertyObjectBase::construct( rParent, "AX-IMAGE-PROPERTIES" );
@@ -1375,8 +1320,6 @@ void AxImageObject::implDumpShortProperties()
     dumpStreamProperty();
 }
 
-
-
 AxScrollBarObject::AxScrollBarObject( const InputObjectBase& rParent )
 {
     AxPropertyObjectBase::construct( rParent, "AX-SCROLLBAR-PROPERTIES" );
@@ -1403,8 +1346,6 @@ void AxScrollBarObject::implDumpShortProperties()
     dumpStreamProperty();
 }
 
-
-
 AxSpinButtonObject::AxSpinButtonObject( const InputObjectBase& rParent )
 {
     AxPropertyObjectBase::construct( rParent, "AX-SPINBUTTON-PROPERTIES" );
@@ -1429,8 +1370,6 @@ void AxSpinButtonObject::implDumpShortProperties()
     dumpMousePtrProperty();
 }
 
-
-
 AxTabStripObject::AxTabStripObject( const InputObjectBase& rParent )
 {
     AxPropertyObjectBase::construct( rParent, "AX-TABSTRIP-PROPERTIES" );
@@ -1478,9 +1417,6 @@ void AxTabStripObject::implDumpExtended()
     }
 }
 
-
-
-
 FormControlStreamObject::FormControlStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName, const OUString* pProgId )
 {
     construct( rParent, rxStrm, rSysFileName );
@@ -1561,9 +1497,6 @@ void FormControlStreamObject::constructFormCtrlStrmObj( const OUString* pProgId
         maProgId = *pProgId;
 }
 
-
-
-
 VbaFormClassInfoObject::VbaFormClassInfoObject( const InputObjectBase& rParent, VbaFormSharedData& rFormData ) :
     mrFormData( rFormData )
 {
@@ -1590,8 +1523,6 @@ void VbaFormClassInfoObject::implDumpShortProperties()
     dumpDecProperty< sal_uInt16 >( 0 );
 }
 
-
-
 namespace {
 
 const sal_uInt32 VBA_FORMSITE_OBJSTREAM         = 0x0010;
@@ -1601,8 +1532,6 @@ const sal_uInt16 VBA_FORMSITE_CLASSTABLEMASK    = 0x7FFF;
 
 } // namespace
 
-
-
 VbaFormSiteObject::VbaFormSiteObject( const InputObjectBase& rParent, VbaFormSharedData& rFormData ) :
     mrFormData( rFormData )
 {
@@ -1646,8 +1575,6 @@ void VbaFormSiteObject::implDumpShortProperties()
     mrFormData.maSiteInfos.push_back( aSiteInfo );
 }
 
-
-
 VbaFormDesignExtObject::VbaFormDesignExtObject( const InputObjectBase& rParent )
 {
     AxPropertyObjectBase::construct( rParent, "VBA-FORMDESIGNEXT-PROPERTIES" );
@@ -1662,8 +1589,6 @@ void VbaFormDesignExtObject::implDumpShortProperties()
     dumpDecProperty< sal_Int8 >( 0, "VBA-FORMDESIGNEXT-DBLCLICKCTRLMODE" );
 }
 
-
-
 namespace {
 
 const sal_uInt32 AX_FORM_HASDESIGNEXTENDER      = 0x00004000;
@@ -1674,8 +1599,6 @@ const sal_uInt8 AX_FORM_SITECOUNTTYPE_MASK      = 0x7F;
 
 } // namespace
 
-
-
 VbaFStreamObject::VbaFStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName, VbaFormSharedData& rFormData ) :
     mrFormData( rFormData )
 {
@@ -1798,8 +1721,6 @@ void VbaFStreamObject::dumpDesignExtender()
     }
 }
 
-
-
 VbaOStreamObject::VbaOStreamObject( const ObjectBase& rParent,
         const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName, VbaFormSharedData& rFormData ) :
     mrFormData( rFormData )
@@ -1824,8 +1745,6 @@ void VbaOStreamObject::implDump()
     dumpRemainingStream();
 }
 
-
-
 VbaPageObject::VbaPageObject( const InputObjectBase& rParent )
 {
     AxPropertyObjectBase::construct( rParent, "VBA-PAGE-PROPERTIES" );
@@ -1838,8 +1757,6 @@ void VbaPageObject::implDumpShortProperties()
     dumpDecProperty< sal_uInt32 >( 0, "AX-CONV-MS" );
 }
 
-
-
 VbaMultiPageObject::VbaMultiPageObject( const InputObjectBase& rParent )
 {
     AxPropertyObjectBase::construct( rParent, "VBA-MULTIPAGE-PROPERTIES" );
@@ -1865,8 +1782,6 @@ void VbaMultiPageObject::implDumpExtended()
     }
 }
 
-
-
 VbaXStreamObject::VbaXStreamObject( const ObjectBase& rParent,
         const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName, VbaFormSharedData& rFormData ) :
     mrFormData( rFormData )
@@ -1893,8 +1808,6 @@ void VbaXStreamObject::implDump()
     dumpRemainingStream();
 }
 
-
-
 VbaContainerStorageObject::VbaContainerStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath ) :
     OleStorageObject( rParent, rxStrg, rSysPath )
 {
@@ -1937,9 +1850,6 @@ bool VbaContainerStorageObject::isFormStorage( const OUString& rStrgPath ) const
     return false;
 }
 
-
-
-
 VbaSharedData::VbaSharedData() :
     meTextEnc( RTL_TEXTENCODING_MS_1252 )
 {
@@ -1956,8 +1866,6 @@ sal_Int32 VbaSharedData::getStreamOffset( const OUString& rStrmName ) const
     return (aIt == maStrmOffsets.end()) ? 0 : aIt->second;
 }
 
-
-
 VbaDirStreamObject::VbaDirStreamObject( const ObjectBase& rParent,
         const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName, VbaSharedData& rVbaData ) :
     mrVbaData( rVbaData )
@@ -2095,8 +2003,6 @@ OUString VbaDirStreamObject::dumpByteStringWithLength( const String& rName )
     return dumpCharArray( rName, mxStrm->readInt32(), mrVbaData.meTextEnc );
 }
 
-
-
 VbaModuleStreamObject::VbaModuleStreamObject(
         const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm,
         const OUString& rSysFileName, VbaSharedData& rVbaData, sal_Int32 nStrmOffset ) :
@@ -2116,8 +2022,6 @@ void VbaModuleStreamObject::implDump()
     TextLineStreamObject( *this, xVbaStrm, mrVbaData.meTextEnc ).dump();
 }
 
-
-
 VbaStorageObject::VbaStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath, VbaSharedData& rVbaData ) :
     OleStorageObject( rParent, rxStrg, rSysPath ),
     mrVbaData( rVbaData )
@@ -2135,8 +2039,6 @@ void VbaStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm,
         OleStorageObject::implDumpStream( rxStrm, rStrgPath, rStrmName, rSysFileName );
 }
 
-
-
 VbaFormStorageObject::VbaFormStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath, VbaSharedData& rVbaData ) :
     VbaContainerStorageObject( rParent, rxStrg, rSysPath ),
     mrVbaData( rVbaData )
@@ -2151,8 +2053,6 @@ void VbaFormStorageObject::implDumpStream( const Reference< XInputStream >& rxSt
         VbaContainerStorageObject::implDumpStream( rxStrm, rStrgPath, rStrmName, rSysFileName );
 }
 
-
-
 VbaProjectStorageObject::VbaProjectStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath ) :
     OleStorageObject( rParent, rxStrg, rSysPath )
 {
@@ -2175,9 +2075,6 @@ void VbaProjectStorageObject::implDumpStorage( const StorageRef& rxStrg, const O
         VbaFormStorageObject( *this, rxStrg, rSysPath, maVbaData ).dump();
 }
 
-
-
-
 ActiveXStorageObject::ActiveXStorageObject( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath ) :
     VbaContainerStorageObject( rParent, rxStrg, rSysPath )
 {
@@ -2188,9 +2085,6 @@ void ActiveXStorageObject::implDumpBaseStream( const BinaryInputStreamRef& rxStr
     FormControlStreamObject( *this, rxStrm, rSysFileName ).dump();
 }
 
-
-
-
 } // namespace dump
 } // namespace oox
 
diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx
index 048fbac0be75..9df2a6b2bc69 100644
--- a/oox/source/dump/pptxdumper.cxx
+++ b/oox/source/dump/pptxdumper.cxx
@@ -30,16 +30,12 @@ namespace oox {
 namespace dump {
 namespace pptx {
 
-
-
 using namespace ::com::sun::star::io;
 //using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
 using ::oox::core::FilterBase;
 
-
-
 RootStorageObject::RootStorageObject( const DumperBase& rParent )
 {
     StorageObjectBase::construct( rParent );
@@ -105,8 +101,6 @@ void RootStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm,
     }
 }
 
-
-
 #define DUMP_PPTX_CONFIG_ENVVAR "OOO_PPTXDUMPER"
 
 Dumper::Dumper( const FilterBase& rFilter )
@@ -130,8 +124,6 @@ void Dumper::implDump()
     RootStorageObject( *this ).dump();
 }
 
-
-
 } // namespace pptx
 } // namespace dump
 } // namespace oox
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index 3ff4f28c7aaa..5a4021589b37 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -31,8 +31,6 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::RuntimeException;
 
-
-
 namespace
 {
 class lcl_ColorPropertySetInfo : public ::cppu::WeakImplHelper1<
@@ -82,8 +80,6 @@ sal_Bool SAL_CALL lcl_ColorPropertySetInfo::hasPropertyByName( const OUString& N
 
 } // anonymous namespace
 
-
-
 namespace oox
 {
 namespace drawingml
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 48c8fc5a5617..174cd8c5ca5d 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1647,7 +1647,6 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
         return;
     }
 
-
     // export dataseries for current chart-type
     Sequence< Reference< chart2::XDataSeries > > aSeriesSeq( xDSCnt->getDataSeries());
     for( sal_Int32 nSeriesIdx=0; nSeriesIdx<aSeriesSeq.getLength(); ++nSeriesIdx )
@@ -1798,7 +1797,6 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
                         }
                     }
 
-
                     if( eChartType == chart::TYPEID_BUBBLE )
                     {
                         // export yVal
@@ -2222,7 +2220,6 @@ void ChartExport::exportAxis( AxisIdPair aAxisIdPair )
         }
     }
 
-
     _exportAxis( xAxisProp, xAxisTitle, xMajorGrid, xMinorGrid, nAxisType, sAxPos, aAxisIdPair );
 }
 
@@ -2556,7 +2553,6 @@ void ChartExport::exportDataLabels(
 
         sal_Int32 nElem = 0;
 
-
         uno::Reference< beans::XPropertySet > xPropSet;
         if(nSeriesLength != 0)
         {
@@ -2579,8 +2575,6 @@ void ChartExport::exportDataLabels(
                mAny >>= aTempLabel;
         }
 
-
-
         for( nElem = 1; nElem < nSeriesLength; ++nElem)
         {
             try
@@ -2648,7 +2642,6 @@ void ChartExport::exportDataLabels(
                            pFS->singleElement( FSNS( XML_c, XML_showVal), XML_val,aLabel.ShowNumber ? "1": "0", FSEND);
                        }
 
-
                        if(aTempLabel.ShowCategoryName != aLabel.ShowCategoryName)
                        {
                            pFS->singleElement( FSNS( XML_c, XML_showCatName), XML_val, aLabel.ShowCategoryName ? "1": "0", FSEND);
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 69242d6d4701..039514d03c1e 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -40,7 +40,6 @@
 
 #include <cstdio>
 
-
 using namespace sax_fastparser;
 using namespace oox::vml;
 using namespace com::sun::star;
diff --git a/oox/source/helper/attributelist.cxx b/oox/source/helper/attributelist.cxx
index 0fa5abdb0d10..3360c203c830 100644
--- a/oox/source/helper/attributelist.cxx
+++ b/oox/source/helper/attributelist.cxx
@@ -27,14 +27,10 @@
 
 namespace oox {
 
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 
-
-
 namespace {
 
 const sal_Int32 XSTRING_ENCCHAR_LEN     = 7;
@@ -67,8 +63,6 @@ sal_Unicode lclGetXChar( const sal_Unicode*& rpcStr, const sal_Unicode* pcEnd )
 
 } // namespace
 
-
-
 sal_Int32 AttributeConversion::decodeToken( const OUString& rValue )
 {
     return StaticTokenMap::get().getTokenFromUnicode( rValue );
@@ -111,8 +105,6 @@ sal_Int32 AttributeConversion::decodeIntegerHex( const OUString& rValue )
         // cast, but that will have a ripple effect
 }
 
-
-
 AttributeList::AttributeList( const Reference< XFastAttributeList >& rxAttribs ) :
     mxAttribs( rxAttribs ),
     mpAttribList( NULL )
@@ -314,8 +306,6 @@ util::DateTime AttributeList::getDateTime( sal_Int32 nAttrToken, const util::Dat
     return getDateTime( nAttrToken ).get( rDefault );
 }
 
-
-
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx
index 552e321ec52d..6c97222bdbe8 100644
--- a/oox/source/helper/binaryinputstream.cxx
+++ b/oox/source/helper/binaryinputstream.cxx
@@ -29,8 +29,6 @@
 
 namespace oox {
 
-
-
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 
@@ -40,8 +38,6 @@ const sal_Int32 INPUTSTREAM_BUFFERSIZE      = 0x8000;
 
 } // namespace
 
-
-
 OUString BinaryInputStream::readNulUnicodeArray()
 {
     OUStringBuffer aBuffer;
@@ -121,8 +117,6 @@ void BinaryInputStream::copyToStream( BinaryOutputStream& rOutStrm, sal_Int64 nB
     }
 }
 
-
-
 BinaryXInputStream::BinaryXInputStream( const Reference< XInputStream >& rxInStrm, bool bAutoClose ) :
     BinaryStreamBase( Reference< XSeekable >( rxInStrm, UNO_QUERY ).is() ),
     BinaryXSeekableStream( Reference< XSeekable >( rxInStrm, UNO_QUERY ) ),
@@ -202,8 +196,6 @@ void BinaryXInputStream::skip( sal_Int32 nBytes, size_t /*nAtomSize*/ )
     }
 }
 
-
-
 SequenceInputStream::SequenceInputStream( const StreamDataSequence& rData ) :
     BinaryStreamBase( true ),
     SequenceSeekableStream( rData )
@@ -249,8 +241,6 @@ void SequenceInputStream::skip( sal_Int32 nBytes, size_t /*nAtomSize*/ )
     }
 }
 
-
-
 RelativeInputStream::RelativeInputStream( BinaryInputStream& rInStrm, sal_Int64 nSize ) :
     BinaryStreamBase( rInStrm.isSeekable() ),
     mpInStrm( &rInStrm ),
@@ -325,8 +315,6 @@ void RelativeInputStream::skip( sal_Int32 nBytes, size_t nAtomSize )
     }
 }
 
-
-
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/binaryoutputstream.cxx b/oox/source/helper/binaryoutputstream.cxx
index 30c55e47eb3d..fcd21e07ddfb 100644
--- a/oox/source/helper/binaryoutputstream.cxx
+++ b/oox/source/helper/binaryoutputstream.cxx
@@ -26,8 +26,6 @@
 
 namespace oox {
 
-
-
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 
@@ -37,8 +35,6 @@ const sal_Int32 OUTPUTSTREAM_BUFFERSIZE     = 0x8000;
 
 } // namespace
 
-
-
 BinaryXOutputStream::BinaryXOutputStream( const Reference< XOutputStream >& rxOutStrm, bool bAutoClose ) :
     BinaryStreamBase( Reference< XSeekable >( rxOutStrm, UNO_QUERY ).is() ),
     BinaryXSeekableStream( Reference< XSeekable >( rxOutStrm, UNO_QUERY ) ),
@@ -137,8 +133,6 @@ BinaryOutputStream::writeCompressedUnicodeArray( const OUString& rString, bool b
         writeUnicodeArray( rString, bAllowNulChars );
 }
 
-
-
 SequenceOutputStream::SequenceOutputStream( StreamDataSequence& rData ) :
     BinaryStreamBase( true ),
     SequenceSeekableStream( rData )
@@ -162,8 +156,6 @@ void SequenceOutputStream::writeMemory( const void* pMem, sal_Int32 nBytes, size
     }
 }
 
-
-
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/binarystreambase.cxx b/oox/source/helper/binarystreambase.cxx
index 9e86080f0565..6b314fc5c18b 100644
--- a/oox/source/helper/binarystreambase.cxx
+++ b/oox/source/helper/binarystreambase.cxx
@@ -24,13 +24,9 @@
 
 namespace oox {
 
-
-
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 
-
-
 BinaryStreamBase::~BinaryStreamBase()
 {
 }
@@ -57,8 +53,6 @@ void BinaryStreamBase::alignToBlock( sal_Int32 nBlockSize, sal_Int64 nAnchorPos
     }
 }
 
-
-
 BinaryXSeekableStream::BinaryXSeekableStream( const Reference< XSeekable >& rxSeekable ) :
     BinaryStreamBase( mxSeekable.is() ),
     mxSeekable( rxSeekable )
@@ -114,8 +108,6 @@ void BinaryXSeekableStream::close()
     mbEof = true;
 }
 
-
-
 SequenceSeekableStream::SequenceSeekableStream( const StreamDataSequence& rData ) :
     BinaryStreamBase( true ),
     mpData( &rData ),
@@ -148,8 +140,6 @@ void SequenceSeekableStream::close()
     mbEof = true;
 }
 
-
-
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index bb7a13b92d0c..805a9c52e94d 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -28,14 +28,10 @@
 
 namespace oox {
 
-
-
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
-
-
 namespace {
 
 struct ValueRangeComp
@@ -48,8 +44,6 @@ struct ValueRangeComp
 
 } // namespace
 
-
-
 void ValueRangeSet::insert( const ValueRange& rRange )
 {
     // find the first range that contains or follows the starting point of the passed range
@@ -80,8 +74,6 @@ void ValueRangeSet::insert( const ValueRange& rRange )
     }
 }
 
-
-
 OUString ContainerHelper::getUnusedName(
         const Reference< XNameAccess >& rxNameAccess, const OUString& rSuggestedName,
         sal_Unicode cSeparator, sal_Int32 nFirstIndexToAppend )
@@ -147,8 +139,6 @@ OUString ContainerHelper::insertByUnusedName(
     return aNewName;
 }
 
-
-
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/grabbagstack.cxx b/oox/source/helper/grabbagstack.cxx
index 8a7e3ad8d1c8..1505bb286864 100644
--- a/oox/source/helper/grabbagstack.cxx
+++ b/oox/source/helper/grabbagstack.cxx
@@ -25,7 +25,6 @@ GrabBagStack::GrabBagStack(const OUString& aName)
 GrabBagStack::~GrabBagStack()
 {}
 
-
 bool GrabBagStack::isStackEmpty()
 {
     return mStack.empty();
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index 9e8c00f4f37e..11dc2da83ca0 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -40,9 +40,6 @@
 
 namespace oox {
 
-
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
@@ -51,8 +48,6 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
-
-
 namespace {
 
 inline sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double fPixelPerHmm )
@@ -62,8 +57,6 @@ inline sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double fPixelPerHmm
 
 } // namespace
 
-
-
 GraphicHelper::GraphicHelper( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rxTargetFrame, const StorageRef& rxStorage ) :
     mxContext( rxContext ),
     mxStorage( rxStorage ),
@@ -160,7 +153,6 @@ sal_Int32 GraphicHelper::getPaletteColor( sal_Int32 /*nPaletteIdx*/ ) const
 
 // Device info and device dependent unit conversion ---------------------------
 
-
 sal_Int32 GraphicHelper::convertScreenPixelXToHmm( double fPixelX ) const
 {
     return lclConvertScreenPixelToHmm( fPixelX, mfPixelPerHmmX );
@@ -336,8 +328,6 @@ awt::Size GraphicHelper::getOriginalSize( const Reference< XGraphic >& xGraphic
     return aSizeHmm;
 }
 
-
-
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx
index 1ec45af58d55..4b6ef286ae36 100644
--- a/oox/source/helper/modelobjecthelper.cxx
+++ b/oox/source/helper/modelobjecthelper.cxx
@@ -29,15 +29,11 @@
 
 namespace oox {
 
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
-
-
 ObjectContainer::ObjectContainer( const Reference< XMultiServiceFactory >& rxModelFactory, const OUString& rServiceName ) :
     mxModelFactory( rxModelFactory ),
     maServiceName( rServiceName ),
@@ -89,8 +85,6 @@ void ObjectContainer::createContainer() const
     OSL_ENSURE( mxContainer.is(), "ObjectContainer::createContainer - container not found" );
 }
 
-
-
 ModelObjectHelper::ModelObjectHelper( const Reference< XMultiServiceFactory >& rxModelFactory ) :
     maMarkerContainer(    rxModelFactory, "com.sun.star.drawing.MarkerTable" ),
     maDashContainer(      rxModelFactory, "com.sun.star.drawing.DashTable" ),
@@ -147,8 +141,6 @@ OUString ModelObjectHelper::getFillBitmapUrl( const OUString &rGraphicName )
     return OUString();
 }
 
-
-
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/progressbar.cxx b/oox/source/helper/progressbar.cxx
index ab616772d7c9..307a78bf553b 100644
--- a/oox/source/helper/progressbar.cxx
+++ b/oox/source/helper/progressbar.cxx
@@ -24,8 +24,6 @@
 
 namespace oox {
 
-
-
 using namespace ::com::sun::star::task;
 using namespace ::com::sun::star::uno;
 
@@ -35,21 +33,14 @@ const sal_Int32 PROGRESS_RANGE      = 1000000;
 
 } // namespace
 
-
-
 IProgressBar::~IProgressBar()
 {
 }
 
-
-
 ISegmentProgressBar::~ISegmentProgressBar()
 {
 }
 
-
-
-
 ProgressBar::ProgressBar( const Reference< XStatusIndicator >& rxIndicator, const OUString& rText ) :
     mxIndicator( rxIndicator ),
     mfPosition( 0 )
@@ -77,8 +68,6 @@ void ProgressBar::setPosition( double fPosition )
         mxIndicator->setValue( static_cast< sal_Int32 >( mfPosition * PROGRESS_RANGE ) );
 }
 
-
-
 namespace prv {
 
 class SubSegment : public ISegmentProgressBar
@@ -100,8 +89,6 @@ private:
     double              mfFreeStart;
 };
 
-
-
 SubSegment::SubSegment( IProgressBar& rParentProgress, double fStartPos, double fLength ) :
     mrParentProgress( rParentProgress ),
     mfStartPos( fStartPos ),
@@ -139,8 +126,6 @@ ISegmentProgressBarRef SubSegment::createSegment( double fLength )
 
 } // namespace prv
 
-
-
 SegmentProgressBar::SegmentProgressBar( const Reference< XStatusIndicator >& rxIndicator, const OUString& rText ) :
     maProgress( rxIndicator, rText ),
     mfFreeStart( 0.0 )
@@ -171,8 +156,6 @@ ISegmentProgressBarRef SegmentProgressBar::createSegment( double fLength )
     return xSegment;
 }
 
-
-
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx
index 70a733fc168b..ff092e029b05 100644
--- a/oox/source/helper/propertyset.cxx
+++ b/oox/source/helper/propertyset.cxx
@@ -25,13 +25,9 @@
 
 namespace oox {
 
-
-
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
 
-
-
 void PropertySet::set( const Reference< XPropertySet >& rxPropSet )
 {
     mxPropSet = rxPropSet;
diff --git a/oox/source/helper/storagebase.cxx b/oox/source/helper/storagebase.cxx
index 740db3270d55..1083d02a27fb 100644
--- a/oox/source/helper/storagebase.cxx
+++ b/oox/source/helper/storagebase.cxx
@@ -27,14 +27,10 @@
 
 namespace oox {
 
-
-
 using namespace ::com::sun::star::embed;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 
-
-
 namespace {
 
 void lclSplitFirstElement( OUString& orElement, OUString& orRemainder, const OUString& _aFullName )
@@ -62,8 +58,6 @@ void lclSplitFirstElement( OUString& orElement, OUString& orRemainder, const OUS
 
 } // namespace
 
-
-
 StorageBase::StorageBase( const Reference< XInputStream >& rxInStream, bool bBaseStreamAccess ) :
     mxInStream( rxInStream ),
     mbBaseStreamAccess( bBaseStreamAccess ),
@@ -102,13 +96,11 @@ bool StorageBase::isRootStorage() const
     return implIsStorage() && maStorageName.isEmpty();
 }
 
-
 Reference< XStorage > StorageBase::getXStorage() const
 {
     return implGetXStorage();
 }
 
-
 OUString StorageBase::getPath() const
 {
     OUStringBuffer aBuffer( maParentPath );
@@ -258,8 +250,6 @@ StorageRef StorageBase::getSubStorage( const OUString& rElementName, bool bCreat
     return rxSubStrg;
 }
 
-
-
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index 3d86c403fd82..82148c497bf0 100644
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -27,14 +27,10 @@
 
 namespace oox {
 
-
-
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
-
-
 namespace {
 
 typedef ::cppu::WeakImplHelper1< XInputStream > UnoBinaryInputStream_BASE;
@@ -64,8 +60,6 @@ private:
     BinaryInputStream*  mpInStrm;
 };
 
-
-
 UnoBinaryInputStream::UnoBinaryInputStream( BinaryInputStream& rInStrm ) :
     mpInStrm( &rInStrm )
 {
@@ -113,8 +107,6 @@ void UnoBinaryInputStream::ensureConnected() const throw (NotConnectedException)
 
 } // namespace
 
-
-
 TextInputStream::TextInputStream( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm, rtl_TextEncoding eTextEnc )
 {
     init( rxContext, rxInStrm, eTextEnc );
@@ -220,8 +212,6 @@ void TextInputStream::init( const Reference< XComponentContext >& rxContext, con
     mxTextStrm = createXTextInputStream( rxContext, rxInStrm, eTextEnc );
 }
 
-
-
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx
index 46fffdc9dc9b..be8068c65836 100644
--- a/oox/source/helper/zipstorage.cxx
+++ b/oox/source/helper/zipstorage.cxx
@@ -31,16 +31,12 @@
 
 namespace oox {
 
-
-
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::embed;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
-
-
 ZipStorage::ZipStorage( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStream ) :
     StorageBase( rxInStream, false )
 {
@@ -202,8 +198,6 @@ void ZipStorage::implCommit() const
     }
 }
 
-
-
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx
index afa164b886c8..2b7eb1124852 100644
--- a/oox/source/mathml/importutils.cxx
+++ b/oox/source/mathml/importutils.cxx
@@ -152,7 +152,6 @@ XmlStream::Tag::Tag( int t, const AttributeList& a )
 {
 }
 
-
 XmlStream::Tag::operator bool() const
 {
     return token != XML_TOKEN_INVALID;
@@ -318,7 +317,6 @@ void XmlStream::handleUnexpectedTag()
     skipElementInternal( currentToken(), false ); // otherwise skip the entire element
 }
 
-
 void XmlStreamBuilder::appendOpeningTag( int token, const uno::Reference< xml::sax::XFastAttributeList >& attrs )
 {
     tags.push_back( Tag( OPENING( token ), attrs ));
diff --git a/oox/source/ole/axbinaryreader.cxx b/oox/source/ole/axbinaryreader.cxx
index 16e65f5d1a73..9df00e7672a2 100644
--- a/oox/source/ole/axbinaryreader.cxx
+++ b/oox/source/ole/axbinaryreader.cxx
@@ -24,8 +24,6 @@
 namespace oox {
 namespace ole {
 
-
-
 namespace {
 
 const sal_uInt32 AX_STRING_SIZEMASK         = 0x7FFFFFFF;
@@ -33,8 +31,6 @@ const sal_uInt32 AX_STRING_COMPRESSED       = 0x80000000;
 
 } // namespace
 
-
-
 AxAlignedInputStream::AxAlignedInputStream( BinaryInputStream& rInStrm ) :
     BinaryStreamBase( false ),
     mpInStrm( &rInStrm ),
@@ -106,8 +102,6 @@ void AxAlignedInputStream::align( size_t nSize )
     skip( static_cast< sal_Int32 >( (nSize - (mnStrmPos % nSize)) % nSize ) );
 }
 
-
-
 namespace {
 
 bool lclReadString( AxAlignedInputStream& rInStrm, OUString& rValue, sal_uInt32 nSize, bool bArrayString )
@@ -127,8 +121,6 @@ bool lclReadString( AxAlignedInputStream& rInStrm, OUString& rValue, sal_uInt32
 
 } // namespace
 
-
-
 AxBinaryPropertyReader::ComplexProperty::~ComplexProperty()
 {
 }
@@ -175,8 +167,6 @@ bool AxBinaryPropertyReader::PictureProperty::readProperty( AxAlignedInputStream
     return OleHelper::importStdPic( mrPicData, rInStrm, true );
 }
 
-
-
 AxBinaryPropertyReader::AxBinaryPropertyReader( BinaryInputStream& rInStrm, bool b64BitPropFlags ) :
     maInStrm( rInStrm ),
     mbValid( true )
@@ -285,8 +275,6 @@ bool AxBinaryPropertyReader::startNextProperty()
     return ensureValid() && bHasProp;
 }
 
-
-
 } // namespace ole
 } // namespace oox
 
diff --git a/oox/source/ole/axbinarywriter.cxx b/oox/source/ole/axbinarywriter.cxx
index 076dfff8aead..eaa336e10a36 100644
--- a/oox/source/ole/axbinarywriter.cxx
+++ b/oox/source/ole/axbinarywriter.cxx
@@ -13,16 +13,12 @@
 namespace oox {
 namespace ole {
 
-
-
 namespace {
 
 const sal_uInt32 AX_STRING_COMPRESSED       = 0x80000000;
 
 } // namespace
 
-
-
 AxAlignedOutputStream::AxAlignedOutputStream( BinaryOutputStream& rOutStrm ) :
     BinaryStreamBase( false ),
     mpOutStrm( &rOutStrm ),
@@ -88,8 +84,6 @@ void AxAlignedOutputStream::align( size_t nSize )
     pad( static_cast< sal_Int32 >( (nSize - (mnStrmPos % nSize)) % nSize ) );
 }
 
-
-
 namespace {
 
 void lclWriteString( AxAlignedOutputStream& rOutStrm, OUString& rValue, sal_uInt32 nSize, bool bArrayString )
@@ -100,8 +94,6 @@ void lclWriteString( AxAlignedOutputStream& rOutStrm, OUString& rValue, sal_uInt
 
 } // namespace
 
-
-
 AxBinaryPropertyWriter::ComplexProperty::~ComplexProperty()
 {
 }
@@ -118,8 +110,6 @@ bool AxBinaryPropertyWriter::StringProperty::writeProperty( AxAlignedOutputStrea
     return true;
 }
 
-
-
 AxBinaryPropertyWriter::AxBinaryPropertyWriter( BinaryOutputStream& rOutStrm, bool b64BitPropFlags ) :
     maOutStrm( rOutStrm ),
     mnPropFlags( 0x0 ),
@@ -212,8 +202,6 @@ bool AxBinaryPropertyWriter::startNextProperty( bool bSkip )
     return true;
 }
 
-
-
 } // namespace exp
 } // namespace ole
 
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index f767fb340659..d4426c08c897 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -90,8 +90,6 @@ const sal_uInt32 COMCTL_SCROLLBAR_HOR       = 0x00000010;
 const sal_uInt32 COMCTL_ID_PROGRESSBAR_50   = 0xE6E17E84;
 const sal_uInt32 COMCTL_ID_PROGRESSBAR_60   = 0x97AB8A01;
 
-
-
 const sal_uInt32 AX_CMDBUTTON_DEFFLAGS      = 0x0000001B;
 const sal_uInt32 AX_LABEL_DEFFLAGS          = 0x0080001B;
 const sal_uInt32 AX_IMAGE_DEFFLAGS          = 0x0000001B;
@@ -150,8 +148,6 @@ const sal_Int32 AX_CONTAINER_CYCLEALL       = 0;
 
 const sal_Int32 AX_CONTAINER_SCR_NONE       = 0x00;
 
-
-
 const sal_Int16 API_BORDER_NONE             = 0;
 const sal_Int16 API_BORDER_SUNKEN           = 1;
 const sal_Int16 API_BORDER_FLAT             = 2;
@@ -160,8 +156,6 @@ const sal_Int16 API_STATE_UNCHECKED         = 0;
 const sal_Int16 API_STATE_CHECKED           = 1;
 const sal_Int16 API_STATE_DONTKNOW          = 2;
 
-
-
 /** Tries to extract a range address from a defined name. */
 bool lclExtractRangeFromName( CellRangeAddress& orRangeAddr, const Reference< XModel >& rxDocModel, const OUString& rAddressString )
 {
@@ -217,8 +211,6 @@ void lclPrepareConverter( PropertySet& rConverter, const Reference< XModel >& rx
 
 } // namespace
 
-
-
 ControlConverter::ControlConverter( const Reference< XModel >& rxDocModel,
         const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) :
     mxDocModel( rxDocModel ),
@@ -578,8 +570,6 @@ void ControlConverter::convertToAxOrientation( PropertySet& rPropSet,
         nOrientation = AX_ORIENTATION_VERTICAL;
 }
 
-
-
 ControlModelBase::ControlModelBase() :
     maSize( 0, 0 ),
     mbAwtModel( false )
@@ -654,8 +644,6 @@ void ControlModelBase::convertSize( PropertyMap& rPropMap, const ControlConverte
     rConv.convertSize( rPropMap, maSize );
 }
 
-
-
 ComCtlModelBase::ComCtlModelBase( sal_uInt32 nDataPartId5, sal_uInt32 nDataPartId6,
         sal_uInt16 nVersion, bool bCommonPart, bool bComplexPart ) :
     maFontData( "Tahoma", 82500 ),
@@ -768,8 +756,6 @@ bool ComCtlModelBase::importComplexPart( BinaryInputStream& rInStrm )
     return false;
 }
 
-
-
 ComCtlScrollBarModel::ComCtlScrollBarModel( sal_uInt16 nVersion ) :
     ComCtlModelBase( SAL_MAX_UINT32, COMCTL_ID_SCROLLBAR_60, nVersion, true, true ),
     mnScrollBarFlags( 0x00000011 ),
@@ -799,8 +785,6 @@ void ComCtlScrollBarModel::importControlData( BinaryInputStream& rInStrm )
     rInStrm >> mnScrollBarFlags >> mnLargeChange >> mnSmallChange >> mnMin >> mnMax >> mnPosition;
 }
 
-
-
 ComCtlProgressBarModel::ComCtlProgressBarModel( sal_uInt16 nVersion ) :
     ComCtlModelBase( COMCTL_ID_PROGRESSBAR_50, COMCTL_ID_PROGRESSBAR_60, nVersion, true, true ),
     mfMin( 0.0 ),
@@ -833,8 +817,6 @@ void ComCtlProgressBarModel::importControlData( BinaryInputStream& rInStrm )
         rInStrm >> mnVertical >> mnSmooth;
 }
 
-
-
 AxControlModelBase::AxControlModelBase()
 {
 }
@@ -858,8 +840,6 @@ void AxControlModelBase::importProperty( sal_Int32 nPropId, const OUString& rVal
     }
 }
 
-
-
 AxFontDataModel::AxFontDataModel( bool bSupportsAlign ) :
     mbSupportsAlign( bSupportsAlign )
 {
@@ -961,8 +941,6 @@ void AxFontDataModel::convertFromProperties( PropertySet& rPropSet, const Contro
     }
 }
 
-
-
 AxCommandButtonModel::AxCommandButtonModel() :
     mnTextColor( AX_SYSCOLOR_BUTTONTEXT ),
     mnBackColor( AX_SYSCOLOR_BUTTONFACE ),
@@ -1013,7 +991,6 @@ bool AxCommandButtonModel::importBinaryModel( BinaryInputStream& rInStrm )
     return aReader.finalizeImport() && AxFontDataModel::importBinaryModel( rInStrm );
 }
 
-
 void AxCommandButtonModel::exportBinaryModel( BinaryOutputStream& rOutStrm )
 {
     AxBinaryPropertyWriter aWriter( rOutStrm );
@@ -1094,7 +1071,6 @@ void AxCommandButtonModel::convertFromProperties( PropertySet& rPropSet, const C
     AxFontDataModel::convertFromProperties( rPropSet, rConv );
 }
 
-
 AxLabelModel::AxLabelModel() :
     mnTextColor( AX_SYSCOLOR_BUTTONTEXT ),
     mnBackColor( AX_SYSCOLOR_BUTTONFACE ),
@@ -1225,8 +1201,6 @@ void AxLabelModel::convertProperties( PropertyMap& rPropMap, const ControlConver
     AxFontDataModel::convertProperties( rPropMap, rConv );
 }
 
-
-
 AxImageModel::AxImageModel() :
     mnBackColor( AX_SYSCOLOR_BUTTONFACE ),
     mnFlags( AX_IMAGE_DEFFLAGS ),
@@ -1346,8 +1320,6 @@ void AxImageModel::convertProperties( PropertyMap& rPropMap, const ControlConver
     AxControlModelBase::convertProperties( rPropMap, rConv );
 }
 
-
-
 AxTabStripModel::AxTabStripModel() :
     mnListIndex( 0 ),
     mnTabStyle( 0 ),
@@ -1575,8 +1547,6 @@ void AxMorphDataModelBase::convertProperties( PropertyMap& rPropMap, const Contr
     AxFontDataModel::convertProperties( rPropMap, rConv );
 }
 
-
-
 AxToggleButtonModel::AxToggleButtonModel()
 {
     mnDisplayStyle = AX_DISPLAYSTYLE_TOGGLE;
@@ -1639,8 +1609,6 @@ void AxToggleButtonModel::exportCompObj( BinaryOutputStream& rOutStream )
     rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) );
 }
 
-
-
 AxCheckBoxModel::AxCheckBoxModel()
 {
     mnDisplayStyle = AX_DISPLAYSTYLE_CHECKBOX;
@@ -1703,7 +1671,6 @@ void AxCheckBoxModel::exportCompObj( BinaryOutputStream& rOutStream )
     rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) );
 }
 
-
 AxOptionButtonModel::AxOptionButtonModel()
 {
     mnDisplayStyle = AX_DISPLAYSTYLE_OPTBUTTON;
@@ -1767,8 +1734,6 @@ void AxOptionButtonModel::exportCompObj( BinaryOutputStream& rOutStream )
     rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) );
 }
 
-
-
 AxTextBoxModel::AxTextBoxModel()
 {
     mnDisplayStyle = AX_DISPLAYSTYLE_TEXT;
@@ -1846,7 +1811,6 @@ void AxTextBoxModel::exportCompObj( BinaryOutputStream& rOutStream )
     rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) );
 }
 
-
 AxNumericFieldModel::AxNumericFieldModel()
 {
     mnDisplayStyle = AX_DISPLAYSTYLE_TEXT;
@@ -1909,7 +1873,6 @@ void AxNumericFieldModel::exportCompObj( BinaryOutputStream& rOutStream )
     rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) );
 }
 
-
 AxListBoxModel::AxListBoxModel()
 {
     mnDisplayStyle = AX_DISPLAYSTYLE_LISTBOX;
@@ -1966,7 +1929,6 @@ void AxListBoxModel::exportCompObj( BinaryOutputStream& rOutStream )
     rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) );
 }
 
-
 AxComboBoxModel::AxComboBoxModel()
 {
     mnDisplayStyle = AX_DISPLAYSTYLE_COMBOBOX;
@@ -2054,7 +2016,6 @@ void AxComboBoxModel::exportCompObj( BinaryOutputStream& rOutStream )
     rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) );
 }
 
-
 AxSpinButtonModel::AxSpinButtonModel() :
     mnArrowColor( AX_SYSCOLOR_BUTTONTEXT ),
     mnBackColor( AX_SYSCOLOR_BUTTONFACE ),
@@ -2197,7 +2158,6 @@ void AxSpinButtonModel::exportCompObj( BinaryOutputStream& rOutStream )
     rOutStream.writeMemory( aCompObj, sizeof( aCompObj ) );
 }
 
-
 AxScrollBarModel::AxScrollBarModel() :
     mnArrowColor( AX_SYSCOLOR_BUTTONTEXT ),
     mnBackColor( AX_SYSCOLOR_BUTTONFACE ),
@@ -2349,8 +2309,6 @@ void AxScrollBarModel::convertFromProperties( PropertySet& rPropSet, const Contr
 
 }
 
-
-
 AxContainerModelBase::AxContainerModelBase( bool bFontSupport ) :
     AxFontDataModel( false ),   // no support for alignment properties
     maLogicalSize( AX_CONTAINER_DEFWIDTH, AX_CONTAINER_DEFHEIGHT ),
@@ -2454,8 +2412,6 @@ bool AxContainerModelBase::importClassTable( BinaryInputStream& rInStrm, AxClass
     return bValid;
 }
 
-
-
 AxFrameModel::AxFrameModel() :
     AxContainerModelBase( true )
 {
@@ -2501,7 +2457,6 @@ ApiControlType AxMultiPageModel::getControlType() const
     return API_CONTROL_MULTIPAGE;
 }
 
-
 bool AxMultiPageModel::importPageAndMultiPageProperties( BinaryInputStream& rInStrm, sal_Int32 nPages )
 {
     // PageProperties
@@ -2540,9 +2495,6 @@ void AxMultiPageModel::convertProperties( PropertyMap& rPropMap, const ControlCo
     AxContainerModelBase::convertProperties( rPropMap, rConv );
 }
 
-
-
-
 AxUserFormModel::AxUserFormModel()
 {
 }
@@ -2629,7 +2581,6 @@ HtmlSelectModel::importBinaryModel( BinaryInputStream& rInStrm )
     return true;
 }
 
-
 void
 HtmlSelectModel::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const
 {
@@ -2658,7 +2609,6 @@ HtmlTextBoxModel::importBinaryModel( BinaryInputStream& rInStrm )
     return true;
 }
 
-
 EmbeddedControl::EmbeddedControl( const OUString& rName ) :
     maName( rName )
 {
@@ -2731,8 +2681,6 @@ bool EmbeddedControl::convertFromProperties( const Reference< XControlModel >& r
     return false;
 }
 
-
-
 EmbeddedForm::EmbeddedForm( const Reference< XModel >& rxDocModel,
         const Reference< XDrawPage >& rxDrawPage, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) :
     maControlConv( rxDocModel, rGraphicHelper, bDefaultColorBgr ),
@@ -2796,8 +2744,6 @@ Reference< XIndexContainer > EmbeddedForm::createXForm()
     return mxFormIC;
 }
 
-
-
 } // namespace ole
 } // namespace oox
 
diff --git a/oox/source/ole/axcontrolfragment.cxx b/oox/source/ole/axcontrolfragment.cxx
index 6704eff5f4ce..9f4d81267997 100644
--- a/oox/source/ole/axcontrolfragment.cxx
+++ b/oox/source/ole/axcontrolfragment.cxx
@@ -29,8 +29,6 @@
 namespace oox {
 namespace ole {
 
-
-
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 
@@ -39,8 +37,6 @@ using ::oox::core::ContextHandlerRef;
 using ::oox::core::FragmentHandler2;
 using ::oox::core::XmlFilterBase;
 
-
-
 AxControlPropertyContext::AxControlPropertyContext( FragmentHandler2& rFragment, ControlModelBase& rModel ) :
     ContextHandler2( rFragment ),
     mrModel( rModel ),
@@ -84,8 +80,6 @@ ContextHandlerRef AxControlPropertyContext::onCreateContext( sal_Int32 nElement,
     return 0;
 }
 
-
-
 AxControlFragment::AxControlFragment( XmlFilterBase& rFilter, const OUString& rFragmentPath, EmbeddedControl& rControl ) :
     FragmentHandler2( rFilter, rFragmentPath, true ),
     mrControl( rControl )
@@ -145,8 +139,6 @@ ContextHandlerRef AxControlFragment::onCreateContext( sal_Int32 nElement, const
     return 0;
 }
 
-
-
 } // namespace ole
 } // namespace oox
 
diff --git a/oox/source/ole/axfontdata.cxx b/oox/source/ole/axfontdata.cxx
index ba93c7014482..ea31b3d1b9d0 100644
--- a/oox/source/ole/axfontdata.cxx
+++ b/oox/source/ole/axfontdata.cxx
@@ -25,8 +25,6 @@
 namespace oox {
 namespace ole {
 
-
-
 AxFontData::AxFontData() :
     mnFontEffects( 0 ),
     mnFontHeight( 160 ),
@@ -111,8 +109,6 @@ bool AxFontData::importGuidAndFont( BinaryInputStream& rInStrm )
     return false;
 }
 
-
-
 } // namespace ole
 } // namespace oox
 
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 8b393ea0dc91..420a80dc4158 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -44,8 +44,6 @@
 namespace oox {
 namespace ole {
 
-
-
 using ::com::sun::star::form::XFormComponent;
 using ::com::sun::star::form::XForm;
 using ::com::sun::star::awt::XControlModel;
@@ -70,8 +68,6 @@ using ::com::sun::star::lang::XServiceInfo;
 
 using namespace ::com::sun::star::form;
 
-
-
 namespace {
 
 const sal_uInt32 OLE_COLORTYPE_MASK         = 0xFF000000;
@@ -83,7 +79,6 @@ const sal_uInt32 OLE_COLORTYPE_SYSCOLOR     = 0x80000000;
 const sal_uInt32 OLE_PALETTECOLOR_MASK      = 0x0000FFFF;
 const sal_uInt32 OLE_SYSTEMCOLOR_MASK       = 0x0000FFFF;
 
-
 /** Swaps the red and blue component of the passed color. */
 inline sal_uInt32 lclSwapRedBlue( sal_uInt32 nColor )
 {
@@ -96,8 +91,6 @@ inline sal_Int32 lclDecodeBgrColor( sal_uInt32 nOleColor )
     return static_cast< sal_Int32 >( lclSwapRedBlue( nOleColor ) & 0xFFFFFF );
 }
 
-
-
 const sal_uInt32 OLE_STDPIC_ID              = 0x0000746C;
 
 struct GUIDCNamePair
@@ -197,8 +190,6 @@ GUIDCNamePairMap& classIdToGUIDCNamePairMap::get()
     return theInst.mnIdToGUIDCNamePairMap;
 }
 
-
-
 template< typename Type >
 void lclAppendHex( OUStringBuffer& orBuffer, Type nValue )
 {
@@ -211,8 +202,6 @@ void lclAppendHex( OUStringBuffer& orBuffer, Type nValue )
 
 } // namespace
 
-
-
 StdFontInfo::StdFontInfo() :
     mnHeight( 0 ),
     mnWeight( OLE_STDFONT_NORMAL ),
@@ -231,8 +220,6 @@ StdFontInfo::StdFontInfo( const OUString& rName, sal_uInt32 nHeight,
 {
 }
 
-
-
 sal_Int32 OleHelper::decodeOleColor(
         const GraphicHelper& rGraphicHelper, sal_uInt32 nOleColor, bool bDefaultColorBgr )
 {
@@ -548,7 +535,6 @@ bool MSConvertOCXControls::ReadOCXStorage( SotStorageRef& xOleStg,
         SvStorageStreamRef pContents = xOleStg->OpenSotStream( OUString("contents"));
         BinaryXInputStream aInStrm(  Reference< XInputStream >( new utl::OSeekableInputStreamWrapper( *pContents ) ), true );
 
-
         SvStorageStreamRef pClsStrm = xOleStg->OpenSotStream(OUString("\1CompObj"));
         BinaryXInputStream aClsStrm( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper(*pClsStrm ) ), true );
         aClsStrm.skip(12);
diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx
index efa94eb56a05..a2c008a917f5 100644
--- a/oox/source/ole/oleobjecthelper.cxx
+++ b/oox/source/ole/oleobjecthelper.cxx
@@ -32,8 +32,6 @@
 namespace oox {
 namespace ole {
 
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::embed;
@@ -41,8 +39,6 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
-
-
 OleObjectInfo::OleObjectInfo() :
     mbLinked( false ),
     mbShowAsIcon( false ),
@@ -50,8 +46,6 @@ OleObjectInfo::OleObjectInfo() :
 {
 }
 
-
-
 OleObjectHelper::OleObjectHelper( const Reference< XMultiServiceFactory >& rxModelFactory ) :
     maEmbeddedObjScheme( "vnd.sun.star.EmbeddedObject:" ),
     mnObjectId( 100 )
@@ -124,8 +118,6 @@ bool OleObjectHelper::importOleObject( PropertyMap& rPropMap, const OleObjectInf
     return bRet;
 }
 
-
-
 } // namespace ole
 } // namespace oox
 
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index 9ff7bc883630..0b6c51cbd9db 100644
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -38,8 +38,6 @@
 namespace oox {
 namespace ole {
 
-
-
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::embed;
@@ -47,8 +45,6 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
-
-
 namespace {
 
 typedef ::cppu::WeakImplHelper2< XSeekable, XOutputStream > OleOutputStreamBase;
@@ -85,8 +81,6 @@ private:
     OUString            maElementName;
 };
 
-
-
 OleOutputStream::OleOutputStream( const Reference< XComponentContext >& rxContext,
         const Reference< XNameContainer >& rxStorage, const OUString& rElementName ) :
     mxStorage( rxStorage ),
@@ -169,8 +163,6 @@ void OleOutputStream::ensureConnected() const throw( NotConnectedException )
 
 } // namespace
 
-
-
 OleStorage::OleStorage( const Reference< XComponentContext >& rxContext,
         const Reference< XInputStream >& rxInStream, bool bBaseStreamAccess ) :
     StorageBase( rxInStream, bBaseStreamAccess ),
@@ -214,8 +206,6 @@ OleStorage::~OleStorage()
 {
 }
 
-
-
 void OleStorage::initStorage( const Reference< XInputStream >& rxInStream )
 {
     // if stream is not seekable, create temporary copy
@@ -390,8 +380,6 @@ void OleStorage::implCommit() const
     }
 }
 
-
-
 } // namespace ole
 } // namespace oox
 
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 818f8789b802..c60007b5aeea 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -77,8 +77,6 @@ const sal_uInt32 VBA_SITE_DEFFLAGS              = 0x00000033;
 const sal_uInt8 VBA_SITEINFO_COUNT              = 0x80;
 const sal_uInt8 VBA_SITEINFO_MASK               = 0x7F;
 
-
-
 /** Collects names of all controls in a user form or container control. Allows
     to generate unused names for dummy controls separating option groups.
  */
@@ -124,8 +122,6 @@ OUString VbaControlNamesSet::generateDummyName()
     return aCtrlName;
 }
 
-
-
 /** Functor that inserts the name of a control into a VbaControlNamesSet. */
 struct VbaControlNameInserter
 {
@@ -135,8 +131,6 @@ public:
     inline void         operator()( const VbaFormControl& rControl ) { mrCtrlNames.insertName( rControl ); }
 };
 
-
-
 /** A dummy invisible form control (fixed label without text) that is used to
     separate two groups of option buttons.
  */
@@ -159,8 +153,6 @@ VbaDummyFormControl::VbaDummyFormControl( const OUString& rName )
 
 } // namespace
 
-
-
 VbaSiteModel::VbaSiteModel() :
     maPos( 0, 0 ),
     mnId( 0 ),
@@ -318,8 +310,6 @@ void VbaSiteModel::convertProperties( PropertyMap& rPropMap,
     }
 }
 
-
-
 VbaFormControl::VbaFormControl()
 {
 }
@@ -722,8 +712,6 @@ bool VbaFormControl::compareByTabIndex( const VbaFormControlRef& rxLeft, const V
     return nLeftTabIndex < nRightTabIndex;
 }
 
-
-
 namespace {
 
 OUString lclGetQuotedString( const OUString& rCodeLine )
@@ -776,8 +764,6 @@ bool lclEatKeyword( OUString& rCodeLine, const OUString& rKeyword )
 
 } // namespace
 
-
-
 VbaUserForm::VbaUserForm( const Reference< XComponentContext >& rxContext,
         const Reference< XModel >& rxDocModel, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) :
     mxContext( rxContext ),
@@ -868,8 +854,6 @@ void VbaUserForm::importForm( const Reference< XNameContainer >& rxDialogLib,
     }
 }
 
-
-
 } // namespace ole
 } // namespace oox
 
diff --git a/oox/source/ole/vbahelper.cxx b/oox/source/ole/vbahelper.cxx
index 4219ceeda462..18a1416d086f 100644
--- a/oox/source/ole/vbahelper.cxx
+++ b/oox/source/ole/vbahelper.cxx
@@ -24,12 +24,8 @@
 namespace oox {
 namespace ole {
 
-
-
 using namespace ::com::sun::star::uno;
 
-
-
 bool VbaHelper::readDirRecord( sal_uInt16& rnRecId, StreamDataSequence& rRecData, BinaryInputStream& rInStrm )
 {
     // read the record header
@@ -57,8 +53,6 @@ bool VbaHelper::extractKeyValue( OUString& rKey, OUString& rValue, const OUStrin
     return false;
 }
 
-
-
 } // namespace ole
 } // namespace oox
 
diff --git a/oox/source/ole/vbainputstream.cxx b/oox/source/ole/vbainputstream.cxx
index 56b4d12eaea6..01ad7bc80cfe 100644
--- a/oox/source/ole/vbainputstream.cxx
+++ b/oox/source/ole/vbainputstream.cxx
@@ -23,8 +23,6 @@
 namespace oox {
 namespace ole {
 
-
-
 namespace {
 
 const sal_uInt8 VBASTREAM_SIGNATURE         = 1;
@@ -36,8 +34,6 @@ const sal_uInt16 VBACHUNK_LENMASK           = 0x0FFF;
 
 } // namespace
 
-
-
 VbaInputStream::VbaInputStream( BinaryInputStream& rInStrm ) :
     BinaryStreamBase( false ),
     mpInStrm( &rInStrm ),
@@ -208,8 +204,6 @@ bool VbaInputStream::updateChunk()
     return !mbEof;
 }
 
-
-
 } // namespace ole
 } // namespace oox
 
diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx
index 465d9652cffc..b6794f319e39 100644
--- a/oox/source/ole/vbamodule.cxx
+++ b/oox/source/ole/vbamodule.cxx
@@ -36,8 +36,6 @@
 namespace oox {
 namespace ole {
 
-
-
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::script::vba;
 using namespace ::com::sun::star::uno;
@@ -338,8 +336,6 @@ void VbaModule::createModule( const OUString& rVBASourceCode,
     }
 }
 
-
-
 } // namespace ole
 } // namespace oox
 
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index 99f07c5e88af..6bffdd7a20ee 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -47,8 +47,6 @@
 namespace oox {
 namespace ole {
 
-
-
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::embed;
@@ -61,8 +59,6 @@ using namespace ::com::sun::star::uno;
 
 using ::comphelper::ConfigurationHelper;
 
-
-
 namespace {
 
 bool lclReadConfigItem( const Reference< XInterface >& rxConfigAccess, const OUString& rItemName )
@@ -81,8 +77,6 @@ bool lclReadConfigItem( const Reference< XInterface >& rxConfigAccess, const OUS
 
 } // namespace
 
-
-
 VbaFilterConfig::VbaFilterConfig( const Reference< XComponentContext >& rxContext, const OUString& rConfigCompName )
 {
     OSL_ENSURE( rxContext.is(), "VbaFilterConfig::VbaFilterConfig - missing component context" );
@@ -117,8 +111,6 @@ bool VbaFilterConfig::isExportVba() const
     return lclReadConfigItem( mxConfigAccess, "Save" );
 }
 
-
-
 VbaMacroAttacherBase::VbaMacroAttacherBase( const OUString& rMacroName ) :
     maMacroName( rMacroName )
 {
@@ -140,8 +132,6 @@ void VbaMacroAttacherBase::resolveAndAttachMacro( const Reference< XVBAMacroReso
     }
 }
 
-
-
 VbaProject::VbaProject( const Reference< XComponentContext >& rxContext,
         const Reference< XModel >& rxDocModel, const OUString& rConfigCompName ) :
     VbaFilterConfig( rxContext, rConfigCompName ),
@@ -157,7 +147,6 @@ VbaProject::~VbaProject()
 {
 }
 
-
 bool VbaProject::importVbaProject( StorageBase& rVbaPrjStrg )
 {
    // create GraphicHelper
@@ -294,7 +283,6 @@ void VbaProject::readVbaModules( StorageBase& rVbaPrjStrg )
     sal_uInt16 nModuleCount = 0;
     bool bExecutable = isImportVbaExecutable();
 
-
     sal_uInt16 nRecId = 0;
     StreamDataSequence aRecData;
     while( VbaHelper::readDirRecord( nRecId, aRecData, aDirStrm ) && (nRecId != VBA_ID_PROJECTEND) )
@@ -562,8 +550,6 @@ void VbaProject::copyStorage( StorageBase& rVbaPrjStrg )
     }
 }
 
-
-
 } // namespace ole
 } // namespace oox
 
diff --git a/oox/source/ppt/animationspersist.cxx b/oox/source/ppt/animationspersist.cxx
index 1405a6ecc376..6b919851da1d 100644
--- a/oox/source/ppt/animationspersist.cxx
+++ b/oox/source/ppt/animationspersist.cxx
@@ -77,7 +77,6 @@ namespace oox { namespace ppt {
         }
     }
 
-
     Any AnimTargetElement::convert(const SlidePersistPtr & pSlide, sal_Int16 & nSubType) const
     {
         Any aTarget;
@@ -125,7 +124,6 @@ namespace oox { namespace ppt {
         return aTarget;
     }
 
-
 // BEGIN CUT&PASTE from sd/source/filter/ppt/pptinanimations.cxx
 /** this adds an any to another any.
     if rNewValue is empty, rOldValue is returned.
@@ -178,7 +176,6 @@ namespace oox { namespace ppt {
         return aAny;
     }
 
-
     Any AnimationCondition::convertList(const SlidePersistPtr & pSlide, const AnimationConditionList & l)
     {
         Any aAny;
@@ -192,5 +189,4 @@ namespace oox { namespace ppt {
 
 } }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/animationtypes.cxx b/oox/source/ppt/animationtypes.cxx
index 4992fdd338f4..65686813c28b 100644
--- a/oox/source/ppt/animationtypes.cxx
+++ b/oox/source/ppt/animationtypes.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include "animationtypes.hxx"
 
 #include <com/sun/star/animations/Timing.hpp>
@@ -45,7 +44,6 @@ Any GetTime(  const OUString & val )
     return aDuration;
 }
 
-
 // ST_TLTimeAnimateValueTime
 Any GetTimeAnimateValueTime( const OUString & val )
 {
diff --git a/oox/source/ppt/animationtypes.hxx b/oox/source/ppt/animationtypes.hxx
index d82918a844bb..02316372ea70 100644
--- a/oox/source/ppt/animationtypes.hxx
+++ b/oox/source/ppt/animationtypes.hxx
@@ -17,16 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-
 #ifndef INCLUDED_OOX_SOURCE_PPT_ANIMATIONTYPES_HXX
 #define INCLUDED_OOX_SOURCE_PPT_ANIMATIONTYPES_HXX
 
-
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
 
-
 namespace oox { namespace ppt {
 
 // ST_TLTime
diff --git a/oox/source/ppt/animvariantcontext.cxx b/oox/source/ppt/animvariantcontext.cxx
index 51ff3a45a130..bc5aca0e262c 100644
--- a/oox/source/ppt/animvariantcontext.cxx
+++ b/oox/source/ppt/animvariantcontext.cxx
@@ -57,7 +57,6 @@ namespace oox { namespace ppt {
         }
     }
 
-
     ContextHandlerRef AnimVariantContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
     {
         switch( aElementToken )
@@ -97,8 +96,6 @@ namespace oox { namespace ppt {
         return this;
     }
 
-
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/backgroundproperties.cxx b/oox/source/ppt/backgroundproperties.cxx
index dd1ba5ac3429..e081a7552965 100644
--- a/oox/source/ppt/backgroundproperties.cxx
+++ b/oox/source/ppt/backgroundproperties.cxx
@@ -28,7 +28,6 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace ppt {
 
-
 BackgroundPropertiesContext::BackgroundPropertiesContext( FragmentHandler2& rParent, ::oox::drawingml::FillProperties& rFillProperties )
 : FragmentHandler2( rParent )
 , mrFillProperties( rFillProperties )
diff --git a/oox/source/ppt/buildlistcontext.cxx b/oox/source/ppt/buildlistcontext.cxx
index b716ebd5c401..1d812f31be87 100644
--- a/oox/source/ppt/buildlistcontext.cxx
+++ b/oox/source/ppt/buildlistcontext.cxx
@@ -82,7 +82,6 @@ namespace oox { namespace ppt {
         return this;
     }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/buildlistcontext.hxx b/oox/source/ppt/buildlistcontext.hxx
index 4bc1aa31624f..19bee7666482 100644
--- a/oox/source/ppt/buildlistcontext.hxx
+++ b/oox/source/ppt/buildlistcontext.hxx
@@ -24,7 +24,6 @@
 
 namespace oox { namespace ppt {
 
-
     /** CT_BuildList */
     class BuildListContext
         : public ::oox::core::FragmentHandler2
@@ -42,9 +41,6 @@ namespace oox { namespace ppt {
         bool              mbBuildAsOne;
     };
 
-
-
-
 } }
 
 #endif
diff --git a/oox/source/ppt/comments.cxx b/oox/source/ppt/comments.cxx
index 81d22e9c3d7e..965a7ef658b0 100644
--- a/oox/source/ppt/comments.cxx
+++ b/oox/source/ppt/comments.cxx
@@ -11,7 +11,6 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <rtl/math.hxx>
 
-
 namespace oox { namespace ppt {
 
 void CommentAuthorList::setValues(const CommentAuthorList& list)
diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx
index 5cc23c562a08..e715f8ba8697 100644
--- a/oox/source/ppt/commonbehaviorcontext.cxx
+++ b/oox/source/ppt/commonbehaviorcontext.cxx
@@ -50,13 +50,10 @@ namespace oox { namespace ppt {
     {
     }
 
-
     CommonBehaviorContext::~CommonBehaviorContext( ) throw( )
     {
     }
 
-
-
     void CommonBehaviorContext::onEndElement()
     {
         switch( getCurrentElement() )
@@ -110,7 +107,6 @@ namespace oox { namespace ppt {
         }
     }
 
-
     void CommonBehaviorContext::onCharacters( const OUString& aChars )
     {
         if( mbIsInAttrName )
@@ -119,7 +115,6 @@ namespace oox { namespace ppt {
         }
     }
 
-
     ::oox::core::ContextHandlerRef CommonBehaviorContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
     {
         switch ( aElementToken )
diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx
index fe989d437a1d..5625f34e9cf1 100644
--- a/oox/source/ppt/commonbehaviorcontext.hxx
+++ b/oox/source/ppt/commonbehaviorcontext.hxx
@@ -34,7 +34,6 @@ namespace oox { namespace ppt {
         MS_AttributeNames type;
     };
 
-
     /** CT_TLCommonBehaviorData */
     class CommonBehaviorContext
         : public TimeNodeContext
@@ -59,7 +58,6 @@ namespace oox { namespace ppt {
         OUString   msCurrentAttribute;
     };
 
-
 } }
 
 #endif
diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx
index c551a74250a7..61d9c5545909 100644
--- a/oox/source/ppt/commontimenodecontext.cxx
+++ b/oox/source/ppt/commontimenodecontext.cxx
@@ -46,7 +46,6 @@ using namespace ::com::sun::star::animations;
 using namespace ::com::sun::star::presentation;
 using namespace ::com::sun::star::xml::sax;
 
-
 using ::com::sun::star::beans::NamedValue;
 
 namespace oox { namespace ppt {
@@ -83,7 +82,6 @@ static const convert_subtype gConvertArray[] =
     {  0, 0 }
 };
 
-
 struct preset_maping
 {
     sal_Int32   mnPresetClass;
@@ -229,9 +227,6 @@ static const preset_maping gPresetMaping[] =
     { ::com::sun::star::presentation::EffectPresetClass::EXIT, 56       ,"ooo-exit-flip" },
     { ::com::sun::star::presentation::EffectPresetClass::EXIT, 58       ,"ooo-exit-fold" },
 
-
-
-
     { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 16     ,"ooo-motionpath-4-point-star" },
     { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 5      ,"ooo-motionpath-5-point-star" },
     { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 11     ,"ooo-motionpath-6-point-star" },
@@ -297,7 +292,6 @@ static const preset_maping gPresetMaping[] =
     { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 39     ,"ooo-motionpath-s-curve-2" },
     { ::com::sun::star::presentation::EffectPresetClass::MOTIONPATH, 45     ,"ooo-motionpath-heartbeat" },
 
-
     { 0,0,0 }
 };
 
@@ -597,12 +591,10 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId
         xAttribs->getOptionalValue( XML_tmFilter );
     }
 
-
     CommonTimeNodeContext::~CommonTimeNodeContext( ) throw ( )
     {
     }
 
-
     void CommonTimeNodeContext::onEndElement()
     {
         if( isCurrentElement( PPT_TOKEN( iterate ) ) )
@@ -611,7 +603,6 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId
         }
     }
 
-
     ::oox::core::ContextHandlerRef CommonTimeNodeContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
     {
 
diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx
index 69c7dd7ec1d2..6790135fc9e1 100644
--- a/oox/source/ppt/commontimenodecontext.hxx
+++ b/oox/source/ppt/commontimenodecontext.hxx
@@ -44,7 +44,6 @@ namespace oox { namespace ppt {
         ::com::sun::star::uno::Reference< ::com::sun::star::animations::XIterateContainer > mxIter;
     };
 
-
 } }
 
 #endif
diff --git a/oox/source/ppt/conditioncontext.cxx b/oox/source/ppt/conditioncontext.cxx
index 2fa15d23332e..9e7d816fd04d 100644
--- a/oox/source/ppt/conditioncontext.cxx
+++ b/oox/source/ppt/conditioncontext.cxx
@@ -152,8 +152,6 @@ namespace oox { namespace ppt {
 
     }
 
-
-
     /** CT_TLTimeConditionList */
     CondListContext::CondListContext(
             FragmentHandler2& rParent, sal_Int32  aElement,
@@ -184,7 +182,6 @@ namespace oox { namespace ppt {
         return this;
     }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx
index 4eac421d68de..612797a57a0a 100644
--- a/oox/source/ppt/conditioncontext.hxx
+++ b/oox/source/ppt/conditioncontext.hxx
@@ -30,7 +30,6 @@
 
 namespace oox { namespace ppt {
 
-
     /** CT_TLTimeCondition */
     class CondContext
         : public TimeNodeContext
@@ -47,8 +46,6 @@ namespace oox { namespace ppt {
         AnimationCondition &                 maCond;
     };
 
-
-
     /** CT_TLTimeConditionList */
     class CondListContext
         : public TimeNodeContext
@@ -66,7 +63,6 @@ namespace oox { namespace ppt {
         AnimationConditionList     & maConditions;
     };
 
-
 } }
 
 #endif
diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx
index 7cd404937742..a23447740e0b 100644
--- a/oox/source/ppt/customshowlistcontext.cxx
+++ b/oox/source/ppt/customshowlistcontext.cxx
@@ -65,8 +65,6 @@ CustomShowContext::~CustomShowContext( )
     return this;
 }
 
-
-
 CustomShowListContext::CustomShowListContext( FragmentHandler2& rParent,
     std::vector< CustomShow >& rCustomShowList )
 : FragmentHandler2( rParent )
@@ -95,7 +93,6 @@ CustomShowListContext::~CustomShowListContext( )
     return this;
 }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx
index d7befd3053cb..3512ca9d5345 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.hxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.hxx
@@ -18,7 +18,6 @@
 
 namespace oox { namespace ppt {
 
-
 class ExtDrawingFragmentHandler : public ::oox::core::FragmentHandler2
 {
 public:
diff --git a/oox/source/ppt/headerfootercontext.hxx b/oox/source/ppt/headerfootercontext.hxx
index 23deb25c0220..7be60f09fe89 100644
--- a/oox/source/ppt/headerfootercontext.hxx
+++ b/oox/source/ppt/headerfootercontext.hxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-
 #ifndef INCLUDED_OOX_SOURCE_PPT_HEADERFOOTERCONTEXT_HXX
 #define INCLUDED_OOX_SOURCE_PPT_HEADERFOOTERCONTEXT_HXX
 
diff --git a/oox/source/ppt/pptfilterhelpers.cxx b/oox/source/ppt/pptfilterhelpers.cxx
index cf8b4625c70b..a5f145b7ed17 100644
--- a/oox/source/ppt/pptfilterhelpers.cxx
+++ b/oox/source/ppt/pptfilterhelpers.cxx
@@ -26,7 +26,6 @@ namespace oox { namespace ppt {
 
     // BEGIN CUT&PASTE from sd pptanimations.hxx
 
-
     static const transition gTransitions[] =
     {
         { "wipe(up)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, true },
@@ -86,7 +85,6 @@ namespace oox { namespace ppt {
         return NULL;
     }
 
-
     bool convertMeasure( OUString& rString )
     {
         bool bRet = false;
@@ -188,7 +186,6 @@ namespace oox { namespace ppt {
         return bRet;
     }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/pptfilterhelpers.hxx b/oox/source/ppt/pptfilterhelpers.hxx
index 910f4f4b3bda..7cbedd304081 100644
--- a/oox/source/ppt/pptfilterhelpers.hxx
+++ b/oox/source/ppt/pptfilterhelpers.hxx
@@ -24,7 +24,6 @@
 
 namespace oox { namespace ppt {
 
-
 //BEGIN CUT&PASTE from sd pptanimations.hxx
     // conversion of MS to OOo attributes.
     enum MS_AttributeNames
@@ -69,7 +68,6 @@ namespace oox { namespace ppt {
     };
     //END CUT&PASTE
 
-
     // BEGIN CUT&PASTE from sd pptanimations.hxx
     struct transition
     {
@@ -83,12 +81,10 @@ namespace oox { namespace ppt {
     };
     // END CUT&PASTE
 
-
     // BEGIN CUT&PASTE from sd pptinanimation.cxx
     bool convertMeasure( OUString& rString );
     // END CUT&PASTE from sd pptinanimation.cxx
 
-
 } }
 
 #endif
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx
index b0772a87d7e0..124b35e560cd 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -196,7 +196,6 @@ ContextHandlerRef PPTGraphicShapeContext::onCreateContext( sal_Int32 aElementTok
     return GraphicShapeContext::onCreateContext( aElementToken, rAttribs );
 }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 6bfb00cc7b4d..0306ab1dc659 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -87,7 +87,6 @@ bool PowerPointImport::importDocument() throw()
     maTableStyleListPath = xPresentationFragmentHandler->getFragmentPathFromFirstTypeFromOfficeDoc( "tableStyles" );
     return importFragment( xPresentationFragmentHandler );
 
-
 }
 
 bool PowerPointImport::exportDocument() throw()
diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx
index 64747a4f3e39..f4dd0042bf77 100644
--- a/oox/source/ppt/pptshapecontext.cxx
+++ b/oox/source/ppt/pptshapecontext.cxx
@@ -227,7 +227,6 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32 aElementToken, con
     return this;
 }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index 62e64da4bb13..828295e899c6 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -38,7 +38,6 @@
 #include "oox/drawingml/clrschemecontext.hxx"
 #include "oox/ppt/pptimport.hxx"
 
-
 using namespace ::com::sun::star;
 using namespace ::oox::core;
 using namespace ::oox::drawingml;
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx
index cc564774ea3f..45b007604ea5 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -38,7 +38,6 @@ using namespace ::com::sun::star::presentation;
 
 namespace oox { namespace ppt {
 
-
     SlideTransition::SlideTransition()
         : mnTransitionType( 0 )
         , mnTransitionSubType( 0 )
@@ -51,7 +50,6 @@ namespace oox { namespace ppt {
 
     }
 
-
     SlideTransition::SlideTransition(const OUString & sFilterName)
         : mnTransitionType( 0 )
         , mnTransitionSubType( 0 )
@@ -70,7 +68,6 @@ namespace oox { namespace ppt {
         }
     }
 
-
     void SlideTransition::setSlideProperties( PropertyMap & aProps )
     {
         try
@@ -109,7 +106,6 @@ namespace oox { namespace ppt {
         }
     }
 
-
     void SlideTransition::setOoxTransitionSpeed( sal_Int32 nToken)
     {
         switch( nToken  )
@@ -145,7 +141,6 @@ namespace oox { namespace ppt {
         return nOdpDirection;
     }
 
-
     sal_Int16 SlideTransition::ooxToOdpBorderDirections( ::sal_Int32 nOoxType )
     {
     sal_Int16 nOdpDirection;
@@ -227,7 +222,6 @@ namespace oox { namespace ppt {
         return nOdpDirection;
     }
 
-
     sal_Int16 SlideTransition::ooxToOdpDirection( ::sal_Int32 nOoxType )
     {
     sal_Int16 nOdpDir;
@@ -409,7 +403,6 @@ namespace oox { namespace ppt {
         }
     }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx
index 0e7caeb23087..c34c44736c6e 100644
--- a/oox/source/ppt/slidetransitioncontext.cxx
+++ b/oox/source/ppt/slidetransitioncontext.cxx
@@ -40,7 +40,6 @@ using namespace ::com::sun::star::container;
 
 namespace oox { namespace ppt {
 
-
 SlideTransitionContext::SlideTransitionContext( FragmentHandler2& rParent, const AttributeList& rAttribs, PropertyMap & aProperties ) throw()
 : FragmentHandler2( rParent )
 , maSlideProperties( aProperties )
@@ -162,7 +161,6 @@ void SlideTransitionContext::onEndElement()
     }
 }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx
index a3104e15dfc4..9d72e3ebeff1 100644
--- a/oox/source/ppt/soundactioncontext.cxx
+++ b/oox/source/ppt/soundactioncontext.cxx
@@ -30,10 +30,8 @@ using namespace ::oox::core;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::uno;
 
-
 namespace oox { namespace ppt {
 
-
     SoundActionContext::SoundActionContext( FragmentHandler2& rParent, PropertyMap & aProperties ) throw()
     : FragmentHandler2( rParent )
     , maSlideProperties( aProperties )
@@ -43,12 +41,10 @@ namespace oox { namespace ppt {
     {
     }
 
-
     SoundActionContext::~SoundActionContext() throw()
     {
     }
 
-
     void SoundActionContext::onEndElement()
     {
         if ( isCurrentElement( PPT_TOKEN( sndAc ) ) )
@@ -71,7 +67,6 @@ namespace oox { namespace ppt {
         }
     }
 
-
     ::oox::core::ContextHandlerRef SoundActionContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
     {
         switch( aElementToken )
@@ -100,8 +95,6 @@ namespace oox { namespace ppt {
         return this;
     }
 
-
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/timeanimvaluecontext.cxx b/oox/source/ppt/timeanimvaluecontext.cxx
index cfae1ceb7db3..922b3ae92123 100644
--- a/oox/source/ppt/timeanimvaluecontext.cxx
+++ b/oox/source/ppt/timeanimvaluecontext.cxx
@@ -36,12 +36,10 @@ namespace oox { namespace ppt {
     {
     }
 
-
     TimeAnimValueListContext::~TimeAnimValueListContext( )
     {
     }
 
-
     void TimeAnimValueListContext::onEndElement()
     {
         if( isCurrentElement( PPT_TOKEN( tav ) ) )
@@ -50,7 +48,6 @@ namespace oox { namespace ppt {
         }
     }
 
-
     ::oox::core::ContextHandlerRef TimeAnimValueListContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
     {
 
@@ -79,7 +76,6 @@ namespace oox { namespace ppt {
         return this;
     }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index 00703675e2b7..043c2e94c2ba 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -96,15 +96,12 @@ namespace oox { namespace ppt {
             return sServiceName;
         }
 
-
-
     TimeNode::TimeNode( sal_Int16 nNodeType )
         : mnNodeType( nNodeType )
         , mbHasEndSyncValue( false )
     {
     }
 
-
     TimeNode::~TimeNode()
     {
     }
@@ -176,8 +173,6 @@ namespace oox { namespace ppt {
         }
     }
 
-
-
     static void fixInteractiveSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
     {
         try
@@ -572,7 +567,6 @@ namespace oox { namespace ppt {
         }
     }
 
-
     Reference< XAnimationNode > TimeNode::createAndInsert(
             const XmlFilterBase& rFilter,
             const OUString& rServiceName,
@@ -593,7 +587,6 @@ namespace oox { namespace ppt {
         return Reference< XAnimationNode >();
     }
 
-
     void    TimeNode::setId( sal_Int32 nId )
     {
         msId = OUString::number(nId);
@@ -604,7 +597,6 @@ namespace oox { namespace ppt {
         maNodeProperties[ NP_TO ] = aTo;
     }
 
-
     void TimeNode::setFrom( const Any & aFrom )
     {
         maNodeProperties[ NP_FROM ] = aFrom;
@@ -615,7 +607,6 @@ namespace oox { namespace ppt {
         maNodeProperties[ NP_BY ] = aBy;
     }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 7955db8e5ec5..a2ab7dce42e3 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -104,7 +104,6 @@ namespace oox { namespace ppt {
         sal_Int32 three;
     };
 
-
     /** CT_TLMediaNodeAudio
             CT_TLMediaNodeVideo */
     class MediaNodeContext
@@ -164,7 +163,6 @@ namespace oox { namespace ppt {
         bool mbFullScrn;
     };
 
-
     /** CT_TLSetBehavior
      */
     class SetTimeNodeContext
@@ -316,7 +314,6 @@ namespace oox { namespace ppt {
                 }
             }
 
-
         virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
             {
                 switch ( aElementToken )
@@ -335,7 +332,6 @@ namespace oox { namespace ppt {
         sal_Int32 maType;
     };
 
-
     /** CT_TLTimeNodeSequence
      */
     class SequenceTimeNodeContext
@@ -359,7 +355,6 @@ namespace oox { namespace ppt {
             {
             }
 
-
         virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
             {
                 switch ( aElementToken )
@@ -383,7 +378,6 @@ namespace oox { namespace ppt {
         sal_Int32 mnNextAc, mnPrevAc;
     };
 
-
     /** CT_TLTimeNodeParallel
      *  CT_TLTimeNodeExclusive
      */
@@ -415,7 +409,6 @@ namespace oox { namespace ppt {
 
     };
 
-
     /** CT_TLAnimateColorBehavior */
     class AnimColorContext
         : public TimeNodeContext
@@ -453,7 +446,6 @@ namespace oox { namespace ppt {
                 }
             }
 
-
             virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
             {
                 switch ( aElementToken )
@@ -502,7 +494,6 @@ namespace oox { namespace ppt {
                 return this;
             }
 
-
     private:
         sal_Int32 mnColorSpace;
         sal_Int32 mnDir;
@@ -512,7 +503,6 @@ namespace oox { namespace ppt {
         oox::drawingml::Color maFromClr;
     };
 
-
     /** CT_TLAnimateBehavior */
     class AnimContext
         : public TimeNodeContext
@@ -563,7 +553,6 @@ namespace oox { namespace ppt {
                 mnValueType = xAttribs->getOptionalValueToken( XML_valueType, 0 );
             }
 
-
         virtual ~AnimContext() throw ()
             {
                 ::std::list< TimeAnimationValue >::iterator iter, end;
@@ -599,7 +588,6 @@ namespace oox { namespace ppt {
                 }
             }
 
-
         virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
             {
                 switch ( aElementToken )
@@ -619,7 +607,6 @@ namespace oox { namespace ppt {
         TimeAnimationValueList maTavList;
     };
 
-
     /** CT_TLAnimateScaleBehavior */
     class AnimScaleContext
         : public TimeNodeContext
@@ -704,7 +691,6 @@ namespace oox { namespace ppt {
         bool mbZoomContents;
     };
 
-
     /** CT_TLAnimateRotationBehavior */
     class AnimRotContext
         : public TimeNodeContext
@@ -756,8 +742,6 @@ namespace oox { namespace ppt {
             }
     };
 
-
-
     /** CT_TLAnimateMotionBehavior */
     class AnimMotionContext
         : public TimeNodeContext
@@ -801,7 +785,6 @@ namespace oox { namespace ppt {
             {
             }
 
-
         virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
             {
                 switch ( aElementToken )
@@ -858,7 +841,6 @@ namespace oox { namespace ppt {
         sal_Int32 mnAngle;
     };
 
-
     /** CT_TLAnimateEffectBehavior */
     class AnimEffectContext
         : public TimeNodeContext
@@ -882,12 +864,10 @@ namespace oox { namespace ppt {
                 }
             }
 
-
         virtual ~AnimEffectContext( ) throw()
             {
             }
 
-
         virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE
             {
                 switch ( aElementToken )
@@ -909,8 +889,6 @@ namespace oox { namespace ppt {
         OUString msPrList;
     };
 
-
-
     TimeNodeContext * TimeNodeContext::makeContext(
             FragmentHandler2& rParent, sal_Int32  aElement,
             const Reference< XFastAttributeList >& xAttribs,
@@ -962,7 +940,6 @@ namespace oox { namespace ppt {
         return pCtx;
     }
 
-
     TimeNodeContext::TimeNodeContext( FragmentHandler2& rParent, sal_Int32 aElement,
             const Reference< XFastAttributeList >& /*xAttribs*/,
             const TimeNodePtr & pNode ) throw()
@@ -972,13 +949,11 @@ namespace oox { namespace ppt {
     {
     }
 
-
     TimeNodeContext::~TimeNodeContext( ) throw()
     {
 
     }
 
-
     TimeNodeListContext::TimeNodeListContext( FragmentHandler2& rParent, TimeNodePtrList & aList )
         throw()
         : FragmentHandler2( rParent )
@@ -986,12 +961,10 @@ namespace oox { namespace ppt {
     {
     }
 
-
     TimeNodeListContext::~TimeNodeListContext( ) throw()
     {
     }
 
-
     ::oox::core::ContextHandlerRef TimeNodeListContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
     {
         sal_Int16 nNodeType;
@@ -1052,7 +1025,6 @@ namespace oox { namespace ppt {
         return pContext ? pContext : this;
     }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx
index 719b36de207a..93e3dd0d5578 100644
--- a/oox/source/ppt/timetargetelementcontext.cxx
+++ b/oox/source/ppt/timetargetelementcontext.cxx
@@ -34,8 +34,6 @@ using namespace ::oox::core;
 
 namespace oox { namespace ppt {
 
-
-
     // CT_TLShapeTargetElement
     class ShapeTargetElementContext
         : public FragmentHandler2
@@ -94,8 +92,6 @@ namespace oox { namespace ppt {
         ShapeTargetElement & maShapeTarget;
     };
 
-
-
     TimeTargetElementContext::TimeTargetElementContext( FragmentHandler2& rParent, const AnimTargetElementPtr & pValue )
         : FragmentHandler2( rParent ),
             mpTarget( pValue )
@@ -103,7 +99,6 @@ namespace oox { namespace ppt {
         OSL_ENSURE( mpTarget, "no valid target passed" );
     }
 
-
     TimeTargetElementContext::~TimeTargetElementContext( ) throw( )
     {
     }
@@ -150,7 +145,6 @@ namespace oox { namespace ppt {
         return this;
     }
 
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/shape/LockedCanvasContext.cxx b/oox/source/shape/LockedCanvasContext.cxx
index 4d9f710dbd62..31b7dc1693b5 100644
--- a/oox/source/shape/LockedCanvasContext.cxx
+++ b/oox/source/shape/LockedCanvasContext.cxx
@@ -26,7 +26,6 @@ LockedCanvasContext::~LockedCanvasContext()
 {
 }
 
-
 ::oox::core::ContextHandlerRef LockedCanvasContext::onCreateContext(sal_Int32 aElementToken, const ::oox::AttributeList& /*rAttribs*/)
 {
     switch (getBaseToken(aElementToken))
diff --git a/oox/source/shape/LockedCanvasContext.hxx b/oox/source/shape/LockedCanvasContext.hxx
index 4284eec8f1d9..f97653f05766 100644
--- a/oox/source/shape/LockedCanvasContext.hxx
+++ b/oox/source/shape/LockedCanvasContext.hxx
@@ -37,7 +37,6 @@ protected:
     oox::drawingml::ShapePtr mpShape;
 };
 
-
 }
 }
 
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index f180f18bb906..53a692774e19 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -57,7 +57,6 @@ ShapeContextHandler_createInstance( const uno::Reference< uno::XComponentContext
     return static_cast< ::cppu::OWeakObject* >( new ShapeContextHandler(context) );
 }
 
-
 ShapeContextHandler::ShapeContextHandler
 (uno::Reference< uno::XComponentContext > const & context) :
 mnStartToken(0), m_xContext(context)
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
index 6c47e2bc91c0..367f29a35fe7 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
@@ -28,7 +28,6 @@ private:
         oox::drawingml::ShapePtr        mpGroupShapePtr;
 };
 
-
 } }
 
 #endif
diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx
index f553fd9d4da5..0072c22ac1e4 100644
--- a/oox/source/shape/ShapeFilterBase.hxx
+++ b/oox/source/shape/ShapeFilterBase.hxx
@@ -30,8 +30,6 @@
 namespace oox {
 namespace shape {
 
-
-
 class ShapeFilterBase : public core::XmlFilterBase
 {
 public:
@@ -70,8 +68,6 @@ private:
     ::oox::drawingml::ThemePtr mpTheme;
 };
 
-
-
 } // namespace shape
 } // namespace oox
 
diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx
index dfaba90e9d2c..9b62fef85897 100644
--- a/oox/source/shape/WpgContext.cxx
+++ b/oox/source/shape/WpgContext.cxx
@@ -30,7 +30,6 @@ WpgContext::~WpgContext()
 {
 }
 
-
 oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& /*rAttribs*/)
 {
     switch (getBaseToken(nElementToken))
diff --git a/oox/source/shape/WpgContext.hxx b/oox/source/shape/WpgContext.hxx
index 694aef09d86c..f4fc9c5c868c 100644
--- a/oox/source/shape/WpgContext.hxx
+++ b/oox/source/shape/WpgContext.hxx
@@ -36,7 +36,6 @@ protected:
     oox::drawingml::ShapePtr mpShape;
 };
 
-
 }
 }
 
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index ec352952196e..d79d1c208709 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -32,7 +32,6 @@ WpsContext::~WpsContext()
 {
 }
 
-
 oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs)
 {
     switch (getBaseToken(nElementToken))
diff --git a/oox/source/shape/WpsContext.hxx b/oox/source/shape/WpsContext.hxx
index c7678c79a1a3..df83f888ecb3 100644
--- a/oox/source/shape/WpsContext.hxx
+++ b/oox/source/shape/WpsContext.hxx
@@ -37,7 +37,6 @@ protected:
     css::uno::Reference<css::drawing::XShape> mxShape;
 };
 
-
 }
 }
 
diff --git a/oox/source/token/namespacemap.cxx b/oox/source/token/namespacemap.cxx
index 11567fe16d3e..f320b993e310 100644
--- a/oox/source/token/namespacemap.cxx
+++ b/oox/source/token/namespacemap.cxx
@@ -21,8 +21,6 @@
 
 namespace oox {
 
-
-
 NamespaceMap::NamespaceMap()
 {
     static const struct NamespaceUrl { sal_Int32 mnId; const sal_Char* mpcUrl; } spNamespaceUrls[] =
@@ -48,5 +46,4 @@ NamespaceMap::NamespaceMap()
 
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/token/propertynames.cxx b/oox/source/token/propertynames.cxx
index a3fce1fe889c..1c27d660c9c4 100644
--- a/oox/source/token/propertynames.cxx
+++ b/oox/source/token/propertynames.cxx
@@ -21,8 +21,6 @@
 
 namespace oox {
 
-
-
 PropertyNameVector::PropertyNameVector()
 {
     static const sal_Char* sppcPropertyNames[] =
@@ -38,8 +36,6 @@ PropertyNameVector::PropertyNameVector()
         push_back( OUString::createFromAscii( sppcPropertyNames[ nIndex ] ) );
 }
 
-
-
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/token/tokenmap.cxx b/oox/source/token/tokenmap.cxx
index 3ee6b69e23ab..2989a343be92 100644
--- a/oox/source/token/tokenmap.cxx
+++ b/oox/source/token/tokenmap.cxx
@@ -26,10 +26,8 @@
 
 namespace oox {
 
-
 using ::com::sun::star::uno::Sequence;
 
-
 namespace {
 // include auto-generated Perfect_Hash
 #if defined __clang__
@@ -46,8 +44,6 @@ namespace {
 #endif
 } // namespace
 
-
-
 TokenMap::TokenMap() :
     maTokenNames( static_cast< size_t >( XML_TOKEN_COUNT ) )
 {
@@ -119,8 +115,6 @@ sal_Int32 TokenMap::getTokenPerfectHash( const char *pStr, sal_Int32 nLength ) c
     return pToken ? pToken->nToken : XML_TOKEN_INVALID;
 }
 
-
-
 } // namespace oox
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index d80155f8b3d4..97634ef86019 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -37,8 +37,6 @@
 namespace oox {
 namespace vml {
 
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::beans;
@@ -49,8 +47,6 @@ using namespace ::com::sun::star::uno;
 
 using ::oox::core::XmlFilterBase;
 
-
-
 namespace {
 
 /** Returns the textual representation of a numeric VML shape identifier. */
@@ -70,8 +66,6 @@ sal_Int32 lclGetShapeId( const OUString& rShapeId )
 
 } // namespace
 
-
-
 OleObjectInfo::OleObjectInfo( bool bDmlShape ) :
     mbAutoLoad( false ),
     mbDmlShape( bDmlShape )
@@ -83,8 +77,6 @@ void OleObjectInfo::setShapeId( sal_Int32 nShapeId )
     maShapeId = lclGetShapeId( nShapeId );
 }
 
-
-
 ControlInfo::ControlInfo()
 {
 }
@@ -94,8 +86,6 @@ void ControlInfo::setShapeId( sal_Int32 nShapeId )
     maShapeId = lclGetShapeId( nShapeId );
 }
 
-
-
 Drawing::Drawing( XmlFilterBase& rFilter, const Reference< XDrawPage >& rxDrawPage, DrawingType eType ) :
     mrFilter( rFilter ),
     mxDrawPage( rxDrawPage ),
@@ -290,8 +280,6 @@ void Drawing::notifyXShapeInserted( const Reference< XShape >& /*rxShape*/,
 {
 }
 
-
-
 } // namespace vml
 } // namespave oox
 
diff --git a/oox/source/vml/vmldrawingfragment.cxx b/oox/source/vml/vmldrawingfragment.cxx
index b8646a335383..4ba82addae71 100644
--- a/oox/source/vml/vmldrawingfragment.cxx
+++ b/oox/source/vml/vmldrawingfragment.cxx
@@ -27,14 +27,10 @@
 namespace oox {
 namespace vml {
 
-
-
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 using namespace ::oox::core;
 
-
-
 DrawingFragment::DrawingFragment( XmlFilterBase& rFilter, const OUString& rFragmentPath, Drawing& rDrawing ) :
     FragmentHandler2( rFilter, rFragmentPath, false ),  // do not trim whitespace, has been preprocessed by the input stream
     mrDrawing( rDrawing )
@@ -79,8 +75,6 @@ void DrawingFragment::finalizeImport()
     mrDrawing.finalizeFragmentImport();
 }
 
-
-
 } // namespace vml
 } // namespace oox
 
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 86b303e94fb3..83f4c2955952 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -35,8 +35,6 @@
 namespace oox {
 namespace vml {
 
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::geometry;
 
@@ -50,8 +48,6 @@ using ::com::sun::star::drawing::PolygonFlags;
 using ::com::sun::star::drawing::PolygonFlags_NORMAL;
 using ::com::sun::star::drawing::PolygonFlags_CONTROL;
 
-
-
 namespace {
 
 bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& rValue )
@@ -64,8 +60,6 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
 
 } // namespace
 
-
-
 bool ConversionHelper::separatePair( OUString& orValue1, OUString& orValue2,
         const OUString& rValue, sal_Unicode cSep )
 {
@@ -497,8 +491,6 @@ void ConversionHelper::decodeVmlPath( ::std::vector< ::std::vector< Point > >& r
     }
 }
 
-
-
 namespace {
 
 sal_Int64 lclGetEmu( const GraphicHelper& rGraphicHelper, const OptValue< OUString >& roValue, sal_Int64 nDefValue )
@@ -620,8 +612,6 @@ sal_Int32 lclGetDmlLineJoint( const OptValue< sal_Int32 >& roJoinStyle )
 
 } // namespace
 
-
-
 void StrokeArrowModel::assignUsed( const StrokeArrowModel& rSource )
 {
     moArrowType.assignIfUsed( rSource.moArrowType );
@@ -629,8 +619,6 @@ void StrokeArrowModel::assignUsed( const StrokeArrowModel& rSource )
     moArrowLength.assignIfUsed( rSource.moArrowLength );
 }
 
-
-
 void StrokeModel::assignUsed( const StrokeModel& rSource )
 {
     moStroked.assignIfUsed( rSource.moStroked );
@@ -671,8 +659,6 @@ void StrokeModel::pushToPropMap( ShapePropertyMap& rPropMap, const GraphicHelper
     aLineProps.pushToPropMap( rPropMap, rGraphicHelper );
 }
 
-
-
 void FillModel::assignUsed( const FillModel& rSource )
 {
     moFilled.assignIfUsed( rSource.moFilled );
@@ -809,8 +795,6 @@ void FillModel::pushToPropMap( ShapePropertyMap& rPropMap, const GraphicHelper&
     aFillProps.pushToPropMap( rPropMap, rGraphicHelper );
 }
 
-
-
 ShadowModel::ShadowModel()
         : mbHasShadow(false)
 {
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index f373bad0c0d1..28ef7bb2cf6f 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -29,13 +29,9 @@
 namespace oox {
 namespace vml {
 
-
-
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 
-
-
 namespace {
 
 inline const sal_Char* lclFindCharacter( const sal_Char* pcBeg, const sal_Char* pcEnd, sal_Char cChar )
@@ -77,8 +73,6 @@ inline void lclAppendToBuffer( OStringBuffer& rBuffer, const sal_Char* pcBeg, co
     rBuffer.append( pcBeg, static_cast< sal_Int32 >( pcEnd - pcBeg ) );
 }
 
-
-
 void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal_Char* pcEnd )
 {
     /*  Map attribute names to char-pointer of all attributes. This map is used
@@ -255,8 +249,6 @@ bool lclProcessCharacters( OStringBuffer& rBuffer, const OString& rChars )
 
 } // namespace
 
-
-
 InputStream::InputStream( const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm ) :
     // use single-byte ISO-8859-1 encoding which maps all byte characters to the first 256 Unicode characters
     mxTextStrm( TextInputStream::createXTextInputStream( rxContext, rxInStrm, RTL_TEXTENCODING_ISO_8859_1 ) ),
@@ -386,8 +378,6 @@ OString InputStream::readToElementEnd() throw (IOException, RuntimeException)
     return aText;
 }
 
-
-
 } // namespace vml
 } // namespave oox
 
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index d7783d806cb0..879b462c9c14 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -68,8 +68,6 @@ using namespace ::com::sun::star::text;
 namespace oox {
 namespace vml {
 
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::graphic;
@@ -78,15 +76,11 @@ using namespace ::com::sun::star::io;
 
 using ::oox::core::XmlFilterBase;
 
-
-
 namespace {
 
 const sal_Int32 VML_SHAPETYPE_PICTUREFRAME  = 75;
 const sal_Int32 VML_SHAPETYPE_HOSTCONTROL   = 201;
 
-
-
 awt::Point lclGetAbsPoint( const awt::Point& rRelPoint, const awt::Rectangle& rShapeRect, const awt::Rectangle& rCoordSys )
 {
     double fWidthRatio = static_cast< double >( rShapeRect.Width ) / rCoordSys.Width;
@@ -111,8 +105,6 @@ awt::Rectangle lclGetAbsRect( const awt::Rectangle& rRelRect, const awt::Rectang
 
 } // namespace
 
-
-
 ShapeTypeModel::ShapeTypeModel():
     mbAutoHeight( false ),
     mbVisible( true )
@@ -132,8 +124,6 @@ void ShapeTypeModel::assignUsed( const ShapeTypeModel& rSource )
     moGraphicTitle.assignIfUsed( rSource.moGraphicTitle );
 }
 
-
-
 ShapeType::ShapeType( Drawing& rDrawing ) :
     mrDrawing( rDrawing )
 {
@@ -210,8 +200,6 @@ awt::Rectangle ShapeType::getRelRectangle() const
         nWidth, nHeight );
 }
 
-
-
 ClientData::ClientData() :
     mnObjType( XML_TOKEN_INVALID ),
     mnTextHAlign( XML_Left ),
@@ -239,8 +227,6 @@ ClientData::ClientData() :
 {
 }
 
-
-
 ShapeModel::ShapeModel()
 {
 }
@@ -261,8 +247,6 @@ ClientData& ShapeModel::createClientData()
     return *mxClientData;
 }
 
-
-
 ShapeBase::ShapeBase( Drawing& rDrawing ) :
     ShapeType( rDrawing )
 {
@@ -452,8 +436,6 @@ void ShapeBase::convertShapeProperties( const Reference< XShape >& rxShape ) con
     PropertySet( rxShape ).setProperties( aPropMap );
 }
 
-
-
 SimpleShape::SimpleShape( Drawing& rDrawing, const OUString& rService ) :
     ShapeBase( rDrawing ),
     maService( rService )
@@ -739,8 +721,6 @@ Reference< XShape > SimpleShape::createPictureObject( const Reference< XShapes >
     return xShape;
 }
 
-
-
 RectangleShape::RectangleShape( Drawing& rDrawing ) :
     SimpleShape( rDrawing, "com.sun.star.drawing.RectangleShape" )
 {
@@ -773,15 +753,11 @@ Reference<XShape> RectangleShape::implConvertAndInsert(const Reference<XShapes>&
     return xShape;
 }
 
-
-
 EllipseShape::EllipseShape( Drawing& rDrawing ) :
     SimpleShape( rDrawing, "com.sun.star.drawing.EllipseShape" )
 {
 }
 
-
-
 PolyLineShape::PolyLineShape( Drawing& rDrawing ) :
     SimpleShape( rDrawing, "com.sun.star.drawing.PolyLineShape" )
 {
@@ -837,8 +813,6 @@ awt::Rectangle LineShape::getRelRectangle() const
     return aShapeRect;
 }
 
-
-
 BezierShape::BezierShape(Drawing& rDrawing)
     : SimpleShape(rDrawing, "com.sun.star.drawing.OpenBezierShape")
 {
@@ -939,8 +913,6 @@ Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes
     return xShape;
 }
 
-
-
 CustomShape::CustomShape( Drawing& rDrawing ) :
     SimpleShape( rDrawing, "com.sun.star.drawing.CustomShape" )
 {
@@ -964,8 +936,6 @@ Reference< XShape > CustomShape::implConvertAndInsert( const Reference< XShapes
     return xShape;
 }
 
-
-
 ComplexShape::ComplexShape( Drawing& rDrawing ) :
     CustomShape( rDrawing )
 {
@@ -1056,8 +1026,6 @@ Reference< XShape > ComplexShape::implConvertAndInsert( const Reference< XShapes
     return CustomShape::implConvertAndInsert( rxShapes, rShapeRect );
 }
 
-
-
 GroupShape::GroupShape( Drawing& rDrawing ) :
     ShapeBase( rDrawing ),
     mxChildren( new ShapeContainer( rDrawing ) )
@@ -1138,8 +1106,6 @@ Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes >
     return xGroupShape;
 }
 
-
-
 } // namespace vml
 } // namespace oox
 
diff --git a/oox/source/vml/vmlshapecontainer.cxx b/oox/source/vml/vmlshapecontainer.cxx
index 74f7c23061ac..76daf625eeac 100644
--- a/oox/source/vml/vmlshapecontainer.cxx
+++ b/oox/source/vml/vmlshapecontainer.cxx
@@ -25,14 +25,10 @@
 namespace oox {
 namespace vml {
 
-
-
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::uno;
 
-
-
 namespace {
 
 template< typename ShapeType >
@@ -52,8 +48,6 @@ void lclMapShapesById( RefMap< OUString, ShapeType >& orMap, const RefVector< Sh
 
 } // namespace
 
-
-
 ShapeContainer::ShapeContainer( Drawing& rDrawing ) :
     mrDrawing( rDrawing )
 {
@@ -135,8 +129,6 @@ void ShapeContainer::convertAndInsert( const Reference< XShapes >& rxShapes, con
         (*aIt)->convertAndInsert( rxShapes, pParentAnchor );
 }
 
-
-
 } // namespace vml
 } // namespace oox
 
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index 146940e03041..0471573db09d 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -28,16 +28,12 @@
 namespace oox {
 namespace vml {
 
-
-
 using namespace ::com::sun::star;
 
 using ::oox::core::ContextHandler2;
 using ::oox::core::ContextHandler2Helper;
 using ::oox::core::ContextHandlerRef;
 
-
-
 namespace {
 
 /** Returns the boolean value from the specified VML attribute (if present).
@@ -134,15 +130,12 @@ bool lclDecodeVmlxBool( const OUString& rValue, bool bDefaultForEmpty )
 
 } // namespace
 
-
-
 ShapeLayoutContext::ShapeLayoutContext( ContextHandler2Helper& rParent, Drawing& rDrawing ) :
     ContextHandler2( rParent ),
     mrDrawing( rDrawing )
 {
 }
 
-
 ContextHandlerRef ShapeLayoutContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
 {
     switch( nElement )
@@ -163,8 +156,6 @@ ContextHandlerRef ShapeLayoutContext::onCreateContext( sal_Int32 nElement, const
     return 0;
 }
 
-
-
 ClientDataContext::ClientDataContext( ContextHandler2Helper& rParent,
         ClientData& rClientData, const AttributeList& rAttribs ) :
     ContextHandler2( rParent ),
@@ -225,8 +216,6 @@ void ClientDataContext::onEndElement()
     }
 }
 
-
-
 ShapeContextBase::ShapeContextBase( ContextHandler2Helper& rParent ) :
     ContextHandler2( rParent )
 {
@@ -271,8 +260,6 @@ ContextHandlerRef ShapeContextBase::createShapeContext( ContextHandler2Helper& r
     return 0;
 }
 
-
-
 ShapeTypeContext::ShapeTypeContext( ContextHandler2Helper& rParent, ShapeType& rShapeType, const AttributeList& rAttribs ) :
     ShapeContextBase( rParent ),
     mrTypeModel( rShapeType.getTypeModel() )
@@ -429,8 +416,6 @@ void ShapeTypeContext::setStyle( const OUString& rStyle )
     }
 }
 
-
-
 ShapeContext::ShapeContext( ContextHandler2Helper& rParent, ShapeBase& rShape, const AttributeList& rAttribs ) :
     ShapeTypeContext( rParent, rShape, rAttribs ),
     mrShape( rShape ),
@@ -521,9 +506,6 @@ void ShapeContext::setVmlPath( const OUString& rPath )
         mrShapeModel.maVmlPath = rPath;
 }
 
-
-
-
 GroupShapeContext::GroupShapeContext( ContextHandler2Helper& rParent, GroupShape& rShape, const AttributeList& rAttribs ) :
     ShapeContext( rParent, rShape, rAttribs ),
     mrShapes( rShape.getChildren() )
@@ -538,8 +520,6 @@ ContextHandlerRef GroupShapeContext::onCreateContext( sal_Int32 nElement, const
     return xContext.get() ? xContext : ShapeContext::onCreateContext( nElement, rAttribs );
 }
 
-
-
 RectangleShapeContext::RectangleShapeContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, RectangleShape& rShape ) :
     ShapeContext( rParent, rShape, rAttribs )
 {
@@ -551,7 +531,6 @@ ContextHandlerRef RectangleShapeContext::onCreateContext( sal_Int32 nElement, co
     return ShapeContext::onCreateContext( nElement, rAttribs );
 }
 
-
 } // namespace vml
 } // namespace oox
 
diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx
index ab3c11afb732..7442e9eea3f6 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -25,14 +25,10 @@
 namespace oox {
 namespace vml {
 
-
-
 using ::oox::core::ContextHandler2;
 using ::oox::core::ContextHandler2Helper;
 using ::oox::core::ContextHandlerRef;
 
-
-
 TextPortionContext::TextPortionContext( ContextHandler2Helper& rParent,
         TextBox& rTextBox, TextParagraphModel& rParagraph, const TextFontModel& rParentFont,
         sal_Int32 nElement, const AttributeList& rAttribs ) :
@@ -170,8 +166,6 @@ void TextPortionContext::onEndElement()
         mrTextBox.appendPortion( maParagraph, maFont, OUString( ' ' ) );
 }
 
-
-
 TextBoxContext::TextBoxContext( ContextHandler2Helper& rParent, TextBox& rTextBox, const AttributeList& rAttribs,
     const GraphicHelper& graphicHelper ) :
     ContextHandler2( rParent ),
@@ -275,8 +269,6 @@ void TextBoxContext::onEndElement()
     }
 }
 
-
-
 } // namespace vml
 } // namespace oox