Formatting changes across all modules

+ Removed comment cruft
+ Tab formatting in number of files
+ Some commented out code removed
+ Tab characters replaced with spaces
+ Newline cleanup in quite a few files
+ Tweak header guard #endifs

Change-Id: I3208ff2f047da890edcc49b73389aca22442f5fc
Reviewed-on: https://gerrit.libreoffice.org/22221
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

3 files changed, 38 insertions, 7 deletions

diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index 3f97629ca601..57c8249652d7 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -44,8 +44,9 @@
 
 #include <memory>
 
-namespace dbaxml
-{
+
+namespace dbaxml {
+
 using namespace ::xmloff::token;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
@@ -56,9 +57,10 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::xml::sax;
-// - ODBExport -
+
 #define PROGRESS_BAR_STEP 20
 
+
 class ODBExport : public SvXMLExport
 {
     typedef ::std::map< ::xmloff::token::XMLTokenEnum, OUString> TSettingsMap;
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 640111316075..bd1d661c2a2a 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -69,6 +69,7 @@ extern "C" void SAL_CALL createRegistryInfo_ODBFilter( )
     static ::dbaxml::OMultiInstanceAutoRegistration< ::dbaxml::ODBFilter > aAutoRegistration;
 }
 
+
 namespace dbaxml
 {
     sal_Char const sXML_np__db[] = "_db";
@@ -137,6 +138,7 @@ sal_Int32 ReadThroughComponent(
     return 0;
 }
 
+
 /// read a component (storage version)
 sal_Int32 ReadThroughComponent(
     uno::Reference< embed::XStorage > xStorage,
@@ -201,7 +203,6 @@ sal_Int32 ReadThroughComponent(
     return 1;
 }
 
-// - ODBFilter -
 
 ODBFilter::ODBFilter( const uno::Reference< XComponentContext >& _rxContext )
     : SvXMLImport(_rxContext, getImplementationName_Static())
@@ -219,17 +220,20 @@ ODBFilter::ODBFilter( const uno::Reference< XComponentContext >& _rxContext )
                         XML_NAMESPACE_DB );
 }
 
+
 ODBFilter::~ODBFilter() throw()
 {
 
 }
 
+
 OUString ODBFilter::getImplementationName_Static()
     throw (css::uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.sdb.DBFilter");
 }
 
+
 css::uno::Sequence<OUString> ODBFilter::getSupportedServiceNames_Static()
     throw (css::uno::RuntimeException)
 {
@@ -237,12 +241,14 @@ css::uno::Sequence<OUString> ODBFilter::getSupportedServiceNames_Static()
     return s;
 }
 
+
 css::uno::Reference< css::uno::XInterface >
     SAL_CALL ODBFilter::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB)
 {
     return static_cast< XServiceInfo* >(new ODBFilter( comphelper::getComponentContext(_rxORB)));
 }
 
+
 sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescriptor )
     throw (RuntimeException, std::exception)
 {
@@ -270,6 +276,7 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto
     return bRet;
 }
 
+
 bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
     throw (RuntimeException, std::exception)
 {
@@ -377,6 +384,7 @@ bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
     return bRet;
 }
 
+
 SvXMLImportContext* ODBFilter::CreateContext( sal_uInt16 nPrefix,
                                       const OUString& rLocalName,
                                       const uno::Reference< css::xml::sax::XAttributeList >& xAttrList )
@@ -413,6 +421,7 @@ SvXMLImportContext* ODBFilter::CreateContext( sal_uInt16 nPrefix,
     return pContext;
 }
 
+
 void ODBFilter::SetViewSettings(const Sequence<PropertyValue>& aViewProps)
 {
     const PropertyValue *pIter = aViewProps.getConstArray();
@@ -430,6 +439,7 @@ void ODBFilter::SetViewSettings(const Sequence<PropertyValue>& aViewProps)
     }
 }
 
+
 void ODBFilter::SetConfigurationSettings(const Sequence<PropertyValue>& aConfigProps)
 {
     const PropertyValue *pIter = aConfigProps.getConstArray();
@@ -447,6 +457,7 @@ void ODBFilter::SetConfigurationSettings(const Sequence<PropertyValue>& aConfigP
     }
 }
 
+
 void ODBFilter::fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap)
 {
     Sequence<PropertyValue> aWindows;
@@ -462,6 +473,7 @@ void ODBFilter::fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap)
 
 }
 
+
 const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const
 {
     if ( !m_pDocElemTokenMap.get() )
@@ -484,6 +496,7 @@ const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const
     return *m_pDocElemTokenMap;
 }
 
+
 const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const
 {
     if ( !m_pDatabaseElemTokenMap.get() )
@@ -504,6 +517,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const
     return *m_pDatabaseElemTokenMap;
 }
 
