diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-06 17:13:43 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-06 17:19:54 +0200 |
| commit | c4c51709eaa02a5c9a2af3e5d436790307109813 (patch) | |
| tree | c67362b4f2c3d3f34655ca65ec10d54e1509cf73 /sc/source/filter/inc | |
| parent | c78f918a7cb267a713804b8feacc3425196d4428 (diff) | |
whitespace cleanup in sc
Change-Id: Id1dcadcac179c52977e48a6912ce4d5fd542f60c
Diffstat (limited to 'sc/source/filter/inc')
121 files changed, 0 insertions, 1330 deletions
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index b392de9232f9..f16539dcb08e 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -614,8 +614,6 @@ public: void WriteXml( XclExpXmlStream& rStrm ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index fc5a6ec225d4..e9ecb98d8c0b 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -27,16 +27,12 @@ #include "imp_op.hxx" - - struct ScCellValue; class ScChangeAction; class ScChangeTrack; class XclImpChTrFmlConverter; - - struct XclImpChTrRecHeader { sal_uInt32 nSize; @@ -51,8 +47,6 @@ inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpChTrRecHeader& rRecH return rStrm; } - - class XclImpChangeTrack : protected XclImpRoot { private: @@ -179,8 +173,6 @@ inline XclImpChTrFmlConverter::XclImpChTrFmlConverter( { } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index 7691557aaf78..8811c1407c72 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -31,8 +31,6 @@ namespace xls { class BiffInputStream; - - /** A vector of com.sun.star.table.CellRangeAddress elements and additional functionality. */ class ApiCellRangeList : public ::std::vector< ::com::sun::star::table::CellRangeAddress > @@ -45,8 +43,6 @@ public: getBaseAddress() const; }; - - /** A 2D cell address struct for binary filters. */ struct BinAddress { @@ -64,8 +60,6 @@ struct BinAddress void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ); }; - - inline bool operator==( const BinAddress& rL, const BinAddress& rR ) { return (rL.mnCol == rR.mnCol) && (rL.mnRow == rR.mnRow); @@ -88,8 +82,6 @@ inline BiffInputStream& operator>>( BiffInputStream& rStrm, BinAddress& orPos ) return rStrm; } - - /** A 2D cell range address struct for binary filters. */ struct BinRange { @@ -121,8 +113,6 @@ struct BinRange void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ); }; - - inline bool operator==( const BinRange& rL, const BinRange& rR ) { return (rL.maFirst == rR.maFirst) && (rL.maLast == rR.maLast); @@ -145,8 +135,6 @@ inline BiffInputStream& operator>>( BiffInputStream& rStrm, BinRange& orRange ) return rStrm; } - - /** A 2D cell range address list for binary filters. */ class BinRangeList : public ::std::vector< BinRange > { @@ -156,16 +144,12 @@ public: void read( SequenceInputStream& rStrm ); }; - - inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRangeList& orRanges ) { orRanges.read( rStrm ); return rStrm; } - - /** Different target types that can be encoded in a BIFF URL. */ enum BiffTargetType { @@ -177,8 +161,6 @@ enum BiffTargetType }; - - /** Converter for cell addresses and cell ranges for OOXML and BIFF filters. */ class AddressConverter : public WorkbookHelper @@ -186,8 +168,6 @@ class AddressConverter : public WorkbookHelper public: explicit AddressConverter( const WorkbookHelper& rHelper ); - - /** Tries to parse the passed string for a 2d cell address in A1 notation. This function accepts all strings that match the regular expression @@ -241,8 +221,6 @@ public: sal_Int32 nStart = 0, sal_Int32 nLength = SAL_MAX_INT32 ); - - /** Returns the biggest valid cell address in the own Calc document. */ inline const ::com::sun::star::table::CellAddress& getMaxApiAddress() const { return maMaxApiPos; } @@ -264,8 +242,6 @@ public: /** Returns the sheet overflow status. */ inline bool isTabOverflow() const { return mbTabOverflow; } - - /** Checks if the passed column index is valid. @param nCol The column index to check. @@ -293,8 +269,6 @@ public: */ bool checkTab( sal_Int16 nSheet, bool bTrackOverflow ); - - /** Checks the passed cell address if it fits into the spreadsheet limits. @param rAddress The cell address to be checked. @@ -394,8 +368,6 @@ public: sal_Int16 nSheet, bool bTrackOverflow ); - - /** Checks the passed cell range if it fits into the spreadsheet limits. @param rRange The cell range address to be checked. @@ -528,8 +500,6 @@ public: sal_Int16 nSheet, bool bAllowOverflow, bool bTrackOverflow ); - - /** Tries to restrict the passed cell range list to current sheet limits. @param orRanges (in-out-parameter) Restricts the cell range addresses @@ -613,8 +583,6 @@ private: bool mbTabOverflow; /// Flag for "tables overflow". }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx index 6507a1874ee4..848e33793019 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -33,8 +33,6 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { - - /** Contains UNO API filter settings for a column in a filtered range. */ struct ApiFilterSettings { @@ -50,8 +48,6 @@ struct ApiFilterSettings void appendField( bool bAnd, const std::vector<OUString>& rValues ); }; - - /** Base class for specific filter settings for a column in a filtered range. */ class FilterSettingsBase : public WorkbookHelper @@ -70,8 +66,6 @@ public: typedef ::boost::shared_ptr< FilterSettingsBase > FilterSettingsRef; - - /** Settings for a discrete filter, specifying a list of values to be shown in the filtered range. */ @@ -96,8 +90,6 @@ private: bool mbShowBlank; }; - - /** Settings for a top-10 filter. */ class Top10Filter : public FilterSettingsBase { @@ -118,8 +110,6 @@ private: bool mbPercent; /// True = percentage, false = number of items. }; - - /** A filter criterion for a custom filter. */ struct FilterCriterionModel { @@ -137,8 +127,6 @@ struct FilterCriterionModel void readBiffData( SequenceInputStream& rStrm ); }; - - /** Settings for a custom filter, specifying one or two comparison operators associated with some values. */ @@ -166,8 +154,6 @@ private: bool mbAnd; }; - - /** A column in a filtered range. Contains an object with specific filter settings for the cells in the column. */ @@ -200,8 +186,6 @@ private: bool mbShowButton; }; - - class AutoFilter : public WorkbookHelper { public: @@ -227,8 +211,6 @@ private: ::com::sun::star::table::CellRangeAddress maRange; }; - - class AutoFilterBuffer : public WorkbookHelper { public: @@ -254,8 +236,6 @@ private: AutoFilterVector maAutoFilters; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/autofiltercontext.hxx b/sc/source/filter/inc/autofiltercontext.hxx index 8c958189c0b6..d4946addf663 100644 --- a/sc/source/filter/inc/autofiltercontext.hxx +++ b/sc/source/filter/inc/autofiltercontext.hxx @@ -29,8 +29,6 @@ class AutoFilter; class FilterColumn; class FilterSettingsBase; - - class FilterSettingsContext : public WorksheetContextBase { public: @@ -47,8 +45,6 @@ private: FilterSettingsBase& mrFilterSettings; }; - - class FilterColumnContext : public WorksheetContextBase { public: @@ -65,8 +61,6 @@ private: FilterColumn& mrFilterColumn; }; - - class AutoFilterContext : public WorksheetContextBase { public: @@ -83,8 +77,6 @@ private: AutoFilter& mrAutoFilter; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index 8031fbbc6b87..306f7ccbaccf 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -28,12 +28,8 @@ namespace oox { namespace xls { - - const sal_Int64 BIFF_RCF_BLOCKSIZE = 1024; - - /** Base class for BIFF stream decoders. */ class BiffDecoderBase : public ::comphelper::IDocPasswordVerifier { @@ -80,8 +76,6 @@ private: typedef ::boost::shared_ptr< BiffDecoderBase > BiffDecoderRef; - - /** Decodes BIFF stream contents that are encoded using the old XOR algorithm. */ class BiffDecoder_XOR : public BiffDecoderBase { @@ -111,8 +105,6 @@ private: sal_uInt16 mnHash; }; - - /** Decodes BIFF stream contents that are encoded using the RC4 algorithm. */ class BiffDecoder_RCF : public BiffDecoderBase { @@ -142,8 +134,6 @@ private: ::std::vector< sal_uInt8 > maVerifierHash; }; - - /** Helper for BIFF stream codecs. Holds the used codec object. */ class BiffCodecHelper : public WorkbookHelper { @@ -157,8 +147,6 @@ private: BiffDecoderRef mxDecoder; /// The decoder for import filter. }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/biffhelper.hxx b/sc/source/filter/inc/biffhelper.hxx index 77851dc0fdad..c209f668d53b 100644 --- a/sc/source/filter/inc/biffhelper.hxx +++ b/sc/source/filter/inc/biffhelper.hxx @@ -588,8 +588,6 @@ const sal_uInt8 BIFF_STRF_PHONETIC = 0x04; const sal_uInt8 BIFF_STRF_RICH = 0x08; const sal_uInt8 BIFF_STRF_UNKNOWN = 0xF2; - - /** Static helper functions for BIFF filters. */ class BiffHelper { @@ -633,8 +631,6 @@ private: ~BiffHelper(); // not implemented }; - - /** BIFF12 stream operator for an OUString, reads 32-bit string length and Unicode array. */ inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, OUString& orString ) { @@ -642,8 +638,6 @@ inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, OUString& or return rStrm; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index 11f324677bbd..c015823285b9 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -29,8 +29,6 @@ namespace oox { namespace xls { - - namespace prv { /** Buffers the contents of a raw record and encapsulates stream decoding. */ @@ -102,8 +100,6 @@ private: } // namespace prv - - /** This class is used to read BIFF record streams. An instance is constructed with a BinaryInputStream object. The passed @@ -335,8 +331,6 @@ private: bool mbCont; /// True = automatic CONTINUE lookup enabled. }; - - class BiffInputStreamPos { public: @@ -352,8 +346,6 @@ private: sal_Int64 mnRecPos; }; - - /** Stores the current position of the passed stream on construction and restores it automatically on destruction. */ class BiffInputStreamPosGuard : private BiffInputStreamPos @@ -363,8 +355,6 @@ public: ~BiffInputStreamPosGuard(); }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/chartsheetfragment.hxx b/sc/source/filter/inc/chartsheetfragment.hxx index cc9e9449dbbc..48dae48f19c5 100644 --- a/sc/source/filter/inc/chartsheetfragment.hxx +++ b/sc/source/filter/inc/chartsheetfragment.hxx @@ -25,8 +25,6 @@ namespace oox { namespace xls { - - class ChartsheetFragment : public WorksheetFragmentBase { public: diff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxx index f46795f7bb3b..cce007e0b643 100644 --- a/sc/source/filter/inc/colrowst.hxx +++ b/sc/source/filter/inc/colrowst.hxx @@ -23,8 +23,6 @@ #include "xiroot.hxx" #include <mdds/flat_segment_tree.hpp> - - class XclImpColRowSettings : protected XclImpRoot { public: @@ -74,8 +72,6 @@ private: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx index 68fb1636e89e..522c4c596339 100644 --- a/sc/source/filter/inc/commentsbuffer.hxx +++ b/sc/source/filter/inc/commentsbuffer.hxx @@ -27,8 +27,6 @@ namespace oox { namespace xls { - - struct CommentModel { ::com::sun::star::table::CellRangeAddress @@ -51,8 +49,6 @@ struct CommentModel explicit CommentModel(); }; - - class Comment : public WorksheetHelper { public: @@ -77,8 +73,6 @@ private: typedef ::boost::shared_ptr< Comment > CommentRef; - - class CommentsBuffer : public WorksheetHelper { public: @@ -100,8 +94,6 @@ private: CommentVector maComments; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/commentsfragment.hxx b/sc/source/filter/inc/commentsfragment.hxx index 97a59ace922b..2ef52b067ed5 100644 --- a/sc/source/filter/inc/commentsfragment.hxx +++ b/sc/source/filter/inc/commentsfragment.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - class CommentsFragment : public WorksheetFragmentBase { public: @@ -54,8 +52,6 @@ private: CommentRef mxComment; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index dbe4d8d53586..22ef3d9abf2c 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -41,8 +41,6 @@ namespace xls { class CondFormat; - - /** Model for a single rule in a conditional formatting. */ struct CondFormatRuleModel { @@ -145,8 +143,6 @@ private: - - /** Represents a single rule in a conditional formatting. */ class CondFormatRule : public WorksheetHelper { @@ -182,8 +178,6 @@ private: typedef ::boost::shared_ptr< CondFormatRule > CondFormatRuleRef; - - /** Model for a conditional formatting object. */ struct CondFormatModel { @@ -193,8 +187,6 @@ struct CondFormatModel explicit CondFormatModel(); }; - - /** Represents a conditional formatting object with a list of affected cell ranges. */ class CondFormat : public WorksheetHelper { @@ -273,8 +265,6 @@ public: typedef ::boost::shared_ptr< CondFormat > CondFormatRef; typedef ::boost::shared_ptr< ExtCfRule > ExtCfRuleRef; - - class CondFormatBuffer : public WorksheetHelper { public: @@ -300,8 +290,6 @@ private: ExtCfRuleVec maCfRules; /// All external conditional formatting rules in a sheet. }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/condformatcontext.hxx b/sc/source/filter/inc/condformatcontext.hxx index c2fc442e81fb..4324dfba0472 100644 --- a/sc/source/filter/inc/condformatcontext.hxx +++ b/sc/source/filter/inc/condformatcontext.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - class CondFormatContext; class ColorScaleContext : public WorksheetContextBase @@ -85,8 +83,6 @@ private: CondFormatRuleRef mxRule; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx index 7e86049a4c35..0115ad696dd1 100644 --- a/sc/source/filter/inc/connectionsbuffer.hxx +++ b/sc/source/filter/inc/connectionsbuffer.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - const sal_Int32 BIFF12_CONNECTION_UNKNOWN = 0; const sal_Int32 BIFF12_CONNECTION_ODBC = 1; const sal_Int32 BIFF12_CONNECTION_DAO = 2; @@ -38,8 +36,6 @@ const sal_Int32 BIFF12_CONNECTION_TEXT = 6; const sal_Int32 BIFF12_CONNECTION_ADO = 7; const sal_Int32 BIFF12_CONNECTION_DSP = 8; - - /** Special properties for data connections representing web queries. */ struct WebPrModel { @@ -63,8 +59,6 @@ struct WebPrModel explicit WebPrModel(); }; - - /** Common properties of an external data connection. */ struct ConnectionModel { @@ -95,8 +89,6 @@ struct ConnectionModel WebPrModel& createWebPr(); }; - - /** An external data connection (database, web query, etc.). */ class Connection : public WorkbookHelper { @@ -134,8 +126,6 @@ private: typedef ::boost::shared_ptr< Connection > ConnectionRef; - - class ConnectionsBuffer : public WorkbookHelper { public: @@ -163,8 +153,6 @@ private: sal_Int32 mnUnusedId; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/connectionsfragment.hxx b/sc/source/filter/inc/connectionsfragment.hxx index 5b4ecd2cb97c..bb8939281720 100644 --- a/sc/source/filter/inc/connectionsfragment.hxx +++ b/sc/source/filter/inc/connectionsfragment.hxx @@ -27,8 +27,6 @@ namespace xls { class Connection; - - class ConnectionContext : public WorkbookContextBase { public: @@ -45,8 +43,6 @@ private: Connection& mrConnection; }; - - class ConnectionsFragment : public WorkbookFragmentBase { public: @@ -62,8 +58,6 @@ protected: virtual void finalizeImport() SAL_OVERRIDE; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx index 301ac815a656..489fb0813b41 100644 --- a/sc/source/filter/inc/defnamesbuffer.hxx +++ b/sc/source/filter/inc/defnamesbuffer.hxx @@ -32,8 +32,6 @@ namespace xls { class BiffInputStreamPos; - - // codes for built-in names const sal_Unicode BIFF_DEFNAME_CONSOLIDATEAREA = '\x00'; const sal_Unicode BIFF_DEFNAME_AUTOOPEN = '\x01'; // Sheet macro executed when workbook is opened. @@ -51,8 +49,6 @@ const sal_Unicode BIFF_DEFNAME_SHEETTITLE = '\x0C'; const sal_Unicode BIFF_DEFNAME_FILTERDATABASE = '\x0D'; // Sheet range autofilter or advanced filter works on. const sal_Unicode BIFF_DEFNAME_UNKNOWN = '\x0E'; - - struct DefinedNameModel { OUString maName; /// The original name. @@ -67,8 +63,6 @@ struct DefinedNameModel explicit DefinedNameModel(); }; - - /** Base class for defined names and external names. */ class DefinedNameBase : public WorkbookHelper { @@ -100,8 +94,6 @@ protected: ::com::sun::star::uno::Any maRefAny; /// Single cell/range reference. }; - - class DefinedName : public DefinedNameBase { public: @@ -158,8 +150,6 @@ private: typedef ::boost::shared_ptr< DefinedName > DefinedNameRef; - - class DefinedNamesBuffer : public WorkbookHelper { public: @@ -205,8 +195,6 @@ private: DefNameTokenIdMap maTokenIdMap; /// Maps all defined names by API token index. }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx index 8ca3bc38cca0..ba9784f2b849 100644 --- a/sc/source/filter/inc/drawingbase.hxx +++ b/sc/source/filter/inc/drawingbase.hxx @@ -29,8 +29,6 @@ namespace oox { namespace xls { - - /** Absolute position in a spreadsheet (in EMUs) independent from cells. */ struct AnchorPointModel : public ::oox::drawingml::EmuPoint { @@ -38,8 +36,6 @@ struct AnchorPointModel : public ::oox::drawingml::EmuPoint inline bool isValid() const { return (X >= 0) && (Y >= 0); } }; - - /** Absolute size in a spreadsheet (in EMUs). */ struct AnchorSizeModel : public ::oox::drawingml::EmuSize { @@ -47,8 +43,6 @@ struct AnchorSizeModel : public ::oox::drawingml::EmuSize inline bool isValid() const { return (Width >= 0) && (Height >= 0); } }; - - /** Position in spreadsheet (cell position and offset inside cell). */ struct CellAnchorModel { @@ -61,8 +55,6 @@ struct CellAnchorModel inline bool isValid() const { return (mnCol >= 0) && (mnRow >= 0); } }; - - /** Application-specific client data of a shape. */ struct AnchorClientDataModel { @@ -72,8 +64,6 @@ struct AnchorClientDataModel explicit AnchorClientDataModel(); }; - - /** Contains the position of a shape in the spreadsheet. Supports different shape anchor modes (absolute, one-cell, two-cell). */ class ShapeAnchor : public WorksheetHelper @@ -134,8 +124,6 @@ private: AnchorType meEditAs; /// Anchor mode as shown in the UI. }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 5796788d807b..52b23cb4e91b 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -57,8 +57,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; }; - - class Shape : public ::oox::drawingml::Shape, public WorksheetHelper { public: @@ -76,8 +74,6 @@ private: OUString maMacroName; }; - - /** Context handler for creation of shapes embedded in group shapes. */ class GroupShapeContext : public ::oox::drawingml::ShapeGroupContext, public WorksheetHelper { @@ -104,8 +100,6 @@ protected: const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; }; - - /** Fragment handler for a complete sheet drawing. */ class DrawingFragment : public WorksheetFragmentBase { @@ -149,8 +143,6 @@ private: sal_Int32 mnDropStyle; }; - - class VmlDrawing : public ::oox::vml::Drawing, public WorksheetHelper { public: @@ -205,8 +197,6 @@ private: ::oox::vml::TextFontModel maListBoxFont; }; - - class VmlDrawingFragment : public ::oox::vml::DrawingFragment, public WorksheetHelper { public: @@ -218,8 +208,6 @@ protected: virtual void finalizeImport() SAL_OVERRIDE; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index c374594979e6..6bd3a9d42714 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -33,8 +33,6 @@ namespace oox { namespace drawingml { class ShapePropertyMap; } } namespace oox { namespace xls { - - const sal_uInt16 BIFF_OBJ_INVALID_ID = 0; @@ -52,8 +50,6 @@ struct BiffObjLineModel explicit BiffObjLineModel(); }; - - /** This structure contains fill formatting attributes from an OBJ record. */ struct BiffObjFillModel { @@ -73,8 +69,6 @@ class BiffDrawingBase; class BiffDrawingObjectBase; typedef ::boost::shared_ptr< BiffDrawingObjectBase > BiffDrawingObjectRef; - - class BiffDrawingObjectContainer { public: @@ -93,8 +87,6 @@ private: BiffDrawingObjectVector maObjects; }; - - /** Base class for all BIFF drawing objects (OBJ records). */ class BiffDrawingObjectBase : public WorksheetHelper { @@ -208,8 +200,6 @@ private: BiffObjIdVector maSkipObjs; /// Identifiers of all objects to be skipped. }; - - /** Drawing manager of a single sheet. */ class BiffSheetDrawing : public BiffDrawingBase { @@ -222,8 +212,6 @@ public: const ::com::sun::star::awt::Rectangle& rShapeRect ) SAL_OVERRIDE; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index 6fb3da11370a..cdaad9adf38a 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -132,8 +132,6 @@ public: const ScEEParseEntry* ListEntry( size_t index ) const { return maList[ index ]; } }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/excdefs.hxx b/sc/source/filter/inc/excdefs.hxx index 5ba6a097c2ea..8466ac91d12f 100644 --- a/sc/source/filter/inc/excdefs.hxx +++ b/sc/source/filter/inc/excdefs.hxx @@ -92,8 +92,6 @@ const sal_uInt8 EXC_AFOPER_GREATEREQUAL = 0x06; #define EXC_CHTR_ACCEPT 0x0001 #define EXC_CHTR_REJECT 0x0003 - - #endif // _EXCDEFS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/excelchartconverter.hxx b/sc/source/filter/inc/excelchartconverter.hxx index 43f80c5bba98..24c2cbbdda99 100644 --- a/sc/source/filter/inc/excelchartconverter.hxx +++ b/sc/source/filter/inc/excelchartconverter.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - class ExcelChartConverter : public ::oox::drawingml::chart::ChartConverter, public WorkbookHelper { public: @@ -45,8 +43,6 @@ public: const ::oox::drawingml::chart::DataSequenceModel& rDataSeq ) SAL_OVERRIDE; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index bc472de4c738..90c015938be2 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -27,8 +27,6 @@ namespace xls { class WorkbookGlobals; - - class ExcelFilter : public ::oox::core::XmlFilterBase { public: diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx index d97e5bd70303..be853d9a4136 100644 --- a/sc/source/filter/inc/excelhandlers.hxx +++ b/sc/source/filter/inc/excelhandlers.hxx @@ -27,8 +27,6 @@ namespace oox { namespace xls { - - /** Context handler derived from the WorkbookHelper helper class. Used to import contexts in global workbook fragments. @@ -41,8 +39,6 @@ public: ::oox::core::ContextHandler2( rParent ), WorkbookHelper( rParent ) {} }; - - /** Context handler derived from the WorksheetHelper helper class. Used to import contexts in sheet fragments. @@ -55,8 +51,6 @@ public: ::oox::core::ContextHandler2( rParent ), WorksheetHelper( rParent ) {} }; - - /** Fragment handler derived from the WorkbookHelper helper class. Used to import global workbook fragments. @@ -69,8 +63,6 @@ public: const OUString& rFragmentPath ); }; - - /** Fragment handler derived from the WorksheetHelper helper class. Used to import sheet fragments. @@ -84,8 +76,6 @@ public: }; - - /** Base class for all BIFF context handlers. Derived handlers have to implement the importRecord() function that has to @@ -100,8 +90,6 @@ public: virtual void importRecord( BiffInputStream& rStrm ) = 0; }; - - /** Context handler derived from the WorksheetHelper helper class. Used to import contexts in sheet fragments. @@ -112,8 +100,6 @@ protected: explicit BiffWorksheetContextBase( const WorksheetHelper& rHelper ); }; - - /** An enumeration for all types of fragments in a BIFF workbook stream. */ enum BiffFragmentType { @@ -127,8 +113,6 @@ enum BiffFragmentType BIFF_FRAGMENT_UNKNOWN /// Unknown fragment/error. }; - - class BiffFragmentHandler { public: @@ -167,8 +151,6 @@ private: BiffInputStreamRef mxBiffStrm; }; - - /** Fragment handler derived from the WorkbookHelper helper class. Used to import global workbook fragments. @@ -182,8 +164,6 @@ protected: bool bCloneDecoder = false ); }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/excelvbaproject.hxx b/sc/source/filter/inc/excelvbaproject.hxx index 9bc706c55847..37401b2efb4c 100644 --- a/sc/source/filter/inc/excelvbaproject.hxx +++ b/sc/source/filter/inc/excelvbaproject.hxx @@ -29,8 +29,6 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { - - /** Special implementation of the VBA project for the Excel filters. */ class ExcelVbaProject : public ::oox::ole::VbaProject { @@ -48,8 +46,6 @@ private: mxDocument; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index cd6d2539da7e..87cb42dd1f20 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -95,8 +95,6 @@ inline bool ExcelToSc::IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 return ( ( nRow1 & 0x3FFF ) == 0x0000 ) && ( ( nRow2 & 0x3FFF ) == 0x3FFF ); } - - class XclImpLinkManager; class XclImpExtName; @@ -149,8 +147,6 @@ inline bool ExcelToSc8::IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt1 - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index b5c102965b78..b0df0ba0b9f4 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -34,8 +34,6 @@ class ScDBData; class XclImpStream; - - class ImportExcel8 : public ImportExcel { public: @@ -75,8 +73,6 @@ private: }; - - // classes AutoFilterData, AutoFilterBuffer class XclImpAutoFilterData : private ExcRoot diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 22892b1c9bec..3db24063c007 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -228,8 +228,6 @@ public: virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; }; - - class ExcDummy_041 : public ExcDummyRec { private: @@ -276,8 +274,6 @@ public: virtual sal_uInt16 GetNum() const SAL_OVERRIDE; }; - - class ExcBundlesheet : public ExcBundlesheetBase { private: @@ -304,8 +300,6 @@ public: }; - - /** This record contains the Windows country IDs for the UI and document language. */ class XclExpCountry : public XclExpRecord { @@ -354,8 +348,6 @@ public: explicit XclExpFiltermode(); }; - - class XclExpAutofilterinfo : public XclExpUInt16Record { public: @@ -368,8 +360,6 @@ private: ScAddress maStartPos; }; - - class ExcFilterCondition { private: @@ -394,8 +384,6 @@ public: void SaveText( XclExpStream& rStrm ); }; - - class XclExpAutofilter : public XclExpRecord, protected XclExpRoot { private: @@ -425,8 +413,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - class ExcAutoFilterRecs : public XclExpRecordBase, protected XclExpRoot { public: @@ -455,8 +441,6 @@ private: bool mbAutoFilter; }; - - /** Sheet filter manager. Contains auto filters or advanced filters from all sheets. */ class XclExpFilterManager : protected XclExpRoot { diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx index 374f08551dd6..53fe60540190 100644 --- a/sc/source/filter/inc/exp_op.hxx +++ b/sc/source/filter/inc/exp_op.hxx @@ -50,8 +50,6 @@ public: virtual FltError Write() = 0; }; - - class ExportBiff5 : public ExportTyp, protected XclExpRoot { private: @@ -67,8 +65,6 @@ public: }; - - class ExportBiff8 : public ExportBiff5 { public: diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx index 8a22d471c391..655d2b8ac5e2 100644 --- a/sc/source/filter/inc/externallinkbuffer.hxx +++ b/sc/source/filter/inc/externallinkbuffer.hxx @@ -38,8 +38,6 @@ namespace oox { namespace core { namespace oox { namespace xls { - - struct ExternalNameModel { bool mbBuiltIn; /// Name is a built-in name. @@ -52,8 +50,6 @@ struct ExternalNameModel explicit ExternalNameModel(); }; - - class ExternalLink; class ExternalName : public DefinedNameBase @@ -126,8 +122,6 @@ private: typedef ::boost::shared_ptr< ExternalName > ExternalNameRef; - - /** Contains indexes for a range of sheets in the spreadsheet document. */ class LinkSheetRange { @@ -172,8 +166,6 @@ private: sal_Int32 mnLast; /// Index of the last sheet or index of last external sheet cache. }; - - enum ExternalLinkType { LINKTYPE_SELF, /// Link refers to the current workbook. @@ -188,8 +180,6 @@ enum ExternalLinkType LINKTYPE_UNKNOWN /// Unknown or unsupported link type. }; - - class ExternalLink : public WorkbookHelper { public: @@ -290,8 +280,6 @@ private: typedef ::boost::shared_ptr< ExternalLink > ExternalLinkRef; - - /** Represents a REF entry in the BIFF12 EXTERNALSHEETS or in the BIFF8 EXTERNSHEET record. @@ -310,8 +298,6 @@ struct RefSheetsModel void readBiff12Data( SequenceInputStream& rStrm ); }; - - class ExternalLinkBuffer : public WorkbookHelper { public: @@ -361,8 +347,6 @@ private: bool mbUseRefSheets; /// True = use maRefSheets list (BIFF12 only). }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/externallinkfragment.hxx b/sc/source/filter/inc/externallinkfragment.hxx index 1402b9f2112a..e71ebc878f07 100644 --- a/sc/source/filter/inc/externallinkfragment.hxx +++ b/sc/source/filter/inc/externallinkfragment.hxx @@ -29,8 +29,6 @@ namespace xls { class ExternalLink; - - /** This class implements importing the sheetData element in external sheets. The sheetData element embedded in the externalBook element contains cached @@ -74,8 +72,6 @@ private: sal_Int32 mnCurrType; /// Data type of current cell. }; - - class ExternalLinkFragment : public WorkbookFragmentBase { public: @@ -103,8 +99,6 @@ private: sal_Int32 mnResultType; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index d1f20da5cf2e..c0d1166b96f7 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -200,8 +200,6 @@ private: css::uno::Reference< css::beans::XMultiPropertySet > mxMultiPropSet; /// The optional multi property set interface. }; - - /** Generic helper class for reading from and writing to property sets. Usage: @@ -268,8 +266,6 @@ private: size_t mnNextIdx; /// Counter for next Any to be processed. }; - - template< typename Type > bool ScfPropSetHelper::ReadValue( Type& rValue ) { @@ -299,8 +295,6 @@ ScfPropSetHelper& operator<<( ScfPropSetHelper& rPropSetHelper, const Type& rVal return rPropSetHelper; } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index dd4bf610309f..b46ade5f885c 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -242,8 +242,6 @@ struct BinSingleRef2d void readBiff8Data( BiffInputStream& rStrm, bool bRelativeAsOffset ); }; - - /** A 2D formula cell range reference struct with relative flags. */ struct BinComplexRef2d { @@ -472,8 +470,6 @@ enum FunctionLibraryType FUNCLIB_EUROTOOL /// EuroTool add-in with EUROCONVERT function. }; - - /** Represents information for a spreadsheet function. The member mpParamInfos points to a C-array of type information structures @@ -634,8 +630,6 @@ class FormulaProcessorBase : public OpCodeProvider, protected ApiOpCodes, public public: explicit FormulaProcessorBase( const WorkbookHelper& rHelper ); - - /** Generates a cell address string in A1 notation from the passed cell address. @@ -656,8 +650,6 @@ public: const BinAddress& rAddress, bool bAbsolute ); - - /** Generates a string in Calc formula notation from the passed string. @param rString The string value. @@ -674,8 +666,6 @@ public: */ static OUString generateApiArray( const Matrix< ::com::sun::star::uno::Any >& rMatrix ); - - /** Tries to extract a single cell reference from a formula token sequence. @param rTokens The token sequence to be parsed. Should contain exactly @@ -792,8 +782,6 @@ public: bool bTrimLeadingSpaces ) const; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/formulaparser.hxx b/sc/source/filter/inc/formulaparser.hxx index ec8413d900bc..a8fc93aad6f5 100644 --- a/sc/source/filter/inc/formulaparser.hxx +++ b/sc/source/filter/inc/formulaparser.hxx @@ -89,8 +89,6 @@ private: ApiTokenVector maTokens; }; - - class FormulaParserImpl; /** Import formula parser for OOXML and BIFF filters. @@ -144,8 +142,6 @@ private: ::std::auto_ptr< FormulaParserImpl > mxImpl; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx index 0ec11a5cef1b..7764118792d2 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -29,12 +29,8 @@ class SfxObjectShell; class ScProgress; - - const sal_Int32 SCF_INV_SEGMENT = -1; - - /** Progress bar for complex progress representation. The progress bar contains one or more segments, each with customable @@ -186,8 +182,6 @@ private: bool mbInProgress; /// true = progress bar started. }; - - /** A simplified progress bar with only one segment. */ class ScfSimpleProgressBar { @@ -208,8 +202,6 @@ private: ScfProgressBar maProgress; /// The used progress bar. }; - - /** A simplified progress bar based on the stream position of an existing stream. */ class ScfStreamProgressBar { @@ -230,8 +222,6 @@ private: SvStream& mrStrm; /// The used stream. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index c8c0164c39e1..40431c2728f7 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -118,8 +118,6 @@ void insert_value( Type& rnBitField, InsertType nValue, sal_uInt8 nStartBit, sal (rnBitField &= ~(nMask << nStartBit)) |= (nNewValue << nStartBit); } - - class Color; class SfxPoolItem; class SfxItemSet; @@ -270,8 +268,6 @@ typedef ::std::vector< sal_Int32 > ScfInt32Vec; typedef ::std::vector< sal_uInt32 > ScfUInt32Vec; typedef ::std::vector< OUString > ScfStringVec; - - class ScFormatFilterPluginImpl : public ScFormatFilterPlugin { public: @@ -310,8 +306,6 @@ public: virtual ScOrcusFilters* GetOrcusFilters() SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index e50b0d9e9348..a667dde7da1c 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -98,8 +98,6 @@ public: }; - - typedef o3tl::sorted_vector<sal_uLong> ScHTMLColOffset; struct ScHTMLTableStackEntry @@ -151,8 +149,6 @@ struct ScHTMLAdjustStackEntry typedef ::std::stack< ScHTMLAdjustStackEntry* > ScHTMLAdjustStack; - - class EditEngine; class ScDocument; class HTMLOption; @@ -231,8 +227,6 @@ public: }; - - // HTML DATA QUERY PARSER @@ -246,8 +240,6 @@ const ScHTMLTableId SC_HTML_GLOBAL_TABLE = 0; /** Used as table index for normal (non-table) entries in ScHTMLEntry structs. */ const ScHTMLTableId SC_HTML_NO_TABLE = 0; - - /** A 2D cell position in an HTML table. */ struct ScHTMLPos { @@ -281,8 +273,6 @@ inline bool operator<( const ScHTMLPos& rPos1, const ScHTMLPos& rPos2 ) return (rPos1.mnRow < rPos2.mnRow) || ((rPos1.mnRow == rPos2.mnRow) && (rPos1.mnCol < rPos2.mnCol)); } - - /** A 2D cell size in an HTML table. */ struct ScHTMLSize { @@ -306,8 +296,6 @@ inline bool operator==( const ScHTMLSize& rSize1, const ScHTMLSize& rSize2 ) return (rSize1.mnRows == rSize2.mnRows) && (rSize1.mnCols == rSize2.mnCols); } - - /** A single entry containing a line of text or representing a table. */ struct ScHTMLEntry : public ScEEParseEntry { @@ -343,8 +331,6 @@ private: bool mbImportAlways; /// true = Always import this entry. }; - - /** This struct handles creation of unique table identifiers. */ struct ScHTMLTableAutoId { @@ -355,8 +341,6 @@ struct ScHTMLTableAutoId explicit ScHTMLTableAutoId( ScHTMLTableId& rnUnusedId ); }; - - class ScHTMLTableMap; /** Stores data for one table in an HTML document. @@ -590,8 +574,6 @@ private: bool mbPushEmptyLine:1; /// true = Insert empty line before current entry. }; - - /** The "global table" representing the entire HTML document. */ class ScHTMLGlobalTable : public ScHTMLTable { @@ -608,8 +590,6 @@ public: void Recalc(); }; - - /** The HTML parser for data queries. Focuses on data import, not on layout. Builds the table structure correctly, ignores extended formatting like @@ -668,8 +648,6 @@ private: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx index 084fa507b5d4..fe056fc3879d 100644 --- a/sc/source/filter/inc/lotfntbf.hxx +++ b/sc/source/filter/inc/lotfntbf.hxx @@ -95,8 +95,6 @@ private: ENTRY pData[ nSize ]; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx index 661b9eb04ce5..a5c4c9d37110 100644 --- a/sc/source/filter/inc/lotform.hxx +++ b/sc/source/filter/inc/lotform.hxx @@ -57,8 +57,6 @@ enum FUNC_TYPE }; - - class LotusToSc : public LotusConverterBase { private: @@ -115,8 +113,6 @@ inline void LotusToSc::SetWK3( void ) bWK3 = true; } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index f1157a607ddf..98aada0d32dc 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -154,8 +154,6 @@ inline void ImportLotus::Skip( const sal_uInt16 n ) pIn->SeekRel( n ); } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index f34fe9d910b5..ead34cc451fb 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -35,8 +35,6 @@ class ScTokenArray; class NameBuffer; - - class StringHashEntry { private: @@ -92,8 +90,6 @@ inline bool StringHashEntry::operator ==( const StringHashEntry& r ) const return ( nHash == r.nHash && aString == r.aString ); } - - class NameBuffer : public ExcRoot { private: @@ -218,8 +214,6 @@ inline void RangeNameBufferWK3::Add( const OUString& rName, const ScRange& aScRa } - - class ExtSheetBuffer : public ExcRoot { private: @@ -271,8 +265,6 @@ inline ExtSheetBuffer::ExtSheetBuffer( RootData* p ) : ExcRoot( p ) } - - struct ExtName { OUString aName; @@ -286,8 +278,6 @@ struct ExtName }; - - class ExtNameBuff : protected XclImpRoot { public: diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx index 2ed51e73372b..446b4320cca5 100644 --- a/sc/source/filter/inc/numberformatsbuffer.hxx +++ b/sc/source/filter/inc/numberformatsbuffer.hxx @@ -33,8 +33,6 @@ namespace oox { class PropertyMap; } namespace oox { namespace xls { - - struct NumFmtModel { ::com::sun::star::lang::Locale maLocale; @@ -44,8 +42,6 @@ struct NumFmtModel explicit NumFmtModel(); }; - - /** Contains all API number format attributes. */ struct ApiNumFmtData { @@ -54,8 +50,6 @@ struct ApiNumFmtData explicit ApiNumFmtData(); }; - - /** Contains all data for a number format code. */ class NumberFormat : public WorkbookHelper { @@ -88,8 +82,6 @@ private: typedef ::boost::shared_ptr< NumberFormat > NumberFormatRef; - - class NumberFormatsBuffer : public WorkbookHelper { public: @@ -123,8 +115,6 @@ private: sal_Int32 mnHighestId; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx index e6adca8cfa9c..b4e1346a9e3a 100644 --- a/sc/source/filter/inc/ooxformulaparser.hxx +++ b/sc/source/filter/inc/ooxformulaparser.hxx @@ -33,8 +33,6 @@ namespace xls { class OOXMLFormulaParserImpl; - - typedef ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XInitialization, @@ -100,8 +98,6 @@ OUString SAL_CALL OOXMLFormulaParser_getImplementationName(); css::uno::Sequence< OUString > SAL_CALL OOXMLFormulaParser_getSupportedServiceNames(); - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/pagesettings.hxx b/sc/source/filter/inc/pagesettings.hxx index 5ce87a9d7487..548ba5ac7263 100644 --- a/sc/source/filter/inc/pagesettings.hxx +++ b/sc/source/filter/inc/pagesettings.hxx @@ -30,8 +30,6 @@ namespace xls { class HeaderFooterParser; - - /** Holds page style data for a single sheet. */ struct PageSettingsModel { @@ -81,8 +79,6 @@ struct PageSettingsModel void setBiffPrintErrors( sal_uInt8 nPrintErrors ); }; - - class PageSettings : public WorksheetHelper { public: @@ -130,8 +126,6 @@ private: PageSettingsModel maModel; }; - - class PageSettingsConverter : public WorkbookHelper { public: @@ -180,8 +174,6 @@ private: HFHelperData maFooterData; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index e24c5042c060..033daef3006f 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -38,8 +38,6 @@ namespace xls { class WorksheetHelper; - - typedef ::std::pair< sal_Int32, OUString > IdCaptionPair; typedef ::std::vector< IdCaptionPair > IdCaptionPairList; @@ -105,8 +103,6 @@ friend class PivotCacheItemList; bool mbUnused; }; - - class PivotCacheItemList : public WorkbookHelper { public: @@ -141,8 +137,6 @@ private: CacheItemVector maItems; /// All items of this list. }; - - struct PCFieldModel { OUString maName; /// Fixed name of the cache field. @@ -162,8 +156,6 @@ struct PCFieldModel explicit PCFieldModel(); }; - - struct PCSharedItemsModel { bool mbHasSemiMixed; /// True = has (blank|string|bool|error) item(s), maybe other types. @@ -180,8 +172,6 @@ struct PCSharedItemsModel explicit PCSharedItemsModel(); }; - - struct PCFieldGroupModel { ::com::sun::star::util::DateTime maStartDate; /// Manual or calculated start date for range grouping. @@ -203,8 +193,6 @@ struct PCFieldGroupModel void setBiffGroupBy( sal_uInt8 nGroupBy ); }; - - /** Helper struct for mapping original item names from/to group item names. */ struct PivotCacheGroupItem { @@ -217,8 +205,6 @@ struct PivotCacheGroupItem typedef ::std::vector< PivotCacheGroupItem > PivotCacheGroupItemVector; - - class PivotCacheField : public WorkbookHelper { public: @@ -337,8 +323,6 @@ private: PCFieldGroupModel maFieldGroupModel; /// Settings for item grouping. }; - - struct PCDefinitionModel { OUString maRelId; /// Relation identifier for cache records fragment. @@ -361,8 +345,6 @@ struct PCDefinitionModel explicit PCDefinitionModel(); }; - - struct PCSourceModel { sal_Int32 mnSourceType; /// Type of the source data (sheet, consolidation, scenario, external). @@ -371,8 +353,6 @@ struct PCSourceModel explicit PCSourceModel(); }; - - struct PCWorksheetSourceModel { OUString maRelId; /// Relation identifier for an external document URL. @@ -384,8 +364,6 @@ struct PCWorksheetSourceModel explicit PCWorksheetSourceModel(); }; - - class PivotCache : public WorkbookHelper { public: @@ -473,8 +451,6 @@ private: bool mbDummySheet; /// True = pivot cache is based on a dummy sheet. }; - - class PivotCacheBuffer : public WorkbookHelper { public: @@ -501,8 +477,6 @@ private: PivotCacheIdVector maCacheIds; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx index b35cd1527cba..86378ed9c63c 100644 --- a/sc/source/filter/inc/pivotcachefragment.hxx +++ b/sc/source/filter/inc/pivotcachefragment.hxx @@ -28,8 +28,6 @@ namespace xls { class PivotCache; class PivotCacheField; - - class PivotCacheFieldContext : public WorkbookContextBase { public: @@ -47,8 +45,6 @@ private: PivotCacheField& mrCacheField; }; - - class PivotCacheDefinitionFragment : public WorkbookFragmentBase { public: @@ -67,8 +63,6 @@ private: PivotCache& mrPivotCache; }; - - class PivotCacheRecordsFragment : public WorksheetFragmentBase { public: @@ -95,8 +89,6 @@ private: }; - - class BiffPivotCacheFragment : public BiffWorkbookFragmentBase { public: @@ -112,8 +104,6 @@ private: PivotCache& mrPivotCache; }; - - class BiffPivotCacheRecordsContext : public BiffWorksheetContextBase { public: @@ -139,8 +129,6 @@ private: bool mbInRow; /// True = a data row has been started. }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index fff2b652a939..5ef56e924a8c 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -36,8 +36,6 @@ namespace xls { class PivotTable; - - struct PTFieldItemModel { sal_Int32 mnCacheItem; /// Index to shared item in pivot cache. @@ -52,8 +50,6 @@ struct PTFieldItemModel void setBiffType( sal_uInt16 nType ); }; - - struct PTFieldModel { sal_Int32 mnAxis; /// Axis this field is assigned to (none, row, column, page). @@ -91,8 +87,6 @@ struct PTFieldModel void setBiffAxis( sal_uInt8 nAxisFlags ); }; - - struct PTPageFieldModel { OUString maName; /// Unique name of the page field. @@ -102,8 +96,6 @@ struct PTPageFieldModel explicit PTPageFieldModel(); }; - - struct PTDataFieldModel { OUString maName; /// Name of the data field. @@ -122,8 +114,6 @@ struct PTDataFieldModel void setBiffShowDataAs( sal_Int32 nShowDataAs ); }; - - class PivotTableField : public WorkbookHelper { public: @@ -189,8 +179,6 @@ private: sal_Int32 mnFieldIndex; /// Zero-based index of this field. }; - - struct PTFilterModel { OUString maName; /// Name of the field filter. @@ -210,8 +198,6 @@ struct PTFilterModel explicit PTFilterModel(); }; - - class PivotTableFilter : public WorkbookHelper { public: @@ -235,8 +221,6 @@ private: PTFilterModel maModel; }; - - struct PTDefinitionModel : public AutoFormatModel { OUString maName; @@ -285,8 +269,6 @@ struct PTDefinitionModel : public AutoFormatModel explicit PTDefinitionModel(); }; - - struct PTLocationModel { ::com::sun::star::table::CellRangeAddress @@ -300,8 +282,6 @@ struct PTLocationModel explicit PTLocationModel(); }; - - class PivotTable : public WorkbookHelper { public: @@ -400,8 +380,6 @@ private: mxDPDescriptor; /// Descriptor of the DataPilot object. }; - - class PivotTableBuffer : public WorkbookHelper { public: @@ -418,8 +396,6 @@ private: PivotTableVector maTables; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/pivottablefragment.hxx b/sc/source/filter/inc/pivottablefragment.hxx index 7847f2be33fb..8bfb2dccbcbf 100644 --- a/sc/source/filter/inc/pivottablefragment.hxx +++ b/sc/source/filter/inc/pivottablefragment.hxx @@ -30,8 +30,6 @@ class PivotTable; class PivotTableField; class PivotTableFilter; - - class PivotTableFieldContext : public WorksheetContextBase { public: @@ -49,8 +47,6 @@ private: PivotTableField& mrTableField; }; - - class PivotTableFilterContext : public WorksheetContextBase { public: @@ -68,8 +64,6 @@ private: PivotTableFilter& mrTableFilter; }; - - class PivotTableFragment : public WorksheetFragmentBase { public: @@ -86,8 +80,6 @@ private: PivotTable& mrPivotTable; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/querytablebuffer.hxx b/sc/source/filter/inc/querytablebuffer.hxx index da1d952db855..3fb4b7d3dc2a 100644 --- a/sc/source/filter/inc/querytablebuffer.hxx +++ b/sc/source/filter/inc/querytablebuffer.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - struct QueryTableModel : public AutoFormatModel { OUString maDefName; /// Defined name containing the target cell range. @@ -49,8 +47,6 @@ struct QueryTableModel : public AutoFormatModel explicit QueryTableModel(); }; - - class QueryTable : public WorksheetHelper { public: @@ -68,8 +64,6 @@ private: QueryTableModel maModel; }; - - class QueryTableBuffer : public WorksheetHelper { public: @@ -86,8 +80,6 @@ private: QueryTableVector maQueryTables; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/querytablefragment.hxx b/sc/source/filter/inc/querytablefragment.hxx index 3539639793bc..30c9ae64256b 100644 --- a/sc/source/filter/inc/querytablefragment.hxx +++ b/sc/source/filter/inc/querytablefragment.hxx @@ -27,8 +27,6 @@ namespace xls { class QueryTable; - - class QueryTableFragment : public WorksheetFragmentBase { public: @@ -46,8 +44,6 @@ private: QueryTable& mrQueryTable; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index 9dfa124f5c43..d29da6017a3e 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -34,8 +34,6 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { - - /** Flags used to specify import/export mode of strings. */ typedef sal_Int32 BiffStringFlags; @@ -46,8 +44,6 @@ const BiffStringFlags BIFF_STR_SMARTFLAGS = 0x0004; /// Omit flags on empty const BiffStringFlags BIFF_STR_KEEPFONTS = 0x0008; /// Keep old fonts when reading unformatted string (default: clear fonts). Import only. const BiffStringFlags BIFF_STR_EXTRAFONTS = 0x0010; /// Read trailing rich-string font array (default: nothing). BIFF2-BIFF5 import only. - - /** Contains text data and font attributes for a part of a rich formatted string. */ class RichStringPortion : public WorkbookHelper { @@ -88,8 +84,6 @@ private: typedef ::boost::shared_ptr< RichStringPortion > RichStringPortionRef; - - enum BiffFontPortionMode { BIFF_FONTPORTION_8BIT, /// Font portion with 8-bit values. @@ -97,8 +91,6 @@ enum BiffFontPortionMode BIFF_FONTPORTION_OBJ /// Font portion in OBJ or TXO record. }; - - /** Represents a position in a rich-string containing current font identifier. This object stores the position of a formatted character in a rich-string @@ -117,8 +109,6 @@ struct FontPortionModel void read( SequenceInputStream& rStrm ); }; - - /** A vector with all font portions in a rich-string. */ class FontPortionModelList : public ::std::vector< FontPortionModel > { @@ -131,8 +121,6 @@ public: void importPortions( SequenceInputStream& rStrm ); }; - - struct PhoneticDataModel { sal_Int32 mnFontId; /// Font identifier for text formatting. @@ -145,8 +133,6 @@ struct PhoneticDataModel void setBiffData( sal_Int32 nType, sal_Int32 nAlignment ); }; - - class PhoneticSettings : public WorkbookHelper { public: @@ -164,8 +150,6 @@ private: PhoneticDataModel maModel; }; - - /** Contains text data and positioning information for a phonetic text portion. */ class RichStringPhonetic : public WorkbookHelper { @@ -187,8 +171,6 @@ private: typedef ::boost::shared_ptr< RichStringPhonetic > RichStringPhoneticRef; - - /** Represents a phonetic text portion in a rich-string with phonetic text. Used in binary filters only. */ struct PhoneticPortionModel @@ -204,8 +186,6 @@ struct PhoneticPortionModel void read( SequenceInputStream& rStrm ); }; - - /** A vector with all phonetic portions in a rich-string. */ class PhoneticPortionModelList : public ::std::vector< PhoneticPortionModel > { @@ -218,8 +198,6 @@ public: void importPortions( SequenceInputStream& rStrm ); }; - - /** Contains string data and a list of formatting runs for a rich formatted string. */ class RichString : public WorkbookHelper { @@ -280,8 +258,6 @@ private: typedef ::boost::shared_ptr< RichString > RichStringRef; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx index e277f939caa7..e24a5e65d83b 100644 --- a/sc/source/filter/inc/richstringcontext.hxx +++ b/sc/source/filter/inc/richstringcontext.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - class RichStringContext : public WorkbookContextBase { public: @@ -45,8 +43,6 @@ private: FontRef mxFont; /// Processed font of the portion. }; - - template< typename ParentType > RichStringContext::RichStringContext( ParentType& rParent, RichStringRef xString ) : WorkbookContextBase( rParent ), @@ -55,8 +51,6 @@ RichStringContext::RichStringContext( ParentType& rParent, RichStringRef xString OSL_ENSURE( mxString.get(), "RichStringContext::RichStringContext - missing string object" ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/scenariobuffer.hxx b/sc/source/filter/inc/scenariobuffer.hxx index f3fc8b33e47f..5c6385bd6414 100644 --- a/sc/source/filter/inc/scenariobuffer.hxx +++ b/sc/source/filter/inc/scenariobuffer.hxx @@ -28,8 +28,6 @@ namespace oox { namespace xls { - - struct ScenarioCellModel { ::com::sun::star::table::CellAddress maPos; @@ -40,8 +38,6 @@ struct ScenarioCellModel explicit ScenarioCellModel(); }; - - struct ScenarioModel { OUString maName; /// Name of the scenario. @@ -53,8 +49,6 @@ struct ScenarioModel explicit ScenarioModel(); }; - - class Scenario : public WorkbookHelper { public: @@ -81,8 +75,6 @@ private: sal_Int16 mnSheet; /// Index of the sheet this scenario is based on. }; - - struct SheetScenariosModel { sal_Int32 mnCurrent; /// Selected scenario. @@ -91,8 +83,6 @@ struct SheetScenariosModel explicit SheetScenariosModel(); }; - - class SheetScenarios : public WorkbookHelper { public: @@ -116,8 +106,6 @@ private: sal_Int16 mnSheet; }; - - class ScenarioBuffer : public WorkbookHelper { public: @@ -134,8 +122,6 @@ private: SheetScenariosMap maSheetScenarios; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/scenariocontext.hxx b/sc/source/filter/inc/scenariocontext.hxx index 7eafaf3bec24..8345cf953f89 100644 --- a/sc/source/filter/inc/scenariocontext.hxx +++ b/sc/source/filter/inc/scenariocontext.hxx @@ -28,8 +28,6 @@ namespace xls { class Scenario; class SheetScenarios; - - class ScenarioContext : public WorksheetContextBase { public: @@ -46,8 +44,6 @@ private: Scenario& mrScenario; }; - - class ScenariosContext : public WorksheetContextBase { public: @@ -64,8 +60,6 @@ private: SheetScenarios& mrSheetScenarios; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/sharedstringsbuffer.hxx b/sc/source/filter/inc/sharedstringsbuffer.hxx index 31475d25629c..027a185fff39 100644 --- a/sc/source/filter/inc/sharedstringsbuffer.hxx +++ b/sc/source/filter/inc/sharedstringsbuffer.hxx @@ -25,8 +25,6 @@ namespace oox { namespace xls { - - /** Collects all strings from the shared strings substream. */ class SharedStringsBuffer : public WorkbookHelper { @@ -47,8 +45,6 @@ private: StringVector maStrings; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/sharedstringsfragment.hxx b/sc/source/filter/inc/sharedstringsfragment.hxx index c7e2633c22cd..f854e3acf498 100644 --- a/sc/source/filter/inc/sharedstringsfragment.hxx +++ b/sc/source/filter/inc/sharedstringsfragment.hxx @@ -25,8 +25,6 @@ namespace oox { namespace xls { - - class SharedStringsFragment : public WorkbookFragmentBase { public: @@ -42,8 +40,6 @@ protected: virtual void finalizeImport() SAL_OVERRIDE; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index f2ffdd02d1ec..edbaa7aba67a 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -32,8 +32,6 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { - - /** Stores basic data about cell values and formatting. */ struct CellModel { @@ -46,8 +44,6 @@ struct CellModel explicit CellModel(); }; - - /** Stores data about cell formulas. */ struct CellFormulaModel { @@ -64,8 +60,6 @@ struct CellFormulaModel bool isValidSharedRef( const ::com::sun::star::table::CellAddress& rCellAddr ); }; - - /** Stores data about table operations. */ struct DataTableModel { @@ -79,8 +73,6 @@ struct DataTableModel explicit DataTableModel(); }; - - /** Manages all cell blocks currently in use. */ class CellBlockBuffer : public WorksheetHelper { @@ -101,8 +93,6 @@ private: }; - - /** Manages the cell contents and cell formatting of a sheet. */ class SheetDataBuffer : public WorksheetHelper @@ -253,8 +243,6 @@ private: std::map< sal_Int32, std::vector< ValueRange > > maXfIdRowRangeList; /// Cached XF identifiers for a ranges of rows, we try and process rowranges with the same XF id together }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx index 45593235ba5d..ec2d447d3b0b 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -30,8 +30,6 @@ namespace oox { namespace xls { - - /** Used as base for sheet data context classes. Provides fast access to often used converter objects and sheet index, to improve performance. */ @@ -48,8 +46,6 @@ struct SheetDataContextBase virtual ~SheetDataContextBase(); }; - - /** This class implements importing the sheetData element. The sheetData element contains all row settings and all cells in a single @@ -134,8 +130,6 @@ private: }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index ff2a8550e315..7b8f19235689 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -48,8 +48,6 @@ namespace oox { class PropertySet; } namespace oox { namespace xls { - - const sal_Int32 OOX_COLOR_WINDOWTEXT3 = 24; /// System window text color (BIFF3-BIFF4). const sal_Int32 OOX_COLOR_WINDOWBACK3 = 25; /// System window background color (BIFF3-BIFF4). const sal_Int32 OOX_COLOR_WINDOWTEXT = 64; /// System window text color (BIFF5+). @@ -62,8 +60,6 @@ const sal_Int32 OOX_COLOR_NOTEBACK = 80; /// Note background colo const sal_Int32 OOX_COLOR_NOTETEXT = 81; /// Note text color. const sal_Int32 OOX_COLOR_FONTAUTO = 0x7FFF; /// Font auto color (system window text color). - - const sal_Int16 API_LINE_NONE = 0; const sal_Int16 API_LINE_HAIR = 1; const sal_Int16 API_LINE_THIN = 15; @@ -77,8 +73,6 @@ const sal_Int16 API_ESCAPE_SUBSCRIPT = -101; /// Subscript: lower cha const sal_Int8 API_ESCAPEHEIGHT_NONE = 100; /// Relative character height if not escaped. const sal_Int8 API_ESCAPEHEIGHT_DEFAULT = 58; /// Relative character height if escaped. - - /** Special implementation of the GraphicHelper for Excel palette and scheme colors. */ @@ -93,8 +87,6 @@ public: virtual sal_Int32 getPaletteColor( sal_Int32 nPaletteIdx ) const SAL_OVERRIDE; }; - - class Color : public ::oox::drawingml::Color { public: @@ -119,12 +111,8 @@ public: inline bool isAuto() const { return isPlaceHolder(); } }; - - SequenceInputStream& operator>>( SequenceInputStream& rStrm, Color& orColor ); - - /** Stores all colors of the color palette. */ class ColorPalette : public WorkbookHelper { @@ -149,8 +137,6 @@ private: size_t mnAppendIndex; /// Index to append a new color. }; - - /** Contains all XML font attributes, e.g. from a font or rPr element. */ struct FontModel { @@ -177,8 +163,6 @@ struct FontModel void setBiffEscapement( sal_uInt16 nEscapement ); }; - - /** Enumerates different types of API font property sets. */ enum FontPropertyType { @@ -186,8 +170,6 @@ enum FontPropertyType FONT_PROPTYPE_TEXT /// Font properties in a text object (text::Text service). }; - - /** Contains used flags for all API font attributes. */ struct ApiFontUsedFlags { @@ -206,8 +188,6 @@ struct ApiFontUsedFlags explicit ApiFontUsedFlags( bool bAllUsed ); }; - - /** Contains API font name, family, and charset for a script type. */ struct ApiScriptFontName { @@ -218,8 +198,6 @@ struct ApiScriptFontName explicit ApiScriptFontName(); }; - - /** Contains all API font attributes. */ struct ApiFontData { @@ -238,8 +216,6 @@ struct ApiFontData explicit ApiFontData(); }; - - class Font : public WorkbookHelper { public: @@ -301,8 +277,6 @@ private: typedef ::boost::shared_ptr< Font > FontRef; - - /** Contains all XML cell alignment attributes, e.g. from an alignment element. */ struct AlignmentModel { @@ -323,8 +297,6 @@ struct AlignmentModel void setBiffVerAlign( sal_uInt8 nVerAlign ); }; - - /** Contains all API cell alignment attributes. */ struct ApiAlignmentData { @@ -347,8 +319,6 @@ struct ApiAlignmentData bool operator==( const ApiAlignmentData& rLeft, const ApiAlignmentData& rRight ); - - class Alignment : public WorkbookHelper { public: @@ -382,8 +352,6 @@ private: typedef ::boost::shared_ptr< Alignment > AlignmentRef; - - /** Contains all XML cell protection attributes, e.g. from a protection element. */ struct ProtectionModel { @@ -393,8 +361,6 @@ struct ProtectionModel explicit ProtectionModel(); }; - - /** Contains all API cell protection attributes. */ struct ApiProtectionData { @@ -407,8 +373,6 @@ struct ApiProtectionData bool operator==( const ApiProtectionData& rLeft, const ApiProtectionData& rRight ); - - class Protection : public WorkbookHelper { public: @@ -438,8 +402,6 @@ private: typedef ::boost::shared_ptr< Protection > ProtectionRef; - - /** Contains XML attributes of a single border line. */ struct BorderLineModel { @@ -453,8 +415,6 @@ struct BorderLineModel void setBiffStyle( sal_Int32 nLineStyle ); }; - - /** Contains XML attributes of a complete cell border. */ struct BorderModel { @@ -469,8 +429,6 @@ struct BorderModel explicit BorderModel( bool bDxf ); }; - - /** Contains API attributes of a complete cell border. */ struct ApiBorderData { @@ -493,8 +451,6 @@ struct ApiBorderData bool operator==( const ApiBorderData& rLeft, const ApiBorderData& rRight ); - - class Border : public WorkbookHelper { public: @@ -544,8 +500,6 @@ private: typedef ::boost::shared_ptr< Border > BorderRef; - - /** Contains XML pattern fill attributes from the patternFill element. */ struct PatternFillModel { @@ -562,8 +516,6 @@ struct PatternFillModel void setBiffPattern( sal_Int32 nPattern ); }; - - /** Contains XML gradient fill attributes from the gradientFill element. */ struct GradientFillModel { @@ -585,8 +537,6 @@ struct GradientFillModel void readGradientStop( SequenceInputStream& rStrm, bool bDxf ); }; - - /** Contains API fill attributes. */ struct ApiSolidFillData { @@ -599,8 +549,6 @@ struct ApiSolidFillData bool operator==( const ApiSolidFillData& rLeft, const ApiSolidFillData& rRight ); - - /** Contains cell fill attributes, either a pattern fill or a gradient fill. */ class Fill : public WorkbookHelper { @@ -657,8 +605,6 @@ private: typedef ::boost::shared_ptr< Fill > FillRef; - - /** Contains all data for a cell format or cell style. */ struct XfModel { @@ -680,8 +626,6 @@ struct XfModel bool operator==( const XfModel& rXfModel1, const XfModel& rXfModel2 ); - - /** Represents a cell format or a cell style (called XF, extended format). This class stores the type (cell/style), the index to the parent style (if @@ -743,8 +687,6 @@ bool operator==( const Xf& rXf1, const Xf& rXf2 ); typedef ::boost::shared_ptr< Xf > XfRef; - - class Dxf : public WorkbookHelper { public: @@ -779,8 +721,6 @@ private: typedef ::boost::shared_ptr< Dxf > DxfRef; - - /** Contains attributes of a cell style, e.g. from the cellStyle element. */ struct CellStyleModel { @@ -800,8 +740,6 @@ struct CellStyleModel bool isDefaultStyle() const; }; - - class CellStyle : public WorkbookHelper { public: @@ -833,8 +771,6 @@ private: typedef ::boost::shared_ptr< CellStyle > CellStyleRef; - - class CellStyleBuffer : public WorkbookHelper { public: @@ -873,8 +809,6 @@ private: CellStyleRef mxDefStyle; /// Default cell style. }; - - struct AutoFormatModel { sal_Int32 mnAutoFormatId; /// Index of predefined autoformatting. @@ -888,8 +822,6 @@ struct AutoFormatModel explicit AutoFormatModel(); }; - - class StylesBuffer : public WorkbookHelper { public: @@ -1002,8 +934,6 @@ private: mutable DxfStyleMap maDxfStyles; /// Maps DXF identifiers to Calc style sheet names. }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx index cdb90041d2bc..53a58131e80c 100644 --- a/sc/source/filter/inc/stylesfragment.hxx +++ b/sc/source/filter/inc/stylesfragment.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - class IndexedColorsContext : public WorkbookContextBase { public: @@ -38,8 +36,6 @@ protected: virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; }; - - class FontContext : public WorkbookContextBase { public: @@ -54,8 +50,6 @@ private: FontRef mxFont; }; - - class BorderContext : public WorkbookContextBase { public: @@ -71,8 +65,6 @@ private: BorderRef mxBorder; }; - - class FillContext : public WorkbookContextBase { public: @@ -88,8 +80,6 @@ private: double mfGradPos; /// Gradient color position. }; - - class XfContext : public WorkbookContextBase { public: @@ -106,8 +96,6 @@ private: bool mbCellXf; /// True = cell XF, false = style XF. }; - - class DxfContext : public WorkbookContextBase { public: @@ -122,8 +110,6 @@ private: DxfRef mxDxf; }; - - class StylesFragment : public WorkbookFragmentBase { public: @@ -139,8 +125,6 @@ protected: virtual void finalizeImport() SAL_OVERRIDE; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/tablebuffer.hxx b/sc/source/filter/inc/tablebuffer.hxx index 91042f17f9d3..5ef7fb4db610 100644 --- a/sc/source/filter/inc/tablebuffer.hxx +++ b/sc/source/filter/inc/tablebuffer.hxx @@ -27,8 +27,6 @@ namespace oox { namespace xls { - - struct TableModel { ::com::sun::star::table::CellRangeAddress @@ -43,8 +41,6 @@ struct TableModel explicit TableModel(); }; - - class Table : public WorkbookHelper { public: @@ -92,8 +88,6 @@ private: typedef ::boost::shared_ptr< Table > TableRef; - - class TableBuffer : public WorkbookHelper { public: @@ -125,8 +119,6 @@ private: TableNameMap maNameTables; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/tablefragment.hxx b/sc/source/filter/inc/tablefragment.hxx index 6e5bd4d0cd50..0b196b01a371 100644 --- a/sc/source/filter/inc/tablefragment.hxx +++ b/sc/source/filter/inc/tablefragment.hxx @@ -27,8 +27,6 @@ namespace xls { class Table; - - class TableFragment : public WorksheetFragmentBase { public: @@ -46,8 +44,6 @@ private: Table& mrTable; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/themebuffer.hxx b/sc/source/filter/inc/themebuffer.hxx index f1593beaf63b..9c458b45e4db 100644 --- a/sc/source/filter/inc/themebuffer.hxx +++ b/sc/source/filter/inc/themebuffer.hxx @@ -28,8 +28,6 @@ namespace xls { struct FontModel; - - class ThemeBuffer : public ::oox::drawingml::Theme, public WorkbookHelper { public: @@ -47,8 +45,6 @@ private: FontModelPtr mxDefFontModel; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 41b9ab1a2eac..d1de203d1d50 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -49,8 +49,6 @@ struct TokenId inline bool operator !=( sal_uInt16 n ) const { return nId != n; } }; - - struct ScComplexRefData; class TokenStack; @@ -74,8 +72,6 @@ enum E_TYPE }; - - class TokenPool { // !ACHTUNG!: externe Id-Basis ist 1, interne 0! @@ -223,8 +219,6 @@ class TokenPool }; - - class TokenStack // Stack fuer Token-Ids: Id 0 sollte reserviert bleiben als // fehlerhafte Id, da z.B. Get() im Fehlerfall 0 liefert @@ -246,8 +240,6 @@ class TokenStack }; - - inline const TokenId TokenStack::Get( void ) { OSL_ENSURE( nPos > 0, @@ -298,8 +290,6 @@ inline void TokenStack::Reset( void ) } - - inline TokenPool& TokenPool::operator <<( const TokenId nId ) { // POST: nId's werden hintereinander im Pool unter einer neuen Id diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h index 9ba1b89fec65..9816c6707db4 100644 --- a/sc/source/filter/inc/tool.h +++ b/sc/source/filter/inc/tool.h @@ -99,8 +99,6 @@ public: #define __nSize 2048 - - class FormCache { private: diff --git a/sc/source/filter/inc/unitconverter.hxx b/sc/source/filter/inc/unitconverter.hxx index 18e7f5a08f7c..c73c1d8f7aa2 100644 --- a/sc/source/filter/inc/unitconverter.hxx +++ b/sc/source/filter/inc/unitconverter.hxx @@ -31,8 +31,6 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { - - /** Units supported by the UnitConverter class. */ enum Unit { @@ -104,8 +102,6 @@ private: sal_Int32 mnNullDate; /// Nulldate of this workbook (number of days since 0000-01-01). }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/viewsettings.hxx b/sc/source/filter/inc/viewsettings.hxx index 8dfdfa5940a2..467cc39aed0e 100644 --- a/sc/source/filter/inc/viewsettings.hxx +++ b/sc/source/filter/inc/viewsettings.hxx @@ -29,8 +29,6 @@ namespace oox { namespace xls { - - /** Contains all settings for a selection in a single pane of a sheet. */ struct PaneSelectionModel { @@ -41,8 +39,6 @@ struct PaneSelectionModel explicit PaneSelectionModel(); }; - - /** Contains all view settings for a single sheet. */ struct SheetViewModel { @@ -93,8 +89,6 @@ struct SheetViewModel typedef ::boost::shared_ptr< SheetViewModel > SheetViewModelRef; - - class SheetViewSettings : public WorksheetHelper { public: @@ -132,8 +126,6 @@ private: SheetViewModelVec maSheetViews; }; - - /** Contains all view settings for the entire document. */ struct WorkbookViewModel { @@ -155,8 +147,6 @@ struct WorkbookViewModel typedef ::boost::shared_ptr< WorkbookViewModel > WorkbookViewModelRef; - - class ViewSettings : public WorkbookHelper { public: @@ -203,8 +193,6 @@ private: bool mbValidOleSize; /// True = imported OLE size is a valid cell range. }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/workbookfragment.hxx b/sc/source/filter/inc/workbookfragment.hxx index df53df149b8b..5ef19dd2c491 100644 --- a/sc/source/filter/inc/workbookfragment.hxx +++ b/sc/source/filter/inc/workbookfragment.hxx @@ -28,8 +28,6 @@ namespace xls { class ExternalLink; - - class WorkbookFragment : public WorkbookFragmentBase { public: diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index 2d0804929ad9..39dc56971af9 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -66,8 +66,6 @@ namespace xls { class ExcelFilter; - - /** An enumeration for all supported spreadsheet filter types. */ enum FilterType { @@ -76,16 +74,12 @@ enum FilterType FILTER_UNKNOWN /// Unknown filter type. }; - - /** Functor for case-insensitive string comparison, usable in maps etc. */ struct IgnoreCaseCompare { bool operator()( const OUString& rName1, const OUString& rName2 ) const; }; - - class AddressConverter; class BiffCodecHelper; class ConnectionsBuffer; @@ -289,8 +283,6 @@ private: WorkbookGlobals& mrBookGlob; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/workbooksettings.hxx b/sc/source/filter/inc/workbooksettings.hxx index 8c4e2219ede4..59bba3304437 100644 --- a/sc/source/filter/inc/workbooksettings.hxx +++ b/sc/source/filter/inc/workbooksettings.hxx @@ -27,8 +27,6 @@ namespace com { namespace sun { namespace star { namespace util { struct Date; } namespace oox { namespace xls { - - /** Settings for workbook write protection. */ struct FileSharingModel { @@ -39,8 +37,6 @@ struct FileSharingModel explicit FileSharingModel(); }; - - /** Global workbook settings. */ struct WorkbookSettingsModel { @@ -58,8 +54,6 @@ struct WorkbookSettingsModel void setBiffObjectMode( sal_uInt16 nObjMode ); }; - - /** Workbook calculation settings. */ struct CalcSettingsModel { @@ -79,8 +73,6 @@ struct CalcSettingsModel explicit CalcSettingsModel(); }; - - class WorkbookSettings : public WorkbookHelper { public: @@ -118,8 +110,6 @@ private: CalcSettingsModel maCalcSettings; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx index 8c996f01d234..a75027e73358 100644 --- a/sc/source/filter/inc/worksheetbuffer.hxx +++ b/sc/source/filter/inc/worksheetbuffer.hxx @@ -32,8 +32,6 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { - - /** Contains data from the 'sheet' element describing a sheet in the workbook. */ struct SheetInfoModel { @@ -46,8 +44,6 @@ struct SheetInfoModel explicit SheetInfoModel(); }; - - /** Stores information about all sheets in a spreadsheet document. Information about sheets includes the sheet name, the visibility state, and @@ -111,8 +107,6 @@ private: SheetInfoMap maSheetInfosByName; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/worksheetfragment.hxx b/sc/source/filter/inc/worksheetfragment.hxx index fdf78f80af02..20d2f9692f73 100644 --- a/sc/source/filter/inc/worksheetfragment.hxx +++ b/sc/source/filter/inc/worksheetfragment.hxx @@ -25,8 +25,6 @@ namespace oox { namespace xls { - - class DataValidationsContext : public WorksheetContextBase { public: @@ -49,8 +47,6 @@ private: ::std::auto_ptr< ValidationModel > mxValModel; }; - - class WorksheetFragment : public WorksheetFragmentBase { public: diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index aa0f239e4fc1..b38132fc4afb 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -59,8 +59,6 @@ class WorksheetSettings; typedef ::std::map< OUString, void* > ExtLst; - - typedef ::std::map< BinAddress, sal_Int32 > SharedFormulaMap; /** An enumeration for all types of sheets in a workbook. */ @@ -74,8 +72,6 @@ enum WorksheetType SHEETTYPE_EMPTYSHEET /// Other (unsupported) sheet type. }; - - /** Stores settings and formatting data about a range of sheet columns. */ struct ColumnModel { @@ -93,8 +89,6 @@ struct ColumnModel bool isMergeable( const ColumnModel& rModel ) const; }; - - /** Stores settings and formatting data about a sheet row. */ struct RowModel { @@ -119,8 +113,6 @@ struct RowModel bool isMergeable( const RowModel& rModel ) const; }; - - /** Stores formatting data about a page break. */ struct PageBreakModel { @@ -132,8 +124,6 @@ struct PageBreakModel explicit PageBreakModel(); }; - - /** Stores data about a hyperlink range. */ struct HyperlinkModel : public ::oox::ole::StdHlinkInfo { @@ -144,8 +134,6 @@ struct HyperlinkModel : public ::oox::ole::StdHlinkInfo explicit HyperlinkModel(); }; - - /** Stores data about ranges with data validation settings. */ struct ValidationModel { @@ -176,8 +164,6 @@ struct ValidationModel }; - - class WorksheetGlobals; typedef ::boost::shared_ptr< WorksheetGlobals > WorksheetGlobalsRef; @@ -203,8 +189,6 @@ public: // horrible accessor for hidden WorksheetGlobals ... static IWorksheetProgress *getWorksheetInterface( const WorksheetGlobalsRef &xRef ); - - /** Returns the type of this sheet. */ WorksheetType getSheetType() const; /** Returns the index of the current sheet. */ @@ -333,8 +317,6 @@ private: }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/worksheetsettings.hxx b/sc/source/filter/inc/worksheetsettings.hxx index 161492211813..02877c797c8e 100644 --- a/sc/source/filter/inc/worksheetsettings.hxx +++ b/sc/source/filter/inc/worksheetsettings.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - /** Sheet and outline settings. */ struct SheetSettingsModel { @@ -41,8 +39,6 @@ struct SheetSettingsModel explicit SheetSettingsModel(); }; - - /** Sheet protection settings. */ struct SheetProtectionModel { @@ -67,8 +63,6 @@ struct SheetProtectionModel explicit SheetProtectionModel(); }; - - class WorksheetSettings : public WorksheetHelper { public: @@ -109,8 +103,6 @@ private: SheetProtectionModel maSheetProt; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index ba71aa5e039d..505de89540aa 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -29,8 +29,6 @@ namespace utl { class TempFile; } - - class SvStream; class XclEscherExGlobal : public EscherExGlobal, protected XclExpRoot @@ -49,8 +47,6 @@ private: SAL_WNODEPRECATED_DECLARATIONS_POP }; - - class XclObj; class XclExpDffAnchorBase; class XclEscherHostAppData; @@ -155,8 +151,6 @@ public: - - // --- class XclEscherClientData ------------------------------------- class XclEscherClientData : public EscherExClientRecord_Base @@ -189,8 +183,6 @@ public: virtual void WriteData( EscherEx& rEx ) const SAL_OVERRIDE; }; - - #endif // _XCL97ESC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index 023d929d0753..7c776d11d1ff 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -25,8 +25,6 @@ #include "xlstyle.hxx" #include "tabprotection.hxx" - - class XclObj; class XclExpMsoDrawing; class SdrCaptionObj; @@ -384,8 +382,6 @@ public: void SaveXml( XclExpXmlStream& rStrm ) const; }; - - class ExcEScenario : public ExcRecord { private: @@ -412,8 +408,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - class ExcEScenarioManager : public ExcRecord { private: @@ -434,8 +428,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - - /** Represents a FEATHDR (SHEETPROTECTION) record that stores sheet protection options. Note that a sheet still needs to save its sheet protection options even when it's not protected. */ @@ -467,8 +459,6 @@ private: ScEnhancedProtection maEnhancedProtection; }; - - class XclCalccount : public ExcRecord { private: @@ -485,8 +475,6 @@ public: }; - - class XclIteration : public ExcRecord { private: @@ -503,8 +491,6 @@ public: }; - - class XclDelta : public ExcRecord { private: @@ -521,8 +507,6 @@ public: }; - - class XclRefmode : public XclExpBoolRecord { public: @@ -531,8 +515,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - class XclExpFileEncryption : public XclExpRecord { public: @@ -546,8 +528,6 @@ private: const XclExpRoot& mrRoot; }; - - /** Beginning of User Interface Records */ class XclExpInterfaceHdr : public XclExpUInt16Record { @@ -558,8 +538,6 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - /** End of User Interface Records */ class XclExpInterfaceEnd : public XclExpRecord { @@ -571,8 +549,6 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - /** Write Access User Name - This record contains the user name, which is the name you type when you install Excel. */ class XclExpWriteAccess : public XclExpRecord @@ -585,8 +561,6 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - class XclExpFileSharing : public XclExpRecord { public: @@ -603,8 +577,6 @@ private: bool mbRecommendReadOnly; }; - - class XclExpProt4Rev : public XclExpRecord { public: @@ -615,8 +587,6 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - class XclExpProt4RevPass : public XclExpRecord { public: @@ -627,16 +597,12 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - class XclExpRecalcId : public XclExpDummyRecord { public: explicit XclExpRecalcId(); }; - - class XclExpBookExt : public XclExpDummyRecord { public: diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 4a48d46f9442..fc152284f272 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -154,8 +154,6 @@ private: XclExpChRootDataRef mxChData; /// Reference to the root data object. }; - - /** Base class for chart record groups. Provides helper functions to write sub records. A chart record group consists of a header record, followed by a CHBEGIN @@ -185,8 +183,6 @@ private: XclChFrBlock maFrBlock; /// Future records block settings. }; - - /** Base class for chart future records. On saving, the record writes missing CHFRBLOCKBEGIN records automatically. */ @@ -219,8 +215,6 @@ private: typedef boost::shared_ptr< XclExpChFramePos > XclExpChFramePosRef; - - class XclExpChLineFormat : public XclExpRecord { public: @@ -254,8 +248,6 @@ private: typedef boost::shared_ptr< XclExpChLineFormat > XclExpChLineFormatRef; - - class XclExpChAreaFormat : public XclExpRecord { public: @@ -288,8 +280,6 @@ private: typedef boost::shared_ptr< XclExpChAreaFormat > XclExpChAreaFormatRef; - - class XclExpChEscherFormat : public XclExpChGroupBase { public: @@ -323,8 +313,6 @@ private: typedef boost::shared_ptr< XclExpChEscherFormat > XclExpChEscherFormatRef; - - /** Base class for record groups containing frame formatting. Frame formatting can be part of several record groups, e.g. CHFRAME, @@ -357,8 +345,6 @@ private: XclExpChEscherFormatRef mxEscherFmt; /// Complex area format (CHESCHERFORMAT record). }; - - /** Represents the CHFRAME record group containing object frame properties. The CHFRAME group consists of: CHFRAME, CHBEGIN, CHLINEFORMAT, @@ -445,8 +431,6 @@ public: typedef boost::shared_ptr< XclExpChFont > XclExpChFontRef; - - /** The CHOBJECTLINK record linking a text object to a specific chart object. */ class XclExpChObjectLink : public XclExpRecord { @@ -462,8 +446,6 @@ private: typedef boost::shared_ptr< XclExpChObjectLink > XclExpChObjectLinkRef; - - /** Additional data label settings in the future record CHFRLABELPROPS. */ class XclExpChFrLabelProps : public XclExpChFutureRecordBase { @@ -485,8 +467,6 @@ private: typedef boost::shared_ptr< XclExpChFrLabelProps > XclExpChFrLabelPropsRef; - - /** Base class for objects with font settings. Provides font conversion helper functions. */ class XclExpChFontBase { @@ -506,8 +486,6 @@ public: void ConvertRotationBase( const XclExpChRoot& rRoot, const ScfPropertySet& rPropSet, bool bSupportsStacked ); }; - - /** Represents the CHTEXT record group containing text object properties. The CHTEXT group consists of: CHTEXT, CHBEGIN, CHFRAMEPOS, CHFONT, @@ -597,8 +575,6 @@ private: typedef boost::shared_ptr< XclExpChMarkerFormat > XclExpChMarkerFormatRef; - - /** The CHPIEFORMAT record containing data point formatting data for pie segments. */ class XclExpChPieFormat : public XclExpUInt16Record { @@ -611,8 +587,6 @@ public: typedef boost::shared_ptr< XclExpChPieFormat > XclExpChPieFormatRef; - - /** The CH3DDATAFORMAT record containing the bar type in 3D bar charts. */ class XclExpCh3dDataFormat : public XclExpRecord { @@ -631,8 +605,6 @@ private: typedef boost::shared_ptr< XclExpCh3dDataFormat > XclExpCh3dDataFormatRef; - - /** The CHATTACHEDLABEL record that contains the type of a data point label. */ class XclExpChAttachedLabel : public XclExpUInt16Record { @@ -642,8 +614,6 @@ public: typedef boost::shared_ptr< XclExpChAttachedLabel > XclExpChAttLabelRef; - - /** Represents the CHDATAFORMAT record group containing data point properties. The CHDATAFORMAT group consists of: CHDATAFORMAT, CHBEGIN, CHFRAME group, @@ -683,8 +653,6 @@ private: typedef boost::shared_ptr< XclExpChDataFormat > XclExpChDataFormatRef; - - /** Represents the CHSERTRENDLINE record containing settings for a trend line. */ class XclExpChSerTrendLine : public XclExpRecord, protected XclExpChRoot { @@ -713,8 +681,6 @@ private: typedef boost::shared_ptr< XclExpChSerTrendLine > XclExpChSerTrendLineRef; - - /** Represents the CHSERERRORBAR record containing settings for error bars. */ class XclExpChSerErrorBar : public XclExpRecord, protected XclExpChRoot { @@ -733,8 +699,6 @@ private: typedef boost::shared_ptr< XclExpChSerErrorBar > XclExpChSerErrorBarRef; - - /** Represents the CHSERIES record group describing a data series in a chart. The CHSERIES group consists of: CHSERIES, CHBEGIN, CHSOURCELINK groups, @@ -838,8 +802,6 @@ private: XclChTypeInfo maTypeInfo; /// Chart type info for the contained type. }; - - /** Represents the CHCHART3D record that contains 3D view settings. */ class XclExpChChart3d : public XclExpRecord { @@ -863,8 +825,6 @@ private: typedef boost::shared_ptr< XclExpChChart3d > XclExpChChart3dRef; - - /** Represents the CHLEGEND record group describing the chart legend. The CHLEGEND group consists of: CHLEGEND, CHBEGIN, CHFRAMEPOS, CHFRAME @@ -893,8 +853,6 @@ private: typedef boost::shared_ptr< XclExpChLegend > XclExpChLegendRef; - - /** Represents the CHDROPBAR record group describing pos/neg bars in line charts. The CHDROPBAR group consists of: CHDROPBAR, CHBEGIN, CHLINEFORMAT, @@ -921,8 +879,6 @@ private: typedef boost::shared_ptr< XclExpChDropBar > XclExpChDropBarRef; - - /** Represents the CHTYPEGROUP record group describing a group of series. The CHTYPEGROUP group consists of: CHTYPEGROUP, CHBEGIN, a chart type @@ -1029,8 +985,6 @@ private: typedef boost::shared_ptr< XclExpChLabelRange > XclExpChLabelRangeRef; - - class XclExpChValueRange : public XclExpRecord, protected XclExpChRoot { public: @@ -1050,8 +1004,6 @@ private: typedef boost::shared_ptr< XclExpChValueRange > XclExpChValueRangeRef; - - class XclExpChTick : public XclExpRecord, protected XclExpChRoot { public: @@ -1074,8 +1026,6 @@ private: typedef boost::shared_ptr< XclExpChTick > XclExpChTickRef; - - /** Represents the CHAXIS record group describing an entire chart axis. The CHAXIS group consists of: CHAXIS, CHBEGIN, CHLABELRANGE, CHEXTRANGE, @@ -1129,8 +1079,6 @@ private: typedef boost::shared_ptr< XclExpChAxis > XclExpChAxisRef; - - /** Represents the CHAXESSET record group describing an axes set (X/Y/Z axes). The CHAXESSET group consists of: CHAXESSET, CHBEGIN, CHFRAMEPOS, CHAXIS @@ -1239,8 +1187,6 @@ private: XclExpChTextList maLabels; /// Data point labels (CHTEXT groups). }; - - /** Represents the group of DFF and OBJ records containing all drawing shapes embedded in the chart object. */ @@ -1260,8 +1206,6 @@ private: boost::shared_ptr< XclExpRecordBase > mxObjRecs; }; - - /** Represents the entire chart substream (all records in BOF/EOF block). */ class XclExpChart : public XclExpSubStream, protected XclExpRoot { @@ -1273,8 +1217,6 @@ public: XModelRef xModel, const Rectangle& rChartRect ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 545ff59f5ddf..f14a1ed69dea 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -220,8 +220,6 @@ private: const Color& mrColor; }; - - class ScConditionalFormat; /** Represents a CONDFMT record that contains all conditions of a conditional format. @@ -296,8 +294,6 @@ private: sal_Int32 mnPriority; }; - - /** Contains all conditional formats of a specific sheet. */ class XclExpCondFormatBuffer : public XclExpRecordBase, protected XclExpRoot { @@ -357,8 +353,6 @@ private: sal_uLong mnScHandle; /// The core handle for quick list search. }; - - /** This class contains the DV record list following the DVAL record. */ class XclExpDval : public XclExpRecord, protected XclExpRoot { @@ -416,8 +410,6 @@ private: bool mbEntireDoc; /// true = entire document. }; - - /** Contains all web query records for this document. */ class XclExpWebQueryBuffer : public XclExpRecordList< XclExpWebQuery > { @@ -425,8 +417,6 @@ public: explicit XclExpWebQueryBuffer( const XclExpRoot& rRoot ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index a51e5306341c..bb38e62fd735 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -65,8 +65,6 @@ protected: // for access in derived classes sal_uInt16 mnFlags; /// Flags for DFF stream export. }; - - /** Represents the position (anchor) of an object in a Calc sheet. */ class XclExpDffSheetAnchor : public XclExpDffAnchorBase { @@ -81,8 +79,6 @@ private: SCTAB mnScTab; /// Calc sheet index. }; - - /** Represents the position (anchor) of a shape in an embedded draw page. */ class XclExpDffEmbeddedAnchor : public XclExpDffAnchorBase { @@ -100,8 +96,6 @@ private: sal_Int32 mnScaleY; }; - - /** Represents the position (anchor) of a note object. */ class XclExpDffNoteAnchor : public XclExpDffAnchorBase { @@ -109,8 +103,6 @@ public: explicit XclExpDffNoteAnchor( const XclExpRoot& rRoot, const Rectangle& rRect ); }; - - /** Represents the position (anchor) of a cell dropdown object. */ class XclExpDffDropDownAnchor : public XclExpDffAnchorBase { @@ -134,8 +126,6 @@ protected: sal_uInt32 mnFragmentKey; /// The key of the DFF stream fragment to be written by this record. }; - - /** The MSODRAWINGGROUP record contains the DGGCONTAINER with global DFF data such as the picture container. */ @@ -145,8 +135,6 @@ public: explicit XclExpMsoDrawingGroup( XclEscherEx& rEscherEx ); }; - - /** One or more MSODRAWING records contain the DFF stream data for a drawing shape. */ @@ -156,8 +144,6 @@ public: explicit XclExpMsoDrawing( XclEscherEx& rEscherEx ); }; - - /** Provides export of bitmap data to an IMGDATA record. */ class XclExpImgData : public XclExpRecordBase { @@ -173,8 +159,6 @@ private: sal_uInt16 mnRecId; /// Record identifier for the IMGDATA record. }; - - /** Helper class for form controils to manage spreadsheet links . */ class XclExpControlHelper : protected XclExpRoot { @@ -234,8 +218,6 @@ private: virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - //delete for exporting OCX //#if EXC_EXP_OCX_CTRL @@ -302,8 +284,6 @@ private: //#endif - - class XclExpChart; /** A chart object. This is the drawing object wrapper for the chart data. */ @@ -331,8 +311,6 @@ private: XChartDocRef mxChartDoc; }; - - /** Represents a NOTE record containing the relevant data of a cell note. NOTE records differ significantly in various BIFF versions. This class @@ -387,8 +365,6 @@ private: Rectangle maCommentTo; /// To and To Offsets }; - - class XclExpComments : public XclExpRecord { public: @@ -452,8 +428,6 @@ private: boost::shared_ptr< XclExpObjList > mxObjList; }; - - class XclExpEmbeddedObjectManager : public XclExpObjectManager { public: @@ -472,8 +446,6 @@ private: sal_Int32 mnScaleY; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xeformula.hxx b/sc/source/filter/inc/xeformula.hxx index 14efdaf9a8e2..d7651ec83291 100644 --- a/sc/source/filter/inc/xeformula.hxx +++ b/sc/source/filter/inc/xeformula.hxx @@ -87,8 +87,6 @@ private: XclExpFmlaCompImplRef mxImpl; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index 721efa08200d..fe6f5e210a7d 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -203,8 +203,6 @@ private: bool mbMultipleUrls; /// true = Multiple URL fields processed. }; - - class EditEngine; class EditTextObject; class SdrTextObj; @@ -435,8 +433,6 @@ private: const ScMatrix& mrMatrix; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index 01477085c362..e9c8cf2238de 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -205,8 +205,6 @@ private: XclExpLinkMgrImplPtr mxImpl; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx index dfe639e2ef53..35692c70157b 100644 --- a/sc/source/filter/inc/xename.hxx +++ b/sc/source/filter/inc/xename.hxx @@ -26,8 +26,6 @@ #include "xeroot.hxx" #include <boost/shared_ptr.hpp> - - class ScRangeList; class XclExpNameManagerImpl; @@ -76,8 +74,6 @@ private: XclExpNameMgrImplRef mxImpl; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx index a726b362d01f..db9c7068141d 100644 --- a/sc/source/filter/inc/xepage.hxx +++ b/sc/source/filter/inc/xepage.hxx @@ -104,8 +104,6 @@ private: XclPageData maData; /// Page settings data. }; - - /** Contains all page (print) settings records for a chart object. */ class XclExpChartPageSettings : public XclExpRecordBase, protected XclExpRoot { @@ -123,8 +121,6 @@ private: XclPageData maData; /// Page settings data. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 902d9088dba6..c462b6cf7515 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -61,8 +61,6 @@ private: sal_uInt16 mnTypeFlag; /// Data type flag. }; - - class XclExpPivotCache; class XclExpPCField : public XclExpRecord, public XclPCField, protected XclExpRoot @@ -164,8 +162,6 @@ private: sal_uInt16 mnTypeFlags; /// Collected item data type flags. }; - - class XclExpPivotCache : protected XclExpRoot { public: @@ -248,8 +244,6 @@ class XclExpPivotTable; /** Data field position specifying the pivot table field index (first) and data info index (second). */ typedef ::std::pair< sal_uInt16, sal_uInt16 > XclPTDataFieldPos; - - class XclExpPTItem : public XclExpRecord { public: @@ -271,8 +265,6 @@ private: XclPTItemInfo maItemInfo; /// General data for this item. }; - - class XclExpPTField : public XclExpRecordBase { public: @@ -338,8 +330,6 @@ private: XclExpPTItemList maItemList; /// List of all items of this field. }; - - class XclExpPivotTable : public XclExpRecordBase, protected XclExpRoot { public: @@ -425,8 +415,6 @@ private: size_t mnId; /// Stream ID }; - - /** The main class for pivot table export. This class contains all pivot caches and pivot tables in a Calc document. @@ -470,8 +458,6 @@ private: bool mbShareCaches; /// true = Tries to share caches between tables. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index c0678aa62965..ca02094b9d31 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -43,8 +43,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); }; - - class XclExpDelegatingRecord : public XclExpRecordBase { public: @@ -56,8 +54,6 @@ private: XclExpRecordBase* mpRecord; }; - - class XclExpXmlElementRecord : public XclExpRecordBase { public: @@ -68,8 +64,6 @@ protected: sal_Int32 mnElement; }; - - class XclExpXmlStartElementRecord : public XclExpXmlElementRecord { public: @@ -80,8 +74,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - class XclExpXmlEndElementRecord : public XclExpXmlElementRecord { public: @@ -92,8 +84,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - class XclExpXmlStartSingleElementRecord : public XclExpXmlElementRecord { public: @@ -104,8 +94,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - class XclExpXmlEndSingleElementRecord : public XclExpRecordBase { public: @@ -116,8 +104,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - /** Base class for single records with any content. This class handles writing the record header. Derived classes only have to @@ -165,8 +151,6 @@ private: sal_uInt16 mnRecId; /// The record ID. }; - - /** A record without body. Only the record ID and the size 0 will be written. */ class XclExpEmptyRecord : public XclExpRecord { @@ -180,8 +164,6 @@ inline XclExpEmptyRecord::XclExpEmptyRecord( sal_uInt16 nRecId ) : { } - - /** A record with a single value of type Type. @descr Requires operator<<( XclExpStream&, const Type& ). */ template< typename Type > @@ -235,8 +217,6 @@ XclExpValueRecord< Type >* XclExpValueRecord< Type >::SetAttribute( sal_Int32 nI return this; } - - /** A record containing an unsigned 16-bit value. */ typedef XclExpValueRecord< sal_uInt16 > XclExpUInt16Record; @@ -246,8 +226,6 @@ typedef XclExpValueRecord< sal_uInt32 > XclExpUInt32Record; /** A record containing a double value. */ typedef XclExpValueRecord< double > XclExpDoubleRecord; - - /** Record which contains a Boolean value. @descr The value is stored as 16-bit value: 0x0000 = sal_False, 0x0001 = TRUE. */ class XclExpBoolRecord : public XclExpRecord @@ -274,8 +252,6 @@ private: sal_Int32 mnAttribute; /// The attribute to generate within SaveXml() }; - - /** Record which exports a memory data array. */ class XclExpDummyRecord : public XclExpRecord { @@ -388,8 +364,6 @@ private: RecordVec maRecs; }; - - /** Represents a complete substream of records enclosed into a pair of BOF/EOF records. */ class XclExpSubStream : public XclExpRecordList<> { @@ -403,8 +377,6 @@ private: sal_uInt16 mnSubStrmType; /// Substream type, stored in leading BOF record. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index 80a7ee58fa3c..e58ddf3a3033 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -99,8 +99,6 @@ struct XclExpRootData : public XclRootData virtual ~XclExpRootData(); }; - - /** Access to global data from other classes. */ class XclExpRoot : public XclRoot { @@ -173,8 +171,6 @@ private: XclExpRootData& mrExpData; /// Reference to the global export data struct. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 2ccc15ee8405..d852eaa6bd61 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef SC_XESTREAM_HXX #define SC_XESTREAM_HXX @@ -197,8 +195,6 @@ private: bool mbInRec; /// true = currently writing inside of a record. }; - - class XclExpBiff8Encrypter { public: @@ -243,8 +239,6 @@ private: - - // `s.GetChar(0) != 0` needed because some strings on export only contain NULL. #define XESTRING_TO_PSZ(s) \ (s.Len() && s.GetChar( 0 ) != 0 ? XclXmlUtils::ToOString( s ).getStr() : NULL) diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx index 43431824a786..0a084754ab64 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -22,8 +22,6 @@ #include "xlstring.hxx" - - class XclExpStream; class XclExpXmlStream; @@ -265,8 +263,6 @@ inline XclExpStream& operator<<( XclExpStream& rStrm, const XclExpString& rStrin return rStrm; } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index 507b8d2ec59d..cf2c24023cfb 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -58,8 +58,6 @@ enum XclExpColorType EXC_COLOR_TABBG /// Spreadsheet tab bg color. }; - - class XclExpPaletteImpl; /** Stores all used colors in the document. @@ -131,8 +129,6 @@ class SvxFont; const size_t EXC_FONTLIST_NOTFOUND = static_cast< size_t >( -1 ); - - /** Static helper functions for font export. */ class XclExpFontHelper { @@ -161,8 +157,6 @@ private: ~XclExpFontHelper(); }; - - /** Stores all data of an Excel font and provides export of FONT records. */ class XclExpFont : public XclExpRecord, protected XclExpRoot { @@ -190,8 +184,6 @@ private: sal_uInt32 mnHash; /// Hash value for fast comparison. }; - - /** Used as placeholder for font index 4, which is not used in Excel. */ class XclExpBlindFont : public XclExpFont { @@ -205,8 +197,6 @@ public: virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - class ScPatternAttr; /** Stores the data of all fonts used in the document. */ @@ -275,8 +265,6 @@ struct XclExpNumFmt void SaveXml( XclExpXmlStream& rStrm ); }; - - class SvNumberFormatter; typedef ::std::auto_ptr< SvNumberFormatter > SvNumberFormatterPtr; @@ -333,8 +321,6 @@ struct XclExpCellProt : public XclCellProt void SaveXml( XclExpXmlStream& rStrm ) const; }; - - /** Extends the XclCellAlign struct for export. @descr Provides functions to fill from item sets and to fill to Excel record data. */ struct XclExpCellAlign : public XclCellAlign @@ -354,8 +340,6 @@ struct XclExpCellAlign : public XclCellAlign void SaveXml( XclExpXmlStream& rStrm ) const; }; - - /** Extends the XclCellBorder struct for export. @descr Provides functions to fill from item sets and to fill to Excel record data. */ struct XclExpCellBorder : public XclCellBorder @@ -387,8 +371,6 @@ struct XclExpCellBorder : public XclCellBorder void SaveXml( XclExpXmlStream& rStrm ) const; }; - - /** Extends the XclCellArea struct for export. @descr Provides functions to fill from item sets and to fill to Excel record data. */ struct XclExpCellArea : public XclCellArea @@ -426,8 +408,6 @@ struct XclExpColor void SaveXml( XclExpXmlStream& rStrm ) const; }; - - /** A combination of unique XF identifier with real Excel XF index. */ struct XclExpXFId { @@ -441,8 +421,6 @@ struct XclExpXFId void ConvertXFIndex( const XclExpRoot& rRoot ); }; - - class SfxStyleSheetBase; /** Represents an XF record which contains all formatting data of a cell or cell style. */ @@ -538,8 +516,6 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - /** Represents a default XF record. Supports methods to set attributes directly. */ class XclExpDefaultXF : public XclExpXF { @@ -552,8 +528,6 @@ public: void SetNumFmt( sal_uInt16 nXclNumFmt ); }; - - /** Represents a STYLE record containing the data of a cell style. @descr The calss is able to store built-in and user-defined styles. */ class XclExpStyle : public XclExpRecord @@ -580,8 +554,6 @@ private: sal_uInt8 mnLevel; /// Outline level for RowLevel and ColLevel styles. }; - - /** Stores all XF records (cell formats and cell styles) in the document. Stores also the names of user defined cell styles (STYLE records). Supports @@ -763,8 +735,6 @@ private: boost::scoped_ptr<NfKeywordTable> mpKeywordTable; /// Replacement table. }; - - class XclExpXmlStyleSheet : public XclExpRecordBase, protected XclExpRoot { public: @@ -773,8 +743,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index a5173d4a41d0..06146cfe28a6 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -126,8 +126,6 @@ private: typedef boost::shared_ptr< XclExpArray > XclExpArrayRef; - - /** Caches all ARRAY records. */ class XclExpArrayBuffer : protected XclExpRoot { @@ -177,8 +175,6 @@ private: typedef boost::shared_ptr< XclExpShrfmla > XclExpShrfmlaRef; - - /** Caches all SHRFMLA records and provides functions to update their ranges. */ class XclExpShrfmlaBuffer : protected XclExpRoot { @@ -252,8 +248,6 @@ private: typedef boost::shared_ptr< XclExpTableop > XclExpTableopRef; - - /** Contains all created TABLEOP records and supports creating or updating them. */ class XclExpTableopBuffer : protected XclExpRoot { @@ -370,8 +364,6 @@ private: sal_Size mnContSize; /// The size of the cell contents. }; - - /** Represents a NUMBER record that describes a cell with a double value. */ class XclExpNumberCell : public XclExpSingleCellBase { @@ -390,8 +382,6 @@ private: double mfValue; /// The cell value. }; - - /** Represents a BOOLERR record that describes a cell with a Boolean value. */ class XclExpBooleanCell : public XclExpSingleCellBase { @@ -451,8 +441,6 @@ private: bool mbLineBreak; /// True = cell has automatic linebreaks enabled. }; - - class ScFormulaCell; /** Represents a FORMULA record that describes a cell with a formula. */ @@ -492,8 +480,6 @@ struct XclExpMultiXFId : public XclExpXFId XclExpXFId( nXFId ), mnCount( nCount ) {} }; - - /** Base class for all cell records supporting multiple contents. */ class XclExpMultiCellBase : public XclExpCellBase { @@ -554,8 +540,6 @@ private: XclExpMultiXFIdDeq maXFIds; /// The XF identifiers of the cell formatting. }; - - /** Represents a BLANK or MULBLANK record that describes empty but formatted cells. */ class XclExpBlankCell : public XclExpMultiCellBase { @@ -581,8 +565,6 @@ private: virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ) SAL_OVERRIDE; }; - - /** Represents an RK or MULRK record that describes cells with a compressed double values. */ class XclExpRkCell : public XclExpMultiCellBase { @@ -644,8 +626,6 @@ private: bool mbCurrCollapse; /// true = Collapsed group ends at current position. }; - - /** The outline buffer for column outlines. */ class XclExpColOutlineBuffer : public XclExpOutlineBuffer { @@ -658,8 +638,6 @@ public: { UpdateColRow( static_cast< SCCOLROW >( nScCol ) ); } }; - - /** The outline buffer for row outlines. */ class XclExpRowOutlineBuffer : public XclExpOutlineBuffer { @@ -672,8 +650,6 @@ public: { UpdateColRow( static_cast< SCCOLROW >( nScRow ) ); } }; - - /** Represents a GUTS record containing the level count of row and column outlines. */ class XclExpGuts : public XclExpRecord { @@ -690,8 +666,6 @@ private: sal_uInt16 mnRowWidth; /// Width of row outline area (pixels). }; - - /** Represents a DIMENSIONS record containing the used area of a sheet. */ class XclExpDimensions : public XclExpRecord { @@ -715,8 +689,6 @@ private: sal_uInt16 mnFirstFreeXclCol; /// First free column after used area. }; - - /** Represents the DEFCOLWIDTH record containing the default column width of a sheet. Excel stores the default column width in entire character widths of the '0' @@ -741,8 +713,6 @@ public: void SetDefWidth( sal_uInt16 nXclColWidth ); }; - - /** Contains the column settings for a range of columns. After construction the record contains a temporary XF identifier returned @@ -790,8 +760,6 @@ private: sal_uInt16 mnLastXclCol; /// Index to last column. }; - - /** Contains COLINFO records for all columns of a Calc sheet. On construction one COLINFO record per column is created. After creating @@ -824,8 +792,6 @@ private: XclExpColOutlineBuffer maOutlineBfr; /// Buffer for column outline groups. }; - - class XclExpRow; /** Contains all possible default row settings. */ @@ -843,8 +809,6 @@ struct XclExpDefaultRowData inline bool IsUnsynced() const { return ::get_flag( mnFlags, EXC_DEFROW_UNSYNCED ); } }; - - /** Represents a DEFROWHEIGHT record containing default format for unused rows. */ class XclExpDefrowheight : public XclExpRecord { @@ -862,8 +826,6 @@ private: XclExpDefaultRowData maDefData; /// Record data. }; - - /** Represents a ROW record and additionally contains all cells records of a row. This class contains all cell records of a row in a spreadsheet. There are 2 @@ -953,8 +915,6 @@ private: bool mbEnabled; /// true = Write this ROW record. }; - - /** Collects all rows which contain all cells of a sheet. This row buffer automatically creates ROW records when cells are inserted diff --git a/sc/source/filter/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxx index cbfb8395f3f3..9b0afde5656a 100644 --- a/sc/source/filter/inc/xeview.hxx +++ b/sc/source/filter/inc/xeview.hxx @@ -65,8 +65,6 @@ private: sal_uInt16 mnPageZoom; /// Zoom factor for pagebreak preview. }; - - /** Represents an SCL record for the zoom factor of the current view of a sheet. */ class XclExpScl : public XclExpRecord { @@ -84,8 +82,6 @@ private: sal_uInt16 mnDenom; /// Denominator of the zoom factor. }; - - /** Represents a PANE record containing settings for split/frozen windows. */ class XclExpPane : public XclExpRecord { @@ -106,8 +102,6 @@ private: bool mbFrozenPanes; /// true = "frozen" panes; false = "split" window. }; - - /** Represents a SELECTION record with selection data for a pane. */ class XclExpSelection : public XclExpRecord { @@ -167,8 +161,6 @@ private: sal_uInt32 mnGridColorId; /// Color identifier for grid color. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 3e8a346833af..986ca320b578 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -170,8 +170,6 @@ private: XclImpChRootDataRef mxChData; /// Reference to the root data object. }; - - /** Base class for chart record groups. Provides helper functions to read sub records. A chart record group consists of a header record, followed by a CHBEGIN @@ -215,8 +213,6 @@ private: typedef boost::shared_ptr< XclImpChFramePos > XclImpChFramePosRef; - - /** The CHLINEFORMAT record containing line formatting data. */ class XclImpChLineFormat { @@ -249,8 +245,6 @@ private: typedef boost::shared_ptr< XclImpChLineFormat > XclImpChLineFormatRef; - - /** The CHAREAFORMAT record containing simple area formatting data (solid or patterns). */ class XclImpChAreaFormat { @@ -279,8 +273,6 @@ private: typedef boost::shared_ptr< XclImpChAreaFormat > XclImpChAreaFormatRef; - - /** The CHESCHERFORMAT record containing complex area formatting data (bitmaps, hatches). */ class XclImpChEscherFormat : public XclImpChGroupBase { @@ -304,8 +296,6 @@ private: typedef boost::shared_ptr< XclImpChEscherFormat > XclImpChEscherFormatRef; - - /** Base class for record groups containing frame formatting. Frame formatting can be part of several record groups, e.g. CHFRAME, @@ -355,8 +345,6 @@ protected: XclImpChEscherFormatRef mxEscherFmt; /// Complex area format (CHESCHERFORMAT record). }; - - /** Represents the CHFRAME record group containing object frame properties. The CHFRAME group consists of: CHFRAME, CHBEGIN, CHLINEFORMAT, @@ -458,8 +446,6 @@ public: void ConvertRotationBase( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet, bool bSupportsStacked ) const; }; - - /** The CHFONT record containing a font index for text objects. */ class XclImpChFont { @@ -477,8 +463,6 @@ private: typedef boost::shared_ptr< XclImpChFont > XclImpChFontRef; - - /** Represents the CHTEXT record group containing text object properties. The CHTEXT group consists of: CHTEXT, CHBEGIN, CHFRAMEPOS, CHFONT, @@ -581,8 +565,6 @@ private: typedef boost::shared_ptr< XclImpChMarkerFormat > XclImpChMarkerFormatRef; - - /** The CHPIEFORMAT record containing data point formatting data for pie segments. */ class XclImpChPieFormat { @@ -599,8 +581,6 @@ private: typedef boost::shared_ptr< XclImpChPieFormat > XclImpChPieFormatRef; - - /** The CHSERIESFORMAT record containing additional settings for a data series. */ class XclImpChSeriesFormat { @@ -617,8 +597,6 @@ private: typedef boost::shared_ptr< XclImpChSeriesFormat > XclImpChSeriesFormatRef; - - /** The CH3DDATAFORMAT record containing the bar type in 3D bar charts. */ class XclImpCh3dDataFormat { @@ -634,8 +612,6 @@ private: typedef boost::shared_ptr< XclImpCh3dDataFormat > XclImpCh3dDataFormatRef; - - /** The CHATTACHEDLABEL record that contains the type of a data point label. */ class XclImpChAttachedLabel : protected XclImpChRoot { @@ -652,8 +628,6 @@ private: typedef boost::shared_ptr< XclImpChAttachedLabel > XclImpChAttLabelRef; - - /** Represents the CHDATAFORMAT record group containing data point properties. The CHDATAFORMAT group consists of: CHDATAFORMAT, CHBEGIN, CHFRAME group, @@ -720,8 +694,6 @@ private: typedef boost::shared_ptr< XclImpChDataFormat > XclImpChDataFormatRef; - - /** Represents the CHSERTRENDLINE record containing settings for a trend line. */ class XclImpChSerTrendLine : protected XclImpChRoot { @@ -749,8 +721,6 @@ private: typedef boost::shared_ptr< XclImpChSerTrendLine > XclImpChSerTrendLineRef; - - /** Represents the CHSERERRORBAR record containing settings for error bars. */ class XclImpChSerErrorBar : protected XclImpChRoot { @@ -786,8 +756,6 @@ private: typedef boost::shared_ptr< XclImpChSerErrorBar > XclImpChSerErrorBarRef; - - /** Represents the CHSERIES record group describing a data series in a chart. The CHSERIES group consists of: CHSERIES, CHBEGIN, CHSOURCELINK groups, @@ -927,8 +895,6 @@ private: XclChTypeInfo maTypeInfo; /// Chart type info for the contained type. }; - - /** Represents the CHCHART3D record that contains 3D view settings. */ class XclImpChChart3d { @@ -946,8 +912,6 @@ private: typedef boost::shared_ptr< XclImpChChart3d > XclImpChChart3dRef; - - /** Represents the CHLEGEND record group describing the chart legend. The CHLEGEND group consists of: CHLEGEND, CHBEGIN, CHFRAMEPOS, CHFRAME @@ -980,8 +944,6 @@ private: typedef boost::shared_ptr< XclImpChLegend > XclImpChLegendRef; - - /** Represents the CHDROPBAR record group describing pos/neg bars in line charts. The CHDROPBAR group consists of: CHDROPBAR, CHBEGIN, CHLINEFORMAT, @@ -1005,8 +967,6 @@ private: typedef boost::shared_ptr< XclImpChDropBar > XclImpChDropBarRef; - - /** Represents the CHTYPEGROUP record group describing a group of series. The CHTYPEGROUP group consists of: CHTYPEGROUP, CHBEGIN, a chart type @@ -1147,8 +1107,6 @@ private: typedef boost::shared_ptr< XclImpChLabelRange > XclImpChLabelRangeRef; - - class XclImpChValueRange : protected XclImpChRoot { public: @@ -1169,8 +1127,6 @@ private: typedef boost::shared_ptr< XclImpChValueRange > XclImpChValueRangeRef; - - class XclImpChTick : protected XclImpChRoot { public: @@ -1194,8 +1150,6 @@ private: typedef boost::shared_ptr< XclImpChTick > XclImpChTickRef; - - /** Represents the CHAXIS record group describing an entire chart axis. The CHAXIS group consists of: CHAXIS, CHBEGIN, CHLABELRANGE, CHEXTRANGE, @@ -1265,8 +1219,6 @@ private: typedef boost::shared_ptr< XclImpChAxis > XclImpChAxisRef; - - /** Represents the CHAXESSET record group describing an axes set (X/Y/Z axes). The CHAXESSET group consists of: CHAXESSET, CHBEGIN, CHFRAMEPOS, CHAXIS @@ -1438,8 +1390,6 @@ private: typedef boost::shared_ptr< XclImpChChart > XclImpChChartRef; - - /** Drawing container of a chart. */ class XclImpChartDrawing : public XclImpDrawing { @@ -1463,8 +1413,6 @@ private: bool mbOwnTab; /// True = own sheet, false = embedded object. }; - - /** Represents the entire chart substream (all records in BOF/EOF block). */ class XclImpChart : protected XclImpRoot { @@ -1509,8 +1457,6 @@ private: bool mbIsPivotChart; /// true = chart is based on a pivot table. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx index d3668d4e8e1a..1509733b2f00 100644 --- a/sc/source/filter/inc/xicontent.hxx +++ b/sc/source/filter/inc/xicontent.hxx @@ -142,8 +142,6 @@ private: sal_uInt16 mnCondIndex; /// Condition index to be inserted next. }; - - /** Imports and collects all conditional formatting of a sheet. */ class XclImpCondFormatManager : protected XclImpRoot { @@ -227,8 +225,6 @@ private: sal_uInt16 mnRefresh; /// Refresh time in minutes. }; - - class XclImpWebQueryBuffer : protected XclImpRoot { public: @@ -270,8 +266,6 @@ private: XclImpDecryptHelper(); }; - - // Document protection ======================================================== class XclImpDocProtectBuffer : protected XclImpRoot @@ -331,8 +325,6 @@ private: ProtectedSheetMap maProtectedSheets; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 4eaf60cd4568..ef99ab7f6519 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -202,8 +202,6 @@ private: bool mbCustomDff; /// true = Recreate SdrObject in DFF import. }; - - class XclImpDrawObjVector : public ::std::vector< XclImpDrawObjRef > { public: @@ -216,8 +214,6 @@ public: sal_Size GetProgressSize() const; }; - - /** A placeholder object for unknown object types. */ class XclImpPhObj : public XclImpDrawObjBase { @@ -225,8 +221,6 @@ public: explicit XclImpPhObj( const XclImpRoot& rRoot ); }; - - /** A group object. */ class XclImpGroupObj : public XclImpDrawObjBase { @@ -253,8 +247,6 @@ protected: sal_uInt16 mnFirstUngrouped; /// Object identfier of first object not grouped into this group. }; - - /** A line object. */ class XclImpLineObj : public XclImpDrawObjBase { @@ -277,8 +269,6 @@ protected: sal_uInt8 mnStartPoint; /// Starting point. }; - - /** A rectangle or oval object. */ class XclImpRectObj : public XclImpDrawObjBase { @@ -307,8 +297,6 @@ protected: sal_uInt16 mnFrameFlags; /// Additional flags. }; - - /** An oval object. */ class XclImpOvalObj : public XclImpRectObj { @@ -320,8 +308,6 @@ protected: virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; }; - - /** An arc object. */ class XclImpArcObj : public XclImpDrawObjBase { @@ -344,8 +330,6 @@ protected: sal_uInt8 mnQuadrant; /// Visible quadrant of the circle. }; - - /** A polygon object. */ class XclImpPolygonObj : public XclImpRectObj { @@ -370,8 +354,6 @@ protected: sal_uInt16 mnPointCount; /// Polygon point count. }; - - struct XclImpObjTextData { XclObjTextData maData; /// BIFF5 text data. @@ -383,8 +365,6 @@ struct XclImpObjTextData void ReadFormats( XclImpStream& rStrm ); }; - - /** A drawing object supporting text contents. Used for all simple objects in BIFF8. */ class XclImpTextObj : public XclImpRectObj { @@ -410,8 +390,6 @@ protected: XclImpObjTextData maTextData; /// Textbox data from BIFF5 OBJ or BIFF8 TXO record. }; - - /** A chart object. This is the drawing object wrapper for the chart data. */ class XclImpChartObj : public XclImpRectObj { @@ -449,8 +427,6 @@ private: bool mbOwnTab; /// true = own sheet; false = embedded object. }; - - /** A note object, which is a specialized text box objext. */ class XclImpNoteObj : public XclImpTextObj { @@ -469,8 +445,6 @@ private: sal_uInt16 mnNoteFlags; /// Flags from NOTE record. }; - - /** Helper base class for TBX and OCX form controls to manage spreadsheet links. */ class XclImpControlHelper { @@ -516,8 +490,6 @@ private: XclCtrlBindMode meBindMode; /// Value binding mode. }; - - /** Base class for textbox based form controls. */ class XclImpTbxObjBase : public XclImpTextObj, public XclImpControlHelper { @@ -550,8 +522,6 @@ protected: virtual XclTbxEventType DoGetEventType() const = 0; }; - - /** A button control. */ class XclImpButtonObj : public XclImpTbxObjBase { @@ -567,8 +537,6 @@ protected: virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; - - /** A checkbox control. */ class XclImpCheckBoxObj : public XclImpTbxObjBase { @@ -592,8 +560,6 @@ protected: sal_uInt16 mnCheckBoxFlags; }; - - /** An option button control. */ class XclImpOptionButtonObj : public XclImpCheckBoxObj { @@ -618,8 +584,6 @@ protected: sal_uInt16 mnFirstInGroup; /// 1 = Button is the first in a group. }; - - /** A label control. */ class XclImpLabelObj : public XclImpTbxObjBase { @@ -635,8 +599,6 @@ protected: virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; - - /** A groupbox control. */ class XclImpGroupBoxObj : public XclImpTbxObjBase { @@ -659,8 +621,6 @@ protected: sal_uInt16 mnGroupBoxFlags; }; - - /** A dialog control. */ class XclImpDialogObj : public XclImpTbxObjBase { @@ -676,8 +636,6 @@ protected: virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; - - /** An edit control. */ class XclImpEditObj : public XclImpTbxObjBase { @@ -706,8 +664,6 @@ protected: sal_uInt16 mnListBoxObjId; }; - - /** Base class of scrollable form controls (spin button, scrollbar, listbox, dropdown). */ class XclImpTbxObjScrollableBase : public XclImpTbxObjBase { @@ -732,8 +688,6 @@ protected: sal_uInt16 mnScrollFlags; }; - - /** A spinbutton control. */ class XclImpSpinButtonObj : public XclImpTbxObjScrollableBase { @@ -751,8 +705,6 @@ protected: virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; - - /** A scrollbar control. */ class XclImpScrollBarObj : public XclImpTbxObjScrollableBase { @@ -770,8 +722,6 @@ protected: virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; - - /** Base class for list controls (listbox, dropdown). */ class XclImpTbxObjListBase : public XclImpTbxObjScrollableBase { @@ -792,8 +742,6 @@ protected: bool mbHasDefFontIdx; }; - - /** A listbox control. */ class XclImpListBoxObj : public XclImpTbxObjListBase { @@ -819,8 +767,6 @@ protected: ScfUInt8Vec maSelection; }; - - /** A dropdown listbox control. */ class XclImpDropDownObj : public XclImpTbxObjListBase { @@ -855,8 +801,6 @@ protected: sal_uInt16 mnMinWidth; }; - - /** A picture, an embedded or linked OLE object, or an OCX form control. */ class XclImpPictureObj : public XclImpRectObj, public XclImpControlHelper { @@ -956,8 +900,6 @@ private: XclImpSdrObjMap maSdrObjMap; /// Maps SdrObjects to shape IDs. }; - - /** Simple implementation of the SVX DFF manager. Implements resolving palette colors. Used by XclImpDffPropSet (as is), extended by XclImpDffConverter. */ @@ -972,8 +914,6 @@ protected: virtual bool GetColorFromPalette( sal_uInt16 nIndex, Color& rColor ) const SAL_OVERRIDE; }; - - /** This is the central instance for converting binary DFF data into shape objects. Used for all sheet shapes and shapes embedded in chart objects. @@ -1166,8 +1106,6 @@ private: bool mbOleObjs; /// True = draw model supports OLE objects. }; - - /** Drawing manager of a single sheet. */ class XclImpSheetDrawing : public XclImpDrawing { @@ -1294,8 +1232,6 @@ private: XclImpStream& operator>>( XclImpStream& rStrm, XclImpDffPropSet& rPropSet ); - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xiformula.hxx b/sc/source/filter/inc/xiformula.hxx index 51d2d2971a75..13ab2017872b 100644 --- a/sc/source/filter/inc/xiformula.hxx +++ b/sc/source/filter/inc/xiformula.hxx @@ -55,8 +55,6 @@ private: XclImpFmlaCompImplRef mxImpl; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index ff1204bd3c42..bacfda0bee73 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -322,8 +322,6 @@ protected: sal_uInt8 mnType; /// The type of the cached value (EXC_CACHEDVAL_*). }; - - /** Contains cached values in a 2-dimensional array. */ class XclImpCachedMatrix { @@ -342,8 +340,6 @@ private: SCSIZE mnScRows; /// Number of cached rows. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx index f0f6e224e7bf..19111544ca5e 100644 --- a/sc/source/filter/inc/xilink.hxx +++ b/sc/source/filter/inc/xilink.hxx @@ -101,8 +101,6 @@ enum XclImpExtNameType xlExtEuroConvert /// An external in Excel, but internal in OO function name. }; - - class XclImpCachedMatrix; class ScTokenArray; class XclImpSupbook; @@ -225,8 +223,6 @@ private: XclImpLinkMgrImplPtr mxImpl; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx index 432220644f28..560d250de2b8 100644 --- a/sc/source/filter/inc/xiname.hxx +++ b/sc/source/filter/inc/xiname.hxx @@ -30,8 +30,6 @@ #include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> - - class ScRangeData; class ScTokenArray; @@ -77,8 +75,6 @@ private: boost::scoped_ptr<TokenStrmData> mpTokensData; /// For later conversion of token array. }; - - /** This buffer contains all internal defined names of the document. @descr It manages the position of the names in the document, means if they are global or attached to a specific sheet. While inserting the names into the Calc @@ -110,8 +106,6 @@ private: XclImpNameList maNameList; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xipage.hxx b/sc/source/filter/inc/xipage.hxx index 07ee76551f88..80b58e6090b4 100644 --- a/sc/source/filter/inc/xipage.hxx +++ b/sc/source/filter/inc/xipage.hxx @@ -68,8 +68,6 @@ private: bool mbValidPaper; /// true = Paper size and orientation valid. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index 571fa75e6d12..eb57db902f33 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -60,8 +60,6 @@ private: typedef boost::shared_ptr< XclImpPCItem > XclImpPCItemRef; - - struct ScDPNumGroupInfo; class XclImpPivotCache; @@ -145,8 +143,6 @@ private: typedef boost::shared_ptr< XclImpPCField > XclImpPCFieldRef; - - class XclImpPivotCache : protected XclImpRoot { public: @@ -207,8 +203,6 @@ typedef boost::shared_ptr< XclImpPivotCache > XclImpPivotCacheRef; class XclImpPivotTable; - - class XclImpPTItem { public: @@ -230,8 +224,6 @@ private: typedef boost::shared_ptr< XclImpPTItem > XclImpPTItemRef; - - class XclImpPTField { public: @@ -307,8 +299,6 @@ private: typedef boost::shared_ptr< XclImpPTField > XclImpPTFieldRef; - - class XclImpPivotTable : protected XclImpRoot { public: @@ -350,8 +340,6 @@ public: * autoformat. */ void ReadSxViewEx9( XclImpStream& rStrm ); - - /** Inserts the pivot table into the Calc document. */ void Convert(); @@ -384,8 +372,6 @@ private: typedef boost::shared_ptr< XclImpPivotTable > XclImpPivotTableRef; - - /** The main class for pivot table import. This class contains functions to read all records related to pivot tables @@ -432,8 +418,6 @@ public: * autoformat. */ void ReadSxViewEx9( XclImpStream& rStrm ); - - /** Reads all used pivot caches and creates additional sheets for external data sources. */ void ReadPivotCaches( XclImpStream& rStrm ); /** Inserts all pivot tables into the Calc document. */ @@ -449,8 +433,6 @@ private: XclImpPivotTableVec maPTables; /// List of all pivot tables. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx index 8e4673442cd5..4e0851058a79 100644 --- a/sc/source/filter/inc/xiroot.hxx +++ b/sc/source/filter/inc/xiroot.hxx @@ -122,8 +122,6 @@ struct XclImpRootData : public XclRootData virtual ~XclImpRootData(); }; - - /** Access to global data from other classes. */ class XclImpRoot : public XclRoot { @@ -218,8 +216,6 @@ private: XclImpRootData& mrImpData; /// Reference to the global import data struct. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index ec238da53bd8..b4aec80b48f6 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -90,8 +90,6 @@ private: sal_uInt16 mnRecSize; /// Current record size. }; - - /** Decrypts BIFF5 stream contents. */ class XclImpBiff5Decrypter : public XclImpDecrypter { @@ -120,8 +118,6 @@ private: sal_uInt16 mnHash; }; - - /** Decrypts BIFF8 stream contents using the given document identifier. */ class XclImpBiff8Decrypter : public XclImpDecrypter { @@ -193,8 +189,6 @@ private: bool mbValid; /// Read state: false = record overread. }; - - /** This class is used to import record oriented streams. @descr An instance is constructed with an SvStream. The SvStream stream is reset to its start while constructing this stream. @@ -528,8 +522,6 @@ private: bool mbValid; /// false = Record overread. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xistring.hxx b/sc/source/filter/inc/xistring.hxx index dfbdd5e6eba4..9e00da50c626 100644 --- a/sc/source/filter/inc/xistring.hxx +++ b/sc/source/filter/inc/xistring.hxx @@ -107,8 +107,6 @@ private: size_t mnFormatsEnd; /// Formatting run index for next portion. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xiview.hxx b/sc/source/filter/inc/xiview.hxx index ff3178a65fcc..c75045a66096 100644 --- a/sc/source/filter/inc/xiview.hxx +++ b/sc/source/filter/inc/xiview.hxx @@ -81,8 +81,6 @@ private: XclTabViewData maData; /// Sheet view settings data. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx index ef7d6d84b36b..e17696675ef2 100644 --- a/sc/source/filter/inc/xladdress.hxx +++ b/sc/source/filter/inc/xladdress.hxx @@ -26,8 +26,6 @@ class XclImpStream; class XclExpStream; - - /** A 2D cell address struct with Excel column and row indexes. */ struct XclAddress { @@ -66,8 +64,6 @@ inline XclExpStream& operator<<( XclExpStream& rStrm, const XclAddress& rXclPos return rStrm; } - - /** A 2D cell range address struct with Excel column and row indexes. */ struct XclRange { @@ -116,8 +112,6 @@ inline XclExpStream& operator<<( XclExpStream& rStrm, const XclRange& rXclRange return rStrm; } - - /** A 2D cell range address list with Excel column and row indexes. */ class XclRangeList : public ::std::vector< XclRange > { @@ -144,8 +138,6 @@ inline XclExpStream& operator<<( XclExpStream& rStrm, const XclRangeList& rXclRa return rStrm; } - - class XclTracer; /** Base class for import/export address converters. */ @@ -162,8 +154,6 @@ public: /** Returns whether the "some sheets have been cut" warning box should be shown. */ inline bool IsTabTruncated() const { return mbTabTrunc; } - - /** Checks if the passed sheet index is valid. @param nScTab The sheet index to check. @param bWarn true = Sets the internal flag that produces a warning box @@ -182,8 +172,6 @@ protected: bool mbTabTrunc; /// Flag for "tables truncated" warning box. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 3c18f5f437a0..eb1fd00bd616 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -753,8 +753,6 @@ struct XclChRectangle explicit XclChRectangle(); }; - - /** Specifies the position of a data series or data point. */ struct XclChDataPointPos { @@ -768,8 +766,6 @@ struct XclChDataPointPos bool operator<( const XclChDataPointPos& rL, const XclChDataPointPos& rR ); - - /** Contains the type and context of a block of future records which are guarded by CHFRBLOCKBEGIN and CHFRBLOCKEND records. */ struct XclChFrBlock @@ -793,8 +789,6 @@ struct XclChFramePos explicit XclChFramePos(); }; - - struct XclChLineFormat { Color maColor; /// Line color. @@ -805,8 +799,6 @@ struct XclChLineFormat explicit XclChLineFormat(); }; - - struct XclChAreaFormat { Color maPattColor; /// Pattern color. @@ -817,8 +809,6 @@ struct XclChAreaFormat explicit XclChAreaFormat(); }; - - class SfxItemSet; class EscherPropertyContainer; @@ -834,8 +824,6 @@ struct XclChEscherFormat ~XclChEscherFormat(); }; - - struct XclChPicFormat { sal_uInt16 mnBmpMode; /// Bitmap mode, e.g. stretched, stacked. @@ -845,8 +833,6 @@ struct XclChPicFormat explicit XclChPicFormat(); }; - - struct XclChFrame { sal_uInt16 mnFormat; /// Format type of the frame. @@ -877,8 +863,6 @@ struct XclChObjectLink explicit XclChObjectLink(); }; - - struct XclChFrLabelProps { OUString maSeparator; /// Separator between label values. @@ -887,8 +871,6 @@ struct XclChFrLabelProps explicit XclChFrLabelProps(); }; - - struct XclChText { XclChRectangle maRect; /// Position of the text object. @@ -916,8 +898,6 @@ struct XclChMarkerFormat explicit XclChMarkerFormat(); }; - - struct XclCh3dDataFormat { sal_uInt8 mnBase; /// Base form. @@ -926,8 +906,6 @@ struct XclCh3dDataFormat explicit XclCh3dDataFormat(); }; - - struct XclChDataFormat { XclChDataPointPos maPointPos; /// Position of the data point or series. @@ -937,8 +915,6 @@ struct XclChDataFormat explicit XclChDataFormat(); }; - - struct XclChSerTrendLine { double mfIntercept; /// Forced intercept. @@ -952,8 +928,6 @@ struct XclChSerTrendLine explicit XclChSerTrendLine(); }; - - struct XclChSerErrorBar { double mfValue; /// Fixed value for several source types. @@ -965,8 +939,6 @@ struct XclChSerErrorBar explicit XclChSerErrorBar(); }; - - struct XclChSeries { sal_uInt16 mnCategType; /// Data type for category entries. @@ -994,8 +966,6 @@ struct XclChType explicit XclChType(); }; - - struct XclChChart3d { sal_uInt16 mnRotation; /// Rotation (0...359deg). @@ -1009,8 +979,6 @@ struct XclChChart3d explicit XclChChart3d(); }; - - struct XclChLegend { XclChRectangle maRect; /// Position of the legend. @@ -1021,8 +989,6 @@ struct XclChLegend explicit XclChLegend(); }; - - struct XclChTypeGroup { sal_uInt16 mnFlags; /// Additional flags. @@ -1031,8 +997,6 @@ struct XclChTypeGroup explicit XclChTypeGroup(); }; - - struct XclChProperties { sal_uInt16 mnFlags; /// Additional flags. @@ -1053,8 +1017,6 @@ struct XclChLabelRange explicit XclChLabelRange(); }; - - struct XclChDateRange { sal_uInt16 mnMinDate; /// Minimum value on axis. @@ -1070,8 +1032,6 @@ struct XclChDateRange explicit XclChDateRange(); }; - - struct XclChValueRange { double mfMin; /// Minimum value on axis. @@ -1084,8 +1044,6 @@ struct XclChValueRange explicit XclChValueRange(); }; - - struct XclChTick { Color maTextColor; /// Tick labels color. @@ -1099,8 +1057,6 @@ struct XclChTick explicit XclChTick(); }; - - struct XclChAxis { sal_uInt16 mnType; /// Axis type. @@ -1111,8 +1067,6 @@ struct XclChAxis sal_Int32 GetApiAxisDimension() const; }; - - struct XclChAxesSet { XclChRectangle maRect; /// Position of the axes set (inner plot area). @@ -1198,8 +1152,6 @@ struct XclChFormatInfo bool mbIsFrame; /// true = Object is a frame, false = Object is a line. }; - - /** Provides access to chart auto formatting for all available object types. */ class XclChFormatInfoProvider { @@ -1294,8 +1246,6 @@ struct XclChExtTypeInfo : public XclChTypeInfo { return IsSeriesFrameFormat() ? EXC_CHOBJTYPE_FILLEDSERIES : EXC_CHOBJTYPE_LINEARSERIES; } }; - - /** Provides access to chart type info structs for all available chart types. */ class XclChTypeInfoProvider { @@ -1363,8 +1313,6 @@ private: sal_Int32 mnIndex; /// Index to create unique identifiers. }; - - struct XclFontData; /** Helper class for usage of property sets. */ @@ -1458,8 +1406,6 @@ private: ScfPropSetHelper maBitmapHlp; /// Properties for bitmaps. }; - - /** Base struct for internal root data structs for import and export. */ struct XclChRootData { @@ -1499,8 +1445,6 @@ struct XclChRootData GetTitleShape( const XclChTextKey& rTitleKey ) const; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx index ab5d083b735f..512f8f24fb1b 100644 --- a/sc/source/filter/inc/xlescher.hxx +++ b/sc/source/filter/inc/xlescher.hxx @@ -341,8 +341,6 @@ inline SvStream& WriteXclObjAnchor( SvStream& rStrm, const XclObjAnchor& rAnchor .WriteUInt16( rAnchor.maLast.mnRow).WriteUInt16(rAnchor.mnBY); } - - struct XclObjLineData { sal_uInt8 mnColorIdx; @@ -358,8 +356,6 @@ struct XclObjLineData XclImpStream& operator>>( XclImpStream& rStrm, XclObjLineData& rLineData ); - - struct XclObjFillData { sal_uInt8 mnBackColorIdx; @@ -375,8 +371,6 @@ struct XclObjFillData XclImpStream& operator>>( XclImpStream& rStrm, XclObjFillData& rFillData ); - - struct XclObjTextData { sal_uInt16 mnTextLen; @@ -402,8 +396,6 @@ struct XclObjTextData inline sal_uInt8 GetVerAlign() const { return ::extract_value< sal_uInt8 >( mnFlags, 4, 3 ); } }; - - enum XclTbxEventType { EXC_TBX_EVENT_ACTION, /// XActionListener.actionPerformed @@ -413,8 +405,6 @@ enum XclTbxEventType EXC_TBX_EVENT_CHANGE /// XChangeListener.changed }; - - /** Provides static helper functions for form controls. */ class XclControlHelper { @@ -435,8 +425,6 @@ public: XclTbxEventType eEventType, SfxObjectShell* pShell = NULL ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx index e09063912ab0..16c19b0a42c8 100644 --- a/sc/source/filter/inc/xlformula.hxx +++ b/sc/source/filter/inc/xlformula.hxx @@ -149,8 +149,6 @@ const sal_uInt16 EXC_TOK_NLR_REL = 0x8000; /// True = Natural langu const sal_uInt32 EXC_TOK_NLR_ADDREL = 0x80000000; /// NLR relative (in appended data). const sal_uInt32 EXC_TOK_NLR_ADDMASK = 0x3FFFFFFF; /// Mask for number of appended ranges. - - /** Type of a formula. */ enum XclFormulaType { @@ -334,8 +332,6 @@ struct XclFunctionInfo OUString GetAddInEquivalentFuncName() const; }; - - class XclRoot; /** Provides access to function info structs for all available functions. */ @@ -422,8 +418,6 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclTokenArray& rTokArr ); /** Calls the Write() function at the passed token array. */ XclExpStream& operator<<( XclExpStream& rStrm, const XclTokenArrayRef& rxTokArr ); - - namespace formula { class FormulaToken; } class ScTokenArray; @@ -466,8 +460,6 @@ private: bool mbSkipSpaces; /// true = Skip whitespace tokens. }; - - /** Contains all cell references that can be extracted from a multiple operations formula. */ struct XclMultipleOpRefs { @@ -479,8 +471,6 @@ struct XclMultipleOpRefs bool mbDblRefMode; /// true = One formula with row and column values. }; - - /** A helper with Excel specific token array functions. The purpose to not add these functions to ScTokenArray is to prevent code @@ -541,8 +531,6 @@ public: static bool GetMultipleOpRefs( XclMultipleOpRefs& rRefs, const ScTokenArray& rScTokArr, const ScAddress& rScPos ); }; - - inline sal_uInt8 XclTokenArrayHelper::GetTokenId( sal_uInt8 nBaseId, sal_uInt8 nTokenClass ) { OSL_ENSURE( !::get_flag( nBaseId, static_cast< sal_uInt8 >( ~EXC_TOKID_MASK ) ), "XclTokenArrayHelper::GetTokenId - invalid token ID" ); @@ -557,8 +545,6 @@ inline void XclTokenArrayHelper::ChangeTokenClass( sal_uInt8& rnTokenId, sal_uIn ::set_flag( rnTokenId, nTokenClass ); } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xllink.hxx b/sc/source/filter/inc/xllink.hxx index 3ec2a99c55e5..238763b1014c 100644 --- a/sc/source/filter/inc/xllink.hxx +++ b/sc/source/filter/inc/xllink.hxx @@ -79,8 +79,6 @@ enum XclSupbookType EXC_SBTYPE_EUROTOOL /// SUPBOOK is uesd for EUROCONVERT. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlname.hxx b/sc/source/filter/inc/xlname.hxx index e5f4ae1340f0..9c8fc0783d68 100644 --- a/sc/source/filter/inc/xlname.hxx +++ b/sc/source/filter/inc/xlname.hxx @@ -61,8 +61,6 @@ const sal_Unicode EXC_BUILTIN_SHEETTITLE = '\x0C'; const sal_Unicode EXC_BUILTIN_FILTERDATABASE = '\x0D'; const sal_Unicode EXC_BUILTIN_UNKNOWN = '\x0E'; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlpage.hxx b/sc/source/filter/inc/xlpage.hxx index f573a379f6f8..97fc09fe42fc 100644 --- a/sc/source/filter/inc/xlpage.hxx +++ b/sc/source/filter/inc/xlpage.hxx @@ -84,8 +84,6 @@ const sal_uInt16 EXC_SETUP_NOTES_END = 0x0200; const sal_uInt16 EXC_PAPERSIZE_DEFAULT = 0; const sal_uInt16 EXC_PAPERSIZE_USER = 0xFFFF; - - // Page settings ============================================================== class SvxBrushItem; @@ -146,8 +144,6 @@ struct XclPageData : private boost::noncopyable void SetScPaperSize( const Size& rSize, bool bPortrait, bool bStrict = false ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index 56704d24338d..75a466bef052 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -556,8 +556,6 @@ struct XclPTCachedName XclImpStream& operator>>( XclImpStream& rStrm, XclPTCachedName& rCachedName ); XclExpStream& operator<<( XclExpStream& rStrm, const XclPTCachedName& rCachedName ); - - /** Base struct for named info structs. Supports explicit naming and using the cache. */ struct XclPTVisNameInfo { @@ -748,8 +746,6 @@ struct XclPTExtInfo XclImpStream& operator>>( XclImpStream& rStrm, XclPTExtInfo& rInfo ); XclExpStream& operator<<( XclExpStream& rStrm, const XclPTExtInfo& rInfo ); - - // Pivot table autoformat settings ============================================== /** Pivot table autoformat settings (SXVIEWEX9 record). */ diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx index 4f8263789aea..49902677cd48 100644 --- a/sc/source/filter/inc/xlroot.hxx +++ b/sc/source/filter/inc/xlroot.hxx @@ -49,8 +49,6 @@ struct XclDebugObjCounter }; #endif - - class SfxMedium; class ScEditEngineDefaulter; class ScHeaderEditEngine; @@ -118,8 +116,6 @@ struct XclRootData virtual ~XclRootData(); }; - - class SfxObjectShell; class ScModelObj; class OutputDevice; @@ -275,8 +271,6 @@ private: XclRootData& mrData; /// Reference to the global data struct. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlstream.hxx b/sc/source/filter/inc/xlstream.hxx index b9b5057af618..9168c96dadac 100644 --- a/sc/source/filter/inc/xlstream.hxx +++ b/sc/source/filter/inc/xlstream.hxx @@ -39,8 +39,6 @@ const sal_uInt16 EXC_ENCR_BLOCKSIZE = 1024; const sal_uInt16 EXC_ID_UNKNOWN = SAL_MAX_UINT16; const sal_uInt16 EXC_ID_CONT = 0x003C; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlstring.hxx b/sc/source/filter/inc/xlstring.hxx index 876ace0cc406..d8094996e6ed 100644 --- a/sc/source/filter/inc/xlstring.hxx +++ b/sc/source/filter/inc/xlstring.hxx @@ -34,8 +34,6 @@ const XclStrFlags EXC_STR_SMARTFLAGS = 0x0004; /// Omit flags on empty const XclStrFlags EXC_STR_SEPARATEFORMATS = 0x0008; /// Import: Keep old formats when reading unformatted string (default: clear formats); Export: Write unformatted string. const XclStrFlags EXC_STR_NOHEADER = 0x0010; /// Export: Don't write the length and flag fields. - - const sal_uInt16 EXC_STR_MAXLEN_8BIT = 0x00FF; const sal_uInt16 EXC_STR_MAXLEN = 0x7FFF; @@ -78,13 +76,9 @@ inline bool operator<( const XclFormatRun& rLeft, const XclFormatRun& rRight ) return (rLeft.mnChar < rRight.mnChar) || ((rLeft.mnChar == rRight.mnChar) && (rLeft.mnFontIdx < rRight.mnFontIdx)); } - - /** A vector with all formatting runs for a rich-string. */ typedef ::std::vector< XclFormatRun > XclFormatRunVec; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xltable.hxx b/sc/source/filter/inc/xltable.hxx index c325ab1d6803..8709c5f0eb25 100644 --- a/sc/source/filter/inc/xltable.hxx +++ b/sc/source/filter/inc/xltable.hxx @@ -164,8 +164,6 @@ const sal_uInt16 EXC_ID_RK = 0x027E; // (0x04BC) SHRFMLA ----------------------------------------------------------- const sal_uInt16 EXC_ID_SHRFMLA = 0x04BC; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index 6cc7ed0374b0..06026e85fd14 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -258,8 +258,6 @@ XclImpStream& operator>>( XclImpStream& rStrm, Color& rColor ); @descr The color has the format (all values 8-bit): Red, Green, Blue, 0. */ XclExpStream& operator<<( XclExpStream& rStrm, const Color& rColor ); - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx index b355c94dc9ec..a0e9c783841a 100644 --- a/sc/source/filter/inc/xltracer.hxx +++ b/sc/source/filter/inc/xltracer.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef SC_XLTRACER_HXX #define SC_XLTRACER_HXX @@ -72,8 +70,6 @@ struct XclTracerDetails }; - - /** This class wraps an MSFilterTracer to create trace logs for import/export filters. */ class XclTracer { @@ -113,8 +109,6 @@ private: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx index 6bc6e723bba8..b5501d588bfd 100644 --- a/sc/source/filter/inc/xlview.hxx +++ b/sc/source/filter/inc/xlview.hxx @@ -102,8 +102,6 @@ struct XclDocViewData explicit XclDocViewData(); }; - - /** Contains all settings for a selection in a single pane of a sheet. */ struct XclSelectionData { @@ -116,8 +114,6 @@ struct XclSelectionData typedef boost::shared_ptr< XclSelectionData > XclSelectionDataRef; - - /** Contains all view settings for a single sheet. */ struct XclTabViewData { @@ -165,8 +161,6 @@ struct XclTabViewData XclSelectionData& CreateSelectionData( sal_uInt8 nPane ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |