diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-04-30 05:32:26 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-04-30 06:14:12 +0300 |
commit | d1ca0f4ed0e30394ce6759a20d4896651dd43051 (patch) | |
tree | af9def17a770c6399e18965c9fb9f3bb4b91b702 /include/xmloff | |
parent | 0d341d28f73603670e3b8c639c583229d3c723a6 (diff) |
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
Diffstat (limited to 'include/xmloff')
-rw-r--r-- | include/xmloff/shapeexport.hxx | 6 | ||||
-rw-r--r-- | include/xmloff/table/XMLTableExport.hxx | 4 | ||||
-rw-r--r-- | include/xmloff/xmlerror.hxx | 13 | ||||
-rw-r--r-- | include/xmloff/xmluconv.hxx | 6 |
4 files changed, 4 insertions, 25 deletions
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx index b957022d5e0e..8ba396903136 100644 --- a/include/xmloff/shapeexport.hxx +++ b/include/xmloff/shapeexport.hxx @@ -146,9 +146,6 @@ typedef std::vector< ImplXMLShapeExportInfo > ImplXMLShapeExportInfoVector; /** a map to store all cache data for already collected XShapes */ typedef std::map< com::sun::star::uno::Reference < com::sun::star::drawing::XShapes >, ImplXMLShapeExportInfoVector > ShapesInfos; - -// predeclarations - class SvXMLExport; class SvXMLExportPropertyMapper; @@ -156,7 +153,7 @@ namespace basegfx { class B2DTuple; class B2DHomMatrix; -} // end of namespace basegfx +} class XMLOFF_DLLPUBLIC XMLShapeExport : public salhelper::SimpleReferenceObject { @@ -328,7 +325,6 @@ public: const rtl::Reference< XMLTableExport >& GetShapeTableExport(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx index 82e6d240274c..447bf88bd37b 100644 --- a/include/xmloff/table/XMLTableExport.hxx +++ b/include/xmloff/table/XMLTableExport.hxx @@ -42,10 +42,6 @@ #include <xmloff/xmlprmap.hxx> #include <xmloff/xmlexppr.hxx> - - -// predeclarations - class SvXMLExport; class SvXMLExportPropertyMapper; diff --git a/include/xmloff/xmlerror.hxx b/include/xmloff/xmlerror.hxx index 3726eb23a19d..853af45923af 100644 --- a/include/xmloff/xmlerror.hxx +++ b/include/xmloff/xmlerror.hxx @@ -26,8 +26,6 @@ #include <vector> - - // masks for the error ID fields #define XMLERROR_MASK_FLAG 0xF0000000 #define XMLERROR_MASK_CLASS 0x00FF0000 @@ -44,7 +42,6 @@ #define XMLERROR_CLASS_API 0x00040000 #define XMLERROR_CLASS_OTHER 0x00080000 - // error numbers, listed by error class // Within each class, errors should be numbered consecutively. Please // always add to error code below the appropriate comment. @@ -76,8 +73,6 @@ // other errors: #define XMLERROR_CANCEL ( XMLERROR_CLASS_OTHER | 0x00000001 ) - - // 16bit error flag constants for use in the // SvXMLExport/SvXMLImport error flags enum class SvXMLErrorFlags { @@ -86,22 +81,19 @@ enum class SvXMLErrorFlags { ERROR_OCCURRED = 0x0002, WARNING_OCCURRED = 0x0004, }; + namespace o3tl { template<> struct typed_flags<SvXMLErrorFlags> : is_typed_flags<SvXMLErrorFlags, 0x7> {}; } - - -// forward declarations namespace com { namespace sun { namespace star { namespace uno { template<class X> class Sequence; } namespace uno { template<class X> class Reference; } namespace xml { namespace sax { class XLocator; } } } } } -class ErrorRecord; - +class ErrorRecord; /** * The XMLErrors is used to collect all errors and warnings that occur @@ -146,7 +138,6 @@ public: throw( ::com::sun::star::xml::sax::SAXParseException ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index 66698fa05413..94f8c43f18b8 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -40,9 +40,6 @@ #include <tools/fldunit.hxx> #include <tools/mapunit.hxx> - -// predeclarations - namespace tools { class Time; } namespace com { namespace sun { namespace star { @@ -53,7 +50,7 @@ namespace com { namespace sun { namespace star { namespace basegfx { class B3DVector; -} // end of namespace basegfx +} class XMLOFF_DLLPUBLIC SvXMLTokenEnumerator { @@ -224,7 +221,6 @@ public: /** convert number (sal_uInt32) to string (hex) */ static void convertHex( OUStringBuffer& rBuffer, sal_uInt32 nVal ); - }; #endif // INCLUDED_XMLOFF_XMLUCONV_HXX |