diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
| commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
| tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /include/oox | |
| parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff) | |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'include/oox')
71 files changed, 0 insertions, 370 deletions
diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx index e9cf43177bfc..0bf2cd7892f5 100644 --- a/include/oox/core/binarycodec.hxx +++ b/include/oox/core/binarycodec.hxx @@ -33,7 +33,6 @@ namespace oox { namespace core { - namespace CodecHelper { /** Returns the password hash if it is in the required 16-bit limit. */ @@ -41,7 +40,6 @@ namespace CodecHelper } - /** Encodes and decodes data from/to protected MS Office documents. Implements a simple XOR encoding/decoding algorithm used in MS Office @@ -163,7 +161,6 @@ private: }; - /** Encodes and decodes data from protected MSO 97+ documents. This is a wrapper class around low level cryptographic functions from RTL. @@ -292,7 +289,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx index 311eefa0b290..e19bdeb87026 100644 --- a/include/oox/core/fastparser.hxx +++ b/include/oox/core/fastparser.hxx @@ -36,7 +36,6 @@ namespace oox { namespace core { - /** Wrapper for a fast SAX parser that works on automatically generated OOXML token and namespace identifiers. */ @@ -89,7 +88,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx index 744d9225870c..339d3caa2d75 100644 --- a/include/oox/core/fasttokenhandler.hxx +++ b/include/oox/core/fasttokenhandler.hxx @@ -32,7 +32,6 @@ namespace oox { namespace core { - /** Wrapper implementing the com.sun.star.xml.sax.XFastTokenHandler API interface that provides access to the tokens generated from the internal token name list. */ @@ -62,7 +61,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx index 519e63ff0504..bed536660d7f 100644 --- a/include/oox/core/filterbase.hxx +++ b/include/oox/core/filterbase.hxx @@ -111,7 +111,6 @@ public: virtual bool exportDocument() = 0; - /** Returns the component context passed in the filter constructor (always existing). */ const css::uno::Reference< css::uno::XComponentContext >& getComponentContext() const; diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index 9ecd9fea1679..7c5552f5cbdb 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -40,7 +40,6 @@ namespace oox { namespace core { - /** Document handler specifically designed for detecting OOXML file formats. It takes a reference to the filter string object via its constructor, and @@ -151,7 +150,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx index f1110db8cf13..952d301b7965 100644 --- a/include/oox/core/fragmenthandler.hxx +++ b/include/oox/core/fragmenthandler.hxx @@ -34,7 +34,6 @@ namespace oox { namespace core { - /** Base data of a fragment. This data is stored in a separate struct to make it accessible in every @@ -55,7 +54,6 @@ struct FragmentBaseData }; - /** Describes record identifiers used to create contexts in a binary stream. If a record is used to start a new context, usually the record identifier @@ -73,7 +71,6 @@ struct RecordInfo }; - typedef ::cppu::ImplInheritanceHelper< ContextHandler, css::xml::sax::XFastDocumentHandler > FragmentHandler_BASE; class OOX_DLLPUBLIC FragmentHandler : public FragmentHandler_BASE @@ -120,7 +117,6 @@ protected: typedef ::rtl::Reference< FragmentHandler > FragmentHandlerRef; - } // namespace core } // namespace oox diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx index 200be17e360d..8ec3c00474a3 100644 --- a/include/oox/core/fragmenthandler2.hxx +++ b/include/oox/core/fragmenthandler2.hxx @@ -29,7 +29,6 @@ namespace oox { namespace core { - class OOX_DLLPUBLIC FragmentHandler2 : public FragmentHandler, public ContextHandler2Helper { protected: @@ -114,7 +113,6 @@ public: typedef ::rtl::Reference< FragmentHandler2 > FragmentHandler2Ref; - } // namespace core } // namespace oox diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx index 03c69042cf88..a9909a0db596 100644 --- a/include/oox/core/recordparser.hxx +++ b/include/oox/core/recordparser.hxx @@ -34,7 +34,6 @@ namespace prv { class Locator; } namespace prv { class ContextStack; } - struct RecordInputSource { BinaryInputStreamRef mxInStream; @@ -43,7 +42,6 @@ struct RecordInputSource }; - class RecordParser { public: @@ -79,7 +77,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx index 6f9fd44a9305..018634972535 100644 --- a/include/oox/core/relations.hxx +++ b/include/oox/core/relations.hxx @@ -29,7 +29,6 @@ namespace oox { namespace core { - /** Expands to an OUString containing an 'officeDocument' transitional relation type created from the passed literal(!) ASCII(!) character array. */ #define CREATE_OFFICEDOC_RELATION_TYPE( ascii ) \ @@ -64,7 +63,6 @@ struct Relation }; - class Relations; typedef std::shared_ptr< Relations > RelationsRef; @@ -117,7 +115,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx index d7ceb73238e3..8d1237adfbf4 100644 --- a/include/oox/core/relationshandler.hxx +++ b/include/oox/core/relationshandler.hxx @@ -26,7 +26,6 @@ namespace oox { namespace core { - class RelationsFragment : public FragmentHandler { public: @@ -45,7 +44,6 @@ private: }; - } // namespace core } // namespace oox diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index 6dc4c3b83e99..e2415b3f64ca 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -97,7 +97,6 @@ public: virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() = 0; - OUString getFragmentPathFromFirstTypeFromOfficeDoc( const OUString& rPart ); /** Imports a fragment using the passed fragment handler, which contains diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx index ebce01a4006d..f8ee8d043d27 100644 --- a/include/oox/drawingml/chart/chartconverter.hxx +++ b/include/oox/drawingml/chart/chartconverter.hxx @@ -42,7 +42,6 @@ struct ChartSpaceModel; struct DataSequenceModel; - class OOX_DLLPUBLIC ChartConverter { public: @@ -94,7 +93,6 @@ private: }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/chart/datasourcemodel.hxx b/include/oox/drawingml/chart/datasourcemodel.hxx index e6539cae744c..b09558f4b5ba 100644 --- a/include/oox/drawingml/chart/datasourcemodel.hxx +++ b/include/oox/drawingml/chart/datasourcemodel.hxx @@ -28,7 +28,6 @@ namespace drawingml { namespace chart { - struct DataSequenceModel { typedef ::std::map< sal_Int32, css::uno::Any > AnyMap; @@ -43,7 +42,6 @@ struct DataSequenceModel }; - struct DataSourceModel { typedef ModelRef< DataSequenceModel > DataSequenceRef; @@ -55,7 +53,6 @@ struct DataSourceModel }; - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index 110b0d6e36f3..98352cbc11e8 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -36,7 +36,6 @@ namespace oox { namespace drawingml { - class OOX_DLLPUBLIC Color { public: diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx index 6fa8261e7956..a6114ac7e279 100644 --- a/include/oox/drawingml/drawingmltypes.hxx +++ b/include/oox/drawingml/drawingmltypes.hxx @@ -36,7 +36,6 @@ namespace oox { namespace drawingml { - const sal_Int32 PER_PERCENT = 1000; const sal_Int32 MAX_PERCENT = 100 * PER_PERCENT; @@ -44,7 +43,6 @@ const sal_Int32 PER_DEGREE = 60000; const sal_Int32 MAX_DEGREE = 360 * PER_DEGREE; - struct LineProperties; typedef std::shared_ptr< LineProperties > LinePropertiesPtr; @@ -78,7 +76,6 @@ class Theme; typedef std::shared_ptr< Theme > ThemePtr; - namespace table { class TableProperties; @@ -87,7 +84,6 @@ typedef std::shared_ptr< TableProperties > TablePropertiesPtr; } // namespace table - /** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */ css::awt::Point GetPointPercent( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs ); @@ -141,7 +137,6 @@ OOX_DLLPUBLIC const char* GetTextVerticalAdjust( css::drawing::TextVerticalAdjus const char* GetHatchPattern( const css::drawing::Hatch& rHatch ); - // CT_IndexRange struct IndexRange { sal_Int32 start; @@ -152,7 +147,6 @@ struct IndexRange { IndexRange GetIndexRange( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes ); - const sal_Int32 EMU_PER_HMM = 360; /// 360 EMUs per 1/100 mm. /** Converts the passed 32-bit integer value from 1/100 mm to EMUs. */ @@ -169,7 +163,6 @@ inline sal_Int32 convertEmuToHmm( sal_Int64 nValue ) } - /** A structure for a point with 64-bit integer components. */ struct EmuPoint { @@ -181,7 +174,6 @@ struct EmuPoint }; - /** A structure for a size with 64-bit integer components. */ struct EmuSize { @@ -193,7 +185,6 @@ struct EmuSize }; - /** A structure for a rectangle with 64-bit integer components. */ struct EmuRectangle : public EmuPoint, public EmuSize { @@ -206,7 +197,6 @@ struct EmuRectangle : public EmuPoint, public EmuSize }; - } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx index 9f7115c2cf69..2cf6c6285a33 100644 --- a/include/oox/drawingml/graphicshapecontext.hxx +++ b/include/oox/drawingml/graphicshapecontext.hxx @@ -37,7 +37,6 @@ public: }; - class OOX_DLLPUBLIC GraphicalObjectFrameContext : public ShapeContext { public: @@ -52,7 +51,6 @@ private: }; - class OleObjectGraphicDataContext : public ShapeContext { public: @@ -65,7 +63,6 @@ private: }; - class Diagram; class DiagramGraphicDataContext @@ -84,7 +81,6 @@ private: }; - class ChartGraphicDataContext : public ShapeContext { public: @@ -102,7 +98,6 @@ private: }; - } } #endif // INCLUDED_OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx index 3306a4c171ff..4aaedd7c1d81 100644 --- a/include/oox/drawingml/shapepropertymap.hxx +++ b/include/oox/drawingml/shapepropertymap.hxx @@ -93,7 +93,6 @@ struct OOX_DLLPUBLIC ShapePropertyInfo }; - class OOX_DLLPUBLIC ShapePropertyMap : public PropertyMap { public: @@ -143,7 +142,6 @@ private: }; - } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx index 557e9a16248e..134167f3fdad 100644 --- a/include/oox/drawingml/theme.hxx +++ b/include/oox/drawingml/theme.hxx @@ -30,7 +30,6 @@ namespace oox { namespace drawingml { - const sal_Int32 THEMED_STYLE_SUBTLE = 1; const sal_Int32 THEMED_STYLE_MODERATE = 2; const sal_Int32 THEMED_STYLE_INTENSE = 3; @@ -102,7 +101,6 @@ private: }; - } // namespace drawingml } // namespace oox diff --git a/include/oox/drawingml/themefragmenthandler.hxx b/include/oox/drawingml/themefragmenthandler.hxx index 4287778d3a9f..24ea7abb2d21 100644 --- a/include/oox/drawingml/themefragmenthandler.hxx +++ b/include/oox/drawingml/themefragmenthandler.hxx @@ -29,7 +29,6 @@ namespace drawingml { class Theme; - class OOX_DLLPUBLIC ThemeFragmentHandler : public ::oox::core::FragmentHandler2 { public: @@ -46,7 +45,6 @@ private: }; - } // namespace drawingml } // namespace oox diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx index 46dd050f62a1..2cde09d3e2c0 100644 --- a/include/oox/dump/dffdumper.hxx +++ b/include/oox/dump/dffdumper.hxx @@ -28,7 +28,6 @@ namespace oox { namespace dump { - class DffStreamObject : public SequenceRecordObjectBase { public: @@ -59,7 +58,6 @@ private: }; - } // namespace dump } // namespace oox diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 0f274356b834..4561720c31ee 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -62,7 +62,6 @@ namespace oox { namespace dump { - #define OOX_DUMP_UNUSED "unused" #define OOX_DUMP_UNKNOWN "?unknown" @@ -97,8 +96,6 @@ typedef ::std::vector< OUString > OUStringVector; typedef ::std::vector< sal_Int64 > Int64Vector; - - /** Static helper functions for system file and stream access. */ class InputOutputHelper { @@ -137,7 +134,6 @@ public: }; - class BinaryInputStreamRef : public ::oox::BinaryInputStreamRef { public: @@ -155,8 +151,6 @@ public: }; - - /** Specifiers for atomic data types. */ enum DataType { @@ -174,7 +168,6 @@ enum DataType }; - /** Specifiers for the output format of values. */ enum FormatType { @@ -188,7 +181,6 @@ enum FormatType }; - /** Describes the output format of a data item. Data items are written in the following format: @@ -249,10 +241,6 @@ struct ItemFormat }; - - - - /** Static helper functions for formatted output to strings. */ class StringHelper { @@ -364,7 +352,6 @@ public: }; - template< typename Type > void StringHelper::appendFix( OUStringBuffer& rStr, Type nData, sal_Int32 nWidth ) { @@ -387,7 +374,6 @@ void StringHelper::appendValue( OUStringBuffer& rStr, Type nData, FormatType eFm } - class String : public OUString { public: @@ -403,8 +389,6 @@ public: static const String EMPTY_STRING; - - class Base; /** Base class for all dumper classes. @@ -471,8 +455,6 @@ protected: }; - - class ConfigItemBase { public: @@ -510,7 +492,6 @@ private: }; - class SharedConfigData; class Config; @@ -600,7 +581,6 @@ private: }; - class ConstList : public NameListBase { public: @@ -632,7 +612,6 @@ private: }; - class MultiList : public ConstList { public: @@ -653,7 +632,6 @@ private: }; - class FlagsList : public NameListBase { public: @@ -684,7 +662,6 @@ private: }; - class CombiList : public FlagsList { public: @@ -717,7 +694,6 @@ private: }; - class UnitConverter : public NameListBase { public: @@ -742,7 +718,6 @@ private: }; - class NameListWrapper { public: @@ -762,7 +737,6 @@ private: static const NameListWrapper NO_LIST; - class ItemFormatMap { private: @@ -782,8 +756,6 @@ public: }; - - class SharedConfigData : public Base, public ConfigItemBase { public: @@ -841,7 +813,6 @@ private: }; - template< typename ListType > std::shared_ptr< ListType > SharedConfigData::createNameList( const OUString& rListName ) { @@ -863,7 +834,6 @@ void SharedConfigData::readNameList( TextInputStream& rStrm, const OUString& rLi } - class Config : public Base { public: @@ -929,7 +899,6 @@ private: typedef std::shared_ptr< Config > ConfigRef; - template< typename Type > Type Config::getIntOption( const String& rKey, Type nDefault ) const { @@ -960,8 +929,6 @@ bool Config::hasName( const NameListWrapper& rListWrp, Type nKey ) const } - - class Output : public Base { public: @@ -970,7 +937,6 @@ public: const OUString& rFileName ); - void newLine(); void emptyLine( size_t nCount = 1 ); @@ -1047,7 +1013,6 @@ private: typedef std::shared_ptr< Output > OutputRef; - class IndentGuard { public: @@ -1061,7 +1026,6 @@ private: }; - class TableGuard { public: @@ -1084,7 +1048,6 @@ private: }; - class ItemGuard { public: @@ -1100,7 +1063,6 @@ private: }; - class MultiItemsGuard { public: @@ -1114,7 +1076,6 @@ private: }; - class StorageIterator : public Base { public: @@ -1137,8 +1098,6 @@ private: }; - - class ObjectBase : public Base { public: @@ -1160,7 +1119,6 @@ protected: virtual void implDump(); - Config& cfg() const { return *mxConfig; } private: @@ -1170,8 +1128,6 @@ private: typedef std::shared_ptr< ObjectBase > ObjectRef; - - class StorageObjectBase : public ObjectBase { protected: @@ -1242,9 +1198,6 @@ private: }; - - - class OutputObjectBase : public ObjectBase { public: @@ -1261,7 +1214,6 @@ protected: virtual bool implIsValid() const override; - void writeEmptyItem( const String& rName ); void writeInfoItem( const String& rName, const String& rData ); void writeCharItem( const String& rName, sal_Unicode cData ); @@ -1304,8 +1256,6 @@ protected: }; - - template< typename Type > void OutputObjectBase::addNameToItem( Type nData, const NameListWrapper& rListWrp ) { @@ -1412,8 +1362,6 @@ void OutputObjectBase::writeHexPairItem( const String& rName, Type nData1, Type } - - class InputObjectBase : public OutputObjectBase { public: @@ -1492,8 +1440,6 @@ protected: }; - - template< typename Type > Type InputObjectBase::dumpName( const String& rName, const NameListWrapper& rListWrp ) { @@ -1609,8 +1555,6 @@ void InputObjectBase::dumpHexPair( const String& rName, sal_Unicode cSep ) } - - class BinaryStreamObject : public InputObjectBase { public: @@ -1626,8 +1570,6 @@ protected: }; - - class TextStreamObjectBase : public InputObjectBase { protected: @@ -1657,7 +1599,6 @@ protected: }; - class TextLineStreamObject : public TextStreamObjectBase { public: @@ -1678,7 +1619,6 @@ protected: }; - class XmlStreamObject : public TextStreamObjectBase { public: @@ -1692,8 +1632,6 @@ protected: }; - - class RecordObjectBase : public InputObjectBase { protected: @@ -1739,7 +1677,6 @@ private: }; - class SequenceRecordObjectBase : public RecordObjectBase { protected: @@ -1762,8 +1699,6 @@ private: }; - - /** Base class for a file dumper. Derived classes implement the implDump() function to add functionality. */ @@ -1783,8 +1718,6 @@ protected: }; - - } // namespace dump } // namespace oox diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index ea9604dcc218..0edae384cb4d 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -33,8 +33,6 @@ namespace oox { namespace dump { - - class OleInputObjectBase : public InputObjectBase { protected: @@ -52,8 +50,6 @@ protected: }; - - class StdFontObject : public OleInputObjectBase { public: @@ -64,7 +60,6 @@ protected: }; - class StdPicObject : public OleInputObjectBase { public: @@ -75,8 +70,6 @@ protected: }; - - class OleStreamObject : public OleInputObjectBase { public: @@ -84,7 +77,6 @@ public: }; - class OleCompObjObject : public OleStreamObject { public: @@ -95,8 +87,6 @@ protected: }; - - class OlePropertyStreamObject : public InputObjectBase { public: @@ -136,7 +126,6 @@ private: }; - class OleStorageObject : public StorageObjectBase { public: @@ -156,8 +145,6 @@ protected: }; - - class ComCtlObjectBase : public OleInputObjectBase { protected: @@ -187,7 +174,6 @@ protected: }; - class ComCtlScrollBarObject : public ComCtlObjectBase { public: @@ -198,7 +184,6 @@ protected: }; - class ComCtlProgressBarObject : public ComCtlObjectBase { public: @@ -209,7 +194,6 @@ protected: }; - class ComCtlSliderObject : public ComCtlObjectBase { public: @@ -220,7 +204,6 @@ protected: }; - class ComCtlUpDownObject : public ComCtlObjectBase { public: @@ -231,7 +214,6 @@ protected: }; - class ComCtlImageListObject : public ComCtlObjectBase { public: @@ -244,7 +226,6 @@ protected: }; - class ComCtlTabStripObject : public ComCtlObjectBase { public: @@ -256,7 +237,6 @@ protected: }; - class ComCtlTreeViewObject : public ComCtlObjectBase { public: @@ -271,7 +251,6 @@ private: }; - class ComCtlStatusBarObject : public ComCtlObjectBase { public: @@ -284,8 +263,6 @@ protected: }; - - class AxPropertyObjectBase : public OleInputObjectBase { protected: @@ -395,7 +372,6 @@ private: }; - template< typename Type > void AxPropertyObjectBase::alignInput() { @@ -425,7 +401,6 @@ Type AxPropertyObjectBase::dumpHexProperty( Type nDefault, const NameListWrapper } - class AxCFontNewObject : public AxPropertyObjectBase { public: @@ -436,7 +411,6 @@ protected: }; - class AxColumnInfoObject : public AxPropertyObjectBase { public: @@ -447,7 +421,6 @@ protected: }; - class AxCommandButtonObject : public AxPropertyObjectBase { public: @@ -459,7 +432,6 @@ protected: }; - class AxMorphControlObject : public AxPropertyObjectBase { public: @@ -478,7 +450,6 @@ private: }; - class AxLabelObject : public AxPropertyObjectBase { public: @@ -490,7 +461,6 @@ protected: }; - class AxImageObject : public AxPropertyObjectBase { public: @@ -501,7 +471,6 @@ protected: }; - class AxScrollBarObject : public AxPropertyObjectBase { public: @@ -512,7 +481,6 @@ protected: }; - class AxSpinButtonObject : public AxPropertyObjectBase { public: @@ -523,7 +491,6 @@ protected: }; - class AxTabStripObject : public AxPropertyObjectBase { public: @@ -538,8 +505,6 @@ private: }; - - class FormControlStreamObject : public OleInputObjectBase { public: @@ -565,8 +530,6 @@ private: }; - - struct VbaFormSiteInfo { OUString maProgId; @@ -580,7 +543,6 @@ struct VbaFormSiteInfo typedef ::std::vector< VbaFormSiteInfo > VbaFormSiteInfoVector; - struct VbaFormSharedData { OUStringVector maClassInfoProgIds; @@ -588,7 +550,6 @@ struct VbaFormSharedData }; - class VbaFormClassInfoObject : public AxPropertyObjectBase { public: @@ -602,7 +563,6 @@ private: }; - class VbaFormSiteObject : public AxPropertyObjectBase { public: @@ -616,7 +576,6 @@ private: }; - class VbaFormDesignExtObject : public AxPropertyObjectBase { public: @@ -627,7 +586,6 @@ protected: }; - class VbaFStreamObject : public AxPropertyObjectBase { public: @@ -653,7 +611,6 @@ private: }; - class VbaOStreamObject : public OleInputObjectBase { public: @@ -671,7 +628,6 @@ private: }; - class VbaPageObject : public AxPropertyObjectBase { public: @@ -682,7 +638,6 @@ protected: }; - class VbaMultiPageObject : public AxPropertyObjectBase { public: @@ -697,7 +652,6 @@ private: }; - class VbaXStreamObject : public InputObjectBase { public: @@ -715,7 +669,6 @@ private: }; - class VbaContainerStorageObject : public OleStorageObject { public: @@ -744,8 +697,6 @@ private: }; - - struct VbaSharedData { typedef ::std::map< OUString, sal_Int32 > StreamOffsetMap; @@ -760,7 +711,6 @@ struct VbaSharedData }; - class VbaDirStreamObject : public SequenceRecordObjectBase { public: @@ -789,7 +739,6 @@ private: }; - class VbaModuleStreamObject : public InputObjectBase { public: @@ -809,7 +758,6 @@ private: }; - class VbaStorageObject : public OleStorageObject { public: @@ -831,7 +779,6 @@ private: }; - class VbaFormStorageObject : public VbaContainerStorageObject { public: @@ -853,7 +800,6 @@ private: }; - class VbaProjectStorageObject : public OleStorageObject { public: @@ -876,8 +822,6 @@ private: }; - - class ActiveXStorageObject : public VbaContainerStorageObject { public: @@ -893,8 +837,6 @@ protected: }; - - } // namespace dump } // namespace oox diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx index 5390df05c0e7..9b0a14857b32 100644 --- a/include/oox/dump/pptxdumper.hxx +++ b/include/oox/dump/pptxdumper.hxx @@ -29,7 +29,6 @@ namespace dump { namespace pptx { - class RootStorageObject : public StorageObjectBase { public: @@ -44,7 +43,6 @@ protected: }; - class Dumper : public DumperBase { public: @@ -60,7 +58,6 @@ protected: }; - } // namespace pptx } // namespace dump } // namespace oox diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx index a4651a1cabf5..1d8c28281249 100644 --- a/include/oox/dump/xlsbdumper.hxx +++ b/include/oox/dump/xlsbdumper.hxx @@ -36,7 +36,6 @@ namespace dump { namespace xlsb { - class RecordObjectBase : public SequenceRecordObjectBase { protected: @@ -55,7 +54,6 @@ private: }; - class RootStorageObject : public StorageObjectBase { public: @@ -70,7 +68,6 @@ protected: }; - class Dumper : public DumperBase { public: @@ -86,7 +83,6 @@ protected: }; - } // namespace xlsb } // namespace dump } // namespace oox diff --git a/include/oox/helper/attributelist.hxx b/include/oox/helper/attributelist.hxx index 427e4d63994b..2bde4a8807cc 100644 --- a/include/oox/helper/attributelist.hxx +++ b/include/oox/helper/attributelist.hxx @@ -34,7 +34,6 @@ namespace sax_fastparser { namespace oox { - /** Static helpers for conversion of strings to attribute values of various different data types. */ @@ -62,7 +61,6 @@ public: }; - /** Provides access to attribute values of an element. Wraps a com.sun.star.xml.sax.XFastAttributeList object. Provides @@ -170,7 +168,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index 1baf584f0f75..afc48d3c6351 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -33,7 +33,6 @@ namespace oox { class BinaryOutputStream; - /** Interface for binary input stream classes. The binary data in the stream is assumed to be in little-endian format. @@ -204,7 +203,6 @@ private: typedef std::shared_ptr< BinaryInputStream > BinaryInputStreamRef; - template< typename Type > Type BinaryInputStream::readValue() { @@ -235,7 +233,6 @@ sal_Int32 BinaryInputStream::readArray( ::std::vector< Type >& orVector, sal_Int } - /** Wraps a UNO input stream and provides convenient access functions. The binary data in the stream is assumed to be in little-endian format. @@ -283,7 +280,6 @@ private: }; - /** Wraps a StreamDataSequence and provides convenient access functions. The binary data in the stream is assumed to be in little-endian format. @@ -319,7 +315,6 @@ private: }; - /** Wraps a BinaryInputStream and provides access to a specific part of the stream data. @@ -386,7 +381,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx index ae5496d924fe..4287441fb78c 100644 --- a/include/oox/helper/binaryoutputstream.hxx +++ b/include/oox/helper/binaryoutputstream.hxx @@ -30,7 +30,6 @@ namespace com { namespace sun { namespace star { namespace oox { - /** Interface for binary output stream classes. The binary data in the stream is written in little-endian format. @@ -114,7 +113,6 @@ void BinaryOutputStream::writeValue( Type nValue ) } - /** Wraps a UNO output stream and provides convenient access functions. The binary data in the stream is written in little-endian format. @@ -156,7 +154,6 @@ private: }; - /** Wraps a StreamDataSequence and provides convenient access functions. The binary data in the stream is written in little-endian format. After @@ -183,7 +180,6 @@ public: }; - } // namespace oox #endif diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx index 8492049283ce..e49eca63c601 100644 --- a/include/oox/helper/binarystreambase.hxx +++ b/include/oox/helper/binarystreambase.hxx @@ -34,7 +34,6 @@ namespace oox { typedef css::uno::Sequence< sal_Int8 > StreamDataSequence; - /** Base class for binary stream classes. */ class OOX_DLLPUBLIC BinaryStreamBase @@ -118,7 +117,6 @@ private: }; - /** Base class for binary input and output streams wrapping a UNO stream, seekable via the com.sun.star.io.XSeekable interface. */ @@ -146,7 +144,6 @@ private: }; - /** Base class for binary input and output streams wrapping a StreamDataSequence, which is always seekable. @@ -175,7 +172,6 @@ protected: }; - } // namespace oox #endif diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx index 1c73eb7ec98d..66d098f869ce 100644 --- a/include/oox/helper/containerhelper.hxx +++ b/include/oox/helper/containerhelper.hxx @@ -38,7 +38,6 @@ namespace com { namespace sun { namespace star { namespace oox { - /** A range of signed 32-bit integer values. */ struct ValueRange { @@ -55,11 +54,9 @@ struct ValueRange }; - typedef ::std::vector< ValueRange > ValueRangeVector; - /** An ordered list of value ranges. The insertion operation will merge consecutive value ranges. */ @@ -79,7 +76,6 @@ private: }; - /** Template for a 2-dimensional array of objects. This class template provides a similar interface to the ::std::vector @@ -136,7 +132,6 @@ private: }; - /** Static helper functions for improved API container handling. */ class OOX_DLLPUBLIC ContainerHelper { @@ -267,7 +262,6 @@ public: }; - template< typename VectorType > /*static*/ const typename VectorType::value_type* ContainerHelper::getVectorElement( const VectorType& rVector, sal_Int32 nIndex ) { @@ -325,7 +319,6 @@ template< typename MatrixType > } - } // namespace oox #endif diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx index ce0b3655621a..36f374805c33 100644 --- a/include/oox/helper/graphichelper.hxx +++ b/include/oox/helper/graphichelper.hxx @@ -46,7 +46,6 @@ namespace com { namespace sun { namespace star { namespace oox { - /** Provides helper functions for colors, device measurement conversion, graphics, and graphic objects handling. @@ -165,7 +164,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx index 5029d5fa1d26..30525a86c8b0 100644 --- a/include/oox/helper/helper.hxx +++ b/include/oox/helper/helper.hxx @@ -75,7 +75,6 @@ const sal_uInt8 WINDOWS_CHARSET_EASTERN = 238; const sal_uInt8 WINDOWS_CHARSET_OEM = 255; - const sal_Int32 API_RGB_TRANSPARENT = -1; ///< Transparent color for API calls. const sal_uInt32 UNSIGNED_RGB_TRANSPARENT = static_cast<sal_uInt32>(-1); ///< Transparent color for unsigned int32 places. const sal_Int32 API_RGB_BLACK = 0x000000; ///< Black color for API calls. @@ -101,7 +100,6 @@ const sal_Int8 API_ESCAPEHEIGHT_NONE = 100; ///< Relative character const sal_Int8 API_ESCAPEHEIGHT_DEFAULT = 58; ///< Relative character height if escaped. - // Limitate values ------------------------------------------------------------ template< typename ReturnType, typename Type > @@ -167,7 +165,6 @@ inline void setFlag( Type& ornBitField, Type nMask, bool bSet = true ) } - /** Optional value, similar to ::boost::optional<>, with convenience accessors. */ template< typename Type > @@ -201,7 +198,6 @@ private: }; - /** Provides platform independent functions to convert from or to little-endian byte order, e.g. for reading data from or writing data to memory or a binary stream. @@ -261,7 +257,6 @@ private: }; - template< typename Type > inline void ByteOrderConverter::writeLittleEndian( void* pDstBuffer, Type nValue ) { @@ -298,7 +293,6 @@ inline void ByteOrderConverter::swap8( sal_uInt8* pnData ) #endif - } // namespace oox #endif diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx index 1f530fd6af48..85ce16808a7b 100644 --- a/include/oox/helper/modelobjecthelper.hxx +++ b/include/oox/helper/modelobjecthelper.hxx @@ -34,7 +34,6 @@ namespace com { namespace sun { namespace star { namespace oox { - /** This helper manages named objects in a container, which is created on demand. */ class OOX_DLLPUBLIC ObjectContainer @@ -69,7 +68,6 @@ private: }; - /** Contains tables for named drawing objects for a document model. Contains tables for named line markers, line dashes, fill gradients, and @@ -121,7 +119,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx index faabe22bec2b..2ee50a376426 100644 --- a/include/oox/helper/progressbar.hxx +++ b/include/oox/helper/progressbar.hxx @@ -57,8 +57,6 @@ public: }; - - class ISegmentProgressBar; typedef std::shared_ptr< ISegmentProgressBar > ISegmentProgressBarRef; @@ -78,8 +76,6 @@ public: }; - - /** A simple progress bar. */ class OOX_DLLPUBLIC ProgressBar : public IProgressBar @@ -103,7 +99,6 @@ private: }; - /** A progress bar containing several independent segments. */ class OOX_DLLPUBLIC SegmentProgressBar : public ISegmentProgressBar @@ -129,7 +124,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx index 99412d145687..aa6696b0248e 100644 --- a/include/oox/helper/propertymap.hxx +++ b/include/oox/helper/propertymap.hxx @@ -38,7 +38,6 @@ namespace oox { struct PropertyNameVector; - typedef ::std::map< sal_Int32, css::uno::Any > PropertyMapType; typedef ::std::map< OUString, css::uno::Any > PropertyNameMap; @@ -118,7 +117,6 @@ protected: }; - } // namespace oox #endif diff --git a/include/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx index db1a5aa83226..669472a07b6d 100644 --- a/include/oox/helper/propertyset.hxx +++ b/include/oox/helper/propertyset.hxx @@ -30,7 +30,6 @@ namespace oox { class PropertyMap; - /** A wrapper for a UNO property set. This class provides functions to silently get and set properties (without @@ -138,7 +137,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/refmap.hxx b/include/oox/helper/refmap.hxx index ef20d37acb94..d1784f73be5d 100644 --- a/include/oox/helper/refmap.hxx +++ b/include/oox/helper/refmap.hxx @@ -30,7 +30,6 @@ namespace oox { - /** Template for a map of ref-counted objects with additional accessor functions. An instance of the class RefMap< Type > stores elements of the type @@ -140,7 +139,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/refvector.hxx b/include/oox/helper/refvector.hxx index 81920328d577..9fab74a97ccf 100644 --- a/include/oox/helper/refvector.hxx +++ b/include/oox/helper/refvector.hxx @@ -30,7 +30,6 @@ namespace oox { - /** Template for a vector of ref-counted objects with additional accessor functions. An instance of the class RefVector< Type > stores elements of the type @@ -157,7 +156,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx index c1264d9eb11b..b953495fb094 100644 --- a/include/oox/helper/storagebase.hxx +++ b/include/oox/helper/storagebase.hxx @@ -35,7 +35,6 @@ namespace com { namespace sun { namespace star { namespace oox { - class StorageBase; typedef std::shared_ptr< StorageBase > StorageRef; @@ -183,7 +182,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/textinputstream.hxx b/include/oox/helper/textinputstream.hxx index 71018569c154..8412b77a53ba 100644 --- a/include/oox/helper/textinputstream.hxx +++ b/include/oox/helper/textinputstream.hxx @@ -34,7 +34,6 @@ namespace oox { class BinaryInputStream; - class TextInputStream { public: @@ -88,7 +87,6 @@ public: OUString readToChar( sal_Unicode cChar, bool bIncludeChar ); - /** Creates a UNO text input stream object from the passed UNO input stream. */ static css::uno::Reference< css::io::XTextInputStream2 > @@ -114,7 +112,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx index 9b5328f74560..4e4236393cbd 100644 --- a/include/oox/helper/zipstorage.hxx +++ b/include/oox/helper/zipstorage.hxx @@ -29,7 +29,6 @@ namespace com { namespace sun { namespace star { namespace oox { - /** Implements stream access for ZIP storages containing XML streams. */ class ZipStorage : public StorageBase { @@ -80,7 +79,6 @@ private: }; - } // namespace oox #endif diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx index 3d4e2a273150..5823fbb8ef19 100644 --- a/include/oox/ole/axbinaryreader.hxx +++ b/include/oox/ole/axbinaryreader.hxx @@ -29,7 +29,6 @@ namespace oox { namespace ole { - /** A wrapper for a binary input stream that supports aligned read operations. The implementation does not support seeking back the wrapped stream. All @@ -83,7 +82,6 @@ private: }; - /** A pair of integer values as a property. */ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; @@ -91,7 +89,6 @@ typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData; typedef ::std::vector< OUString > AxArrayString; - /** Import helper to read simple and complex ActiveX form control properties from a binary input stream. */ class AxBinaryPropertyReader @@ -241,7 +238,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index a9c8eee451be..87b8515fa6a9 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -46,7 +46,6 @@ namespace oox { namespace ole { - #define COMCTL_GUID_SCROLLBAR_60 "{FE38753A-44A3-11D1-B5B7-0000C09000C4}" #define COMCTL_GUID_PROGRESSBAR_50 "{0713E8D2-850A-101B-AFC0-4210102A8DA7}" #define COMCTL_GUID_PROGRESSBAR_60 "{35053A22-8589-11D1-B16A-00C0F0283628}" @@ -55,7 +54,6 @@ const sal_uInt16 COMCTL_VERSION_50 = 5; const sal_uInt16 COMCTL_VERSION_60 = 6; - #define AX_GUID_COMMANDBUTTON "{D7053240-CE69-11CD-a777-00dd01143c57}" #define AX_GUID_LABEL "{978C9E23-D4B0-11CE-bf2d-00aa003f40d0}" #define AX_GUID_IMAGE "{4C599241-6926-101B-9992-00000b65c6f9}" @@ -142,7 +140,6 @@ const sal_Int32 AX_SCROLLBAR_HORIZONTAL = 0x01; const sal_Int32 AX_SCROLLBAR_VERTICAL = 0x02; - /** Enumerates all UNO API control types supported by these filters. */ enum ApiControlType { @@ -167,7 +164,6 @@ enum ApiControlType }; - /** Specifies how a form control supports transparent background. */ enum ApiTransparencyMode { @@ -185,7 +181,6 @@ enum ApiDefaultStateMode }; - /** A base class with useful helper functions for something that is able to convert ActiveX and ComCtl form controls. */ @@ -345,7 +340,6 @@ private: }; - /** Base class for all models of form controls. */ class OOX_DLLPUBLIC ControlModelBase { @@ -392,7 +386,6 @@ protected: typedef std::shared_ptr< ControlModelBase > ControlModelRef; - /** Base class for all models of ComCtl form controls. */ class ComCtlModelBase : public ControlModelBase { @@ -434,7 +427,6 @@ private: }; - /** Model for a ComCtl scroll bar. */ class ComCtlScrollBarModel : public ComCtlModelBase { @@ -457,7 +449,6 @@ private: }; - /** Model for a ComCtl progress bar. */ class ComCtlProgressBarModel : public ComCtlModelBase { @@ -478,7 +469,6 @@ private: }; - /** Base class for all models of Form 2.0 form controls. */ class OOX_DLLPUBLIC AxControlModelBase : public ControlModelBase { @@ -489,7 +479,6 @@ public: }; - /** Base class for Forms 2.0 controls supporting text formatting. */ class OOX_DLLPUBLIC AxFontDataModel : public AxControlModelBase { @@ -513,7 +502,6 @@ private: }; - /** Model for a Forms 2.0 command button. */ class OOX_DLLPUBLIC AxCommandButtonModel : public AxFontDataModel { @@ -542,7 +530,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 label. */ class OOX_DLLPUBLIC AxLabelModel : public AxFontDataModel { @@ -570,7 +557,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 image. */ class OOX_DLLPUBLIC AxImageModel : public AxControlModelBase { @@ -617,7 +603,6 @@ public: }; - /** Base class for a Forms 2.0 morph data control. */ class OOX_DLLPUBLIC AxMorphDataModelBase : public AxFontDataModel { @@ -654,7 +639,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 toggle button. */ class OOX_DLLPUBLIC AxToggleButtonModel : public AxMorphDataModelBase { @@ -668,7 +652,6 @@ public: }; - /** Model for a Forms 2.0 check box. */ class OOX_DLLPUBLIC AxCheckBoxModel : public AxMorphDataModelBase { @@ -682,7 +665,6 @@ public: }; - /** Model for a Forms 2.0 option button. */ class OOX_DLLPUBLIC AxOptionButtonModel : public AxMorphDataModelBase { @@ -699,7 +681,6 @@ public: }; - /** Model for a Forms 2.0 text box. */ class OOX_DLLPUBLIC AxTextBoxModel : public AxMorphDataModelBase { @@ -713,7 +694,6 @@ public: }; - /** Model for a numeric field (legacy drawing controls only). */ class OOX_DLLPUBLIC AxNumericFieldModel : public AxMorphDataModelBase { @@ -727,7 +707,6 @@ public: }; - /** Model for a Forms 2.0 list box. */ class OOX_DLLPUBLIC AxListBoxModel : public AxMorphDataModelBase { @@ -741,7 +720,6 @@ public: }; - /** Model for a Forms 2.0 combo box. */ class OOX_DLLPUBLIC AxComboBoxModel : public AxMorphDataModelBase { @@ -755,7 +733,6 @@ public: }; - /** Model for a Forms 2.0 spin button. */ class OOX_DLLPUBLIC AxSpinButtonModel : public AxControlModelBase { @@ -784,7 +761,6 @@ public: // direct access needed for legacy VML drawing controls }; - /** Model for a Forms 2.0 scroll bar. */ class OOX_DLLPUBLIC AxScrollBarModel : public AxControlModelBase { @@ -815,7 +791,6 @@ public: // direct access needed for legacy VML drawing controls }; - typedef ::std::vector< OUString > AxClassTable; /** Base class for ActiveX container controls. */ @@ -856,8 +831,6 @@ public: // direct access needed for legacy VML drawing controls }; - - /** Model for a Forms 2.0 frame control. */ class OOX_DLLPUBLIC AxFrameModel : public AxContainerModelBase { @@ -891,8 +864,6 @@ public: }; - - /** Model for a Forms 2.0 user form. */ class OOX_DLLPUBLIC AxUserFormModel : public AxContainerModelBase { @@ -966,7 +937,6 @@ private: }; - template< typename ModelType > inline ModelType& EmbeddedControl::createModel() { @@ -986,7 +956,6 @@ inline ModelType& EmbeddedControl::createModel( const ParamType& rParam ) } - /** A wrapper for a control form embedded directly in a draw page. */ class EmbeddedForm { @@ -1019,7 +988,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx index 7964e55225cd..b4284cf892e7 100644 --- a/include/oox/ole/axcontrolfragment.hxx +++ b/include/oox/ole/axcontrolfragment.hxx @@ -29,7 +29,6 @@ class ControlModelBase; class EmbeddedControl; - /** Context handler for ActiveX form control model properties. */ class AxControlPropertyContext : public ::oox::core::ContextHandler2 { @@ -47,7 +46,6 @@ private: }; - /** Fragment handler for an embedded ActiveX form control fragment. */ class AxControlFragment : public ::oox::core::FragmentHandler2 { @@ -65,7 +63,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/axfontdata.hxx b/include/oox/ole/axfontdata.hxx index c8e764e997cc..05694fbcd12e 100644 --- a/include/oox/ole/axfontdata.hxx +++ b/include/oox/ole/axfontdata.hxx @@ -29,7 +29,6 @@ namespace oox { namespace ole { - const sal_Char* const AX_GUID_CFONT = "{AFC20920-DA4E-11CE-B943-00AA006887B4}"; const sal_uInt32 AX_FONTDATA_BOLD = 0x00000001; diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx index 12ae732ebf6c..0a6ba4a76302 100644 --- a/include/oox/ole/olehelper.hxx +++ b/include/oox/ole/olehelper.hxx @@ -56,13 +56,10 @@ namespace oox { namespace ole { - - #define OLE_GUID_STDFONT "{0BE35203-8F91-11CE-9DE3-00AA004BB851}" #define OLE_GUID_STDPIC "{0BE35204-8F91-11CE-9DE3-00AA004BB851}" - const sal_uInt16 OLE_STDFONT_NORMAL = 400; const sal_uInt16 OLE_STDFONT_BOLD = 700; @@ -89,7 +86,6 @@ struct StdFontInfo }; - /** Stores data about a StdHlink hyperlink. */ struct StdHlinkInfo { @@ -99,7 +95,6 @@ struct StdHlinkInfo }; - /** Static helper functions for OLE import/export. */ namespace OleHelper { @@ -170,8 +165,6 @@ public: }; - - } // namespace ole } // namespace oox diff --git a/include/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx index 85b9ee59c022..0947ad1f9447 100644 --- a/include/oox/ole/oleobjecthelper.hxx +++ b/include/oox/ole/oleobjecthelper.hxx @@ -36,7 +36,6 @@ namespace oox { namespace ole { - /** Contains generic information about an OLE object. */ struct OOX_DLLPUBLIC OleObjectInfo { @@ -51,7 +50,6 @@ struct OOX_DLLPUBLIC OleObjectInfo }; - /** Helper for OLE object handling. */ class OleObjectHelper { diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx index 6b00ada1b61a..9039cae2dedb 100644 --- a/include/oox/ole/olestorage.hxx +++ b/include/oox/ole/olestorage.hxx @@ -31,7 +31,6 @@ namespace oox { namespace ole { - /** Implements stream access for binary OLE storages. */ class OOX_DLLPUBLIC OleStorage : public StorageBase { @@ -101,7 +100,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx index 7d4a4bbe1d93..a50054e5f5c2 100644 --- a/include/oox/ole/vbacontrol.hxx +++ b/include/oox/ole/vbacontrol.hxx @@ -34,7 +34,6 @@ namespace oox { namespace ole { - /** Common properties for all controls that are part of a VBA user form or of another container control in a VBA user form. */ class VbaSiteModel @@ -95,7 +94,6 @@ protected: typedef std::shared_ptr< VbaSiteModel > VbaSiteModelRef; - /** A control that is embedded in a VBA user form or in another container control in a VBA user form. @@ -172,7 +170,6 @@ private: }; - class VbaUserForm : public VbaFormControl { public: @@ -197,7 +194,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbahelper.hxx b/include/oox/ole/vbahelper.hxx index 75ad1b57e1a9..94a63efe34a8 100644 --- a/include/oox/ole/vbahelper.hxx +++ b/include/oox/ole/vbahelper.hxx @@ -50,7 +50,6 @@ const sal_uInt16 VBA_ID_PROJECTNAME = 0x0004; const sal_uInt16 VBA_ID_PROJECTVERSION = 0x0009; - /** Static helper functions for the VBA filters. */ namespace VbaHelper { @@ -84,7 +83,6 @@ namespace VbaHelper } - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx index 393f517c06b4..dd6e53ad6a9a 100644 --- a/include/oox/ole/vbainputstream.hxx +++ b/include/oox/ole/vbainputstream.hxx @@ -27,7 +27,6 @@ namespace oox { namespace ole { - /** A non-seekable input stream that implements run-length decompression. */ class VbaInputStream : public BinaryInputStream { @@ -65,7 +64,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx index 9fa2de0408fe..68aef13e82e1 100644 --- a/include/oox/ole/vbamodule.hxx +++ b/include/oox/ole/vbamodule.hxx @@ -39,7 +39,6 @@ namespace oox { namespace ole { - class VbaModule { public: @@ -100,7 +99,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index 9478c9adde96..e4ed68255bdb 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -42,7 +42,6 @@ namespace oox { namespace ole { - class OOX_DLLPUBLIC VbaFilterConfig { public: @@ -64,7 +63,6 @@ private: }; - /** Base class for objects that attach a macro to a specific action. Purpose is to collect objects that need to attach a VBA macro to an action. @@ -105,7 +103,6 @@ private: typedef std::shared_ptr< VbaMacroAttacherBase > VbaMacroAttacherRef; - class OOX_DLLPUBLIC VbaProject : public VbaFilterConfig { public: @@ -204,7 +201,6 @@ private: }; - } // namespace ole } // namespace oox diff --git a/include/oox/ppt/animationspersist.hxx b/include/oox/ppt/animationspersist.hxx index c4165a1abe06..cbf0070f325f 100644 --- a/include/oox/ppt/animationspersist.hxx +++ b/include/oox/ppt/animationspersist.hxx @@ -120,9 +120,6 @@ namespace oox { namespace ppt { } } - - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx index c1106ef23f38..4df7a3081e49 100644 --- a/include/oox/ppt/backgroundproperties.hxx +++ b/include/oox/ppt/backgroundproperties.hxx @@ -26,7 +26,6 @@ namespace oox { namespace ppt { - class BackgroundPropertiesContext : public ::oox::core::FragmentHandler2 { public: diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx index 531ab6c2dea8..7272eeeb8c4e 100644 --- a/include/oox/ppt/dgmimport.hxx +++ b/include/oox/ppt/dgmimport.hxx @@ -32,7 +32,6 @@ namespace oox { namespace ppt { - class QuickDiagrammingImport : public oox::core::XmlFilterBase { public: diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx index 9dcd8ae6fda9..0ba4d53ae5b2 100644 --- a/include/oox/ppt/dgmlayout.hxx +++ b/include/oox/ppt/dgmlayout.hxx @@ -32,7 +32,6 @@ namespace oox { namespace ppt { - class QuickDiagrammingLayout : public oox::core::XmlFilterBase { public: diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index 9908177ea9f4..125030381f70 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -32,7 +32,6 @@ namespace oox { namespace ppt { - class PowerPointImport : public oox::core::XmlFilterBase { public: diff --git a/include/oox/ppt/soundactioncontext.hxx b/include/oox/ppt/soundactioncontext.hxx index 4b3bd9fee30b..51e0e0da0890 100644 --- a/include/oox/ppt/soundactioncontext.hxx +++ b/include/oox/ppt/soundactioncontext.hxx @@ -47,7 +47,6 @@ private: } } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx index af0d6f6cba07..5406771013fd 100644 --- a/include/oox/ppt/timenodelistcontext.hxx +++ b/include/oox/ppt/timenodelistcontext.hxx @@ -43,7 +43,6 @@ namespace oox { namespace ppt { }; - /** FastParser context for XML_tnLst, XML_subTnLst and XML_childTnLst */ class TimeNodeListContext : public ::oox::core::FragmentHandler2 { diff --git a/include/oox/token/namespacemap.hxx b/include/oox/token/namespacemap.hxx index 46c89d658b80..a17e8cc98ff6 100644 --- a/include/oox/token/namespacemap.hxx +++ b/include/oox/token/namespacemap.hxx @@ -27,7 +27,6 @@ namespace oox { - /** A map that contains all XML namespace URLs used in the filters. */ struct NamespaceMap { @@ -44,7 +43,6 @@ struct NamespaceMap struct StaticNamespaceMap : public ::rtl::Static< NamespaceMap, StaticNamespaceMap > {}; - } // namespace oox #endif diff --git a/include/oox/token/propertynames.hxx b/include/oox/token/propertynames.hxx index 3d0c8db6134c..6419b57f70c1 100644 --- a/include/oox/token/propertynames.hxx +++ b/include/oox/token/propertynames.hxx @@ -27,7 +27,6 @@ namespace oox { - /** A vector that contains all predefined property names used in the filters. */ struct PropertyNameVector : public ::std::vector< OUString > { PropertyNameVector(); }; @@ -35,7 +34,6 @@ struct PropertyNameVector : public ::std::vector< OUString > { PropertyNameVecto struct StaticPropertyNameVector : public ::rtl::Static< PropertyNameVector, StaticPropertyNameVector > {}; - } // namespace oox #endif diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx index 686b8316284c..83ce4cfa5d96 100644 --- a/include/oox/token/tokenmap.hxx +++ b/include/oox/token/tokenmap.hxx @@ -30,7 +30,6 @@ namespace oox { - class TokenMap { public: @@ -82,11 +81,9 @@ private: }; - struct StaticTokenMap : public ::rtl::Static< TokenMap, StaticTokenMap > {}; - } // namespace oox #endif diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx index ad34652a1d79..ad1462a812eb 100644 --- a/include/oox/vml/vmldrawing.hxx +++ b/include/oox/vml/vmldrawing.hxx @@ -48,7 +48,6 @@ class ShapeBase; struct ClientData; - /** Enumerates different types of VML drawings. */ enum DrawingType { @@ -58,7 +57,6 @@ enum DrawingType }; - /** Contains information about an OLE object embedded in a draw page. */ struct OOX_DLLPUBLIC OleObjectInfo : public ::oox::ole::OleObjectInfo { @@ -89,7 +87,6 @@ struct OOX_DLLPUBLIC ControlInfo }; - /** Represents the collection of VML shapes for a complete draw page. */ class OOX_DLLPUBLIC Drawing { @@ -202,7 +199,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmldrawingfragment.hxx b/include/oox/vml/vmldrawingfragment.hxx index 7e0d4c474a46..c2e82d4aae71 100644 --- a/include/oox/vml/vmldrawingfragment.hxx +++ b/include/oox/vml/vmldrawingfragment.hxx @@ -29,7 +29,6 @@ namespace vml { class Drawing; - class OOX_DLLPUBLIC DrawingFragment : public ::oox::core::FragmentHandler2 { public: @@ -51,7 +50,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx index 8df59acf4eaf..2e212a52eb6f 100644 --- a/include/oox/vml/vmlformatting.hxx +++ b/include/oox/vml/vmlformatting.hxx @@ -38,12 +38,10 @@ namespace oox { namespace vml { - typedef ::std::pair< sal_Int32, sal_Int32 > Int32Pair; typedef ::std::pair< double, double > DoublePair; - namespace ConversionHelper { /** Returns two values contained in rValue separated by cSep. @@ -158,7 +156,6 @@ namespace ConversionHelper } - /** The stroke arrow model structure contains all properties for an line end arrow. */ struct StrokeArrowModel { @@ -170,7 +167,6 @@ struct StrokeArrowModel }; - /** The stroke model structure contains all shape border properties. */ struct StrokeModel { @@ -194,7 +190,6 @@ struct StrokeModel }; - /** The fill model structure contains all shape fill properties. */ struct OOX_DLLPUBLIC FillModel { @@ -220,7 +215,6 @@ struct OOX_DLLPUBLIC FillModel }; - /** The shadow model structure contains all shape shadow properties. */ struct OOX_DLLPUBLIC ShadowModel { diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx index 0197cff6278e..4fc6dc9e9fc9 100644 --- a/include/oox/vml/vmlinputstream.hxx +++ b/include/oox/vml/vmlinputstream.hxx @@ -33,7 +33,6 @@ namespace oox { namespace vml { - /** An input stream class for VML streams, implementing the UNO interface com.sun.star.io.XInputStream needed by the Expat XML parsers. @@ -87,7 +86,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index 927f8c1ab9ad..631359103952 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -41,7 +41,6 @@ struct ShapeParentAnchor; class ShapeContainer; - const sal_Int32 VML_CLIENTDATA_UNCHECKED = 0; const sal_Int32 VML_CLIENTDATA_CHECKED = 1; const sal_Int32 VML_CLIENTDATA_MIXED = 2; @@ -53,7 +52,6 @@ const sal_Int32 VML_CLIENTDATA_REFERENCE = 3; const sal_Int32 VML_CLIENTDATA_FORMULA = 4; - /** The shape model structure contains all properties shared by all types of shapes. */ struct OOX_DLLPUBLIC ShapeTypeModel { @@ -112,7 +110,6 @@ struct OOX_DLLPUBLIC ShapeTypeModel }; - /** A shape template contains all formatting properties of shapes and can serve as templates for several shapes in a drawing. */ class ShapeType @@ -151,7 +148,6 @@ protected: }; - /** Excel specific shape client data (such as cell anchor). */ struct ClientData { @@ -189,7 +185,6 @@ struct ClientData }; - struct ShapeModel { typedef ::std::vector< css::awt::Point > PointVector; @@ -217,7 +212,6 @@ struct ShapeModel }; - /** A shape object that is part of a drawing. May inherit properties from a shape template. */ class OOX_DLLPUBLIC ShapeBase : public ShapeType @@ -278,7 +272,6 @@ protected: }; - /** A simple shape object based on a specific UNO shape service. */ class SimpleShape : public ShapeBase { @@ -303,7 +296,6 @@ private: }; - /** A rectangular shape object. */ class RectangleShape : public SimpleShape { @@ -318,7 +310,6 @@ protected: }; - /** An oval shape object. */ class EllipseShape : public SimpleShape { @@ -327,7 +318,6 @@ public: }; - /** A polygon shape object. */ class PolyLineShape : public SimpleShape { @@ -371,7 +361,6 @@ protected: }; - /** A shape object with custom geometry. */ class CustomShape : public SimpleShape { @@ -387,7 +376,6 @@ protected: }; - /** A complex shape object. This can be a picture shape, a custom shape, an OLE object, or an ActiveX form control. */ class ComplexShape : public CustomShape @@ -404,7 +392,6 @@ protected: }; - /** A group shape that extends the basic shape by a container of child shapes. */ class GroupShape : public ShapeBase { @@ -438,7 +425,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx index b843c4d73f00..9f99f3974b12 100644 --- a/include/oox/vml/vmlshapecontainer.hxx +++ b/include/oox/vml/vmlshapecontainer.hxx @@ -37,7 +37,6 @@ class ShapeType; class ShapeBase; - struct ShapeParentAnchor { css::awt::Rectangle maShapeRect; @@ -45,7 +44,6 @@ struct ShapeParentAnchor }; - /** Container that holds a list of shapes and shape templates. */ class ShapeContainer { @@ -118,7 +116,6 @@ private: }; - template< typename ShapeT > ShapeT& ShapeContainer::createShape() { @@ -134,7 +131,6 @@ const ShapeBase* ShapeContainer::findShape( const Functor& rFunctor ) const } - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx index 194a66c600aa..4636b0fdbc5c 100644 --- a/include/oox/vml/vmlshapecontext.hxx +++ b/include/oox/vml/vmlshapecontext.hxx @@ -39,7 +39,6 @@ class RectangleShape; class ShapeContainer; - class ShapeLayoutContext : public ::oox::core::ContextHandler2 { public: @@ -55,7 +54,6 @@ private: }; - class ClientDataContext : public ::oox::core::ContextHandler2 { public: @@ -75,7 +73,6 @@ private: }; - class ShapeContextBase : public ::oox::core::ContextHandler2 { public: @@ -91,7 +88,6 @@ protected: }; - class ShapeTypeContext : public ShapeContextBase { public: @@ -115,7 +111,6 @@ private: }; - class ShapeContext : public ShapeTypeContext { public: @@ -149,7 +144,6 @@ private: }; - class GroupShapeContext : public ShapeContext { public: @@ -166,7 +160,6 @@ private: }; - class RectangleShapeContext : public ShapeContext { public: diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx index 1aa06db3f484..1c7ff8e2db3c 100644 --- a/include/oox/vml/vmltextbox.hxx +++ b/include/oox/vml/vmltextbox.hxx @@ -36,7 +36,6 @@ namespace vml { struct ShapeTypeModel; - /// A text paragraph in a textbox. struct TextParagraphModel { @@ -60,7 +59,6 @@ struct OOX_DLLPUBLIC TextFontModel }; - /** A text portion in a textbox with the same formatting for all characters. */ struct TextPortionModel { @@ -72,7 +70,6 @@ struct TextPortionModel }; - /** The textbox contains all text contents and properties. */ class OOX_DLLPUBLIC TextBox { @@ -104,7 +101,6 @@ private: }; - } // namespace vml } // namespace oox diff --git a/include/oox/vml/vmltextboxcontext.hxx b/include/oox/vml/vmltextboxcontext.hxx index 770a6f015861..7d90e43e1c3a 100644 --- a/include/oox/vml/vmltextboxcontext.hxx +++ b/include/oox/vml/vmltextboxcontext.hxx @@ -29,7 +29,6 @@ namespace oox { namespace vml { - class TextPortionContext : public ::oox::core::ContextHandler2 { public: @@ -55,7 +54,6 @@ private: }; - class TextBoxContext : public ::oox::core::ContextHandler2 { public: @@ -76,7 +74,6 @@ private: }; - } // namespace vml } // namespace oox |