+
 const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const
 {
     if ( !m_pDataSourceElemTokenMap.get() )
@@ -555,6 +569,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const
     return *m_pDataSourceElemTokenMap;
 }
 
+
 const SvXMLTokenMap& ODBFilter::GetLoginElemTokenMap() const
 {
     if ( !m_pLoginElemTokenMap.get() )
@@ -572,6 +587,7 @@ const SvXMLTokenMap& ODBFilter::GetLoginElemTokenMap() const
     return *m_pLoginElemTokenMap;
 }
 
+
 const SvXMLTokenMap& ODBFilter::GetDatabaseDescriptionElemTokenMap() const
 {
     if ( !m_pDatabaseDescriptionElemTokenMap.get() )
@@ -587,6 +603,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseDescriptionElemTokenMap() const
     return *m_pDatabaseDescriptionElemTokenMap;
 }
 
+
 const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const
 {
     if ( !m_pDataSourceInfoElemTokenMap.get() )
@@ -613,6 +630,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const
     return *m_pDataSourceInfoElemTokenMap;
 }
 
+
 const SvXMLTokenMap& ODBFilter::GetDocumentsElemTokenMap() const
 {
     if ( !m_pDocumentsElemTokenMap.get() )
@@ -633,6 +651,7 @@ const SvXMLTokenMap& ODBFilter::GetDocumentsElemTokenMap() const
     return *m_pDocumentsElemTokenMap;
 }
 
+
 const SvXMLTokenMap& ODBFilter::GetComponentElemTokenMap() const
 {
     if ( !m_pComponentElemTokenMap.get() )
@@ -652,6 +671,7 @@ const SvXMLTokenMap& ODBFilter::GetComponentElemTokenMap() const
     return *m_pComponentElemTokenMap;
 }
 
+
 const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const
 {
     if ( !m_pQueryElemTokenMap.get() )
@@ -676,6 +696,7 @@ const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const
     return *m_pQueryElemTokenMap;
 }
 
+
 const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const
 {
     if ( !m_pColumnElemTokenMap.get() )
@@ -697,6 +718,7 @@ const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const
     return *m_pColumnElemTokenMap;
 }
 
+
 SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const OUString& rLocalName,
                                      const uno::Reference< XAttributeList>& xAttrList, bool bIsAutoStyle )
 {
@@ -709,11 +731,13 @@ SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const OUS
     return pContext;
 }
 
+
 SvXMLImportContext* ODBFilter::CreateScriptContext( const OUString& _rLocalName )
 {
     return new XMLScriptContext( *this, XML_NAMESPACE_OFFICE, _rLocalName, GetModel() );
 }
 
+
 rtl::Reference < XMLPropertySetMapper > ODBFilter::GetTableStylesPropertySetMapper() const
 {
     if ( !m_xTableStylesPropertySetMapper.is() )
@@ -723,6 +747,7 @@ rtl::Reference < XMLPropertySetMapper > ODBFilter::GetTableStylesPropertySetMapp
     return m_xTableStylesPropertySetMapper;
 }
 
+
 rtl::Reference < XMLPropertySetMapper > ODBFilter::GetColumnStylesPropertySetMapper() const
 {
     if ( !m_xColumnStylesPropertySetMapper.is() )
@@ -732,6 +757,7 @@ rtl::Reference < XMLPropertySetMapper > ODBFilter::GetColumnStylesPropertySetMap
     return m_xColumnStylesPropertySetMapper;
 }
 
+
 rtl::Reference < XMLPropertySetMapper > ODBFilter::GetCellStylesPropertySetMapper() const
 {
     if ( !m_xCellStylesPropertySetMapper.is() )
@@ -741,6 +767,7 @@ rtl::Reference < XMLPropertySetMapper > ODBFilter::GetCellStylesPropertySetMappe
     return m_xCellStylesPropertySetMapper;
 }
 
+
 void ODBFilter::setPropertyInfo()
 {
     Reference<XPropertySet> xDataSource(getDataSource());
@@ -770,6 +797,6 @@ void ODBFilter::setPropertyInfo()
     }
 }
 
-}// dbaxml
+} // namespace dbaxml
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index 32df1c170c3e..2b3daecfad21 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -41,8 +41,10 @@
 #include <map>
 #include <memory>
 
+
 namespace dbaxml
 {
+
 using namespace ::xmloff::token;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
@@ -53,7 +55,7 @@ using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::xml::sax;
 
-// - ODBFilter -
+
 class ODBFilter : public SvXMLImport
 {
 public:
@@ -155,7 +157,7 @@ public:
     inline void setNewFormat(bool _bNewFormat) { m_bNewFormat = _bNewFormat; }
 };
 
-} // dbaxml
+} // namespace dbaxml
 #endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLFILTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */