Bin some pointless comments and reduce some vertical whitespace

Bin pointless '// predeclarations' or '// forward declarations' comments.  If
a programmer doesn't know what a forward declaration is, well, why read C++
source code?

Also bin some pointless '// end of namespace foo' comments after namespace
blocks just a handful of lines long, and some superfluous vertical whitespace.

Change-Id: I2a31c5d73d9b4de8825fb8eb9e7559dbd7303ef9

9 files changed, 9 insertions, 82 deletions

diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 2c8112adf360..3f9d42dc593b 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -30,8 +30,6 @@
 
 #include <vector>
 
-// predeclarations
-
 struct ImpSdXMLExpTransObj2DBase;
 struct ImpSdXMLExpTransObj3DBase;
 class SvXMLUnitConverter;
@@ -43,7 +41,7 @@ namespace basegfx
     class B2DTuple;
     class B2DHomMatrix;
     class B3DHomMatrix;
-} // end of namespace basegfx
+}
 
 typedef ::std::vector< ImpSdXMLExpTransObj2DBase* > ImpSdXMLExpTransObj2DBaseList;
 typedef ::std::vector< ImpSdXMLExpTransObj3DBase* > ImpSdXMLExpTransObj3DBaseList;
diff --git a/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx
index 7d4e3327b489..ee5574cbdb42 100644
--- a/xmloff/source/xforms/SchemaContext.hxx
+++ b/xmloff/source/xforms/SchemaContext.hxx
@@ -23,16 +23,12 @@
 #include "TokenContext.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 
-
-
-// forward declarations
-
-
 namespace com { namespace sun { namespace star {
     namespace xml { namespace sax { class XAttributeList; } }
     namespace beans { class XPropertySet; }
     namespace xforms { class XDataTypeRepository; }
 } } }
+
 class SvXMLImport;
 class SvXMLImportContext;
 
@@ -42,20 +38,15 @@ class SchemaContext : public TokenContext
     com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository> mxRepository;
 
 public:
-
     SchemaContext( SvXMLImport& rImport,
                    sal_uInt16 nPrfx,
                    const OUString& rLName,
                    const com::sun::star::uno::Reference<com::sun::star::xforms::XDataTypeRepository>& rRepository );
     virtual ~SchemaContext();
 
-
-
     // implement TokenContext methods:
 
-
 protected:
-
     virtual void HandleAttribute(
         sal_uInt16 nToken,
         const OUString& rValue ) SAL_OVERRIDE;
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx
index e55e945d7686..04541cfa0048 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.hxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx
@@ -23,16 +23,12 @@
 #include "TokenContext.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 
-
-
-// forward declarations
-
-
 namespace com { namespace sun { namespace star {
     namespace xml { namespace sax { class XAttributeList; } }
     namespace beans { class XPropertySet; }
     namespace xforms { class XDataTypeRepository; }
 } } }
+
 class SvXMLImport;
 class SvXMLImportContext;
 
@@ -45,7 +41,6 @@ class SchemaRestrictionContext : public TokenContext
     OUString msBaseName;
 
 public:
-
     SchemaRestrictionContext( SvXMLImport& rImport,
                               sal_uInt16 nPrfx,
                               const OUString& rLName,
@@ -53,16 +48,12 @@ public:
                               const OUString& sTypeName );
     virtual ~SchemaRestrictionContext();
 
-
 protected:
-
     // create mxDataType (if not already present)
     void CreateDataType();
 
-
     // implement TokenContext methods:
 
-
     virtual void HandleAttribute(
         sal_uInt16 nToken,
         const OUString& rValue ) SAL_OVERRIDE;
diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
index a84f4ce57194..3d0a3909298b 100644
--- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
+++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx
@@ -23,16 +23,12 @@
 #include "TokenContext.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 
-
-
-// forward declarations
-
-
 namespace com { namespace sun { namespace star {
     namespace xml { namespace sax { class XAttributeList; } }
     namespace beans { class XPropertySet; }
     namespace xforms { class XDataTypeRepository; }
 } } }
+
 class SvXMLImport;
 class SvXMLImportContext;
 
@@ -43,7 +39,6 @@ class SchemaSimpleTypeContext : public TokenContext
     OUString msTypeName;
 
 public:
-
     SchemaSimpleTypeContext( SvXMLImport& rImport,
                              sal_uInt16 nPrfx,
                              const OUString& rLName,
@@ -51,13 +46,9 @@ public:
 
     virtual ~SchemaSimpleTypeContext();
 
-
-
     // implement TokenContext methods:
 
-
 protected:
-
     virtual void HandleAttribute(
         sal_uInt16 nToken,
         const OUString& rValue ) SAL_OVERRIDE;
diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx
index 072174a573d3..3357736308f1 100644
--- a/xmloff/source/xforms/TokenContext.hxx
+++ b/xmloff/source/xforms/TokenContext.hxx
@@ -22,15 +22,11 @@
 
 #include <xmloff/xmlictxt.hxx>
 
-
-
-// forward declarations
-
-
 namespace com { namespace sun { namespace star {
     namespace xml { namespace sax { class XAttributeList; } }
     namespace uno { template<typename T> class Reference; }
 } } }
+
 class SvXMLImport;
 
 #define TOKEN_MAP_ENTRY(NAMESPACE,TOKEN) { XML_NAMESPACE_##NAMESPACE, xmloff::token::XML_##TOKEN, xmloff::token::XML_##TOKEN }
@@ -45,7 +41,6 @@ protected:
     const SvXMLTokenMapEntry* mpChildren;      /// static token map
 
 public:
-
     TokenContext( SvXMLImport& rImport,
                   sal_uInt16 nPrefix,
                   const OUString& rLocalName,
@@ -54,11 +49,8 @@ public:
 
     virtual ~TokenContext();
 
-
-
     // implement SvXMLImportContext methods:
 
-
     /** call HandleAttribute for each attribute in the token map;
      * create a warning for all others. Classes that wish to override
      * StartElement need to call the parent method. */
diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx
index 4dec0e109977..a00d8c200159 100644
--- a/xmloff/source/xforms/XFormsBindContext.hxx
+++ b/xmloff/source/xforms/XFormsBindContext.hxx
@@ -23,20 +23,15 @@
 #include "TokenContext.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 
-
-
-// forward declarations
-
-
 namespace com { namespace sun { namespace star {
     namespace xml { namespace sax { class XAttributeList; } }
     namespace beans { class XPropertySet; }
     namespace xforms { class XModel2; }
 } } }
+
 class SvXMLImport;
 class SvXMLImportContext;
 
-
 /** import the xforms:binding element */
 class XFormsBindContext : public TokenContext
 {
@@ -44,18 +39,14 @@ class XFormsBindContext : public TokenContext
     com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> mxBinding;
 
 public:
-
     XFormsBindContext( SvXMLImport& rImport,
                        sal_uInt16 nPrefix,
                        const OUString& rLocalName,
                        const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel );
     virtual ~XFormsBindContext();
 
-
-
     // implement SvXMLImportContext & TokenContext methods:
 
-
     virtual void StartElement(
         const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE;
 
diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx
index a42b6967fdb6..64a76634adc3 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.hxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.hxx
@@ -23,21 +23,16 @@
 #include "TokenContext.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 
-
-
-// forward declarations
-
-
 namespace com { namespace sun { namespace star {
     namespace xml { namespace sax { class XAttributeList; } }
     namespace xml { namespace dom { class XDocument; } }
     namespace beans { class XPropertySet; }
     namespace xforms { class XModel2; }
 } } }
+
 class SvXMLImport;
 class SvXMLImportContext;
 
-
 /** import the xforms:instance element */
 class XFormsInstanceContext : public TokenContext
 {
@@ -47,21 +42,17 @@ class XFormsInstanceContext : public TokenContext
     OUString msURL;
 
 public:
-
     XFormsInstanceContext( SvXMLImport& rImport,
                            sal_uInt16 nPrfx,
                            const OUString& rLName,
                            const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> & xModel );
     virtual ~XFormsInstanceContext();
 
-
-
     // implement SvXMLImportContext & TokenContext methods:
     // We override CreateChildContext, because we want to read
     // arbitrary DOM elements. For the attributes, we use the
     // TokenContext mechanism.
 
-
     virtual SvXMLImportContext* CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
@@ -70,7 +61,6 @@ public:
     virtual void EndElement() SAL_OVERRIDE;
 
 protected:
-
     virtual void HandleAttribute(
         sal_uInt16 nToken,
         const OUString& rValue ) SAL_OVERRIDE;
diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx
index b439c2771111..4247f02fac22 100644
--- a/xmloff/source/xforms/XFormsModelContext.hxx
+++ b/xmloff/source/xforms/XFormsModelContext.hxx
@@ -24,15 +24,11 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/xforms/XModel2.hpp>
 
-
-
-// forward declarations
-
-
 namespace com { namespace sun { namespace star {
     namespace xml { namespace sax { class XAttributeList; } }
     namespace beans { class XPropertySet; }
 } } }
+
 class SvXMLImport;
 class SvXMLImportContext;
 
@@ -42,7 +38,6 @@ class XFormsModelContext : public TokenContext
     com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> mxModel;
 
 public:
-
     XFormsModelContext( SvXMLImport& rImport,
                         sal_uInt16 nPrfx,
                         const OUString& rLName );
@@ -50,14 +45,11 @@ public:
 
     com::sun::star::uno::Reference<com::sun::star::xforms::XModel2> getModel() { return mxModel;}
 
-
     // implement SvXMLImportContext & TokenContext methods:
 
-
     virtual void EndElement() SAL_OVERRIDE;
 
 protected:
-
     virtual void HandleAttribute(
         sal_uInt16 nToken,
         const OUString& rValue ) SAL_OVERRIDE;
diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx
index 82c9292b0c34..0457f3aa78ed 100644
--- a/xmloff/source/xforms/XFormsSubmissionContext.hxx
+++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx
@@ -23,38 +23,29 @@
 #include "TokenContext.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 
-
-
-// forward declarations
-
-
 namespace com { namespace sun { namespace star {
     namespace xml { namespace sax { class XAttributeList; } }
     namespace beans { class XPropertySet; }
     namespace xforms { class XModel2; }
 } } }
+
 class SvXMLImport;
 class SvXMLImportContext;
 
-
 /** import the xforms:submission element */
 class XFormsSubmissionContext : public TokenContext
 {
     com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> mxSubmission;
 
 public:
-
     XFormsSubmissionContext( SvXMLImport& rImport,
                              sal_uInt16 nPrefix,
                              const OUString& rLocalName,
                              const com::sun::star::uno::Reference<com::sun::star::xforms::XModel2>& xModel );
     virtual ~XFormsSubmissionContext();
 
-
-
     // implement TokenContext methods:
 
-
 protected:
     virtual void HandleAttribute( sal_uInt16 nToken,
                                   const OUString& rValue ) SAL_OVERRIDE;