diff options
Diffstat (limited to 'sc/source/filter/inc')
121 files changed, 759 insertions, 759 deletions
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 378a4e271df8..8e1d984799d2 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -29,7 +29,7 @@ #include "ftools.hxx" #include "excrecds.hxx" -//___________________________________________________________________ + // XclExpUserBView - one UserBView record for each user class XclExpUserBView : public ExcRecord @@ -49,7 +49,7 @@ public: virtual sal_Size GetLen() const; }; -//___________________________________________________________________ + // XclExpUserBViewList - list of UserBView records class XclExpUserBViewList : public ExcEmptyRec @@ -76,7 +76,7 @@ public: virtual void Save( XclExpStream& rStrm ); }; -//___________________________________________________________________ + // XclExpUsersViewBegin - begin of view block (one per sheet) class XclExpUsersViewBegin : public ExcRecord @@ -93,7 +93,7 @@ public: virtual sal_Size GetLen() const; }; -//___________________________________________________________________ + // XclExpUsersViewEnd - end of view block (one per sheet) class XclExpUsersViewEnd : public ExcRecord @@ -106,7 +106,7 @@ public: virtual sal_Size GetLen() const; }; -//___________________________________________________________________ + // dummy record for "User Names" stream class XclExpChTr0x0191 : public ExcRecord @@ -119,7 +119,7 @@ public: virtual sal_Size GetLen() const; }; -//___________________________________________________________________ + // dummy record for "User Names" stream class XclExpChTr0x0198 : public ExcRecord @@ -132,7 +132,7 @@ public: virtual sal_Size GetLen() const; }; -//___________________________________________________________________ + // dummy record for "User Names" stream class XclExpChTr0x0192 : public ExcRecord @@ -145,7 +145,7 @@ public: virtual sal_Size GetLen() const; }; -//___________________________________________________________________ + // dummy record for "User Names" stream class XclExpChTr0x0197 : public ExcRecord @@ -158,7 +158,7 @@ public: virtual sal_Size GetLen() const; }; -//___________________________________________________________________ + // dummy record without content class XclExpChTrEmpty : public ExcRecord @@ -174,7 +174,7 @@ public: virtual sal_Size GetLen() const; }; -//___________________________________________________________________ + // dummy record for "Revision Log" stream class XclExpChTr0x0195 : public ExcRecord @@ -189,7 +189,7 @@ public: virtual sal_Size GetLen() const; }; -//___________________________________________________________________ + // dummy record for "Revision Log" stream class XclExpChTr0x0194 : public ExcRecord @@ -214,7 +214,7 @@ inline XclExpChTr0x0194::XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ) : { } -//___________________________________________________________________ + // XclExpChTrHeader - header record, includes action count class XclExpChTrHeader : public ExcRecord @@ -238,7 +238,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); }; -//___________________________________________________________________ + // XclExpChTrInfo - header of action group of a user class XclExpChTrInfo : public ExcRecord @@ -273,7 +273,7 @@ inline XclExpChTrInfo::XclExpChTrInfo( const OUString& rUsername, const DateTime memcpy( aGUID, pGUID, 16 ); } -//___________________________________________________________________ + // XclExpChTrTabIdBuffer - buffer for tab id's class XclExpChTrTabIdBuffer @@ -301,7 +301,7 @@ public: { memcpy( pDest, pBuffer, sizeof(sal_uInt16) * GetBufferCount() ); } }; -//___________________________________________________________________ + // XclExpChTrTabId - tab id record class XclExpChTrTabId : public ExcRecord @@ -329,7 +329,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); }; -//___________________________________________________________________ + // XclExpChTrAction - base class for action records class XclExpChTrAction : public ExcRecord @@ -425,7 +425,7 @@ inline void XclExpChTrAction::WriteTabId( XclExpStream& rStrm, SCTAB nTab ) cons rStrm << GetTabId( nTab ); } -//___________________________________________________________________ + // XclExpChTrData - cell content itself struct XclExpChTrData @@ -452,7 +452,7 @@ struct XclExpChTrData const XclExpChTrTabIdBuffer& rTabIdBuffer ); }; -//___________________________________________________________________ + // XclExpChTrCellContent - changed cell content class XclExpChTrCellContent : public XclExpChTrAction, protected XclExpRoot @@ -486,7 +486,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); }; -//___________________________________________________________________ + // XclExpChTrInsert - insert/delete columns/rows class XclExpChTrInsert : public XclExpChTrAction @@ -515,7 +515,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); }; -//___________________________________________________________________ + // XclExpChTrInsertTab - insert table class XclExpChTrInsertTab : public XclExpChTrAction, protected XclExpRoot @@ -539,7 +539,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); }; -//___________________________________________________________________ + // XclExpChTrMoveRange - move cell range class XclExpChTrMoveRange : public XclExpChTrAction @@ -566,7 +566,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); }; -//___________________________________________________________________ + // XclExpChTr0x019A - additional data for delete action class XclExpChTr0x014A : public XclExpChTrInsert @@ -584,7 +584,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); }; -//___________________________________________________________________ + // XclExpChangeTrack - exports the "Revision Log" stream class XclExpChangeTrack : protected XclExpRoot @@ -614,7 +614,7 @@ public: void WriteXml( XclExpXmlStream& rStrm ); }; -//___________________________________________________________________ + #endif diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index 5ef3945e6308..f4a128e8a122 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -27,7 +27,7 @@ #include "imp_op.hxx" -//___________________________________________________________________ + struct ScCellValue; class ScChangeAction; @@ -35,7 +35,7 @@ class ScChangeTrack; class XclImpChTrFmlConverter; -//___________________________________________________________________ + struct XclImpChTrRecHeader { @@ -51,7 +51,7 @@ inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpChTrRecHeader& rRecH return rStrm; } -//___________________________________________________________________ + class XclImpChangeTrack : protected XclImpRoot { @@ -154,7 +154,7 @@ inline void XclImpChangeTrack::ReadString( OUString& rString ) rString = pStrm->ReadUniString(); } -//___________________________________________________________________ + // derived class for special 3D ref handling class XclImpChTrFmlConverter : public ExcelToSc8 @@ -179,7 +179,7 @@ inline XclImpChTrFmlConverter::XclImpChTrFmlConverter( { } -//___________________________________________________________________ + #endif diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index 36f859948092..7691557aaf78 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -30,8 +30,8 @@ namespace xls { class BiffInputStream; -// ============================================================================ -// ============================================================================ + + /** A vector of com.sun.star.table.CellRangeAddress elements and additional functionality. */ @@ -45,7 +45,7 @@ public: getBaseAddress() const; }; -// ============================================================================ + /** A 2D cell address struct for binary filters. */ struct BinAddress @@ -64,7 +64,7 @@ struct BinAddress void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ); }; -// ---------------------------------------------------------------------------- + inline bool operator==( const BinAddress& rL, const BinAddress& rR ) { @@ -88,7 +88,7 @@ inline BiffInputStream& operator>>( BiffInputStream& rStrm, BinAddress& orPos ) return rStrm; } -// ============================================================================ + /** A 2D cell range address struct for binary filters. */ struct BinRange @@ -121,7 +121,7 @@ struct BinRange void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ); }; -// ---------------------------------------------------------------------------- + inline bool operator==( const BinRange& rL, const BinRange& rR ) { @@ -145,7 +145,7 @@ 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,7 +156,7 @@ public: void read( SequenceInputStream& rStrm ); }; -// ---------------------------------------------------------------------------- + inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRangeList& orRanges ) { @@ -164,7 +164,7 @@ inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRangeList return rStrm; } -// ============================================================================ + /** Different target types that can be encoded in a BIFF URL. */ enum BiffTargetType @@ -176,8 +176,8 @@ enum BiffTargetType BIFF_TARGETTYPE_UNKNOWN /// Unknown/unsupported target type. }; -// ============================================================================ -// ============================================================================ + + /** Converter for cell addresses and cell ranges for OOXML and BIFF filters. */ @@ -186,7 +186,7 @@ class AddressConverter : public WorkbookHelper public: explicit AddressConverter( const WorkbookHelper& rHelper ); - // ------------------------------------------------------------------------ + /** Tries to parse the passed string for a 2d cell address in A1 notation. @@ -241,7 +241,7 @@ 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& @@ -264,7 +264,7 @@ public: /** Returns the sheet overflow status. */ inline bool isTabOverflow() const { return mbTabOverflow; } - // ------------------------------------------------------------------------ + /** Checks if the passed column index is valid. @@ -293,7 +293,7 @@ public: */ bool checkTab( sal_Int16 nSheet, bool bTrackOverflow ); - // ------------------------------------------------------------------------ + /** Checks the passed cell address if it fits into the spreadsheet limits. @@ -394,7 +394,7 @@ public: sal_Int16 nSheet, bool bTrackOverflow ); - // ------------------------------------------------------------------------ + /** Checks the passed cell range if it fits into the spreadsheet limits. @@ -528,7 +528,7 @@ public: sal_Int16 nSheet, bool bAllowOverflow, bool bTrackOverflow ); - // ------------------------------------------------------------------------ + /** Tries to restrict the passed cell range list to current sheet limits. @@ -583,7 +583,7 @@ public: sal_Int16 nSheet, bool bTrackOverflow ); - // ------------------------------------------------------------------------ + private: void initializeMaxPos( sal_Int16 nMaxXlsTab, sal_Int32 nMaxXlsCol, sal_Int32 nMaxXlsRow ); @@ -613,7 +613,7 @@ 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 05c3e1dade56..c150e3f30c76 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -33,7 +33,7 @@ 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,7 +50,7 @@ struct ApiFilterSettings void appendField( bool bAnd, const std::vector<OUString>& rValues ); }; -// ============================================================================ + /** Base class for specific filter settings for a column in a filtered range. */ @@ -70,7 +70,7 @@ 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,7 +96,7 @@ private: bool mbShowBlank; }; -// ============================================================================ + /** Settings for a top-10 filter. */ class Top10Filter : public FilterSettingsBase @@ -118,7 +118,7 @@ private: bool mbPercent; /// True = percentage, false = number of items. }; -// ============================================================================ + /** A filter criterion for a custom filter. */ struct FilterCriterionModel @@ -137,7 +137,7 @@ struct FilterCriterionModel void readBiffData( SequenceInputStream& rStrm ); }; -// ---------------------------------------------------------------------------- + /** Settings for a custom filter, specifying one or two comparison operators associated with some values. @@ -166,7 +166,7 @@ private: bool mbAnd; }; -// ============================================================================ + /** A column in a filtered range. Contains an object with specific filter settings for the cells in the column. @@ -200,7 +200,7 @@ private: bool mbShowButton; }; -// ============================================================================ + class AutoFilter : public WorkbookHelper { @@ -227,7 +227,7 @@ private: ::com::sun::star::table::CellRangeAddress maRange; }; -// ============================================================================ + class AutoFilterBuffer : public WorkbookHelper { @@ -254,7 +254,7 @@ private: AutoFilterVector maAutoFilters; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/autofiltercontext.hxx b/sc/source/filter/inc/autofiltercontext.hxx index c98eefadd344..5efb9d6d0237 100644 --- a/sc/source/filter/inc/autofiltercontext.hxx +++ b/sc/source/filter/inc/autofiltercontext.hxx @@ -29,7 +29,7 @@ class AutoFilter; class FilterColumn; class FilterSettingsBase; -// ============================================================================ + class FilterSettingsContext : public WorksheetContextBase { @@ -47,7 +47,7 @@ private: FilterSettingsBase& mrFilterSettings; }; -// ============================================================================ + class FilterColumnContext : public WorksheetContextBase { @@ -65,7 +65,7 @@ private: FilterColumn& mrFilterColumn; }; -// ============================================================================ + class AutoFilterContext : public WorksheetContextBase { @@ -83,7 +83,7 @@ private: AutoFilter& mrAutoFilter; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index de43c47fed97..aeb2bbded10b 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -28,11 +28,11 @@ namespace oox { namespace xls { -// ============================================================================ + const sal_Int64 BIFF_RCF_BLOCKSIZE = 1024; -// ============================================================================ + /** Base class for BIFF stream decoders. */ class BiffDecoderBase : public ::comphelper::IDocPasswordVerifier @@ -80,7 +80,7 @@ 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,7 +111,7 @@ private: sal_uInt16 mnHash; }; -// ============================================================================ + /** Decodes BIFF stream contents that are encoded using the RC4 algorithm. */ class BiffDecoder_RCF : public BiffDecoderBase @@ -142,7 +142,7 @@ private: ::std::vector< sal_uInt8 > maVerifierHash; }; -// ============================================================================ + /** Helper for BIFF stream codecs. Holds the used codec object. */ class BiffCodecHelper : public WorkbookHelper @@ -157,7 +157,7 @@ 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 cd5f1e3e7878..77851dc0fdad 100644 --- a/sc/source/filter/inc/biffhelper.hxx +++ b/sc/source/filter/inc/biffhelper.hxx @@ -588,7 +588,7 @@ 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,7 +633,7 @@ 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,7 +642,7 @@ 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 a7cf8e708923..ca11f905f4d7 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -29,7 +29,7 @@ namespace oox { namespace xls { -// ============================================================================ + namespace prv { @@ -102,7 +102,7 @@ private: } // namespace prv -// ============================================================================ + /** This class is used to read BIFF record streams. @@ -285,7 +285,7 @@ public: */ OUString readUniString( bool bAllowNulChars = false ); - // ------------------------------------------------------------------------ + private: /** Initializes all members after base stream has been seeked to new record. */ void setupRecord(); @@ -335,7 +335,7 @@ private: bool mbCont; /// True = automatic CONTINUE lookup enabled. }; -// ============================================================================ + class BiffInputStreamPos { @@ -352,7 +352,7 @@ private: sal_Int64 mnRecPos; }; -// ============================================================================ + /** Stores the current position of the passed stream on construction and restores it automatically on destruction. */ @@ -363,7 +363,7 @@ public: ~BiffInputStreamPosGuard(); }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/chartsheetfragment.hxx b/sc/source/filter/inc/chartsheetfragment.hxx index fa7a995de489..3cce8ab47e0d 100644 --- a/sc/source/filter/inc/chartsheetfragment.hxx +++ b/sc/source/filter/inc/chartsheetfragment.hxx @@ -25,7 +25,7 @@ namespace oox { namespace xls { -// ============================================================================ + class ChartsheetFragment : public WorksheetFragmentBase { diff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxx index 8a8219896b37..f46795f7bb3b 100644 --- a/sc/source/filter/inc/colrowst.hxx +++ b/sc/source/filter/inc/colrowst.hxx @@ -23,7 +23,7 @@ #include "xiroot.hxx" #include <mdds/flat_segment_tree.hpp> -// ============================================================================ + class XclImpColRowSettings : protected XclImpRoot { diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx index ab70f4ccc4fb..68fb1636e89e 100644 --- a/sc/source/filter/inc/commentsbuffer.hxx +++ b/sc/source/filter/inc/commentsbuffer.hxx @@ -27,7 +27,7 @@ namespace oox { namespace xls { -// ============================================================================ + struct CommentModel { @@ -51,7 +51,7 @@ struct CommentModel explicit CommentModel(); }; -// ---------------------------------------------------------------------------- + class Comment : public WorksheetHelper { @@ -77,7 +77,7 @@ private: typedef ::boost::shared_ptr< Comment > CommentRef; -// ============================================================================ + class CommentsBuffer : public WorksheetHelper { @@ -100,7 +100,7 @@ private: CommentVector maComments; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/commentsfragment.hxx b/sc/source/filter/inc/commentsfragment.hxx index fe534f129a4a..5b55a90b0b91 100644 --- a/sc/source/filter/inc/commentsfragment.hxx +++ b/sc/source/filter/inc/commentsfragment.hxx @@ -26,7 +26,7 @@ namespace oox { namespace xls { -// ============================================================================ + class CommentsFragment : public WorksheetFragmentBase { @@ -54,7 +54,7 @@ private: CommentRef mxComment; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index d009f044f9fc..dbe4d8d53586 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -41,7 +41,7 @@ namespace xls { class CondFormat; -// ============================================================================ + /** Model for a single rule in a conditional formatting. */ struct CondFormatRuleModel @@ -144,7 +144,7 @@ private: }; -// ============================================================================ + /** Represents a single rule in a conditional formatting. */ @@ -182,7 +182,7 @@ private: typedef ::boost::shared_ptr< CondFormatRule > CondFormatRuleRef; -// ============================================================================ + /** Model for a conditional formatting object. */ struct CondFormatModel @@ -193,7 +193,7 @@ struct CondFormatModel explicit CondFormatModel(); }; -// ============================================================================ + /** Represents a conditional formatting object with a list of affected cell ranges. */ class CondFormat : public WorksheetHelper @@ -273,7 +273,7 @@ public: typedef ::boost::shared_ptr< CondFormat > CondFormatRef; typedef ::boost::shared_ptr< ExtCfRule > ExtCfRuleRef; -// ============================================================================ + class CondFormatBuffer : public WorksheetHelper { @@ -300,7 +300,7 @@ 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 167a3a3025e2..1a0a59c2a7c0 100644 --- a/sc/source/filter/inc/condformatcontext.hxx +++ b/sc/source/filter/inc/condformatcontext.hxx @@ -26,8 +26,8 @@ namespace oox { namespace xls { -// ============================================================================ -// + + class CondFormatContext; class ColorScaleContext : public WorksheetContextBase @@ -85,7 +85,7 @@ private: CondFormatRuleRef mxRule; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx index fdcba12e0f3a..7e86049a4c35 100644 --- a/sc/source/filter/inc/connectionsbuffer.hxx +++ b/sc/source/filter/inc/connectionsbuffer.hxx @@ -26,7 +26,7 @@ namespace oox { namespace xls { -// ============================================================================ + const sal_Int32 BIFF12_CONNECTION_UNKNOWN = 0; const sal_Int32 BIFF12_CONNECTION_ODBC = 1; @@ -38,7 +38,7 @@ 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,7 +63,7 @@ struct WebPrModel explicit WebPrModel(); }; -// ---------------------------------------------------------------------------- + /** Common properties of an external data connection. */ struct ConnectionModel @@ -95,7 +95,7 @@ struct ConnectionModel WebPrModel& createWebPr(); }; -// ---------------------------------------------------------------------------- + /** An external data connection (database, web query, etc.). */ class Connection : public WorkbookHelper @@ -134,7 +134,7 @@ private: typedef ::boost::shared_ptr< Connection > ConnectionRef; -// ============================================================================ + class ConnectionsBuffer : public WorkbookHelper { @@ -163,7 +163,7 @@ 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 91c0bb1d6170..fd8f40a93c5a 100644 --- a/sc/source/filter/inc/connectionsfragment.hxx +++ b/sc/source/filter/inc/connectionsfragment.hxx @@ -27,7 +27,7 @@ namespace xls { class Connection; -// ============================================================================ + class ConnectionContext : public WorkbookContextBase { @@ -45,7 +45,7 @@ private: Connection& mrConnection; }; -// ============================================================================ + class ConnectionsFragment : public WorkbookFragmentBase { @@ -62,7 +62,7 @@ protected: virtual void finalizeImport(); }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx index d45783e746cb..301ac815a656 100644 --- a/sc/source/filter/inc/defnamesbuffer.hxx +++ b/sc/source/filter/inc/defnamesbuffer.hxx @@ -32,7 +32,7 @@ namespace xls { class BiffInputStreamPos; -// ============================================================================ + // codes for built-in names const sal_Unicode BIFF_DEFNAME_CONSOLIDATEAREA = '\x00'; @@ -51,7 +51,7 @@ 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 { @@ -67,7 +67,7 @@ struct DefinedNameModel explicit DefinedNameModel(); }; -// ============================================================================ + /** Base class for defined names and external names. */ class DefinedNameBase : public WorkbookHelper @@ -100,7 +100,7 @@ protected: ::com::sun::star::uno::Any maRefAny; /// Single cell/range reference. }; -// ============================================================================ + class DefinedName : public DefinedNameBase { @@ -158,7 +158,7 @@ private: typedef ::boost::shared_ptr< DefinedName > DefinedNameRef; -// ============================================================================ + class DefinedNamesBuffer : public WorkbookHelper { @@ -205,7 +205,7 @@ 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 be11622aece9..8ca3bc38cca0 100644 --- a/sc/source/filter/inc/drawingbase.hxx +++ b/sc/source/filter/inc/drawingbase.hxx @@ -29,7 +29,7 @@ namespace oox { namespace xls { -// ============================================================================ + /** Absolute position in a spreadsheet (in EMUs) independent from cells. */ struct AnchorPointModel : public ::oox::drawingml::EmuPoint @@ -38,7 +38,7 @@ 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,7 +47,7 @@ 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,7 +61,7 @@ struct CellAnchorModel inline bool isValid() const { return (mnCol >= 0) && (mnRow >= 0); } }; -// ---------------------------------------------------------------------------- + /** Application-specific client data of a shape. */ struct AnchorClientDataModel @@ -72,7 +72,7 @@ struct AnchorClientDataModel explicit AnchorClientDataModel(); }; -// ============================================================================ + /** Contains the position of a shape in the spreadsheet. Supports different shape anchor modes (absolute, one-cell, two-cell). */ @@ -134,7 +134,7 @@ 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 3c149c4a3e94..d1d1eda4e92c 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -40,9 +40,9 @@ namespace oox { namespace ole { namespace oox { namespace xls { -// ============================================================================ + // DrawingML -// ============================================================================ + class ShapeMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { @@ -57,7 +57,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; }; -// ============================================================================ + class Shape : public ::oox::drawingml::Shape, public WorksheetHelper { @@ -76,7 +76,7 @@ private: OUString maMacroName; }; -// ============================================================================ + /** Context handler for creation of shapes embedded in group shapes. */ class GroupShapeContext : public ::oox::drawingml::ShapeGroupContext, public WorksheetHelper @@ -104,7 +104,7 @@ protected: const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; }; -// ============================================================================ + /** Fragment handler for a complete sheet drawing. */ class DrawingFragment : public WorksheetFragmentBase @@ -128,9 +128,9 @@ private: ShapeAnchorRef mxAnchor; /// Current anchor of top-level shape. }; -// ============================================================================ + // VML -// ============================================================================ + class VmlControlMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { @@ -149,7 +149,7 @@ private: sal_Int32 mnDropStyle; }; -// ============================================================================ + class VmlDrawing : public ::oox::vml::Drawing, public WorksheetHelper { @@ -205,7 +205,7 @@ private: ::oox::vml::TextFontModel maListBoxFont; }; -// ============================================================================ + class VmlDrawingFragment : public ::oox::vml::DrawingFragment, public WorksheetHelper { @@ -218,7 +218,7 @@ protected: virtual void finalizeImport(); }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index 791d8bb572b2..c0c1cec95420 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -33,13 +33,13 @@ namespace oox { namespace drawingml { class ShapePropertyMap; } } namespace oox { namespace xls { -// ============================================================================ + const sal_uInt16 BIFF_OBJ_INVALID_ID = 0; -// ============================================================================ + // Model structures for BIFF OBJ record data -// ============================================================================ + /** This structure contains line formatting attributes from an OBJ record. */ struct BiffObjLineModel @@ -52,7 +52,7 @@ struct BiffObjLineModel explicit BiffObjLineModel(); }; -// ============================================================================ + /** This structure contains fill formatting attributes from an OBJ record. */ struct BiffObjFillModel @@ -65,15 +65,15 @@ struct BiffObjFillModel explicit BiffObjFillModel(); }; -// ============================================================================ + // BIFF drawing objects -// ============================================================================ + class BiffDrawingBase; class BiffDrawingObjectBase; typedef ::boost::shared_ptr< BiffDrawingObjectBase > BiffDrawingObjectRef; -// ---------------------------------------------------------------------------- + class BiffDrawingObjectContainer { @@ -93,7 +93,7 @@ private: BiffDrawingObjectVector maObjects; }; -// ============================================================================ + /** Base class for all BIFF drawing objects (OBJ records). */ class BiffDrawingObjectBase : public WorksheetHelper @@ -161,9 +161,9 @@ private: bool mbCustomDff; /// True = recreate UNO shape in DFF import (BIFF8 only). }; -// ============================================================================ + // BIFF drawing page -// ============================================================================ + /** Base class for a container for all objects on a drawing page (in a spreadsheet or in an embedded chart object). @@ -208,7 +208,7 @@ private: BiffObjIdVector maSkipObjs; /// Identifiers of all objects to be skipped. }; -// ---------------------------------------------------------------------------- + /** Drawing manager of a single sheet. */ class BiffSheetDrawing : public BiffDrawingBase @@ -222,7 +222,7 @@ public: const ::com::sun::star::awt::Rectangle& rShapeRect ); }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/excdefs.hxx b/sc/source/filter/inc/excdefs.hxx index 41f56d5c47a2..5ba6a097c2ea 100644 --- a/sc/source/filter/inc/excdefs.hxx +++ b/sc/source/filter/inc/excdefs.hxx @@ -92,7 +92,7 @@ const sal_uInt8 EXC_AFOPER_GREATEREQUAL = 0x06; #define EXC_CHTR_ACCEPT 0x0001 #define EXC_CHTR_REJECT 0x0003 -// ============================================================================ + #endif // _EXCDEFS_HXX diff --git a/sc/source/filter/inc/excelchartconverter.hxx b/sc/source/filter/inc/excelchartconverter.hxx index ca2377ad0215..5abff61ba6ae 100644 --- a/sc/source/filter/inc/excelchartconverter.hxx +++ b/sc/source/filter/inc/excelchartconverter.hxx @@ -26,7 +26,7 @@ namespace oox { namespace xls { -// ============================================================================ + class ExcelChartConverter : public ::oox::drawingml::chart::ChartConverter, public WorkbookHelper { @@ -45,7 +45,7 @@ public: const ::oox::drawingml::chart::DataSequenceModel& rDataSeq ); }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index 45a9469c3669..83eb7da54601 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -27,7 +27,7 @@ namespace xls { class WorkbookGlobals; -// ============================================================================ + class ExcelFilter : public ::oox::core::XmlFilterBase { diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx index ed2805869254..d97e5bd70303 100644 --- a/sc/source/filter/inc/excelhandlers.hxx +++ b/sc/source/filter/inc/excelhandlers.hxx @@ -26,8 +26,8 @@ namespace oox { namespace xls { -// ============================================================================ -// ============================================================================ + + /** Context handler derived from the WorkbookHelper helper class. @@ -41,7 +41,7 @@ public: ::oox::core::ContextHandler2( rParent ), WorkbookHelper( rParent ) {} }; -// ============================================================================ + /** Context handler derived from the WorksheetHelper helper class. @@ -55,7 +55,7 @@ public: ::oox::core::ContextHandler2( rParent ), WorksheetHelper( rParent ) {} }; -// ============================================================================ + /** Fragment handler derived from the WorkbookHelper helper class. @@ -69,7 +69,7 @@ public: const OUString& rFragmentPath ); }; -// ============================================================================ + /** Fragment handler derived from the WorksheetHelper helper class. @@ -83,8 +83,8 @@ public: const OUString& rFragmentPath ); }; -// ============================================================================ -// ============================================================================ + + /** Base class for all BIFF context handlers. @@ -100,7 +100,7 @@ public: virtual void importRecord( BiffInputStream& rStrm ) = 0; }; -// ---------------------------------------------------------------------------- + /** Context handler derived from the WorksheetHelper helper class. @@ -112,7 +112,7 @@ protected: explicit BiffWorksheetContextBase( const WorksheetHelper& rHelper ); }; -// ============================================================================ + /** An enumeration for all types of fragments in a BIFF workbook stream. */ enum BiffFragmentType @@ -127,7 +127,7 @@ enum BiffFragmentType BIFF_FRAGMENT_UNKNOWN /// Unknown fragment/error. }; -// ---------------------------------------------------------------------------- + class BiffFragmentHandler { @@ -167,7 +167,7 @@ private: BiffInputStreamRef mxBiffStrm; }; -// ---------------------------------------------------------------------------- + /** Fragment handler derived from the WorkbookHelper helper class. @@ -182,7 +182,7 @@ 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 1fcc87ff9fb3..d0994dbcd9ef 100644 --- a/sc/source/filter/inc/excelvbaproject.hxx +++ b/sc/source/filter/inc/excelvbaproject.hxx @@ -29,7 +29,7 @@ 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,7 +48,7 @@ private: mxDocument; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index eaf0ae887e64..5d7b046f57e3 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -43,7 +43,7 @@ protected: XclFunctionProvider maFuncProv; const XclBiff meBiff; - // --------------------------------------------------------------- + void DoMulArgs( DefTokenId eId, sal_uInt8 nNumArgs ); void ExcRelToScRel( sal_uInt16 nRow, sal_uInt8 nCol, ScSingleRefData&, const bool bName ); @@ -95,7 +95,7 @@ inline bool ExcelToSc::IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 return ( ( nRow1 & 0x3FFF ) == 0x0000 ) && ( ( nRow2 & 0x3FFF ) == 0x3FFF ); } -// ============================================================================ + class XclImpLinkManager; class XclImpExtName; diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index e847e3aba2c4..54441bdf44ec 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -75,7 +75,7 @@ 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 ae44641f96c5..796e624d87d3 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -303,7 +303,7 @@ public: }; -// ---------------------------------------------------------------------------- + /** This record contains the Windows country IDs for the UI and document language. */ class XclExpCountry : public XclExpRecord @@ -334,7 +334,7 @@ private: }; -// ============================================================================ + class XclExpFiltermode : public XclExpEmptyRecord { @@ -342,7 +342,7 @@ public: explicit XclExpFiltermode(); }; -// ---------------------------------------------------------------------------- + class XclExpAutofilterinfo : public XclExpUInt16Record { @@ -356,7 +356,7 @@ private: ScAddress maStartPos; }; -// ---------------------------------------------------------------------------- + class ExcFilterCondition { @@ -382,7 +382,7 @@ public: void SaveText( XclExpStream& rStrm ); }; -// ---------------------------------------------------------------------------- + class XclExpAutofilter : public XclExpRecord, protected XclExpRoot { @@ -413,7 +413,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); }; -// ---------------------------------------------------------------------------- + class ExcAutoFilterRecs : public XclExpRecordBase, protected XclExpRoot { @@ -443,7 +443,7 @@ 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/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx index 17519c17dc20..8a22d471c391 100644 --- a/sc/source/filter/inc/externallinkbuffer.hxx +++ b/sc/source/filter/inc/externallinkbuffer.hxx @@ -38,7 +38,7 @@ namespace oox { namespace core { namespace oox { namespace xls { -// ============================================================================ + struct ExternalNameModel { @@ -52,7 +52,7 @@ struct ExternalNameModel explicit ExternalNameModel(); }; -// ============================================================================ + class ExternalLink; @@ -126,7 +126,7 @@ private: typedef ::boost::shared_ptr< ExternalName > ExternalNameRef; -// ============================================================================ + /** Contains indexes for a range of sheets in the spreadsheet document. */ class LinkSheetRange @@ -172,7 +172,7 @@ private: sal_Int32 mnLast; /// Index of the last sheet or index of last external sheet cache. }; -// ============================================================================ + enum ExternalLinkType { @@ -188,7 +188,7 @@ enum ExternalLinkType LINKTYPE_UNKNOWN /// Unknown or unsupported link type. }; -// ---------------------------------------------------------------------------- + class ExternalLink : public WorkbookHelper { @@ -290,7 +290,7 @@ private: typedef ::boost::shared_ptr< ExternalLink > ExternalLinkRef; -// ============================================================================ + /** Represents a REF entry in the BIFF12 EXTERNALSHEETS or in the BIFF8 EXTERNSHEET record. @@ -310,7 +310,7 @@ struct RefSheetsModel void readBiff12Data( SequenceInputStream& rStrm ); }; -// ---------------------------------------------------------------------------- + class ExternalLinkBuffer : public WorkbookHelper { @@ -361,7 +361,7 @@ 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 c6e20186740b..5aea1766c0c1 100644 --- a/sc/source/filter/inc/externallinkfragment.hxx +++ b/sc/source/filter/inc/externallinkfragment.hxx @@ -28,8 +28,8 @@ namespace xls { class ExternalLink; -// ============================================================================ -// ============================================================================ + + /** This class implements importing the sheetData element in external sheets. @@ -74,7 +74,7 @@ private: sal_Int32 mnCurrType; /// Data type of current cell. }; -// ============================================================================ + class ExternalLinkFragment : public WorkbookFragmentBase { @@ -103,7 +103,7 @@ 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 40e4b93256c6..d1f20da5cf2e 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -194,13 +194,13 @@ public: @param rValues The related property values. */ void SetProperties( const css::uno::Sequence< OUString > & rPropNames, const css::uno::Sequence< css::uno::Any >& rValues ); - // ------------------------------------------------------------------------ + private: css::uno::Reference< css::beans::XPropertySet > mxPropSet; /// The mandatory property set interface. css::uno::Reference< css::beans::XMultiPropertySet > mxMultiPropSet; /// The optional multi property set interface. }; -// ---------------------------------------------------------------------------- + /** Generic helper class for reading from and writing to property sets. @@ -256,7 +256,7 @@ public: /** Writes all values to the passed property set. */ void WriteToPropertySet( ScfPropertySet& rPropSet ) const; - // ------------------------------------------------------------------------ + private: /** Returns a pointer to the next Any to be written to. */ css::uno::Any* GetNextAny(); @@ -268,7 +268,7 @@ private: size_t mnNextIdx; /// Counter for next Any to be processed. }; -// ---------------------------------------------------------------------------- + template< typename Type > bool ScfPropSetHelper::ReadValue( Type& rValue ) @@ -299,7 +299,7 @@ ScfPropSetHelper& operator<<( ScfPropSetHelper& rPropSetHelper, const Type& rVal return rPropSetHelper; } -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 50948f738530..dd4bf610309f 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -242,7 +242,7 @@ struct BinSingleRef2d void readBiff8Data( BiffInputStream& rStrm, bool bRelativeAsOffset ); }; -// ---------------------------------------------------------------------------- + /** A 2D formula cell range reference struct with relative flags. */ struct BinComplexRef2d @@ -472,7 +472,7 @@ enum FunctionLibraryType FUNCLIB_EUROTOOL /// EuroTool add-in with EUROCONVERT function. }; -// ---------------------------------------------------------------------------- + /** Represents information for a spreadsheet function. @@ -634,7 +634,7 @@ 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,7 +656,7 @@ public: const BinAddress& rAddress, bool bAbsolute ); - // ------------------------------------------------------------------------ + /** Generates a string in Calc formula notation from the passed string. @@ -674,7 +674,7 @@ public: */ static OUString generateApiArray( const Matrix< ::com::sun::star::uno::Any >& rMatrix ); - // ------------------------------------------------------------------------ + /** Tries to extract a single cell reference from a formula token sequence. @@ -792,7 +792,7 @@ 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 5b8f2d01c808..ec8413d900bc 100644 --- a/sc/source/filter/inc/formulaparser.hxx +++ b/sc/source/filter/inc/formulaparser.hxx @@ -89,7 +89,7 @@ private: ApiTokenVector maTokens; }; -// ============================================================================ + class FormulaParserImpl; @@ -144,7 +144,7 @@ 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 4c2833a1220a..0ec11a5cef1b 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -29,11 +29,11 @@ class SfxObjectShell; class ScProgress; -// ============================================================================ + const sal_Int32 SCF_INV_SEGMENT = -1; -// ============================================================================ + /** Progress bar for complex progress representation. @@ -186,7 +186,7 @@ private: bool mbInProgress; /// true = progress bar started. }; -// ============================================================================ + /** A simplified progress bar with only one segment. */ class ScfSimpleProgressBar @@ -208,7 +208,7 @@ private: ScfProgressBar maProgress; /// The used progress bar. }; -// ============================================================================ + /** A simplified progress bar based on the stream position of an existing stream. */ class ScfStreamProgressBar @@ -230,7 +230,7 @@ private: SvStream& mrStrm; /// The used stream. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 85a6e07db91d..a7d478b42075 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -118,7 +118,7 @@ void insert_value( Type& rnBitField, InsertType nValue, sal_uInt8 nStartBit, sal (rnBitField &= ~(nMask << nStartBit)) |= (nNewValue << nStartBit); } -// ============================================================================ + class Color; class SfxPoolItem; @@ -270,7 +270,7 @@ typedef ::std::vector< sal_Int32 > ScfInt32Vec; typedef ::std::vector< sal_uInt32 > ScfUInt32Vec; typedef ::std::vector< OUString > ScfStringVec; -// ---------------------------------------------------------------------------- + class ScFormatFilterPluginImpl : public ScFormatFilterPlugin { @@ -310,7 +310,7 @@ public: virtual ScOrcusFilters* GetOrcusFilters(); }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index f26209080b0d..39ca2d8f77a7 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -38,9 +38,9 @@ const sal_uInt32 SC_HTML_FONTSIZES = 7; // wie Export, HTML-Options const sal_uInt16 SC_HTML_OFFSET_TOLERANCE_SMALL = 1; // single table const sal_uInt16 SC_HTML_OFFSET_TOLERANCE_LARGE = 10; // nested -// ============================================================================ + // BASE class for HTML parser classes -// ============================================================================ + class ScHTMLTable; @@ -98,7 +98,7 @@ public: }; -// ============================================================================ + typedef o3tl::sorted_vector<sal_uLong> ScHTMLColOffset; @@ -151,7 +151,7 @@ struct ScHTMLAdjustStackEntry typedef ::std::stack< ScHTMLAdjustStackEntry* > ScHTMLAdjustStack; -// ============================================================================ + class EditEngine; class ScDocument; @@ -232,9 +232,9 @@ public: -// ============================================================================ + // HTML DATA QUERY PARSER -// ============================================================================ + /** Declares the orientation in or for a table: column or row. */ enum ScHTMLOrient { tdCol = 0 , tdRow = 1 }; @@ -246,7 +246,7 @@ 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,7 +281,7 @@ 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,7 +306,7 @@ 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,7 +343,7 @@ private: bool mbImportAlways; /// true = Always import this entry. }; -// ============================================================================ + /** This struct handles creation of unique table identifiers. */ struct ScHTMLTableAutoId @@ -355,7 +355,7 @@ struct ScHTMLTableAutoId explicit ScHTMLTableAutoId( ScHTMLTableId& rnUnusedId ); }; -// ---------------------------------------------------------------------------- + class ScHTMLTableMap; @@ -590,7 +590,7 @@ private: bool mbPushEmptyLine:1; /// true = Insert empty line before current entry. }; -// ---------------------------------------------------------------------------- + /** The "global table" representing the entire HTML document. */ class ScHTMLGlobalTable : public ScHTMLTable @@ -608,7 +608,7 @@ public: void Recalc(); }; -// ============================================================================ + /** The HTML parser for data queries. Focuses on data import, not on layout. @@ -668,7 +668,7 @@ private: }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index e42cb712e0a9..ccc407edf05d 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -190,7 +190,7 @@ protected: void Bof4( void ); // 0x0409 void Bof5( void ); // 0x0809 - // --------------------------------------------------------------- + void Formula( const XclAddress& rXclPos, sal_uInt16 nXF, sal_uInt16 nFormLen, double fCurVal, bool bShrFmla); // -> excform.cxx diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx index 537dbaf993a4..1778a87aa40e 100644 --- a/sc/source/filter/inc/lotform.hxx +++ b/sc/source/filter/inc/lotform.hxx @@ -66,7 +66,7 @@ private: TokenId nAddToken; // ')+1.0' TokenId nSubToken; // ~ TokenId n0Token; // '0.0'; - // --------------------------------------------------------------- + static FUNC_TYPE IndexToType( sal_uInt8 ); static DefTokenId IndexToToken( sal_uInt8 ); static FUNC_TYPE IndexToTypeWK123( sal_uInt8 ); @@ -76,7 +76,7 @@ private: ScSingleRefData& rSRD ); bool bWK3; // alternative Codeumsetzung statt fuer < WK1 bool bWK123; // alternative for 123 - // ------------------------------------------------------------------- + void ReadSRD( ScSingleRefData& rSRD, sal_uInt8 nFlags ); inline void ReadCRD( ScComplexRefData& rCRD, sal_uInt8 nFlags ); void IncToken( TokenId &rParam ); diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index bd0950f668c3..17bcf0fcfd39 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -39,7 +39,7 @@ private: LotusToSc aConv; sal_uInt16 nTab; // z.Zt. bearbeitete Tabelle sal_Int32 nExtTab; - // ------------------------------------------------------------------- + // in WK?-Datei void Bof( void ); // 0x0000 00 bool BofFm3( void ); // 0x0000 00 @@ -57,13 +57,13 @@ private: void NamedSheet( void ); // 14000 void RowPresentation( sal_uInt16 nRecLen ); // 2007 - // ------------------------------------------------------------------- + // in FM?-Datei void Font_Face( void ); // 174 void Font_Type( void ); // 176 void Font_Ysize( void ); // 177 void _Row( const sal_uInt16 nRecLen ); // 197 ? - // ------------------------------------------------------------------- + inline void Read( ScAddress& ); inline void Read( ScRange& ); // fuer Addresses/Ranges im Format Row(16)/Tab(8)/Col(8) @@ -76,7 +76,7 @@ private: inline void Read( LotAttrWK3& ); void Read( OUString& ); // 0-terminierten String einlesen inline void Skip( const sal_uInt16 nNumBytes ); - // ------------------------------------------------------------------- + public: ImportLotus( SvStream&, ScDocument*, rtl_TextEncoding eSrc ); diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx index 52a68f02a9c6..2ed51e73372b 100644 --- a/sc/source/filter/inc/numberformatsbuffer.hxx +++ b/sc/source/filter/inc/numberformatsbuffer.hxx @@ -33,7 +33,7 @@ namespace oox { class PropertyMap; } namespace oox { namespace xls { -// ============================================================================ + struct NumFmtModel { @@ -44,7 +44,7 @@ struct NumFmtModel explicit NumFmtModel(); }; -// ---------------------------------------------------------------------------- + /** Contains all API number format attributes. */ struct ApiNumFmtData @@ -54,7 +54,7 @@ struct ApiNumFmtData explicit ApiNumFmtData(); }; -// ---------------------------------------------------------------------------- + /** Contains all data for a number format code. */ class NumberFormat : public WorkbookHelper @@ -88,7 +88,7 @@ private: typedef ::boost::shared_ptr< NumberFormat > NumberFormatRef; -// ============================================================================ + class NumberFormatsBuffer : public WorkbookHelper { @@ -123,7 +123,7 @@ 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 c455cfde697f..199370aa2e4b 100644 --- a/sc/source/filter/inc/ooxformulaparser.hxx +++ b/sc/source/filter/inc/ooxformulaparser.hxx @@ -33,7 +33,7 @@ namespace xls { class OOXMLFormulaParserImpl; -// ============================================================================ + typedef ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo, @@ -100,7 +100,7 @@ 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 47f6239b97fe..c386cdd87fc9 100644 --- a/sc/source/filter/inc/pagesettings.hxx +++ b/sc/source/filter/inc/pagesettings.hxx @@ -30,7 +30,7 @@ namespace xls { class HeaderFooterParser; -// ============================================================================ + /** Holds page style data for a single sheet. */ struct PageSettingsModel @@ -81,7 +81,7 @@ struct PageSettingsModel void setBiffPrintErrors( sal_uInt8 nPrintErrors ); }; -// ============================================================================ + class PageSettings : public WorksheetHelper { @@ -130,7 +130,7 @@ private: PageSettingsModel maModel; }; -// ============================================================================ + class PageSettingsConverter : public WorkbookHelper { @@ -180,7 +180,7 @@ private: HFHelperData maFooterData; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index 484e25fd5b58..e24c5042c060 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -38,7 +38,7 @@ namespace xls { class WorksheetHelper; -// ============================================================================ + typedef ::std::pair< sal_Int32, OUString > IdCaptionPair; typedef ::std::vector< IdCaptionPair > IdCaptionPairList; @@ -105,7 +105,7 @@ friend class PivotCacheItemList; bool mbUnused; }; -// ---------------------------------------------------------------------------- + class PivotCacheItemList : public WorkbookHelper { @@ -141,7 +141,7 @@ private: CacheItemVector maItems; /// All items of this list. }; -// ============================================================================ + struct PCFieldModel { @@ -162,7 +162,7 @@ struct PCFieldModel explicit PCFieldModel(); }; -// ---------------------------------------------------------------------------- + struct PCSharedItemsModel { @@ -180,7 +180,7 @@ struct PCSharedItemsModel explicit PCSharedItemsModel(); }; -// ---------------------------------------------------------------------------- + struct PCFieldGroupModel { @@ -203,7 +203,7 @@ struct PCFieldGroupModel void setBiffGroupBy( sal_uInt8 nGroupBy ); }; -// ---------------------------------------------------------------------------- + /** Helper struct for mapping original item names from/to group item names. */ struct PivotCacheGroupItem @@ -217,7 +217,7 @@ struct PivotCacheGroupItem typedef ::std::vector< PivotCacheGroupItem > PivotCacheGroupItemVector; -// ---------------------------------------------------------------------------- + class PivotCacheField : public WorkbookHelper { @@ -337,7 +337,7 @@ private: PCFieldGroupModel maFieldGroupModel; /// Settings for item grouping. }; -// ============================================================================ + struct PCDefinitionModel { @@ -361,7 +361,7 @@ struct PCDefinitionModel explicit PCDefinitionModel(); }; -// ---------------------------------------------------------------------------- + struct PCSourceModel { @@ -371,7 +371,7 @@ struct PCSourceModel explicit PCSourceModel(); }; -// ---------------------------------------------------------------------------- + struct PCWorksheetSourceModel { @@ -384,7 +384,7 @@ struct PCWorksheetSourceModel explicit PCWorksheetSourceModel(); }; -// ---------------------------------------------------------------------------- + class PivotCache : public WorkbookHelper { @@ -473,7 +473,7 @@ private: bool mbDummySheet; /// True = pivot cache is based on a dummy sheet. }; -// ============================================================================ + class PivotCacheBuffer : public WorkbookHelper { @@ -501,7 +501,7 @@ private: PivotCacheIdVector maCacheIds; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx index de973aefd604..0a3b093dd193 100644 --- a/sc/source/filter/inc/pivotcachefragment.hxx +++ b/sc/source/filter/inc/pivotcachefragment.hxx @@ -28,7 +28,7 @@ namespace xls { class PivotCache; class PivotCacheField; -// ============================================================================ + class PivotCacheFieldContext : public WorkbookContextBase { @@ -47,7 +47,7 @@ private: PivotCacheField& mrCacheField; }; -// ============================================================================ + class PivotCacheDefinitionFragment : public WorkbookFragmentBase { @@ -67,7 +67,7 @@ private: PivotCache& mrPivotCache; }; -// ============================================================================ + class PivotCacheRecordsFragment : public WorksheetFragmentBase { @@ -94,8 +94,8 @@ private: bool mbInRecord; }; -// ============================================================================ -// ============================================================================ + + class BiffPivotCacheFragment : public BiffWorkbookFragmentBase { @@ -112,7 +112,7 @@ private: PivotCache& mrPivotCache; }; -// ============================================================================ + class BiffPivotCacheRecordsContext : public BiffWorksheetContextBase { @@ -139,7 +139,7 @@ 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 f1c1e6dd2f42..4147a4c05dd7 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -36,7 +36,7 @@ namespace xls { class PivotTable; -// ============================================================================ + struct PTFieldItemModel { @@ -52,7 +52,7 @@ struct PTFieldItemModel void setBiffType( sal_uInt16 nType ); }; -// ---------------------------------------------------------------------------- + struct PTFieldModel { @@ -91,7 +91,7 @@ struct PTFieldModel void setBiffAxis( sal_uInt8 nAxisFlags ); }; -// ---------------------------------------------------------------------------- + struct PTPageFieldModel { @@ -102,7 +102,7 @@ struct PTPageFieldModel explicit PTPageFieldModel(); }; -// ---------------------------------------------------------------------------- + struct PTDataFieldModel { @@ -122,7 +122,7 @@ struct PTDataFieldModel void setBiffShowDataAs( sal_Int32 nShowDataAs ); }; -// ---------------------------------------------------------------------------- + class PivotTableField : public WorkbookHelper { @@ -189,7 +189,7 @@ private: sal_Int32 mnFieldIndex; /// Zero-based index of this field. }; -// ============================================================================ + struct PTFilterModel { @@ -210,7 +210,7 @@ struct PTFilterModel explicit PTFilterModel(); }; -// ---------------------------------------------------------------------------- + class PivotTableFilter : public WorkbookHelper { @@ -235,7 +235,7 @@ private: PTFilterModel maModel; }; -// ============================================================================ + struct PTDefinitionModel : public AutoFormatModel { @@ -286,7 +286,7 @@ struct PTDefinitionModel : public AutoFormatModel explicit PTDefinitionModel(); }; -// ---------------------------------------------------------------------------- + struct PTLocationModel { @@ -301,7 +301,7 @@ struct PTLocationModel explicit PTLocationModel(); }; -// ---------------------------------------------------------------------------- + class PivotTable : public WorkbookHelper { @@ -401,7 +401,7 @@ private: mxDPDescriptor; /// Descriptor of the DataPilot object. }; -// ============================================================================ + class PivotTableBuffer : public WorkbookHelper { @@ -419,7 +419,7 @@ private: PivotTableVector maTables; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/pivottablefragment.hxx b/sc/source/filter/inc/pivottablefragment.hxx index b9a7f22ea4e3..6c551b8aedd4 100644 --- a/sc/source/filter/inc/pivottablefragment.hxx +++ b/sc/source/filter/inc/pivottablefragment.hxx @@ -30,7 +30,7 @@ class PivotTable; class PivotTableField; class PivotTableFilter; -// ============================================================================ + class PivotTableFieldContext : public WorksheetContextBase { @@ -49,7 +49,7 @@ private: PivotTableField& mrTableField; }; -// ============================================================================ + class PivotTableFilterContext : public WorksheetContextBase { @@ -68,7 +68,7 @@ private: PivotTableFilter& mrTableFilter; }; -// ============================================================================ + class PivotTableFragment : public WorksheetFragmentBase { @@ -86,7 +86,7 @@ private: PivotTable& mrPivotTable; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/querytablebuffer.hxx b/sc/source/filter/inc/querytablebuffer.hxx index 4cbae0fd8950..da1d952db855 100644 --- a/sc/source/filter/inc/querytablebuffer.hxx +++ b/sc/source/filter/inc/querytablebuffer.hxx @@ -26,7 +26,7 @@ namespace oox { namespace xls { -// ============================================================================ + struct QueryTableModel : public AutoFormatModel { @@ -49,7 +49,7 @@ struct QueryTableModel : public AutoFormatModel explicit QueryTableModel(); }; -// ---------------------------------------------------------------------------- + class QueryTable : public WorksheetHelper { @@ -68,7 +68,7 @@ private: QueryTableModel maModel; }; -// ============================================================================ + class QueryTableBuffer : public WorksheetHelper { @@ -86,7 +86,7 @@ private: QueryTableVector maQueryTables; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/querytablefragment.hxx b/sc/source/filter/inc/querytablefragment.hxx index e442bb6990e3..d4726e3d7d99 100644 --- a/sc/source/filter/inc/querytablefragment.hxx +++ b/sc/source/filter/inc/querytablefragment.hxx @@ -27,7 +27,7 @@ namespace xls { class QueryTable; -// ============================================================================ + class QueryTableFragment : public WorksheetFragmentBase { @@ -46,7 +46,7 @@ private: QueryTable& mrQueryTable; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index 96065d3fbe23..9dfa124f5c43 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { -// ============================================================================ + /** Flags used to specify import/export mode of strings. */ typedef sal_Int32 BiffStringFlags; @@ -46,7 +46,7 @@ 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,7 +88,7 @@ private: typedef ::boost::shared_ptr< RichStringPortion > RichStringPortionRef; -// ---------------------------------------------------------------------------- + enum BiffFontPortionMode { @@ -97,7 +97,7 @@ enum BiffFontPortionMode BIFF_FONTPORTION_OBJ /// Font portion in OBJ or TXO record. }; -// ---------------------------------------------------------------------------- + /** Represents a position in a rich-string containing current font identifier. @@ -117,7 +117,7 @@ struct FontPortionModel void read( SequenceInputStream& rStrm ); }; -// ---------------------------------------------------------------------------- + /** A vector with all font portions in a rich-string. */ class FontPortionModelList : public ::std::vector< FontPortionModel > @@ -131,7 +131,7 @@ public: void importPortions( SequenceInputStream& rStrm ); }; -// ============================================================================ + struct PhoneticDataModel { @@ -145,7 +145,7 @@ struct PhoneticDataModel void setBiffData( sal_Int32 nType, sal_Int32 nAlignment ); }; -// ---------------------------------------------------------------------------- + class PhoneticSettings : public WorkbookHelper { @@ -164,7 +164,7 @@ private: PhoneticDataModel maModel; }; -// ============================================================================ + /** Contains text data and positioning information for a phonetic text portion. */ class RichStringPhonetic : public WorkbookHelper @@ -187,7 +187,7 @@ private: typedef ::boost::shared_ptr< RichStringPhonetic > RichStringPhoneticRef; -// ---------------------------------------------------------------------------- + /** Represents a phonetic text portion in a rich-string with phonetic text. Used in binary filters only. */ @@ -204,7 +204,7 @@ struct PhoneticPortionModel void read( SequenceInputStream& rStrm ); }; -// ---------------------------------------------------------------------------- + /** A vector with all phonetic portions in a rich-string. */ class PhoneticPortionModelList : public ::std::vector< PhoneticPortionModel > @@ -218,7 +218,7 @@ public: void importPortions( SequenceInputStream& rStrm ); }; -// ============================================================================ + /** Contains string data and a list of formatting runs for a rich formatted string. */ class RichString : public WorkbookHelper @@ -280,7 +280,7 @@ 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 feed7f5d3e3c..d9229e089e3d 100644 --- a/sc/source/filter/inc/richstringcontext.hxx +++ b/sc/source/filter/inc/richstringcontext.hxx @@ -26,7 +26,7 @@ namespace oox { namespace xls { -// ============================================================================ + class RichStringContext : public WorkbookContextBase { @@ -45,7 +45,7 @@ private: FontRef mxFont; /// Processed font of the portion. }; -// ---------------------------------------------------------------------------- + template< typename ParentType > RichStringContext::RichStringContext( ParentType& rParent, RichStringRef xString ) : @@ -55,7 +55,7 @@ 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 b0e7dc889d6f..f3fc8b33e47f 100644 --- a/sc/source/filter/inc/scenariobuffer.hxx +++ b/sc/source/filter/inc/scenariobuffer.hxx @@ -28,7 +28,7 @@ namespace oox { namespace xls { -// ============================================================================ + struct ScenarioCellModel { @@ -40,7 +40,7 @@ struct ScenarioCellModel explicit ScenarioCellModel(); }; -// ---------------------------------------------------------------------------- + struct ScenarioModel { @@ -53,7 +53,7 @@ struct ScenarioModel explicit ScenarioModel(); }; -// ---------------------------------------------------------------------------- + class Scenario : public WorkbookHelper { @@ -81,7 +81,7 @@ private: sal_Int16 mnSheet; /// Index of the sheet this scenario is based on. }; -// ============================================================================ + struct SheetScenariosModel { @@ -91,7 +91,7 @@ struct SheetScenariosModel explicit SheetScenariosModel(); }; -// ---------------------------------------------------------------------------- + class SheetScenarios : public WorkbookHelper { @@ -116,7 +116,7 @@ private: sal_Int16 mnSheet; }; -// ============================================================================ + class ScenarioBuffer : public WorkbookHelper { @@ -134,7 +134,7 @@ private: SheetScenariosMap maSheetScenarios; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/scenariocontext.hxx b/sc/source/filter/inc/scenariocontext.hxx index 3806b376aa2f..a583f983e33a 100644 --- a/sc/source/filter/inc/scenariocontext.hxx +++ b/sc/source/filter/inc/scenariocontext.hxx @@ -28,7 +28,7 @@ namespace xls { class Scenario; class SheetScenarios; -// ============================================================================ + class ScenarioContext : public WorksheetContextBase { @@ -46,7 +46,7 @@ private: Scenario& mrScenario; }; -// ============================================================================ + class ScenariosContext : public WorksheetContextBase { @@ -64,7 +64,7 @@ private: SheetScenarios& mrSheetScenarios; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/sharedstringsbuffer.hxx b/sc/source/filter/inc/sharedstringsbuffer.hxx index f910e1ee7f44..31475d25629c 100644 --- a/sc/source/filter/inc/sharedstringsbuffer.hxx +++ b/sc/source/filter/inc/sharedstringsbuffer.hxx @@ -25,7 +25,7 @@ namespace oox { namespace xls { -// ============================================================================ + /** Collects all strings from the shared strings substream. */ class SharedStringsBuffer : public WorkbookHelper @@ -47,7 +47,7 @@ private: StringVector maStrings; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/sharedstringsfragment.hxx b/sc/source/filter/inc/sharedstringsfragment.hxx index 4986b6f71c0b..a4384c21010b 100644 --- a/sc/source/filter/inc/sharedstringsfragment.hxx +++ b/sc/source/filter/inc/sharedstringsfragment.hxx @@ -25,7 +25,7 @@ namespace oox { namespace xls { -// ============================================================================ + class SharedStringsFragment : public WorkbookFragmentBase { @@ -42,7 +42,7 @@ protected: virtual void finalizeImport(); }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index f84f91c39430..f2ffdd02d1ec 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { -// ============================================================================ + /** Stores basic data about cell values and formatting. */ struct CellModel @@ -46,7 +46,7 @@ struct CellModel explicit CellModel(); }; -// ---------------------------------------------------------------------------- + /** Stores data about cell formulas. */ struct CellFormulaModel @@ -64,7 +64,7 @@ struct CellFormulaModel bool isValidSharedRef( const ::com::sun::star::table::CellAddress& rCellAddr ); }; -// ---------------------------------------------------------------------------- + /** Stores data about table operations. */ struct DataTableModel @@ -79,7 +79,7 @@ struct DataTableModel explicit DataTableModel(); }; -// ============================================================================ + /** Manages all cell blocks currently in use. */ class CellBlockBuffer : public WorksheetHelper @@ -100,7 +100,7 @@ private: sal_Int32 mnCurrRow; /// Current row index used for buffered cell import. }; -// ============================================================================ + /** Manages the cell contents and cell formatting of a sheet. @@ -253,7 +253,7 @@ 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 3f3e377f5c54..dba7a7e88b14 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -30,7 +30,7 @@ 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,7 +48,7 @@ struct SheetDataContextBase virtual ~SheetDataContextBase(); }; -// ============================================================================ + /** This class implements importing the sheetData element. @@ -133,7 +133,7 @@ private: sal_Int32 mnCol; }; -// ============================================================================ + } // namespace xls diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 19f37cbcde4c..8c8d5ad5f47c 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -48,7 +48,7 @@ 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). @@ -62,7 +62,7 @@ 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; @@ -77,7 +77,7 @@ 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,7 +93,7 @@ public: virtual sal_Int32 getPaletteColor( sal_Int32 nPaletteIdx ) const; }; -// ============================================================================ + class Color : public ::oox::drawingml::Color { @@ -119,11 +119,11 @@ 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,7 +149,7 @@ 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,7 +177,7 @@ struct FontModel void setBiffEscapement( sal_uInt16 nEscapement ); }; -// ---------------------------------------------------------------------------- + /** Enumerates different types of API font property sets. */ enum FontPropertyType @@ -186,7 +186,7 @@ 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,7 +206,7 @@ struct ApiFontUsedFlags explicit ApiFontUsedFlags( bool bAllUsed ); }; -// ---------------------------------------------------------------------------- + /** Contains API font name, family, and charset for a script type. */ struct ApiScriptFontName @@ -218,7 +218,7 @@ struct ApiScriptFontName explicit ApiScriptFontName(); }; -// ---------------------------------------------------------------------------- + /** Contains all API font attributes. */ struct ApiFontData @@ -238,7 +238,7 @@ struct ApiFontData explicit ApiFontData(); }; -// ============================================================================ + class Font : public WorkbookHelper { @@ -301,7 +301,7 @@ private: typedef ::boost::shared_ptr< Font > FontRef; -// ============================================================================ + /** Contains all XML cell alignment attributes, e.g. from an alignment element. */ struct AlignmentModel @@ -323,7 +323,7 @@ struct AlignmentModel void setBiffVerAlign( sal_uInt8 nVerAlign ); }; -// ---------------------------------------------------------------------------- + /** Contains all API cell alignment attributes. */ struct ApiAlignmentData @@ -347,7 +347,7 @@ struct ApiAlignmentData bool operator==( const ApiAlignmentData& rLeft, const ApiAlignmentData& rRight ); -// ============================================================================ + class Alignment : public WorkbookHelper { @@ -382,7 +382,7 @@ private: typedef ::boost::shared_ptr< Alignment > AlignmentRef; -// ============================================================================ + /** Contains all XML cell protection attributes, e.g. from a protection element. */ struct ProtectionModel @@ -393,7 +393,7 @@ struct ProtectionModel explicit ProtectionModel(); }; -// ---------------------------------------------------------------------------- + /** Contains all API cell protection attributes. */ struct ApiProtectionData @@ -407,7 +407,7 @@ struct ApiProtectionData bool operator==( const ApiProtectionData& rLeft, const ApiProtectionData& rRight ); -// ============================================================================ + class Protection : public WorkbookHelper { @@ -438,7 +438,7 @@ private: typedef ::boost::shared_ptr< Protection > ProtectionRef; -// ============================================================================ + /** Contains XML attributes of a single border line. */ struct BorderLineModel @@ -453,7 +453,7 @@ struct BorderLineModel void setBiffStyle( sal_Int32 nLineStyle ); }; -// ---------------------------------------------------------------------------- + /** Contains XML attributes of a complete cell border. */ struct BorderModel @@ -469,7 +469,7 @@ struct BorderModel explicit BorderModel( bool bDxf ); }; -// ---------------------------------------------------------------------------- + /** Contains API attributes of a complete cell border. */ struct ApiBorderData @@ -493,7 +493,7 @@ struct ApiBorderData bool operator==( const ApiBorderData& rLeft, const ApiBorderData& rRight ); -// ============================================================================ + class Border : public WorkbookHelper { @@ -544,7 +544,7 @@ private: typedef ::boost::shared_ptr< Border > BorderRef; -// ============================================================================ + /** Contains XML pattern fill attributes from the patternFill element. */ struct PatternFillModel @@ -562,7 +562,7 @@ struct PatternFillModel void setBiffPattern( sal_Int32 nPattern ); }; -// ---------------------------------------------------------------------------- + /** Contains XML gradient fill attributes from the gradientFill element. */ struct GradientFillModel @@ -585,7 +585,7 @@ struct GradientFillModel void readGradientStop( SequenceInputStream& rStrm, bool bDxf ); }; -// ---------------------------------------------------------------------------- + /** Contains API fill attributes. */ struct ApiSolidFillData @@ -599,7 +599,7 @@ 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,7 +657,7 @@ private: typedef ::boost::shared_ptr< Fill > FillRef; -// ============================================================================ + /** Contains all data for a cell format or cell style. */ struct XfModel @@ -680,7 +680,7 @@ struct XfModel bool operator==( const XfModel& rXfModel1, const XfModel& rXfModel2 ); -// ============================================================================ + /** Represents a cell format or a cell style (called XF, extended format). @@ -743,7 +743,7 @@ bool operator==( const Xf& rXf1, const Xf& rXf2 ); typedef ::boost::shared_ptr< Xf > XfRef; -// ============================================================================ + class Dxf : public WorkbookHelper { @@ -779,7 +779,7 @@ private: typedef ::boost::shared_ptr< Dxf > DxfRef; -// ============================================================================ + /** Contains attributes of a cell style, e.g. from the cellStyle element. */ struct CellStyleModel @@ -800,7 +800,7 @@ struct CellStyleModel bool isDefaultStyle() const; }; -// ============================================================================ + class CellStyle : public WorkbookHelper { @@ -833,7 +833,7 @@ private: typedef ::boost::shared_ptr< CellStyle > CellStyleRef; -// ============================================================================ + class CellStyleBuffer : public WorkbookHelper { @@ -873,7 +873,7 @@ private: CellStyleRef mxDefStyle; /// Default cell style. }; -// ============================================================================ + struct AutoFormatModel { @@ -888,7 +888,7 @@ struct AutoFormatModel explicit AutoFormatModel(); }; -// ============================================================================ + class StylesBuffer : public WorkbookHelper { @@ -1002,7 +1002,7 @@ 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 5e8f1770c34d..e891e6d4f4ca 100644 --- a/sc/source/filter/inc/stylesfragment.hxx +++ b/sc/source/filter/inc/stylesfragment.hxx @@ -26,7 +26,7 @@ namespace oox { namespace xls { -// ============================================================================ + class IndexedColorsContext : public WorkbookContextBase { @@ -38,7 +38,7 @@ protected: virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); }; -// ============================================================================ + class FontContext : public WorkbookContextBase { @@ -54,7 +54,7 @@ private: FontRef mxFont; }; -// ============================================================================ + class BorderContext : public WorkbookContextBase { @@ -71,7 +71,7 @@ private: BorderRef mxBorder; }; -// ============================================================================ + class FillContext : public WorkbookContextBase { @@ -88,7 +88,7 @@ private: double mfGradPos; /// Gradient color position. }; -// ============================================================================ + class XfContext : public WorkbookContextBase { @@ -106,7 +106,7 @@ private: bool mbCellXf; /// True = cell XF, false = style XF. }; -// ============================================================================ + class DxfContext : public WorkbookContextBase { @@ -122,7 +122,7 @@ private: DxfRef mxDxf; }; -// ============================================================================ + class StylesFragment : public WorkbookFragmentBase { @@ -139,7 +139,7 @@ protected: virtual void finalizeImport(); }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/tablebuffer.hxx b/sc/source/filter/inc/tablebuffer.hxx index 2de2d30719a2..91042f17f9d3 100644 --- a/sc/source/filter/inc/tablebuffer.hxx +++ b/sc/source/filter/inc/tablebuffer.hxx @@ -27,7 +27,7 @@ namespace oox { namespace xls { -// ============================================================================ + struct TableModel { @@ -43,7 +43,7 @@ struct TableModel explicit TableModel(); }; -// ---------------------------------------------------------------------------- + class Table : public WorkbookHelper { @@ -92,7 +92,7 @@ private: typedef ::boost::shared_ptr< Table > TableRef; -// ============================================================================ + class TableBuffer : public WorkbookHelper { @@ -125,7 +125,7 @@ private: TableNameMap maNameTables; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/tablefragment.hxx b/sc/source/filter/inc/tablefragment.hxx index 92bc84e55075..f6a6a0e3465a 100644 --- a/sc/source/filter/inc/tablefragment.hxx +++ b/sc/source/filter/inc/tablefragment.hxx @@ -27,7 +27,7 @@ namespace xls { class Table; -// ============================================================================ + class TableFragment : public WorksheetFragmentBase { @@ -46,7 +46,7 @@ private: Table& mrTable; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/themebuffer.hxx b/sc/source/filter/inc/themebuffer.hxx index c0775a6020d5..f1593beaf63b 100644 --- a/sc/source/filter/inc/themebuffer.hxx +++ b/sc/source/filter/inc/themebuffer.hxx @@ -28,7 +28,7 @@ namespace xls { struct FontModel; -// ============================================================================ + class ThemeBuffer : public ::oox::drawingml::Theme, public WorkbookHelper { @@ -47,7 +47,7 @@ private: FontModelPtr mxDefFontModel; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 61a5df570d21..41b9ab1a2eac 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -50,7 +50,7 @@ struct TokenId }; -//------------------------------------------------------------------------ + struct ScComplexRefData; class TokenStack; diff --git a/sc/source/filter/inc/unitconverter.hxx b/sc/source/filter/inc/unitconverter.hxx index 88921d1ceb5b..18e7f5a08f7c 100644 --- a/sc/source/filter/inc/unitconverter.hxx +++ b/sc/source/filter/inc/unitconverter.hxx @@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { -// ============================================================================ + /** Units supported by the UnitConverter class. */ enum Unit @@ -104,7 +104,7 @@ 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 8a90d1e058ff..8dfdfa5940a2 100644 --- a/sc/source/filter/inc/viewsettings.hxx +++ b/sc/source/filter/inc/viewsettings.hxx @@ -29,7 +29,7 @@ namespace oox { namespace xls { -// ============================================================================ + /** Contains all settings for a selection in a single pane of a sheet. */ struct PaneSelectionModel @@ -41,7 +41,7 @@ struct PaneSelectionModel explicit PaneSelectionModel(); }; -// ---------------------------------------------------------------------------- + /** Contains all view settings for a single sheet. */ struct SheetViewModel @@ -93,7 +93,7 @@ struct SheetViewModel typedef ::boost::shared_ptr< SheetViewModel > SheetViewModelRef; -// ---------------------------------------------------------------------------- + class SheetViewSettings : public WorksheetHelper { @@ -132,7 +132,7 @@ private: SheetViewModelVec maSheetViews; }; -// ============================================================================ + /** Contains all view settings for the entire document. */ struct WorkbookViewModel @@ -155,7 +155,7 @@ struct WorkbookViewModel typedef ::boost::shared_ptr< WorkbookViewModel > WorkbookViewModelRef; -// ---------------------------------------------------------------------------- + class ViewSettings : public WorkbookHelper { @@ -203,7 +203,7 @@ 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 88042abee875..7c15c34b5209 100644 --- a/sc/source/filter/inc/workbookfragment.hxx +++ b/sc/source/filter/inc/workbookfragment.hxx @@ -28,7 +28,7 @@ namespace xls { class ExternalLink; -// ============================================================================ + class WorkbookFragment : public WorkbookFragmentBase { diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index c0d79ffb3ca2..2d0804929ad9 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -66,7 +66,7 @@ namespace xls { class ExcelFilter; -// ============================================================================ + /** An enumeration for all supported spreadsheet filter types. */ enum FilterType @@ -76,7 +76,7 @@ enum FilterType FILTER_UNKNOWN /// Unknown filter type. }; -// ============================================================================ + /** Functor for case-insensitive string comparison, usable in maps etc. */ struct IgnoreCaseCompare @@ -84,7 +84,7 @@ struct IgnoreCaseCompare bool operator()( const OUString& rName1, const OUString& rName2 ) const; }; -// ============================================================================ + class AddressConverter; class BiffCodecHelper; @@ -289,7 +289,7 @@ private: WorkbookGlobals& mrBookGlob; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/workbooksettings.hxx b/sc/source/filter/inc/workbooksettings.hxx index 6d2423a7cbaf..8c4e2219ede4 100644 --- a/sc/source/filter/inc/workbooksettings.hxx +++ b/sc/source/filter/inc/workbooksettings.hxx @@ -27,7 +27,7 @@ namespace com { namespace sun { namespace star { namespace util { struct Date; } namespace oox { namespace xls { -// ============================================================================ + /** Settings for workbook write protection. */ struct FileSharingModel @@ -39,7 +39,7 @@ struct FileSharingModel explicit FileSharingModel(); }; -// ============================================================================ + /** Global workbook settings. */ struct WorkbookSettingsModel @@ -58,7 +58,7 @@ struct WorkbookSettingsModel void setBiffObjectMode( sal_uInt16 nObjMode ); }; -// ============================================================================ + /** Workbook calculation settings. */ struct CalcSettingsModel @@ -79,7 +79,7 @@ struct CalcSettingsModel explicit CalcSettingsModel(); }; -// ============================================================================ + class WorkbookSettings : public WorkbookHelper { @@ -118,7 +118,7 @@ private: CalcSettingsModel maCalcSettings; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx index 54b47d15177b..8c996f01d234 100644 --- a/sc/source/filter/inc/worksheetbuffer.hxx +++ b/sc/source/filter/inc/worksheetbuffer.hxx @@ -32,7 +32,7 @@ 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,7 +46,7 @@ struct SheetInfoModel explicit SheetInfoModel(); }; -// ============================================================================ + /** Stores information about all sheets in a spreadsheet document. @@ -111,7 +111,7 @@ private: SheetInfoMap maSheetInfosByName; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/worksheetfragment.hxx b/sc/source/filter/inc/worksheetfragment.hxx index 49f23c7b1bfe..b4c80e913ab3 100644 --- a/sc/source/filter/inc/worksheetfragment.hxx +++ b/sc/source/filter/inc/worksheetfragment.hxx @@ -25,7 +25,7 @@ namespace oox { namespace xls { -// ============================================================================ + class DataValidationsContext : public WorksheetContextBase { @@ -49,7 +49,7 @@ private: ::std::auto_ptr< ValidationModel > mxValModel; }; -// ============================================================================ + class WorksheetFragment : public WorksheetFragmentBase { diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index d93ccc47751a..07f3b736e2f5 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -58,8 +58,8 @@ class VmlDrawing; class WorksheetSettings; typedef ::std::map< OUString, void* > ExtLst; -// ============================================================================ -// ============================================================================ + + typedef ::std::map< BinAddress, sal_Int32 > SharedFormulaMap; @@ -74,7 +74,7 @@ enum WorksheetType SHEETTYPE_EMPTYSHEET /// Other (unsupported) sheet type. }; -// ============================================================================ + /** Stores settings and formatting data about a range of sheet columns. */ struct ColumnModel @@ -93,7 +93,7 @@ struct ColumnModel bool isMergeable( const ColumnModel& rModel ) const; }; -// ---------------------------------------------------------------------------- + /** Stores settings and formatting data about a sheet row. */ struct RowModel @@ -119,7 +119,7 @@ struct RowModel bool isMergeable( const RowModel& rModel ) const; }; -// ---------------------------------------------------------------------------- + /** Stores formatting data about a page break. */ struct PageBreakModel @@ -132,7 +132,7 @@ struct PageBreakModel explicit PageBreakModel(); }; -// ---------------------------------------------------------------------------- + /** Stores data about a hyperlink range. */ struct HyperlinkModel : public ::oox::ole::StdHlinkInfo @@ -144,7 +144,7 @@ struct HyperlinkModel : public ::oox::ole::StdHlinkInfo explicit HyperlinkModel(); }; -// ---------------------------------------------------------------------------- + /** Stores data about ranges with data validation settings. */ struct ValidationModel @@ -175,8 +175,8 @@ struct ValidationModel void setBiffErrorStyle( sal_uInt8 nErrorStyle ); }; -// ============================================================================ -// ============================================================================ + + class WorksheetGlobals; typedef ::boost::shared_ptr< WorksheetGlobals > WorksheetGlobalsRef; @@ -203,7 +203,7 @@ public: // horrible accessor for hidden WorksheetGlobals ... static IWorksheetProgress *getWorksheetInterface( const WorksheetGlobalsRef &xRef ); - // ------------------------------------------------------------------------ + /** Returns the type of this sheet. */ WorksheetType getSheetType() const; @@ -331,8 +331,8 @@ private: WorksheetGlobals& mrSheetGlob; }; -// ============================================================================ -// ============================================================================ + + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/worksheetsettings.hxx b/sc/source/filter/inc/worksheetsettings.hxx index 9fc17a3bf253..161492211813 100644 --- a/sc/source/filter/inc/worksheetsettings.hxx +++ b/sc/source/filter/inc/worksheetsettings.hxx @@ -26,7 +26,7 @@ namespace oox { namespace xls { -// ============================================================================ + /** Sheet and outline settings. */ struct SheetSettingsModel @@ -41,7 +41,7 @@ struct SheetSettingsModel explicit SheetSettingsModel(); }; -// ============================================================================ + /** Sheet protection settings. */ struct SheetProtectionModel @@ -67,7 +67,7 @@ struct SheetProtectionModel explicit SheetProtectionModel(); }; -// ============================================================================ + class WorksheetSettings : public WorksheetHelper { @@ -109,7 +109,7 @@ private: SheetProtectionModel maSheetProt; }; -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index 9d9617b681de..21c9837075ca 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -29,7 +29,7 @@ namespace utl { class TempFile; } -// ============================================================================ + class SvStream; @@ -49,7 +49,7 @@ private: SAL_WNODEPRECATED_DECLARATIONS_POP }; -// ============================================================================ + class XclObj; class XclExpDffAnchorBase; @@ -155,7 +155,7 @@ public: -// ============================================================================ + // --- class XclEscherClientData ------------------------------------- diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index 2777434596fa..2dff81099930 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -24,7 +24,7 @@ #include "xcl97esc.hxx" #include "xlstyle.hxx" -// ============================================================================ + class XclObj; class XclExpMsoDrawing; @@ -433,7 +433,7 @@ public: virtual sal_Size GetLen() const; }; -// ============================================================================ + /** Represents a SHEETPROTECTION record that stores sheet protection options. Note that a sheet still needs to save its sheet protection @@ -450,7 +450,7 @@ private: sal_uInt16 mnOptions; /// Encoded sheet protection options. }; -// ============================================================================ + class XclCalccount : public ExcRecord { @@ -514,7 +514,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); }; -// ============================================================================ + class XclExpFileEncryption : public XclExpRecord { @@ -529,7 +529,7 @@ private: const XclExpRoot& mrRoot; }; -// ============================================================================ + /** Beginning of User Interface Records */ class XclExpInterfaceHdr : public XclExpUInt16Record @@ -541,7 +541,7 @@ private: virtual void WriteBody( XclExpStream& rStrm ); }; -// ============================================================================ + /** End of User Interface Records */ class XclExpInterfaceEnd : public XclExpRecord @@ -554,7 +554,7 @@ private: virtual void WriteBody( XclExpStream& rStrm ); }; -// ============================================================================ + /** Write Access User Name - This record contains the user name, which is the name you type when you install Excel. */ @@ -568,7 +568,7 @@ private: virtual void WriteBody( XclExpStream& rStrm ); }; -// ============================================================================ + class XclExpFileSharing : public XclExpRecord { @@ -586,7 +586,7 @@ private: bool mbRecommendReadOnly; }; -// ============================================================================ + class XclExpProt4Rev : public XclExpRecord { @@ -598,7 +598,7 @@ private: virtual void WriteBody( XclExpStream& rStrm ); }; -// ============================================================================ + class XclExpProt4RevPass : public XclExpRecord { @@ -610,7 +610,7 @@ private: virtual void WriteBody( XclExpStream& rStrm ); }; -// ============================================================================ + class XclExpRecalcId : public XclExpDummyRecord { @@ -618,7 +618,7 @@ public: explicit XclExpRecalcId(); }; -// ============================================================================ + class XclExpBookExt : public XclExpDummyRecord { diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 6884ddd1b6e7..c9c0afed16c7 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -154,7 +154,7 @@ private: XclExpChRootDataRef mxChData; /// Reference to the root data object. }; -// ---------------------------------------------------------------------------- + /** Base class for chart record groups. Provides helper functions to write sub records. @@ -185,7 +185,7 @@ private: XclChFrBlock maFrBlock; /// Future records block settings. }; -// ---------------------------------------------------------------------------- + /** Base class for chart future records. On saving, the record writes missing CHFRBLOCKBEGIN records automatically. @@ -219,7 +219,7 @@ private: typedef boost::shared_ptr< XclExpChFramePos > XclExpChFramePosRef; -// ---------------------------------------------------------------------------- + class XclExpChLineFormat : public XclExpRecord { @@ -254,7 +254,7 @@ private: typedef boost::shared_ptr< XclExpChLineFormat > XclExpChLineFormatRef; -// ---------------------------------------------------------------------------- + class XclExpChAreaFormat : public XclExpRecord { @@ -288,7 +288,7 @@ private: typedef boost::shared_ptr< XclExpChAreaFormat > XclExpChAreaFormatRef; -// ---------------------------------------------------------------------------- + class XclExpChEscherFormat : public XclExpChGroupBase { @@ -323,7 +323,7 @@ private: typedef boost::shared_ptr< XclExpChEscherFormat > XclExpChEscherFormatRef; -// ---------------------------------------------------------------------------- + /** Base class for record groups containing frame formatting. @@ -357,7 +357,7 @@ private: XclExpChEscherFormatRef mxEscherFmt; /// Complex area format (CHESCHERFORMAT record). }; -// ---------------------------------------------------------------------------- + /** Represents the CHFRAME record group containing object frame properties. @@ -445,7 +445,7 @@ public: typedef boost::shared_ptr< XclExpChFont > XclExpChFontRef; -// ---------------------------------------------------------------------------- + /** The CHOBJECTLINK record linking a text object to a specific chart object. */ class XclExpChObjectLink : public XclExpRecord @@ -462,7 +462,7 @@ private: typedef boost::shared_ptr< XclExpChObjectLink > XclExpChObjectLinkRef; -// ---------------------------------------------------------------------------- + /** Additional data label settings in the future record CHFRLABELPROPS. */ class XclExpChFrLabelProps : public XclExpChFutureRecordBase @@ -485,7 +485,7 @@ private: typedef boost::shared_ptr< XclExpChFrLabelProps > XclExpChFrLabelPropsRef; -// ---------------------------------------------------------------------------- + /** Base class for objects with font settings. Provides font conversion helper functions. */ class XclExpChFontBase @@ -506,7 +506,7 @@ public: void ConvertRotationBase( const XclExpChRoot& rRoot, const ScfPropertySet& rPropSet, bool bSupportsStacked ); }; -// ---------------------------------------------------------------------------- + /** Represents the CHTEXT record group containing text object properties. @@ -597,7 +597,7 @@ private: typedef boost::shared_ptr< XclExpChMarkerFormat > XclExpChMarkerFormatRef; -// ---------------------------------------------------------------------------- + /** The CHPIEFORMAT record containing data point formatting data for pie segments. */ class XclExpChPieFormat : public XclExpUInt16Record @@ -611,7 +611,7 @@ public: typedef boost::shared_ptr< XclExpChPieFormat > XclExpChPieFormatRef; -// ---------------------------------------------------------------------------- + /** The CH3DDATAFORMAT record containing the bar type in 3D bar charts. */ class XclExpCh3dDataFormat : public XclExpRecord @@ -631,7 +631,7 @@ private: typedef boost::shared_ptr< XclExpCh3dDataFormat > XclExpCh3dDataFormatRef; -// ---------------------------------------------------------------------------- + /** The CHATTACHEDLABEL record that contains the type of a data point label. */ class XclExpChAttachedLabel : public XclExpUInt16Record @@ -642,7 +642,7 @@ public: typedef boost::shared_ptr< XclExpChAttachedLabel > XclExpChAttLabelRef; -// ---------------------------------------------------------------------------- + /** Represents the CHDATAFORMAT record group containing data point properties. @@ -683,7 +683,7 @@ private: typedef boost::shared_ptr< XclExpChDataFormat > XclExpChDataFormatRef; -// ---------------------------------------------------------------------------- + /** Represents the CHSERTRENDLINE record containing settings for a trend line. */ class XclExpChSerTrendLine : public XclExpRecord, protected XclExpChRoot @@ -713,7 +713,7 @@ private: typedef boost::shared_ptr< XclExpChSerTrendLine > XclExpChSerTrendLineRef; -// ---------------------------------------------------------------------------- + /** Represents the CHSERERRORBAR record containing settings for error bars. */ class XclExpChSerErrorBar : public XclExpRecord, protected XclExpChRoot @@ -733,7 +733,7 @@ private: typedef boost::shared_ptr< XclExpChSerErrorBar > XclExpChSerErrorBarRef; -// ---------------------------------------------------------------------------- + /** Represents the CHSERIES record group describing a data series in a chart. @@ -838,7 +838,7 @@ private: XclChTypeInfo maTypeInfo; /// Chart type info for the contained type. }; -// ---------------------------------------------------------------------------- + /** Represents the CHCHART3D record that contains 3D view settings. */ class XclExpChChart3d : public XclExpRecord @@ -863,7 +863,7 @@ private: typedef boost::shared_ptr< XclExpChChart3d > XclExpChChart3dRef; -// ---------------------------------------------------------------------------- + /** Represents the CHLEGEND record group describing the chart legend. @@ -893,7 +893,7 @@ private: typedef boost::shared_ptr< XclExpChLegend > XclExpChLegendRef; -// ---------------------------------------------------------------------------- + /** Represents the CHDROPBAR record group describing pos/neg bars in line charts. @@ -921,7 +921,7 @@ private: typedef boost::shared_ptr< XclExpChDropBar > XclExpChDropBarRef; -// ---------------------------------------------------------------------------- + /** Represents the CHTYPEGROUP record group describing a group of series. @@ -1029,7 +1029,7 @@ private: typedef boost::shared_ptr< XclExpChLabelRange > XclExpChLabelRangeRef; -// ---------------------------------------------------------------------------- + class XclExpChValueRange : public XclExpRecord, protected XclExpChRoot { @@ -1050,7 +1050,7 @@ private: typedef boost::shared_ptr< XclExpChValueRange > XclExpChValueRangeRef; -// ---------------------------------------------------------------------------- + class XclExpChTick : public XclExpRecord, protected XclExpChRoot { @@ -1074,7 +1074,7 @@ private: typedef boost::shared_ptr< XclExpChTick > XclExpChTickRef; -// ---------------------------------------------------------------------------- + /** Represents the CHAXIS record group describing an entire chart axis. @@ -1129,7 +1129,7 @@ private: typedef boost::shared_ptr< XclExpChAxis > XclExpChAxisRef; -// ---------------------------------------------------------------------------- + /** Represents the CHAXESSET record group describing an axes set (X/Y/Z axes). @@ -1239,7 +1239,7 @@ 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,7 +1260,7 @@ private: boost::shared_ptr< XclExpRecordBase > mxObjRecs; }; -// ---------------------------------------------------------------------------- + /** Represents the entire chart substream (all records in BOF/EOF block). */ class XclExpChart : public XclExpSubStream, protected XclExpRoot @@ -1273,7 +1273,7 @@ public: XModelRef xModel, const Rectangle& rChartRect ); }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 64b98f6a413c..314c0846db2f 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -220,7 +220,7 @@ private: const Color& mrColor; }; -// ---------------------------------------------------------------------------- + class ScConditionalFormat; @@ -296,7 +296,7 @@ private: sal_Int32 mnPriority; }; -// ---------------------------------------------------------------------------- + /** Contains all conditional formats of a specific sheet. */ class XclExpCondFormatBuffer : public XclExpRecordBase, protected XclExpRoot @@ -357,7 +357,7 @@ 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,7 +416,7 @@ private: bool mbEntireDoc; /// true = entire document. }; -// ---------------------------------------------------------------------------- + /** Contains all web query records for this document. */ class XclExpWebQueryBuffer : public XclExpRecordList< XclExpWebQuery > @@ -425,7 +425,7 @@ public: explicit XclExpWebQueryBuffer( const XclExpRoot& rRoot ); }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 096d39323634..660d5f38ceb0 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -65,7 +65,7 @@ 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,7 +81,7 @@ private: SCTAB mnScTab; /// Calc sheet index. }; -// ---------------------------------------------------------------------------- + /** Represents the position (anchor) of a shape in an embedded draw page. */ class XclExpDffEmbeddedAnchor : public XclExpDffAnchorBase @@ -100,7 +100,7 @@ private: sal_Int32 mnScaleY; }; -// ---------------------------------------------------------------------------- + /** Represents the position (anchor) of a note object. */ class XclExpDffNoteAnchor : public XclExpDffAnchorBase @@ -109,7 +109,7 @@ public: explicit XclExpDffNoteAnchor( const XclExpRoot& rRoot, const Rectangle& rRect ); }; -// ---------------------------------------------------------------------------- + /** Represents the position (anchor) of a cell dropdown object. */ class XclExpDffDropDownAnchor : public XclExpDffAnchorBase @@ -134,7 +134,7 @@ 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,7 +145,7 @@ public: explicit XclExpMsoDrawingGroup( XclEscherEx& rEscherEx ); }; -// ---------------------------------------------------------------------------- + /** One or more MSODRAWING records contain the DFF stream data for a drawing shape. @@ -156,7 +156,7 @@ public: explicit XclExpMsoDrawing( XclEscherEx& rEscherEx ); }; -// ============================================================================ + /** Provides export of bitmap data to an IMGDATA record. */ class XclExpImgData : public XclExpRecordBase @@ -173,7 +173,7 @@ private: sal_uInt16 mnRecId; /// Record identifier for the IMGDATA record. }; -// ============================================================================ + /** Helper class for form controils to manage spreadsheet links . */ class XclExpControlHelper : protected XclExpRoot @@ -234,7 +234,7 @@ private: virtual void WriteSubRecs( XclExpStream& rStrm ); }; -// ---------------------------------------------------------------------------- + //delete for exporting OCX //#if EXC_EXP_OCX_CTRL @@ -302,7 +302,7 @@ private: //#endif -// ---------------------------------------------------------------------------- + class XclExpChart; @@ -331,7 +331,7 @@ private: XChartDocRef mxChartDoc; }; -// ============================================================================ + /** Represents a NOTE record containing the relevant data of a cell note. @@ -387,7 +387,7 @@ private: Rectangle maCommentTo; /// To and To Offsets }; -// ============================================================================ + class XclExpComments : public XclExpRecord { @@ -452,7 +452,7 @@ private: boost::shared_ptr< XclExpObjList > mxObjList; }; -// ---------------------------------------------------------------------------- + class XclExpEmbeddedObjectManager : public XclExpObjectManager { @@ -472,7 +472,7 @@ private: sal_Int32 mnScaleY; }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xeformula.hxx b/sc/source/filter/inc/xeformula.hxx index 6dbee75e262c..14efdaf9a8e2 100644 --- a/sc/source/filter/inc/xeformula.hxx +++ b/sc/source/filter/inc/xeformula.hxx @@ -87,7 +87,7 @@ private: XclExpFmlaCompImplRef mxImpl; }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index 132c9a1cc1fc..d06fc7b923f4 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -203,7 +203,7 @@ private: bool mbMultipleUrls; /// true = Multiple URL fields processed. }; -// ---------------------------------------------------------------------------- + class EditEngine; class EditTextObject; @@ -413,7 +413,7 @@ private: XclExpUrlHelper(); }; -// ---------------------------------------------------------------------------- + class ScMatrix; /** Contains cached values in a 2-dimensional array. */ @@ -435,7 +435,7 @@ private: const ScMatrix& mrMatrix; }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index 0aa5ee378baf..c5a5e19cc3ee 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -205,7 +205,7 @@ private: XclExpLinkMgrImplPtr mxImpl; }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx index 3d4c1f9d832f..f607b5e52359 100644 --- a/sc/source/filter/inc/xename.hxx +++ b/sc/source/filter/inc/xename.hxx @@ -26,7 +26,7 @@ #include "xeroot.hxx" #include <boost/shared_ptr.hpp> -// ============================================================================ + class ScRangeList; class XclExpNameManagerImpl; @@ -76,7 +76,7 @@ private: XclExpNameMgrImplRef mxImpl; }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx index 4715539821ef..1972d6324e02 100644 --- a/sc/source/filter/inc/xepage.hxx +++ b/sc/source/filter/inc/xepage.hxx @@ -104,7 +104,7 @@ private: XclPageData maData; /// Page settings data. }; -// ---------------------------------------------------------------------------- + /** Contains all page (print) settings records for a chart object. */ class XclExpChartPageSettings : public XclExpRecordBase, protected XclExpRoot @@ -123,7 +123,7 @@ private: XclPageData maData; /// Page settings data. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 6f5a9a4a9d05..e5a171a058dc 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -33,9 +33,9 @@ class ScDPSaveGroupDimension; class ScDPSaveNumGroupDimension; struct ScDPNumGroupInfo; -// ============================================================================ + // Pivot cache -// ============================================================================ + /** Represents a data item in a pivot cache containing data of any type. */ class XclExpPCItem : public XclExpRecord, public XclPCItem @@ -61,7 +61,7 @@ private: sal_uInt16 mnTypeFlag; /// Data type flag. }; -// ============================================================================ + class XclExpPivotCache; @@ -164,7 +164,7 @@ private: sal_uInt16 mnTypeFlags; /// Collected item data type flags. }; -// ============================================================================ + class XclExpPivotCache : protected XclExpRoot { @@ -239,16 +239,16 @@ private: bool mbValid; /// true = The cache is valid for export. }; -// ============================================================================ + // Pivot table -// ============================================================================ + 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 { @@ -271,7 +271,7 @@ private: XclPTItemInfo maItemInfo; /// General data for this item. }; -// ============================================================================ + class XclExpPTField : public XclExpRecordBase { @@ -312,7 +312,7 @@ public: /** Writes the entire pivot table field. */ virtual void Save( XclExpStream& rStrm ); - // ------------------------------------------------------------------------ + private: /** Returns an item by its name. */ XclExpPTItem* GetItemAcc( const OUString& rName ); @@ -338,7 +338,7 @@ private: XclExpPTItemList maItemList; /// List of all items of this field. }; -// ============================================================================ + class XclExpPivotTable : public XclExpRecordBase, protected XclExpRoot { @@ -365,7 +365,7 @@ public: virtual void Save( XclExpStream& rStrm ); virtual void SaveXml( XclExpXmlStream& rStrm ); - // ------------------------------------------------------------------------ + private: /** Returns a pivot table field by its name. */ XclExpPTField* GetFieldAcc( const OUString& rName ); @@ -403,7 +403,7 @@ private: /** Writes the SX_AUTOFORMAT records with the autoformat id and header layout */ void WriteSxViewEx9( XclExpStream& rStrm ) const; - // ------------------------------------------------------------------------ + private: typedef XclExpRecordList< XclExpPTField > XclExpPTFieldList; typedef XclExpPTFieldList::RecordRefType XclExpPTFieldRef; @@ -425,7 +425,7 @@ private: size_t mnId; /// Stream ID }; -// ============================================================================ + /** The main class for pivot table export. @@ -470,7 +470,7 @@ private: bool mbShareCaches; /// true = Tries to share caches between tables. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index 4ebb771a1439..1c842644cd98 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -43,7 +43,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); }; -// ---------------------------------------------------------------------------- + class XclExpDelegatingRecord : public XclExpRecordBase { @@ -56,7 +56,7 @@ private: XclExpRecordBase* mpRecord; }; -// ---------------------------------------------------------------------------- + class XclExpXmlElementRecord : public XclExpRecordBase { @@ -68,7 +68,7 @@ protected: sal_Int32 mnElement; }; -// ---------------------------------------------------------------------------- + class XclExpXmlStartElementRecord : public XclExpXmlElementRecord { @@ -80,7 +80,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; -// ---------------------------------------------------------------------------- + class XclExpXmlEndElementRecord : public XclExpXmlElementRecord { @@ -92,7 +92,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; -// ---------------------------------------------------------------------------- + class XclExpXmlStartSingleElementRecord : public XclExpXmlElementRecord { @@ -104,7 +104,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; -// ---------------------------------------------------------------------------- + class XclExpXmlEndSingleElementRecord : public XclExpRecordBase { @@ -116,7 +116,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; -// ---------------------------------------------------------------------------- + /** Base class for single records with any content. @@ -165,7 +165,7 @@ 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,7 +180,7 @@ inline XclExpEmptyRecord::XclExpEmptyRecord( sal_uInt16 nRecId ) : { } -// ============================================================================ + /** A record with a single value of type Type. @descr Requires operator<<( XclExpStream&, const Type& ). */ @@ -235,7 +235,7 @@ XclExpValueRecord< Type >* XclExpValueRecord< Type >::SetAttribute( sal_Int32 nI return this; } -// ---------------------------------------------------------------------------- + /** A record containing an unsigned 16-bit value. */ typedef XclExpValueRecord< sal_uInt16 > XclExpUInt16Record; @@ -246,7 +246,7 @@ 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. */ @@ -274,7 +274,7 @@ private: sal_Int32 mnAttribute; /// The attribute to generate within SaveXml() }; -// ---------------------------------------------------------------------------- + /** Record which exports a memory data array. */ class XclExpDummyRecord : public XclExpRecord @@ -388,7 +388,7 @@ private: RecordVec maRecs; }; -// ============================================================================ + /** Represents a complete substream of records enclosed into a pair of BOF/EOF records. */ class XclExpSubStream : public XclExpRecordList<> @@ -403,7 +403,7 @@ private: sal_uInt16 mnSubStrmType; /// Substream type, stored in leading BOF record. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index a0978a72b4da..67c4f2eb694f 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -99,7 +99,7 @@ struct XclExpRootData : public XclRootData virtual ~XclExpRootData(); }; -// ---------------------------------------------------------------------------- + /** Access to global data from other classes. */ class XclExpRoot : public XclRoot @@ -175,7 +175,7 @@ private: XclExpRootData& mrExpData; /// Reference to the global export data struct. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index a6c371eb55ff..8d58c8d52195 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef SC_XESTREAM_HXX #define SC_XESTREAM_HXX @@ -198,7 +198,7 @@ private: bool mbInRec; /// true = currently writing inside of a record. }; -// ============================================================================ + class XclExpBiff8Encrypter { @@ -241,10 +241,10 @@ private: bool mbValid; }; -// ---------------------------------------------------------------------------- -// ============================================================================ + + // `s.GetChar(0) != 0` needed because some strings on export only contain NULL. #define XESTRING_TO_PSZ(s) \ diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx index f4a7e2428105..43431824a786 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -22,7 +22,7 @@ #include "xlstring.hxx" -// ============================================================================ + class XclExpStream; class XclExpXmlStream; @@ -173,7 +173,7 @@ public: void WriteXml( XclExpXmlStream& rStrm ) const; - // ------------------------------------------------------------------------ + private: /** Returns true, if the flag field should be written. */ bool IsWriteFlags() const; @@ -265,7 +265,7 @@ inline XclExpStream& operator<<( XclExpStream& rStrm, const XclExpString& rStrin return rStrm; } -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index 77061c8743dc..944b436c1536 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -58,7 +58,7 @@ enum XclExpColorType EXC_COLOR_TABBG /// Spreadsheet tab bg color. }; -// ---------------------------------------------------------------------------- + class XclExpPaletteImpl; @@ -131,7 +131,7 @@ class SvxFont; const size_t EXC_FONTLIST_NOTFOUND = static_cast< size_t >( -1 ); -// ---------------------------------------------------------------------------- + /** Static helper functions for font export. */ class XclExpFontHelper @@ -161,7 +161,7 @@ private: ~XclExpFontHelper(); }; -// ---------------------------------------------------------------------------- + /** Stores all data of an Excel font and provides export of FONT records. */ class XclExpFont : public XclExpRecord, protected XclExpRoot @@ -190,7 +190,7 @@ 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,7 +205,7 @@ public: virtual void Save( XclExpStream& rStrm ); }; -// ---------------------------------------------------------------------------- + class ScPatternAttr; @@ -275,7 +275,7 @@ struct XclExpNumFmt void SaveXml( XclExpXmlStream& rStrm ); }; -// ---------------------------------------------------------------------------- + class SvNumberFormatter; typedef ::std::auto_ptr< SvNumberFormatter > SvNumberFormatterPtr; @@ -333,7 +333,7 @@ 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. */ @@ -354,7 +354,7 @@ 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. */ @@ -387,7 +387,7 @@ 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. */ @@ -426,7 +426,7 @@ struct XclExpColor void SaveXml( XclExpXmlStream& rStrm ) const; }; -// ---------------------------------------------------------------------------- + /** A combination of unique XF identifier with real Excel XF index. */ struct XclExpXFId @@ -441,7 +441,7 @@ struct XclExpXFId void ConvertXFIndex( const XclExpRoot& rRoot ); }; -// ---------------------------------------------------------------------------- + class SfxStyleSheetBase; @@ -538,7 +538,7 @@ private: virtual void WriteBody( XclExpStream& rStrm ); }; -// ---------------------------------------------------------------------------- + /** Represents a default XF record. Supports methods to set attributes directly. */ class XclExpDefaultXF : public XclExpXF @@ -552,7 +552,7 @@ 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. */ @@ -580,7 +580,7 @@ private: sal_uInt8 mnLevel; /// Outline level for RowLevel and ColLevel styles. }; -// ---------------------------------------------------------------------------- + /** Stores all XF records (cell formats and cell styles) in the document. @@ -763,7 +763,7 @@ private: boost::scoped_ptr<NfKeywordTable> mpKeywordTable; /// Replacement table. }; -// ============================================================================ + class XclExpXmlStyleSheet : public XclExpRecordBase, protected XclExpRoot { @@ -773,7 +773,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 3299e60d99bc..5dd87e43b996 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -44,9 +44,9 @@ Export of cell tables including row and column description. - Merged cell ranges. ============================================================================ */ -// ============================================================================ + // Helper records for cell records -// ============================================================================ + /** Represents a STRING record that contains the result of a string formula. */ class XclExpStringRec : public XclExpRecord @@ -126,7 +126,7 @@ private: typedef boost::shared_ptr< XclExpArray > XclExpArrayRef; -// ---------------------------------------------------------------------------- + /** Caches all ARRAY records. */ class XclExpArrayBuffer : protected XclExpRoot @@ -177,7 +177,7 @@ private: typedef boost::shared_ptr< XclExpShrfmla > XclExpShrfmlaRef; -// ---------------------------------------------------------------------------- + /** Caches all SHRFMLA records and provides functions to update their ranges. */ class XclExpShrfmlaBuffer : protected XclExpRoot @@ -252,7 +252,7 @@ private: typedef boost::shared_ptr< XclExpTableop > XclExpTableopRef; -// ---------------------------------------------------------------------------- + /** Contains all created TABLEOP records and supports creating or updating them. */ class XclExpTableopBuffer : protected XclExpRoot @@ -279,9 +279,9 @@ private: XclExpTableopList maTableopList; /// List of all TABLEOP records. }; -// ============================================================================ + // Cell records -// ============================================================================ + /** The base class of all cell records. */ class XclExpCellBase : public XclExpRecord @@ -370,7 +370,7 @@ 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,7 +390,7 @@ private: double mfValue; /// The cell value. }; -// ---------------------------------------------------------------------------- + /** Represents a BOOLERR record that describes a cell with a Boolean value. */ class XclExpBooleanCell : public XclExpSingleCellBase @@ -451,7 +451,7 @@ private: bool mbLineBreak; /// True = cell has automatic linebreaks enabled. }; -// ---------------------------------------------------------------------------- + class ScFormulaCell; @@ -492,7 +492,7 @@ struct XclExpMultiXFId : public XclExpXFId XclExpXFId( nXFId ), mnCount( nCount ) {} }; -// ---------------------------------------------------------------------------- + /** Base class for all cell records supporting multiple contents. */ class XclExpMultiCellBase : public XclExpCellBase @@ -554,7 +554,7 @@ 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,7 +581,7 @@ private: virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ); }; -// ---------------------------------------------------------------------------- + /** Represents an RK or MULRK record that describes cells with a compressed double values. */ class XclExpRkCell : public XclExpMultiCellBase @@ -605,9 +605,9 @@ private: ScfInt32Vec maRkValues; /// The cell values. }; -// ============================================================================ + // Rows and Columns -// ============================================================================ + class ScOutlineArray; @@ -644,7 +644,7 @@ private: bool mbCurrCollapse; /// true = Collapsed group ends at current position. }; -// ---------------------------------------------------------------------------- + /** The outline buffer for column outlines. */ class XclExpColOutlineBuffer : public XclExpOutlineBuffer @@ -658,7 +658,7 @@ public: { UpdateColRow( static_cast< SCCOLROW >( nScCol ) ); } }; -// ---------------------------------------------------------------------------- + /** The outline buffer for row outlines. */ class XclExpRowOutlineBuffer : public XclExpOutlineBuffer @@ -672,7 +672,7 @@ public: { UpdateColRow( static_cast< SCCOLROW >( nScRow ) ); } }; -// ---------------------------------------------------------------------------- + /** Represents a GUTS record containing the level count of row and column outlines. */ class XclExpGuts : public XclExpRecord @@ -690,7 +690,7 @@ 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,7 +715,7 @@ private: sal_uInt16 mnFirstFreeXclCol; /// First free column after used area. }; -// ============================================================================ + /** Represents the DEFCOLWIDTH record containing the default column width of a sheet. @@ -741,7 +741,7 @@ public: void SetDefWidth( sal_uInt16 nXclColWidth ); }; -// ---------------------------------------------------------------------------- + /** Contains the column settings for a range of columns. @@ -790,7 +790,7 @@ private: sal_uInt16 mnLastXclCol; /// Index to last column. }; -// ---------------------------------------------------------------------------- + /** Contains COLINFO records for all columns of a Calc sheet. @@ -824,7 +824,7 @@ private: XclExpColOutlineBuffer maOutlineBfr; /// Buffer for column outline groups. }; -// ============================================================================ + class XclExpRow; @@ -843,7 +843,7 @@ 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,7 +862,7 @@ private: XclExpDefaultRowData maDefData; /// Record data. }; -// ---------------------------------------------------------------------------- + /** Represents a ROW record and additionally contains all cells records of a row. @@ -953,7 +953,7 @@ private: bool mbEnabled; /// true = Write this ROW record. }; -// ---------------------------------------------------------------------------- + /** Collects all rows which contain all cells of a sheet. @@ -998,9 +998,9 @@ private: XclExpDimensions maDimensions; /// DIMENSIONS record for used area. }; -// ============================================================================ + // Cell Table -// ============================================================================ + class XclExpNote; class XclExpMergedcells; diff --git a/sc/source/filter/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxx index ab53e6d6952d..bacfdf1b12d5 100644 --- a/sc/source/filter/inc/xeview.hxx +++ b/sc/source/filter/inc/xeview.hxx @@ -65,7 +65,7 @@ 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,7 +84,7 @@ private: sal_uInt16 mnDenom; /// Denominator of the zoom factor. }; -// ---------------------------------------------------------------------------- + /** Represents a PANE record containing settings for split/frozen windows. */ class XclExpPane : public XclExpRecord @@ -106,7 +106,7 @@ private: bool mbFrozenPanes; /// true = "frozen" panes; false = "split" window. }; -// ---------------------------------------------------------------------------- + /** Represents a SELECTION record with selection data for a pane. */ class XclExpSelection : public XclExpRecord @@ -167,7 +167,7 @@ private: sal_uInt32 mnGridColorId; /// Color identifier for grid color. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 04f48c77614a..fb4cc3146e8d 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -170,7 +170,7 @@ private: XclImpChRootDataRef mxChData; /// Reference to the root data object. }; -// ---------------------------------------------------------------------------- + /** Base class for chart record groups. Provides helper functions to read sub records. @@ -215,7 +215,7 @@ private: typedef boost::shared_ptr< XclImpChFramePos > XclImpChFramePosRef; -// ---------------------------------------------------------------------------- + /** The CHLINEFORMAT record containing line formatting data. */ class XclImpChLineFormat @@ -249,7 +249,7 @@ private: typedef boost::shared_ptr< XclImpChLineFormat > XclImpChLineFormatRef; -// ---------------------------------------------------------------------------- + /** The CHAREAFORMAT record containing simple area formatting data (solid or patterns). */ class XclImpChAreaFormat @@ -279,7 +279,7 @@ private: typedef boost::shared_ptr< XclImpChAreaFormat > XclImpChAreaFormatRef; -// ---------------------------------------------------------------------------- + /** The CHESCHERFORMAT record containing complex area formatting data (bitmaps, hatches). */ class XclImpChEscherFormat : public XclImpChGroupBase @@ -304,7 +304,7 @@ private: typedef boost::shared_ptr< XclImpChEscherFormat > XclImpChEscherFormatRef; -// ---------------------------------------------------------------------------- + /** Base class for record groups containing frame formatting. @@ -355,7 +355,7 @@ protected: XclImpChEscherFormatRef mxEscherFmt; /// Complex area format (CHESCHERFORMAT record). }; -// ---------------------------------------------------------------------------- + /** Represents the CHFRAME record group containing object frame properties. @@ -458,7 +458,7 @@ public: void ConvertRotationBase( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet, bool bSupportsStacked ) const; }; -// ---------------------------------------------------------------------------- + /** The CHFONT record containing a font index for text objects. */ class XclImpChFont @@ -477,7 +477,7 @@ private: typedef boost::shared_ptr< XclImpChFont > XclImpChFontRef; -// ---------------------------------------------------------------------------- + /** Represents the CHTEXT record group containing text object properties. @@ -581,7 +581,7 @@ private: typedef boost::shared_ptr< XclImpChMarkerFormat > XclImpChMarkerFormatRef; -// ---------------------------------------------------------------------------- + /** The CHPIEFORMAT record containing data point formatting data for pie segments. */ class XclImpChPieFormat @@ -599,7 +599,7 @@ private: typedef boost::shared_ptr< XclImpChPieFormat > XclImpChPieFormatRef; -// ---------------------------------------------------------------------------- + /** The CHSERIESFORMAT record containing additional settings for a data series. */ class XclImpChSeriesFormat @@ -617,7 +617,7 @@ private: typedef boost::shared_ptr< XclImpChSeriesFormat > XclImpChSeriesFormatRef; -// ---------------------------------------------------------------------------- + /** The CH3DDATAFORMAT record containing the bar type in 3D bar charts. */ class XclImpCh3dDataFormat @@ -634,7 +634,7 @@ private: typedef boost::shared_ptr< XclImpCh3dDataFormat > XclImpCh3dDataFormatRef; -// ---------------------------------------------------------------------------- + /** The CHATTACHEDLABEL record that contains the type of a data point label. */ class XclImpChAttachedLabel : protected XclImpChRoot @@ -652,7 +652,7 @@ private: typedef boost::shared_ptr< XclImpChAttachedLabel > XclImpChAttLabelRef; -// ---------------------------------------------------------------------------- + /** Represents the CHDATAFORMAT record group containing data point properties. @@ -720,7 +720,7 @@ private: typedef boost::shared_ptr< XclImpChDataFormat > XclImpChDataFormatRef; -// ---------------------------------------------------------------------------- + /** Represents the CHSERTRENDLINE record containing settings for a trend line. */ class XclImpChSerTrendLine : protected XclImpChRoot @@ -749,7 +749,7 @@ private: typedef boost::shared_ptr< XclImpChSerTrendLine > XclImpChSerTrendLineRef; -// ---------------------------------------------------------------------------- + /** Represents the CHSERERRORBAR record containing settings for error bars. */ class XclImpChSerErrorBar : protected XclImpChRoot @@ -786,7 +786,7 @@ private: typedef boost::shared_ptr< XclImpChSerErrorBar > XclImpChSerErrorBarRef; -// ---------------------------------------------------------------------------- + /** Represents the CHSERIES record group describing a data series in a chart. @@ -927,7 +927,7 @@ private: XclChTypeInfo maTypeInfo; /// Chart type info for the contained type. }; -// ---------------------------------------------------------------------------- + /** Represents the CHCHART3D record that contains 3D view settings. */ class XclImpChChart3d @@ -946,7 +946,7 @@ private: typedef boost::shared_ptr< XclImpChChart3d > XclImpChChart3dRef; -// ---------------------------------------------------------------------------- + /** Represents the CHLEGEND record group describing the chart legend. @@ -980,7 +980,7 @@ private: typedef boost::shared_ptr< XclImpChLegend > XclImpChLegendRef; -// ---------------------------------------------------------------------------- + /** Represents the CHDROPBAR record group describing pos/neg bars in line charts. @@ -1005,7 +1005,7 @@ private: typedef boost::shared_ptr< XclImpChDropBar > XclImpChDropBarRef; -// ---------------------------------------------------------------------------- + /** Represents the CHTYPEGROUP record group describing a group of series. @@ -1147,7 +1147,7 @@ private: typedef boost::shared_ptr< XclImpChLabelRange > XclImpChLabelRangeRef; -// ---------------------------------------------------------------------------- + class XclImpChValueRange : protected XclImpChRoot { @@ -1169,7 +1169,7 @@ private: typedef boost::shared_ptr< XclImpChValueRange > XclImpChValueRangeRef; -// ---------------------------------------------------------------------------- + class XclImpChTick : protected XclImpChRoot { @@ -1194,7 +1194,7 @@ private: typedef boost::shared_ptr< XclImpChTick > XclImpChTickRef; -// ---------------------------------------------------------------------------- + /** Represents the CHAXIS record group describing an entire chart axis. @@ -1265,7 +1265,7 @@ private: typedef boost::shared_ptr< XclImpChAxis > XclImpChAxisRef; -// ---------------------------------------------------------------------------- + /** Represents the CHAXESSET record group describing an axes set (X/Y/Z axes). @@ -1438,7 +1438,7 @@ private: typedef boost::shared_ptr< XclImpChChart > XclImpChChartRef; -// ---------------------------------------------------------------------------- + /** Drawing container of a chart. */ class XclImpChartDrawing : public XclImpDrawing @@ -1463,7 +1463,7 @@ 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,7 +1509,7 @@ private: bool mbIsPivotChart; /// true = chart is based on a pivot table. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx index 52a0e7f02b90..4a7f1024d255 100644 --- a/sc/source/filter/inc/xicontent.hxx +++ b/sc/source/filter/inc/xicontent.hxx @@ -141,7 +141,7 @@ private: sal_uInt16 mnCondIndex; /// Condition index to be inserted next. }; -// ---------------------------------------------------------------------------- + /** Imports and collects all conditional formatting of a sheet. */ class XclImpCondFormatManager : protected XclImpRoot @@ -226,7 +226,7 @@ private: sal_uInt16 mnRefresh; /// Refresh time in minutes. }; -// ---------------------------------------------------------------------------- + class XclImpWebQueryBuffer : protected XclImpRoot { @@ -269,7 +269,7 @@ private: XclImpDecryptHelper(); }; -// ============================================================================ + // Document protection ======================================================== @@ -327,7 +327,7 @@ private: ProtectedSheetMap maProtectedSheets; }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 21317a2ef97f..bc0f6d4fd30f 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -202,7 +202,7 @@ private: bool mbCustomDff; /// true = Recreate SdrObject in DFF import. }; -// ---------------------------------------------------------------------------- + class XclImpDrawObjVector : public ::std::vector< XclImpDrawObjRef > { @@ -216,7 +216,7 @@ public: sal_Size GetProgressSize() const; }; -// ---------------------------------------------------------------------------- + /** A placeholder object for unknown object types. */ class XclImpPhObj : public XclImpDrawObjBase @@ -225,7 +225,7 @@ public: explicit XclImpPhObj( const XclImpRoot& rRoot ); }; -// ---------------------------------------------------------------------------- + /** A group object. */ class XclImpGroupObj : public XclImpDrawObjBase @@ -253,7 +253,7 @@ protected: sal_uInt16 mnFirstUngrouped; /// Object identfier of first object not grouped into this group. }; -// ---------------------------------------------------------------------------- + /** A line object. */ class XclImpLineObj : public XclImpDrawObjBase @@ -277,7 +277,7 @@ protected: sal_uInt8 mnStartPoint; /// Starting point. }; -// ---------------------------------------------------------------------------- + /** A rectangle or oval object. */ class XclImpRectObj : public XclImpDrawObjBase @@ -307,7 +307,7 @@ protected: sal_uInt16 mnFrameFlags; /// Additional flags. }; -// ---------------------------------------------------------------------------- + /** An oval object. */ class XclImpOvalObj : public XclImpRectObj @@ -320,7 +320,7 @@ protected: virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; }; -// ---------------------------------------------------------------------------- + /** An arc object. */ class XclImpArcObj : public XclImpDrawObjBase @@ -344,7 +344,7 @@ protected: sal_uInt8 mnQuadrant; /// Visible quadrant of the circle. }; -// ---------------------------------------------------------------------------- + /** A polygon object. */ class XclImpPolygonObj : public XclImpRectObj @@ -370,7 +370,7 @@ protected: sal_uInt16 mnPointCount; /// Polygon point count. }; -// ---------------------------------------------------------------------------- + struct XclImpObjTextData { @@ -383,7 +383,7 @@ struct XclImpObjTextData void ReadFormats( XclImpStream& rStrm ); }; -// ---------------------------------------------------------------------------- + /** A drawing object supporting text contents. Used for all simple objects in BIFF8. */ class XclImpTextObj : public XclImpRectObj @@ -410,7 +410,7 @@ 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,7 +449,7 @@ private: bool mbOwnTab; /// true = own sheet; false = embedded object. }; -// ---------------------------------------------------------------------------- + /** A note object, which is a specialized text box objext. */ class XclImpNoteObj : public XclImpTextObj @@ -469,7 +469,7 @@ private: sal_uInt16 mnNoteFlags; /// Flags from NOTE record. }; -// ---------------------------------------------------------------------------- + /** Helper base class for TBX and OCX form controls to manage spreadsheet links. */ class XclImpControlHelper @@ -516,7 +516,7 @@ private: XclCtrlBindMode meBindMode; /// Value binding mode. }; -// ---------------------------------------------------------------------------- + /** Base class for textbox based form controls. */ class XclImpTbxObjBase : public XclImpTextObj, public XclImpControlHelper @@ -550,7 +550,7 @@ protected: virtual XclTbxEventType DoGetEventType() const = 0; }; -// ---------------------------------------------------------------------------- + /** A button control. */ class XclImpButtonObj : public XclImpTbxObjBase @@ -567,7 +567,7 @@ protected: virtual XclTbxEventType DoGetEventType() const; }; -// ---------------------------------------------------------------------------- + /** A checkbox control. */ class XclImpCheckBoxObj : public XclImpTbxObjBase @@ -592,7 +592,7 @@ protected: sal_uInt16 mnCheckBoxFlags; }; -// ---------------------------------------------------------------------------- + /** An option button control. */ class XclImpOptionButtonObj : public XclImpCheckBoxObj @@ -618,7 +618,7 @@ protected: sal_uInt16 mnFirstInGroup; /// 1 = Button is the first in a group. }; -// ---------------------------------------------------------------------------- + /** A label control. */ class XclImpLabelObj : public XclImpTbxObjBase @@ -635,7 +635,7 @@ protected: virtual XclTbxEventType DoGetEventType() const; }; -// ---------------------------------------------------------------------------- + /** A groupbox control. */ class XclImpGroupBoxObj : public XclImpTbxObjBase @@ -659,7 +659,7 @@ protected: sal_uInt16 mnGroupBoxFlags; }; -// ---------------------------------------------------------------------------- + /** A dialog control. */ class XclImpDialogObj : public XclImpTbxObjBase @@ -676,7 +676,7 @@ protected: virtual XclTbxEventType DoGetEventType() const; }; -// ---------------------------------------------------------------------------- + /** An edit control. */ class XclImpEditObj : public XclImpTbxObjBase @@ -706,7 +706,7 @@ protected: sal_uInt16 mnListBoxObjId; }; -// ---------------------------------------------------------------------------- + /** Base class of scrollable form controls (spin button, scrollbar, listbox, dropdown). */ class XclImpTbxObjScrollableBase : public XclImpTbxObjBase @@ -732,7 +732,7 @@ protected: sal_uInt16 mnScrollFlags; }; -// ---------------------------------------------------------------------------- + /** A spinbutton control. */ class XclImpSpinButtonObj : public XclImpTbxObjScrollableBase @@ -751,7 +751,7 @@ protected: virtual XclTbxEventType DoGetEventType() const; }; -// ---------------------------------------------------------------------------- + /** A scrollbar control. */ class XclImpScrollBarObj : public XclImpTbxObjScrollableBase @@ -770,7 +770,7 @@ protected: virtual XclTbxEventType DoGetEventType() const; }; -// ---------------------------------------------------------------------------- + /** Base class for list controls (listbox, dropdown). */ class XclImpTbxObjListBase : public XclImpTbxObjScrollableBase @@ -792,7 +792,7 @@ protected: bool mbHasDefFontIdx; }; -// ---------------------------------------------------------------------------- + /** A listbox control. */ class XclImpListBoxObj : public XclImpTbxObjListBase @@ -819,7 +819,7 @@ protected: ScfUInt8Vec maSelection; }; -// ---------------------------------------------------------------------------- + /** A dropdown listbox control. */ class XclImpDropDownObj : public XclImpTbxObjListBase @@ -855,7 +855,7 @@ protected: sal_uInt16 mnMinWidth; }; -// ---------------------------------------------------------------------------- + /** A picture, an embedded or linked OLE object, or an OCX form control. */ class XclImpPictureObj : public XclImpRectObj, public XclImpControlHelper @@ -956,7 +956,7 @@ 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,7 +972,7 @@ protected: virtual bool GetColorFromPalette( sal_uInt16 nIndex, Color& rColor ) const; }; -// ---------------------------------------------------------------------------- + /** 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,7 +1166,7 @@ private: bool mbOleObjs; /// True = draw model supports OLE objects. }; -// ---------------------------------------------------------------------------- + /** Drawing manager of a single sheet. */ class XclImpSheetDrawing : public XclImpDrawing @@ -1227,7 +1227,7 @@ public: /** Returns the name of overridden name ( or zero length string ) for associated object id. */ OUString GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId ); - // ------------------------------------------------------------------------ + private: /** Reads and returns a bitmap from WMF/PICT format. */ @@ -1250,7 +1250,7 @@ private: /** Returns the size of the progress bar shown while processing all objects. */ sal_Size GetProgressSize() const; - // ------------------------------------------------------------------------ + private: typedef ::std::map< sal_uInt16, OUString > DefObjNameMap; typedef boost::shared_ptr< XclImpSheetDrawing > XclImpSheetDrawingRef; @@ -1294,7 +1294,7 @@ private: XclImpStream& operator>>( XclImpStream& rStrm, XclImpDffPropSet& rPropSet ); -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xiformula.hxx b/sc/source/filter/inc/xiformula.hxx index ef03f708135d..51d2d2971a75 100644 --- a/sc/source/filter/inc/xiformula.hxx +++ b/sc/source/filter/inc/xiformula.hxx @@ -55,7 +55,7 @@ private: XclImpFmlaCompImplRef mxImpl; }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index 2474a9365cb4..3ec03780e461 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -322,7 +322,7 @@ protected: sal_uInt8 mnType; /// The type of the cached value (EXC_CACHEDVAL_*). }; -// ---------------------------------------------------------------------------- + /** Contains cached values in a 2-dimensional array. */ class XclImpCachedMatrix @@ -342,7 +342,7 @@ private: SCSIZE mnScRows; /// Number of cached rows. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx index e6b8678cab67..d13c5e254901 100644 --- a/sc/source/filter/inc/xilink.hxx +++ b/sc/source/filter/inc/xilink.hxx @@ -101,7 +101,7 @@ enum XclImpExtNameType xlExtEuroConvert /// An external in Excel, but internal in OO function name. }; -// ---------------------------------------------------------------------------- + class XclImpCachedMatrix; class ScTokenArray; @@ -225,7 +225,7 @@ private: XclImpLinkMgrImplPtr mxImpl; }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx index f3f3bac6e33d..432220644f28 100644 --- a/sc/source/filter/inc/xiname.hxx +++ b/sc/source/filter/inc/xiname.hxx @@ -30,7 +30,7 @@ #include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> -// ============================================================================ + class ScRangeData; class ScTokenArray; @@ -77,7 +77,7 @@ 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 @@ -110,7 +110,7 @@ private: XclImpNameList maNameList; }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xipage.hxx b/sc/source/filter/inc/xipage.hxx index ddb576c0475d..07ee76551f88 100644 --- a/sc/source/filter/inc/xipage.hxx +++ b/sc/source/filter/inc/xipage.hxx @@ -68,7 +68,7 @@ private: bool mbValidPaper; /// true = Paper size and orientation valid. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index bfe14536df47..571fa75e6d12 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -28,9 +28,9 @@ class ScDPSaveData; class ScDPSaveDimension; -// ============================================================================ + // Pivot cache -// ============================================================================ + /** Represents a data item in a pivot cache. */ class XclImpPCItem : public XclPCItem @@ -60,7 +60,7 @@ private: typedef boost::shared_ptr< XclImpPCItem > XclImpPCItemRef; -// ============================================================================ + struct ScDPNumGroupInfo; class XclImpPivotCache; @@ -111,7 +111,7 @@ public: /** Inserts grouping information of this field into the passed ScDPSaveData. */ void ConvertGroupField( ScDPSaveData& rSaveData, const ScfStringVec& rVisNames ) const; - // ------------------------------------------------------------------------ + private: /** Inserts standard grouping information of this field into the passed ScDPSaveData. */ void ConvertStdGroupField( ScDPSaveData& rSaveData, const ScfStringVec& rVisNames ) const; @@ -145,7 +145,7 @@ private: typedef boost::shared_ptr< XclImpPCField > XclImpPCFieldRef; -// ============================================================================ + class XclImpPivotCache : protected XclImpRoot { @@ -201,13 +201,13 @@ private: typedef boost::shared_ptr< XclImpPivotCache > XclImpPivotCacheRef; -// ============================================================================ + // Pivot table -// ============================================================================ + class XclImpPivotTable; -// ============================================================================ + class XclImpPTItem { @@ -230,7 +230,7 @@ private: typedef boost::shared_ptr< XclImpPTItem > XclImpPTItemRef; -// ============================================================================ + class XclImpPTField { @@ -284,7 +284,7 @@ public: void AddDataFieldInfo( const XclPTDataFieldInfo& rDataInfo ); void ConvertDataField( ScDPSaveData& rSaveData ) const; - // ------------------------------------------------------------------------ + private: ScDPSaveDimension* ConvertRCPField( ScDPSaveData& rSaveData ) const; void ConvertFieldInfo( ScDPSaveDimension& rSaveDim ) const; @@ -307,7 +307,7 @@ private: typedef boost::shared_ptr< XclImpPTField > XclImpPTFieldRef; -// ============================================================================ + class XclImpPivotTable : protected XclImpRoot { @@ -350,7 +350,7 @@ public: * autoformat. */ void ReadSxViewEx9( XclImpStream& rStrm ); - // ------------------------------------------------------------------------ + /** Inserts the pivot table into the Calc document. */ void Convert(); @@ -359,7 +359,7 @@ public: void ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveData& rSaveData); - // ------------------------------------------------------------------------ + private: typedef ::std::vector< XclImpPTFieldRef > XclImpPTFieldVec; @@ -383,8 +383,8 @@ private: typedef boost::shared_ptr< XclImpPivotTable > XclImpPivotTableRef; -// ============================================================================ -// ============================================================================ + + /** The main class for pivot table import. @@ -432,7 +432,7 @@ public: * autoformat. */ void ReadSxViewEx9( XclImpStream& rStrm ); - // ------------------------------------------------------------------------ + /** Reads all used pivot caches and creates additional sheets for external data sources. */ void ReadPivotCaches( XclImpStream& rStrm ); @@ -449,7 +449,7 @@ private: XclImpPivotTableVec maPTables; /// List of all pivot tables. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx index 10b616b9dc9e..8e4673442cd5 100644 --- a/sc/source/filter/inc/xiroot.hxx +++ b/sc/source/filter/inc/xiroot.hxx @@ -122,7 +122,7 @@ struct XclImpRootData : public XclRootData virtual ~XclImpRootData(); }; -// ---------------------------------------------------------------------------- + /** Access to global data from other classes. */ class XclImpRoot : public XclRoot @@ -218,7 +218,7 @@ private: XclImpRootData& mrImpData; /// Reference to the global import data struct. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 6bdfa30bb8dd..6ee3d64b20dc 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -34,9 +34,9 @@ Input stream class for Excel import - Decryption ============================================================================ */ -// ============================================================================ + // Decryption -// ============================================================================ + class XclImpDecrypter; typedef boost::shared_ptr< XclImpDecrypter > XclImpDecrypterRef; @@ -90,7 +90,7 @@ private: sal_uInt16 mnRecSize; /// Current record size. }; -// ---------------------------------------------------------------------------- + /** Decrypts BIFF5 stream contents. */ class XclImpBiff5Decrypter : public XclImpDecrypter @@ -120,7 +120,7 @@ private: sal_uInt16 mnHash; }; -// ---------------------------------------------------------------------------- + /** Decrypts BIFF8 stream contents using the given document identifier. */ class XclImpBiff8Decrypter : public XclImpDecrypter @@ -157,9 +157,9 @@ private: ::std::vector< sal_uInt8 > maVerifierHash; }; -// ============================================================================ + // Stream -// ============================================================================ + /** This class represents an Excel stream position. @descr It contains the relevant data for a stream position inside of a record @@ -193,7 +193,7 @@ 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 @@ -528,7 +528,7 @@ private: bool mbValid; /// false = Record overread. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xistring.hxx b/sc/source/filter/inc/xistring.hxx index 9b7613f5bdb1..dfbdd5e6eba4 100644 --- a/sc/source/filter/inc/xistring.hxx +++ b/sc/source/filter/inc/xistring.hxx @@ -107,7 +107,7 @@ private: size_t mnFormatsEnd; /// Formatting run index for next portion. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx index 180e12e64fff..6a9fb3753521 100644 --- a/sc/source/filter/inc/xistyle.hxx +++ b/sc/source/filter/inc/xistyle.hxx @@ -158,7 +158,7 @@ private: bool mbShadowUsed; /// true = Shadowed used. }; -// ---------------------------------------------------------------------------- + /** Stores the data of all fonts occurred in an Excel file. */ class XclImpFontBuffer : protected XclImpRoot, private boost::noncopyable @@ -262,7 +262,7 @@ struct XclImpCellProt : public XclCellProt void FillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const; }; -// ---------------------------------------------------------------------------- + /** Extends the XclCellAlign struct for import. @descr Provides functions to fill from Excel record data and to fill to item sets. */ @@ -284,7 +284,7 @@ struct XclImpCellAlign : public XclCellAlign void FillToItemSet( SfxItemSet& rItemSet, const XclImpFont* pFont, bool bSkipPoolDefs = false ) const; }; -// ---------------------------------------------------------------------------- + /** Extends the XclCellBorder struct for import. @descr Provides functions to fill from Excel record data and to fill to item sets. */ @@ -324,7 +324,7 @@ struct XclImpCellBorder : public XclCellBorder bool bSkipPoolDefs = false ) const; }; -// ---------------------------------------------------------------------------- + /** Extends the XclCellArea struct for import. @descr Provides functions to fill from Excel record data and to fill to item sets. */ @@ -359,7 +359,7 @@ struct XclImpCellArea : public XclCellArea bool bSkipPoolDefs = false ) const; }; -// ---------------------------------------------------------------------------- + /** Represents an XF record index with additional information. */ class XclImpXFIndex @@ -382,7 +382,7 @@ inline bool operator==( const XclImpXFIndex& rLeft, const XclImpXFIndex& rRight inline bool operator!=( const XclImpXFIndex& rLeft, const XclImpXFIndex& rRight ) { return !(rLeft == rRight); } -// ---------------------------------------------------------------------------- + /** Contains all data of a XF record and a Calc item set. */ class XclImpXF : public XclXFBase, protected XclImpRoot, private boost::noncopyable @@ -447,7 +447,7 @@ private: sal_uInt16 mnXclFont; /// Index to font record. }; -// ---------------------------------------------------------------------------- + /** Contains all data of a cell style associated with an XF record. */ class XclImpStyle : protected XclImpRoot @@ -483,7 +483,7 @@ private: ScStyleSheet* mpStyleSheet; /// Calc cell style sheet. }; -// ---------------------------------------------------------------------------- + /** Contains all XF records occurred in the file. @descr This class is able to read XF records (BIFF2 - BIFF8) and STYLE records (BIFF8). */ @@ -571,7 +571,7 @@ inline bool XclImpXFRange::Contains( SCROW nScRow ) const return (mnScRow1 <= nScRow) && (nScRow <= mnScRow2); } -// ---------------------------------------------------------------------------- + /** Contains the XF indexes for every used cell in a column. */ class XclImpXFRangeColumn : private boost::noncopyable @@ -611,7 +611,7 @@ private: IndexList maIndexList; /// The list of XF index range. }; -// ---------------------------------------------------------------------------- + /** Contains the XF indexes for every used cell in a single sheet. */ class XclImpXFRangeBuffer : protected XclImpRoot, private boost::noncopyable @@ -677,7 +677,7 @@ private: ScRangeList maMergeList; /// List of merged cell ranges. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xiview.hxx b/sc/source/filter/inc/xiview.hxx index 65cbc37e15da..ff3178a65fcc 100644 --- a/sc/source/filter/inc/xiview.hxx +++ b/sc/source/filter/inc/xiview.hxx @@ -81,7 +81,7 @@ private: XclTabViewData maData; /// Sheet view settings data. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx index a4c40ad7455c..fb2a36646abb 100644 --- a/sc/source/filter/inc/xladdress.hxx +++ b/sc/source/filter/inc/xladdress.hxx @@ -26,7 +26,7 @@ class XclImpStream; class XclExpStream; -// ============================================================================ + /** A 2D cell address struct with Excel column and row indexes. */ struct XclAddress @@ -66,7 +66,7 @@ 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,7 +116,7 @@ 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,7 +144,7 @@ inline XclExpStream& operator<<( XclExpStream& rStrm, const XclRangeList& rXclRa return rStrm; } -// ============================================================================ + class XclTracer; @@ -162,7 +162,7 @@ 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. @@ -171,7 +171,7 @@ public: @return true = Sheet index in nScTab is valid. */ bool CheckScTab( SCTAB nScTab, bool bWarn ); - // ------------------------------------------------------------------------ + protected: XclTracer& mrTracer; /// Tracer for invalid addresses. ScAddress maMaxPos; /// Default maximum position. @@ -182,7 +182,7 @@ protected: bool mbTabTrunc; /// Flag for "tables truncated" warning box. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 408d6d97cb67..3c18f5f437a0 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -737,9 +737,9 @@ const sal_uInt16 EXC_ID_CHPLOTGROWTH = 0x1064; const sal_uInt16 EXC_ID_CHSERINDEX = 0x1065; const sal_uInt16 EXC_ID_CHUNKNOWN = 0xFFFF; -// ============================================================================ + // Structs and classes -// ============================================================================ + // Common ===================================================================== @@ -753,7 +753,7 @@ struct XclChRectangle explicit XclChRectangle(); }; -// ---------------------------------------------------------------------------- + /** Specifies the position of a data series or data point. */ struct XclChDataPointPos @@ -768,7 +768,7 @@ 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. */ @@ -793,7 +793,7 @@ struct XclChFramePos explicit XclChFramePos(); }; -// ---------------------------------------------------------------------------- + struct XclChLineFormat { @@ -805,7 +805,7 @@ struct XclChLineFormat explicit XclChLineFormat(); }; -// ---------------------------------------------------------------------------- + struct XclChAreaFormat { @@ -817,7 +817,7 @@ struct XclChAreaFormat explicit XclChAreaFormat(); }; -// ---------------------------------------------------------------------------- + class SfxItemSet; class EscherPropertyContainer; @@ -834,7 +834,7 @@ struct XclChEscherFormat ~XclChEscherFormat(); }; -// ---------------------------------------------------------------------------- + struct XclChPicFormat { @@ -845,7 +845,7 @@ struct XclChPicFormat explicit XclChPicFormat(); }; -// ---------------------------------------------------------------------------- + struct XclChFrame { @@ -877,7 +877,7 @@ struct XclChObjectLink explicit XclChObjectLink(); }; -// ---------------------------------------------------------------------------- + struct XclChFrLabelProps { @@ -887,7 +887,7 @@ struct XclChFrLabelProps explicit XclChFrLabelProps(); }; -// ---------------------------------------------------------------------------- + struct XclChText { @@ -916,7 +916,7 @@ struct XclChMarkerFormat explicit XclChMarkerFormat(); }; -// ---------------------------------------------------------------------------- + struct XclCh3dDataFormat { @@ -926,7 +926,7 @@ struct XclCh3dDataFormat explicit XclCh3dDataFormat(); }; -// ---------------------------------------------------------------------------- + struct XclChDataFormat { @@ -937,7 +937,7 @@ struct XclChDataFormat explicit XclChDataFormat(); }; -// ---------------------------------------------------------------------------- + struct XclChSerTrendLine { @@ -952,7 +952,7 @@ struct XclChSerTrendLine explicit XclChSerTrendLine(); }; -// ---------------------------------------------------------------------------- + struct XclChSerErrorBar { @@ -965,7 +965,7 @@ struct XclChSerErrorBar explicit XclChSerErrorBar(); }; -// ---------------------------------------------------------------------------- + struct XclChSeries { @@ -994,7 +994,7 @@ struct XclChType explicit XclChType(); }; -// ---------------------------------------------------------------------------- + struct XclChChart3d { @@ -1009,7 +1009,7 @@ struct XclChChart3d explicit XclChChart3d(); }; -// ---------------------------------------------------------------------------- + struct XclChLegend { @@ -1021,7 +1021,7 @@ struct XclChLegend explicit XclChLegend(); }; -// ---------------------------------------------------------------------------- + struct XclChTypeGroup { @@ -1031,7 +1031,7 @@ struct XclChTypeGroup explicit XclChTypeGroup(); }; -// ---------------------------------------------------------------------------- + struct XclChProperties { @@ -1053,7 +1053,7 @@ struct XclChLabelRange explicit XclChLabelRange(); }; -// ---------------------------------------------------------------------------- + struct XclChDateRange { @@ -1070,7 +1070,7 @@ struct XclChDateRange explicit XclChDateRange(); }; -// ---------------------------------------------------------------------------- + struct XclChValueRange { @@ -1084,7 +1084,7 @@ struct XclChValueRange explicit XclChValueRange(); }; -// ---------------------------------------------------------------------------- + struct XclChTick { @@ -1099,7 +1099,7 @@ struct XclChTick explicit XclChTick(); }; -// ---------------------------------------------------------------------------- + struct XclChAxis { @@ -1111,7 +1111,7 @@ struct XclChAxis sal_Int32 GetApiAxisDimension() const; }; -// ---------------------------------------------------------------------------- + struct XclChAxesSet { @@ -1198,7 +1198,7 @@ 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,7 +1294,7 @@ 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,7 +1363,7 @@ private: sal_Int32 mnIndex; /// Index to create unique identifiers. }; -// ---------------------------------------------------------------------------- + struct XclFontData; @@ -1458,7 +1458,7 @@ private: ScfPropSetHelper maBitmapHlp; /// Properties for bitmaps. }; -// ============================================================================ + /** Base struct for internal root data structs for import and export. */ struct XclChRootData @@ -1499,7 +1499,7 @@ struct XclChRootData GetTitleShape( const XclChTextKey& rTitleKey ) const; }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxx index 54794cb67316..77981212423b 100644 --- a/sc/source/filter/inc/xlconst.hxx +++ b/sc/source/filter/inc/xlconst.hxx @@ -256,7 +256,7 @@ const sal_uInt16 EXC_BORDER_MEDIUM = 35; const sal_uInt16 EXC_BORDER_THIN = 15; const sal_uInt16 EXC_BORDER_HAIR = 1; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xlcontent.hxx b/sc/source/filter/inc/xlcontent.hxx index f60e9f3906de..9d00dcb776ad 100644 --- a/sc/source/filter/inc/xlcontent.hxx +++ b/sc/source/filter/inc/xlcontent.hxx @@ -181,7 +181,7 @@ const sal_uInt16 EXC_WQSETT_FORMATFULL = 0x0003; const sal_uInt16 EXC_ID_WQTABLES = 0x0804; const sal_uInt16 EXC_ID_EXTLST = 0x9988; /// it is just a random number -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx index f99c602301e3..ab5d083b735f 100644 --- a/sc/source/filter/inc/xlescher.hxx +++ b/sc/source/filter/inc/xlescher.hxx @@ -341,7 +341,7 @@ inline SvStream& WriteXclObjAnchor( SvStream& rStrm, const XclObjAnchor& rAnchor .WriteUInt16( rAnchor.maLast.mnRow).WriteUInt16(rAnchor.mnBY); } -// ---------------------------------------------------------------------------- + struct XclObjLineData { @@ -358,7 +358,7 @@ struct XclObjLineData XclImpStream& operator>>( XclImpStream& rStrm, XclObjLineData& rLineData ); -// ---------------------------------------------------------------------------- + struct XclObjFillData { @@ -375,7 +375,7 @@ struct XclObjFillData XclImpStream& operator>>( XclImpStream& rStrm, XclObjFillData& rFillData ); -// ---------------------------------------------------------------------------- + struct XclObjTextData { @@ -402,7 +402,7 @@ struct XclObjTextData inline sal_uInt8 GetVerAlign() const { return ::extract_value< sal_uInt8 >( mnFlags, 4, 3 ); } }; -// ============================================================================ + enum XclTbxEventType { @@ -413,7 +413,7 @@ enum XclTbxEventType EXC_TBX_EVENT_CHANGE /// XChangeListener.changed }; -// ---------------------------------------------------------------------------- + /** Provides static helper functions for form controls. */ class XclControlHelper @@ -435,7 +435,7 @@ public: XclTbxEventType eEventType, SfxObjectShell* pShell = NULL ); }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx index 7688220efc8e..e09063912ab0 100644 --- a/sc/source/filter/inc/xlformula.hxx +++ b/sc/source/filter/inc/xlformula.hxx @@ -149,7 +149,7 @@ 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,7 +334,7 @@ struct XclFunctionInfo OUString GetAddInEquivalentFuncName() const; }; -// ---------------------------------------------------------------------------- + class XclRoot; @@ -422,7 +422,7 @@ 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,7 +466,7 @@ private: bool mbSkipSpaces; /// true = Skip whitespace tokens. }; -// ---------------------------------------------------------------------------- + /** Contains all cell references that can be extracted from a multiple operations formula. */ struct XclMultipleOpRefs @@ -479,7 +479,7 @@ struct XclMultipleOpRefs bool mbDblRefMode; /// true = One formula with row and column values. }; -// ---------------------------------------------------------------------------- + /** A helper with Excel specific token array functions. @@ -541,7 +541,7 @@ public: static bool GetMultipleOpRefs( XclMultipleOpRefs& rRefs, const ScTokenArray& rScTokArr, const ScAddress& rScPos ); }; -// ---------------------------------------------------------------------------- + inline sal_uInt8 XclTokenArrayHelper::GetTokenId( sal_uInt8 nBaseId, sal_uInt8 nTokenClass ) { @@ -557,7 +557,7 @@ inline void XclTokenArrayHelper::ChangeTokenClass( sal_uInt8& rnTokenId, sal_uIn ::set_flag( rnTokenId, nTokenClass ); } -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xllink.hxx b/sc/source/filter/inc/xllink.hxx index 84bd38821d94..3ec2a99c55e5 100644 --- a/sc/source/filter/inc/xllink.hxx +++ b/sc/source/filter/inc/xllink.hxx @@ -79,7 +79,7 @@ enum XclSupbookType EXC_SBTYPE_EUROTOOL /// SUPBOOK is uesd for EUROCONVERT. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xlname.hxx b/sc/source/filter/inc/xlname.hxx index d1b3e35e8e54..e5f4ae1340f0 100644 --- a/sc/source/filter/inc/xlname.hxx +++ b/sc/source/filter/inc/xlname.hxx @@ -61,7 +61,7 @@ const sal_Unicode EXC_BUILTIN_SHEETTITLE = '\x0C'; const sal_Unicode EXC_BUILTIN_FILTERDATABASE = '\x0D'; const sal_Unicode EXC_BUILTIN_UNKNOWN = '\x0E'; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xlpage.hxx b/sc/source/filter/inc/xlpage.hxx index 31a5116e2807..f573a379f6f8 100644 --- a/sc/source/filter/inc/xlpage.hxx +++ b/sc/source/filter/inc/xlpage.hxx @@ -84,7 +84,7 @@ const sal_uInt16 EXC_SETUP_NOTES_END = 0x0200; const sal_uInt16 EXC_PAPERSIZE_DEFAULT = 0; const sal_uInt16 EXC_PAPERSIZE_USER = 0xFFFF; -// ============================================================================ + // Page settings ============================================================== @@ -146,7 +146,7 @@ struct XclPageData : private boost::noncopyable void SetScPaperSize( const Size& rSize, bool bPortrait, bool bStrict = false ); }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index cd8fccbbbdf6..56704d24338d 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -363,9 +363,9 @@ const sal_uInt16 EXC_SXFDBTYPE_DEFAULT = 0x0000; // (0x0810) SXVIEWEX9 --------------------------------------------------------- const sal_uInt16 EXC_ID_SXVIEWEX9 = 0x0810; -// ============================================================================ + // Pivot cache -// ============================================================================ + /** Represents a data item of any type in a pivot cache. Supposed as base class for import and export. */ class XclPCItem @@ -538,9 +538,9 @@ struct XclPCInfo XclImpStream& operator>>( XclImpStream& rStrm, XclPCInfo& rInfo ); XclExpStream& operator<<( XclExpStream& rStrm, const XclPCInfo& rInfo ); -// ============================================================================ + // Pivot table -// ============================================================================ + // cached name ================================================================ @@ -556,7 +556,7 @@ 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,7 +748,7 @@ struct XclPTExtInfo XclImpStream& operator>>( XclImpStream& rStrm, XclPTExtInfo& rInfo ); XclExpStream& operator<<( XclExpStream& rStrm, const XclPTExtInfo& rInfo ); -// ============================================================================ + // Pivot table autoformat settings ============================================== @@ -767,7 +767,7 @@ struct XclPTViewEx9Info XclImpStream& operator>>( XclImpStream& rStrm, XclPTViewEx9Info& rInfo ); XclExpStream& operator<<( XclExpStream& rStrm, const XclPTViewEx9Info& rInfo ); -// ============================================================================ + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx index 9e734964055e..4f8263789aea 100644 --- a/sc/source/filter/inc/xlroot.hxx +++ b/sc/source/filter/inc/xlroot.hxx @@ -49,7 +49,7 @@ struct XclDebugObjCounter }; #endif -// ---------------------------------------------------------------------------- + class SfxMedium; class ScEditEngineDefaulter; @@ -118,7 +118,7 @@ struct XclRootData virtual ~XclRootData(); }; -// ---------------------------------------------------------------------------- + class SfxObjectShell; class ScModelObj; @@ -275,7 +275,7 @@ private: XclRootData& mrData; /// Reference to the global data struct. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xlstream.hxx b/sc/source/filter/inc/xlstream.hxx index b3724f9e8185..b9b5057af618 100644 --- a/sc/source/filter/inc/xlstream.hxx +++ b/sc/source/filter/inc/xlstream.hxx @@ -39,7 +39,7 @@ const sal_uInt16 EXC_ENCR_BLOCKSIZE = 1024; const sal_uInt16 EXC_ID_UNKNOWN = SAL_MAX_UINT16; const sal_uInt16 EXC_ID_CONT = 0x003C; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xlstring.hxx b/sc/source/filter/inc/xlstring.hxx index 698cac3edbc7..876ace0cc406 100644 --- a/sc/source/filter/inc/xlstring.hxx +++ b/sc/source/filter/inc/xlstring.hxx @@ -34,7 +34,7 @@ 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,12 +78,12 @@ 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 diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index d0fb72bbc0d8..f389b0549010 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -386,7 +386,7 @@ struct XclFontData bool operator==( const XclFontData& rLeft, const XclFontData& rRight ); -// ---------------------------------------------------------------------------- + /** Enumerates different types of Which-IDs for font items. */ enum XclFontItemType @@ -404,7 +404,7 @@ enum XclFontPropSetType EXC_FONTPROPSET_CONTROL /// Text formatting in form controls. }; -// ---------------------------------------------------------------------------- + /** Helper class for usage of property sets. */ class XclFontPropSetHelper @@ -449,7 +449,7 @@ struct XclNumFmt LanguageType meLanguage; /// Language type to be set with the number format. }; -// ---------------------------------------------------------------------------- + class XclNumFmtBuffer { @@ -493,7 +493,7 @@ struct XclCellProt bool operator==( const XclCellProt& rLeft, const XclCellProt& rRight ); -// ---------------------------------------------------------------------------- + /** Contains all cell alignment attributes. */ struct XclCellAlign @@ -530,7 +530,7 @@ struct XclCellAlign bool operator==( const XclCellAlign& rLeft, const XclCellAlign& rRight ); -// ---------------------------------------------------------------------------- + /** Contains color and line style for each cell border line. */ struct XclCellBorder @@ -553,7 +553,7 @@ struct XclCellBorder bool operator==( const XclCellBorder& rLeft, const XclCellBorder& rRight ); -// ---------------------------------------------------------------------------- + /** Contains background colors and pattern for a cell. */ struct XclCellArea @@ -570,7 +570,7 @@ struct XclCellArea bool operator==( const XclCellArea& rLeft, const XclCellArea& rRight ); -// ---------------------------------------------------------------------------- + /** Contains base members for XF record import/export. @descr In detail this class stores the XF type (cell/style), the index to the @@ -607,7 +607,7 @@ protected: bool mbAreaUsed; /// true = area data used. }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xltable.hxx b/sc/source/filter/inc/xltable.hxx index 5c85cd5230ed..c325ab1d6803 100644 --- a/sc/source/filter/inc/xltable.hxx +++ b/sc/source/filter/inc/xltable.hxx @@ -164,7 +164,7 @@ const sal_uInt16 EXC_ID_RK = 0x027E; // (0x04BC) SHRFMLA ----------------------------------------------------------- const sal_uInt16 EXC_ID_SHRFMLA = 0x04BC; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index d0cc23e76bc1..6cc7ed0374b0 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -231,7 +231,7 @@ public: /** Returns the Excel macro name from a full StarBasic macro URL. */ static OUString GetXclMacroName( const OUString& rSbMacroUrl ); -// ------------------------------------------------------------------------ + private: static const OUString maDefNamePrefix; /// Prefix for built-in defined names. static const OUString maDefNamePrefixXml; /// Prefix for built-in defined names for OOX @@ -258,7 +258,7 @@ 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 diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx index 86d9bb3eabf9..b355c94dc9ec 100644 --- a/sc/source/filter/inc/xltracer.hxx +++ b/sc/source/filter/inc/xltracer.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef SC_XLTRACER_HXX #define SC_XLTRACER_HXX @@ -72,7 +72,7 @@ struct XclTracerDetails }; -// ============================================================================ + /** This class wraps an MSFilterTracer to create trace logs for import/export filters. */ class XclTracer @@ -113,7 +113,7 @@ private: }; -// ============================================================================ + #endif diff --git a/sc/source/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx index 0bfd339f2e48..6bc6e723bba8 100644 --- a/sc/source/filter/inc/xlview.hxx +++ b/sc/source/filter/inc/xlview.hxx @@ -102,7 +102,7 @@ struct XclDocViewData explicit XclDocViewData(); }; -// ---------------------------------------------------------------------------- + /** Contains all settings for a selection in a single pane of a sheet. */ struct XclSelectionData @@ -116,7 +116,7 @@ struct XclSelectionData typedef boost::shared_ptr< XclSelectionData > XclSelectionDataRef; -// ---------------------------------------------------------------------------- + /** Contains all view settings for a single sheet. */ struct XclTabViewData @@ -165,7 +165,7 @@ struct XclTabViewData XclSelectionData& CreateSelectionData( sal_uInt8 nPane ); }; -// ============================================================================ + #endif |