clean up some include guard terminators

found with
   git grep -n -A10 '#endif // INCLUDED' | grep -v endif | grep -v vim |
grep -v -- '--'

Change-Id: I7ae67cd7c1313e76f059fb8e6afb723caca8a6d7
Reviewed-on: https://gerrit.libreoffice.org/49244Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

forms/source/component/Columns.hxx

@@ -196,10 +196,8 @@ DECL_COLUMN(ComboBoxColumn)
 DECL_COLUMN(ListBoxColumn)
 DECL_COLUMN(FormattedFieldColumn)
 
-#endif // INCLUDED_FORMS_SOURCE_COMPONENT_COLUMNS_HXX
-
-
 }   // namespace frm
 
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_COLUMNS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

forms/source/component/Hidden.hxx

@@ -65,10 +65,8 @@ protected:
     virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone(  ) override;
 };
 
-#endif // INCLUDED_FORMS_SOURCE_COMPONENT_HIDDEN_HXX
-
-
 }
 
+#endif // INCLUDED_FORMS_SOURCE_COMPONENT_HIDDEN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/comphelper/accessibletexthelper.hxx

@@ -143,9 +143,6 @@ namespace comphelper
 }   // namespace comphelper
 
 
-#endif // INCLUDED_COMPHELPER_ACCESSIBLETEXTHELPER_HXX
-
-
 //  OAccessibleTextHelper is a helper class for implementing the
 //  XAccessibleText interface.
 
@@ -173,5 +170,6 @@ namespace comphelper
 //      setSelection
 //      copyText
 
+#endif // INCLUDED_COMPHELPER_ACCESSIBLETEXTHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/svx/svdview.hxx

@@ -236,8 +236,6 @@ public:
     virtual void onAccessibilityOptionsChanged();
 };
 
-#endif // INCLUDED_SVX_SVDVIEW_HXX
-
 // First of all the app creates a SdrModel.
 // Then it opens a Win and creates a SdrView.
 // ShowSdrPage() announces a page at SdrView.
@@ -271,4 +269,6 @@ public:
 //     Pointer GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nTol=0) const;
 //     OUString GetStatusText();
 
+#endif // INCLUDED_SVX_SVDVIEW_HXX
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sd/source/ui/inc/fuhhconv.hxx

@@ -54,8 +54,8 @@ private:
 
 };
 
-#endif // INCLUDED_SD_SOURCE_UI_INC_FUHHCONV_HXX
-
 } // end of namespace sd
 
+#endif // INCLUDED_SD_SOURCE_UI_INC_FUHHCONV_HXX
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

svx/source/inc/sdbdatacolumn.hxx

@@ -53,10 +53,8 @@ namespace svxform
         }
     };
 
-#endif // INCLUDED_SVX_SOURCE_INC_SDBDATACOLUMN_HXX
-
-
 }
 
+#endif // INCLUDED_SVX_SOURCE_INC_SDBDATACOLUMN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */