diff options
628 files changed, 3077 insertions, 3080 deletions
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 6ed3d5815039..30230c0da358 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -297,7 +297,7 @@ public: const IntlWrapper* pIntl = 0 ) const; }; -// + class ScDoubleItem : public SfxPoolItem { diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 8f83d0650f51..66203be32dc5 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -1189,11 +1189,11 @@ public: // - "Delete": a list of deleted (what?) // OR for content, different contents at the same position // OR MatrixReferences belonging to MatrixOrigin - // + // With bListMasterDelete (==TRUE ?) all Deletes of a row belonging // to a MasterDelete are listed (possibly it is // "all Deletes belonging...are listed in a row?) - // + // With bAllFlat (==TRUE ?) all dependents of dependents // will be inserted flatly. diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index b90bb9bbdecb..bd8837c4a5d5 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -281,9 +281,9 @@ private: mutable boost::scoped_ptr<ScConditionEntryCache> mpCache; }; -// + // single entry for conditional formatting -// + class SC_DLLPUBLIC ScCondFormatEntry : public ScConditionEntry { @@ -376,9 +376,9 @@ private: OUString maStyleName; }; -// + // complete conditional formatting -// + class SC_DLLPUBLIC ScConditionalFormat: private boost::noncopyable { @@ -446,9 +446,9 @@ public: void endRendering(); }; -// + // List of areas and formats: -// + class SC_DLLPUBLIC ScConditionalFormatList { diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx index 6bef102a0aae..8202cb236343 100644 --- a/sc/inc/consoli.hxx +++ b/sc/inc/consoli.hxx @@ -53,7 +53,7 @@ public: void AddEntry( SCCOL nCol, SCROW nRow, SCTAB nTab ); }; -// + // Sequence: // 1) create ScConsData // 2) Parameter (Size/Flags) @@ -62,7 +62,7 @@ public: // 5) AddData for all areas // perhaps AddName after each area // 6) OutputToDocument -// + //! Use structure ScDocument if a certain size is exceeded? diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx index 05d74de55109..90cd1f2318ca 100644 --- a/sc/inc/detdata.hxx +++ b/sc/inc/detdata.hxx @@ -54,9 +54,9 @@ public: { return eOperation == r.eOperation && aPos == r.aPos; } }; -// + // list of operators -// + typedef boost::ptr_vector<ScDetOpData> ScDetOpDataVector; diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index b906dd91015d..3af9d365bd32 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -479,9 +479,9 @@ public: }; -// + // returns all areas with non-default formatting (horizontal) -// + class ScHorizontalAttrIterator { @@ -508,9 +508,9 @@ public: const ScPatternAttr* GetNext( SCCOL& rCol1, SCCOL& rCol2, SCROW& rRow ); }; -// + // returns non-empty cells and areas with formatting (horizontal) -// + class SC_DLLPUBLIC ScUsedAreaIterator { diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index 6cdd755f2f50..f7d65fbc3636 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -115,9 +115,9 @@ public: bool IsDateDimension() const; }; -// + // proxy implementation of ScDPTableData to add grouped items -// + class ScDPGroupTableData : public ScDPTableData { diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index 7ced43a0e30f..55e002d87b5e 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -45,9 +45,9 @@ namespace com { namespace sun { namespace star { namespace sheet { class ScDPDimensionSaveData; class ScDPTableData; -// + // classes to save Data Pilot settings -// + class ScDPSaveMember diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index a6a3da60b04f..fce905becdc5 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -142,10 +142,10 @@ struct ScDPRelativePos ScDPRelativePos( long nBase, long nDir ); }; -// + // aggregated data //! separate header file? -// + // Possible values for the nCount member: // (greater than 0 counts the collected values) @@ -192,9 +192,9 @@ public: #endif }; -// + // Row and grand total state, passed down (column total is at result member) -// + class ScDPRowTotals { @@ -213,9 +213,9 @@ public: void SetInColRoot(bool bSet) { bIsInColRoot = bSet; } }; -// + // results for a hierarchy dimension -// + class ScDPResultDimension; class ScDPDataDimension; diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 74ae6fbf4a8f..3525c3104691 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -71,9 +71,9 @@ class ScDPResultData; class ScDPItemData; class ScDPTableData; -// + // implementation of DataPilotSource using ScDPTableData -// + class ScDPDimensions; diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index 2a3b9f59a642..e10dc6329d46 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -40,7 +40,7 @@ class ScOrcusFilters; typedef sal_uLong FltError; #define eERR_OK ERRCODE_NONE // no error -#define eERR_OPEN SCERR_IMPORT_OPEN // ... +#define eERR_OPEN SCERR_IMPORT_OPEN #define eERR_UNBEK SCERR_IMPORT_UNKNOWN // unknown error, historical meaning #define eERR_NOMEM SCERR_IMPORT_OUTOFMEM // out of memory #define eERR_UNKN_WK SCERR_IMPORT_UNKNOWN_WK // unknown WK? format (Lotus 1-2-3) diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index fdde8f6517d6..e993a46ce359 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -273,9 +273,9 @@ public: SCROW nRowEnd; }; -/// + /// @return areas with reference and all db-areas -/// + class SC_DLLPUBLIC ScAreaNameIterator { diff --git a/sc/inc/subtotalparam.hxx b/sc/inc/subtotalparam.hxx index 5105aedd15fa..7d1399a14868 100644 --- a/sc/inc/subtotalparam.hxx +++ b/sc/inc/subtotalparam.hxx @@ -23,7 +23,7 @@ struct SC_DLLPUBLIC ScSubTotalParam bool bRemoveOnly:1; bool bReplace:1; ///< replace existing results bool bPagebreak:1; ///< page break at change of group - bool bCaseSens:1; // + bool bCaseSens:1; bool bDoSort:1; ///< presort bool bAscending:1; ///< sort ascending bool bUserDef:1; ///< sort user defined diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx index ccf50a6ca6ed..22ce2ec0a031 100644 --- a/sc/inc/validat.hxx +++ b/sc/inc/validat.hxx @@ -56,9 +56,9 @@ enum ScValidErrorStyle SC_VALERR_MACRO }; -// + // Entry for validation (only one condition exists) -// + class SC_DLLPUBLIC ScValidationData : public ScConditionEntry { @@ -170,9 +170,9 @@ private: bool IsListValid( ScRefCellValue& rCell, const ScAddress& rPos ) const; }; -// + // list of contitions: -// + struct CompareScValidationDataPtr { diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi index a9b35e2d425d..3e18a13ccd91 100644 --- a/sc/sdi/cellsh.sdi +++ b/sc/sdi/cellsh.sdi @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // =========================================================================== + interface CellSelection [ uuid ( "D7680520-137B-11D3-B25B-006097DA68F3" ) @@ -227,7 +227,7 @@ interface CellSelection SID_TRANSLITERATE_KATAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] } - // =========================================================================== + interface CellMovement [ uuid ( "FF2E35C0-137B-11D3-B25B-006097DA68F3" ) @@ -441,7 +441,7 @@ interface Cell import CellMovement; } - // =========================================================================== + shell ScCellShell : ScFormatShell { import Cell[Automation]; diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi index ed5519b2a646..509ed9ba83c8 100644 --- a/sc/sdi/docsh.sdi +++ b/sc/sdi/docsh.sdi @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - //============================================================================ + interface TableSelection [ uuid = "BA338A41-064E-11d0-89CB-008029E4B0B1" ; @@ -58,7 +58,7 @@ interface TableSelection } - //============================================================================ + interface TableDocument [ uuid = "BA338A42-064E-11d0-89CB-008029E4B0B1" ; @@ -106,7 +106,7 @@ interface TableDocument } - //============================================================================ + shell ScDocShell [ uuid ( "3F543FA0-B6A6-101B-9961-04021C007002" ) diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi index e881b1ee412b..d4a1eec593f1 100644 --- a/sc/sdi/drawsh.sdi +++ b/sc/sdi/drawsh.sdi @@ -50,7 +50,7 @@ interface TableDraw SID_STYLE_HIDE [ StateMethod = StateDisableItems; Export = FALSE; ] SID_STYLE_SHOW [ StateMethod = StateDisableItems; Export = FALSE; ] - //---------------------------------------------------------------------------- + SID_TEXT_STANDARD [ ExecMethod = ExecDrawAttr; StateMethod = NoState; Export = FALSE; ] SID_DRAWTEXT_ATTR_DLG [ ExecMethod = ExecDrawAttr; StateMethod = NoState; Export = FALSE; ] @@ -250,7 +250,7 @@ interface TableDraw } - // =========================================================================== + shell ScDrawShell { import TableDraw; diff --git a/sc/sdi/drformsh.sdi b/sc/sdi/drformsh.sdi index c3597ad1e443..4ca1aaecb62e 100644 --- a/sc/sdi/drformsh.sdi +++ b/sc/sdi/drformsh.sdi @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // =========================================================================== + shell ScDrawFormShell : ScDrawShell { } diff --git a/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdi index ffaf20dc764f..903f6ee0a9af 100644 --- a/sc/sdi/drtxtob.sdi +++ b/sc/sdi/drtxtob.sdi @@ -47,7 +47,7 @@ interface TableDrawText SID_STYLE_HIDE [ StateMethod = StateDisableItems; Export = FALSE; ] SID_STYLE_SHOW [ StateMethod = StateDisableItems; Export = FALSE; ] - //---------------------------------------------------------------------------- + SID_CUT [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_COPY [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] SID_PASTE [ ExecMethod = Execute; StateMethod = GetClipState; Export = FALSE; ] @@ -148,7 +148,7 @@ interface TableDrawText - // =========================================================================== + shell ScDrawTextObjectBar { import TableDrawText; diff --git a/sc/sdi/editsh.sdi b/sc/sdi/editsh.sdi index 33e297ae1dfe..9bb5bd66f890 100644 --- a/sc/sdi/editsh.sdi +++ b/sc/sdi/editsh.sdi @@ -98,7 +98,7 @@ interface TableText } - // =========================================================================== + shell ScEditShell { import TableText; diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi index 693813302c17..72e1e1476963 100644 --- a/sc/sdi/formatsh.sdi +++ b/sc/sdi/formatsh.sdi @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // =========================================================================== + interface TableFont [ uuid ( "2E4AC1C0-137C-11D3-B25B-006097DA68F3" ) @@ -36,7 +36,7 @@ interface TableFont SID_ULINE_VAL_DOTTED [ ExecMethod = ExecuteTextAttr; StateMethod = GetTextAttrState; ] } - // =========================================================================== + interface FormatForSelection [ uuid ( "40F448A0-137C-11D3-B25B-006097DA68F3" ) @@ -141,7 +141,7 @@ interface FormatForSelection } - // =========================================================================== + shell ScFormatShell { import FormatForSelection[Automation]; diff --git a/sc/sdi/graphsh.sdi b/sc/sdi/graphsh.sdi index 6c9ae7a0d440..2329ede9c575 100644 --- a/sc/sdi/graphsh.sdi +++ b/sc/sdi/graphsh.sdi @@ -148,7 +148,7 @@ interface GraphSelection ] } - // =========================================================================== + shell ScGraphicShell : ScDrawShell { import GraphSelection; diff --git a/sc/sdi/mediash.sdi b/sc/sdi/mediash.sdi index 8fc19380f831..3b035b878994 100644 --- a/sc/sdi/mediash.sdi +++ b/sc/sdi/mediash.sdi @@ -25,7 +25,7 @@ interface MediaSelection ] } - // =========================================================================== + shell ScMediaShell : ScDrawShell { import MediaSelection; diff --git a/sc/sdi/oleobjsh.sdi b/sc/sdi/oleobjsh.sdi index 9175d3163c35..fc8802997419 100644 --- a/sc/sdi/oleobjsh.sdi +++ b/sc/sdi/oleobjsh.sdi @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // =========================================================================== + shell ScOleObjectShell : ScDrawShell { } diff --git a/sc/sdi/pgbrksh.sdi b/sc/sdi/pgbrksh.sdi index 3c627c90a444..c48c7bafeb01 100644 --- a/sc/sdi/pgbrksh.sdi +++ b/sc/sdi/pgbrksh.sdi @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // =========================================================================== + shell ScPageBreakShell { } diff --git a/sc/sdi/prevwsh.sdi b/sc/sdi/prevwsh.sdi index 8bd80beb8129..5d9207057ff8 100644 --- a/sc/sdi/prevwsh.sdi +++ b/sc/sdi/prevwsh.sdi @@ -159,7 +159,7 @@ interface TablePrintPreview } - // =========================================================================== + shell ScPreviewShell { import TablePrintPreview; diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 023302579d41..1313bdb26a47 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -40,7 +40,7 @@ SfxVoidItem AcceptChanges FID_CHG_ACCEPT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ActivateOLE SID_OLE_ACTIVATE () [ @@ -65,7 +65,7 @@ SfxVoidItem ActivateOLE SID_OLE_ACTIVATE GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxVoidItem ActivateTable SID_TABLE_ACTIVATE () [ @@ -90,7 +90,7 @@ SfxVoidItem ActivateTable SID_TABLE_ACTIVATE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxObjectItem ActiveCell SID_SC_ACTIVECELL [ @@ -117,7 +117,7 @@ SfxObjectItem ActiveCell SID_SC_ACTIVECELL GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxObjectItem ActiveTable SID_SC_ACTIVETAB [ @@ -144,7 +144,7 @@ SfxObjectItem ActiveTable SID_SC_ACTIVETAB GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem Add FID_TAB_APPEND (SfxStringItem Name FID_TAB_APPEND) [ @@ -169,7 +169,7 @@ SfxVoidItem Add FID_TAB_APPEND GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem AddChartData SID_CHART_ADDSOURCE (SfxStringItem Name SID_CHART_NAME,SfxStringItem Range SID_CHART_SOURCE) [ @@ -194,7 +194,7 @@ SfxVoidItem AddChartData SID_CHART_ADDSOURCE GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem AddInManager SID_ADD_IN_MANAGER () [ @@ -219,7 +219,7 @@ SfxVoidItem AddInManager SID_ADD_IN_MANAGER GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem AddPrintArea SID_ADD_PRINTAREA () [ @@ -244,7 +244,7 @@ SfxVoidItem AddPrintArea SID_ADD_PRINTAREA GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxStringItem Address SID_RANGE_ADDRESS [ @@ -271,7 +271,7 @@ SfxStringItem Address SID_RANGE_ADDRESS GroupId = ; ] -//-------------------------------------------------------------------------- + SfxVoidItem AdjustPrintZoom FID_ADJUST_PRINTZOOM () [ @@ -296,7 +296,7 @@ SfxVoidItem AdjustPrintZoom FID_ADJUST_PRINTZOOM GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem AlignBlock SID_ALIGNBLOCK () [ @@ -321,7 +321,7 @@ SfxVoidItem AlignBlock SID_ALIGNBLOCK GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem AlignBottom SID_ALIGNBOTTOM () [ @@ -346,7 +346,7 @@ SfxVoidItem AlignBottom SID_ALIGNBOTTOM GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem AlignHorizontalCenter SID_ALIGNCENTERHOR () [ @@ -374,7 +374,7 @@ SfxVoidItem AlignHorizontalCenter SID_ALIGNCENTERHOR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem AlignLeft SID_ALIGNLEFT () [ @@ -399,7 +399,7 @@ SfxVoidItem AlignLeft SID_ALIGNLEFT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem AlignRight SID_ALIGNRIGHT () [ @@ -424,7 +424,7 @@ SfxVoidItem AlignRight SID_ALIGNRIGHT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem AlignTop SID_ALIGNTOP () [ @@ -449,7 +449,7 @@ SfxVoidItem AlignTop SID_ALIGNTOP GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem AlignVCenter SID_ALIGNCENTERVER () [ @@ -474,7 +474,7 @@ SfxVoidItem AlignVCenter SID_ALIGNCENTERVER GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ApplyNames FID_APPLY_NAME () [ @@ -499,7 +499,7 @@ SfxVoidItem ApplyNames FID_APPLY_NAME GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem AuditingFillMode SID_DETECTIVE_FILLMODE () [ @@ -524,7 +524,7 @@ SfxVoidItem AuditingFillMode SID_DETECTIVE_FILLMODE GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem AutoComplete FID_AUTOCOMPLETE [ @@ -551,7 +551,7 @@ SfxBoolItem AutoComplete FID_AUTOCOMPLETE GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem AutoFill FID_FILL_AUTO (SfxStringItem EndCell FID_FILL_AUTO) [ @@ -576,7 +576,7 @@ SfxVoidItem AutoFill FID_FILL_AUTO GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxBoolItem AutomaticCalculation FID_AUTO_CALC [ @@ -603,7 +603,7 @@ SfxBoolItem AutomaticCalculation FID_AUTO_CALC GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem AutoOutline SID_AUTO_OUTLINE () [ @@ -628,7 +628,7 @@ SfxVoidItem AutoOutline SID_AUTO_OUTLINE GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxBoolItem AutoRefreshArrows SID_DETECTIVE_AUTO [ @@ -655,7 +655,7 @@ SfxBoolItem AutoRefreshArrows SID_DETECTIVE_AUTO GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem AutoStyle SID_AUTO_STYLE () [ @@ -680,7 +680,7 @@ SfxVoidItem AutoStyle SID_AUTO_STYLE GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem Calculate FID_RECALC () [ @@ -705,7 +705,7 @@ SfxVoidItem Calculate FID_RECALC GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem CalculateHard FID_HARD_RECALC () [ @@ -730,7 +730,7 @@ SfxVoidItem CalculateHard FID_HARD_RECALC GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem Cancel SID_CANCEL () [ @@ -755,7 +755,7 @@ SfxVoidItem Cancel SID_CANCEL GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxObjectItem Cells SID_SC_CELLS (SfxInt16Item Column SID_SC_CELLS,SfxInt32Item Row FN_PARAM_1,SfxInt16Item Table FN_PARAM_2) [ @@ -780,7 +780,7 @@ SfxObjectItem Cells SID_SC_CELLS GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxStringItem CellText SID_SC_CELLTEXT (SfxInt16Item Column SID_SC_CELLTEXT,SfxInt32Item Row FN_PARAM_1,SfxInt16Item Table FN_PARAM_2) [ @@ -805,7 +805,7 @@ SfxStringItem CellText SID_SC_CELLTEXT GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChangeChartData SID_CHART_SOURCE (SfxStringItem Name SID_CHART_NAME,SfxStringItem Range SID_CHART_SOURCE,SfxBoolItem ColHeaders FN_PARAM_1,SfxBoolItem RowHeaders FN_PARAM_2) [ @@ -830,7 +830,7 @@ SfxVoidItem ChangeChartData SID_CHART_SOURCE GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChangePrintArea SID_CHANGE_PRINTAREA (SfxStringItem PrintArea SID_CHANGE_PRINTAREA,SfxStringItem PrintRepeatRow FN_PARAM_2,SfxStringItem PrintRepeatCol FN_PARAM_3) [ @@ -855,7 +855,7 @@ SfxVoidItem ChangePrintArea SID_CHANGE_PRINTAREA GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChooseDesign SID_CHOOSE_DESIGN () [ @@ -880,7 +880,7 @@ SfxVoidItem ChooseDesign SID_CHOOSE_DESIGN GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ClearArrowDependents SID_DETECTIVE_DEL_SUCC () [ @@ -905,7 +905,7 @@ SfxVoidItem ClearArrowDependents SID_DETECTIVE_DEL_SUCC GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem ClearArrowPrecedents SID_DETECTIVE_DEL_PRED () [ @@ -930,7 +930,7 @@ SfxVoidItem ClearArrowPrecedents SID_DETECTIVE_DEL_PRED GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem ClearArrows SID_DETECTIVE_DEL_ALL () [ @@ -955,7 +955,7 @@ SfxVoidItem ClearArrows SID_DETECTIVE_DEL_ALL GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem ClearContents SID_DELETE_CONTENTS () [ @@ -980,7 +980,7 @@ SfxVoidItem ClearContents SID_DELETE_CONTENTS GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxInt16Item Column SID_RANGE_COL [ @@ -1007,7 +1007,7 @@ SfxInt16Item Column SID_RANGE_COL GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxUInt16Item ColumnWidth FID_COL_WIDTH [ @@ -1034,7 +1034,7 @@ SfxUInt16Item ColumnWidth FID_COL_WIDTH GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem CommentChange FID_CHG_COMMENT (SfxStringItem Comment FID_CHG_COMMENT) [ @@ -1059,7 +1059,7 @@ SfxVoidItem CommentChange FID_CHG_COMMENT GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ConditionalFormatDialog SID_OPENDLG_CONDFRMT () [ @@ -1084,7 +1084,7 @@ SfxVoidItem ConditionalFormatDialog SID_OPENDLG_CONDFRMT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ColorScaleFormatDialog SID_OPENDLG_COLORSCALE () [ @@ -1109,7 +1109,7 @@ SfxVoidItem ColorScaleFormatDialog SID_OPENDLG_COLORSCALE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataBarFormatDialog SID_OPENDLG_DATABAR () [ @@ -1134,7 +1134,7 @@ SfxVoidItem DataBarFormatDialog SID_OPENDLG_DATABAR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem IconSetFormatDialog SID_OPENDLG_ICONSET () [ @@ -1159,7 +1159,7 @@ SfxVoidItem IconSetFormatDialog SID_OPENDLG_ICONSET GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem CondDateFormatDialog SID_OPENDLG_CONDDATE () [ @@ -1184,7 +1184,7 @@ SfxVoidItem CondDateFormatDialog SID_OPENDLG_CONDDATE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ConditionalFormatManagerDialog SID_OPENDLG_CONDFRMT_MANAGER () [ @@ -1209,7 +1209,7 @@ SfxVoidItem ConditionalFormatManagerDialog SID_OPENDLG_CONDFRMT_MANAGER GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ColorScaleDialog SID_COLORSCALE () [ @@ -1234,7 +1234,7 @@ SfxVoidItem ColorScaleDialog SID_COLORSCALE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataBarDialog SID_DATABAR () [ @@ -1259,7 +1259,7 @@ SfxVoidItem DataBarDialog SID_DATABAR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ConsolidateExec SID_CONSOLIDATE () [ @@ -1284,7 +1284,7 @@ SfxVoidItem ConsolidateExec SID_CONSOLIDATE GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem CreateNames FID_USE_NAME () [ @@ -1309,7 +1309,7 @@ SfxVoidItem CreateNames FID_USE_NAME GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem CreateSWDrawView SID_CREATE_SW_DRAWVIEW () [ @@ -1334,7 +1334,7 @@ SfxVoidItem CreateSWDrawView SID_CREATE_SW_DRAWVIEW GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxObjectItem CurrentRegion SID_RANGE_REGION [ @@ -1361,7 +1361,7 @@ SfxObjectItem CurrentRegion SID_RANGE_REGION GroupId = ; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataAreaRefresh SID_REFRESH_DBAREA () [ @@ -1386,7 +1386,7 @@ SfxVoidItem DataAreaRefresh SID_REFRESH_DBAREA GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataConsolidate SID_OPENDLG_CONSOLIDATE () [ @@ -1411,7 +1411,7 @@ SfxVoidItem DataConsolidate SID_OPENDLG_CONSOLIDATE GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataDataPilotRun SID_OPENDLG_PIVOTTABLE () [ @@ -1436,7 +1436,7 @@ SfxVoidItem DataDataPilotRun SID_OPENDLG_PIVOTTABLE GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataFilterAutoFilter SID_AUTO_FILTER () [ @@ -1461,7 +1461,7 @@ SfxVoidItem DataFilterAutoFilter SID_AUTO_FILTER GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataFilterHideAutoFilter SID_AUTOFILTER_HIDE () [ @@ -1486,7 +1486,7 @@ SfxVoidItem DataFilterHideAutoFilter SID_AUTOFILTER_HIDE GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataFilterRemoveFilter SID_UNFILTER () [ @@ -1511,7 +1511,7 @@ SfxVoidItem DataFilterRemoveFilter SID_UNFILTER GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataFilterSpecialFilter SID_SPECIAL_FILTER () [ @@ -1536,7 +1536,7 @@ SfxVoidItem DataFilterSpecialFilter SID_SPECIAL_FILTER GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataFilterStandardFilter SID_FILTER () [ @@ -1561,7 +1561,7 @@ SfxVoidItem DataFilterStandardFilter SID_FILTER GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataImport SID_IMPORT_DATA (SfxStringItem DatabaseName SID_IMPORT_DATA,SfxStringItem SqlCommand FN_PARAM_1) [ @@ -1586,7 +1586,7 @@ SfxVoidItem DataImport SID_IMPORT_DATA GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxObjectItem DataPilotCreate SID_PIVOT_CREATE (SfxStringItem Destination FN_PARAM_1,SfxStringItem Name FN_PARAM_2,SfxBoolItem TotalCol FN_PARAM_3,SfxBoolItem TotalRow FN_PARAM_4) [ @@ -1611,7 +1611,7 @@ SfxObjectItem DataPilotCreate SID_PIVOT_CREATE GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataPilotExec SID_PIVOT_TABLE () [ @@ -1636,7 +1636,7 @@ SfxVoidItem DataPilotExec SID_PIVOT_TABLE GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxObjectItem DataPilotTables SID_PIVOT_GET [ @@ -1663,7 +1663,7 @@ SfxObjectItem DataPilotTables SID_PIVOT_GET GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataReImport SID_REIMPORT_DATA () [ @@ -1688,7 +1688,7 @@ SfxVoidItem DataReImport SID_REIMPORT_DATA GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataSelect SID_DATA_SELECT () [ @@ -1713,7 +1713,7 @@ SfxVoidItem DataSelect SID_DATA_SELECT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataSort SID_SORT (SfxBoolItem ByRows SID_SORT_BYROW,SfxBoolItem HasHeader SID_SORT_HASHEADER,SfxBoolItem CaseSensitive SID_SORT_CASESENS,SfxBoolItem NaturalSort SID_SORT_NATURALSORT,SfxBoolItem IncludeAttribs SID_SORT_ATTRIBS,SfxUInt16Item UserDefIndex SID_SORT_USERDEF,SfxInt32Item Col1 FN_PARAM_1,SfxBoolItem Ascending1 FN_PARAM_2,SfxInt32Item Col2 FN_PARAM_3,SfxBoolItem Ascending2 FN_PARAM_4,SfxInt32Item Col3 FN_PARAM_5,SfxBoolItem Ascending3 FN_PARAM_6) [ @@ -1738,7 +1738,7 @@ SfxVoidItem DataSort SID_SORT GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataForm SID_DATA_FORM () [ @@ -1763,7 +1763,7 @@ SfxVoidItem DataForm SID_DATA_FORM GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataSubTotals SID_SUBTOTALS () [ @@ -1788,7 +1788,7 @@ SfxVoidItem DataSubTotals SID_SUBTOTALS GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem Deactivate SID_OLE_DEACTIVATE () [ @@ -1813,7 +1813,7 @@ SfxVoidItem Deactivate SID_OLE_DEACTIVATE GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxVoidItem DefineDBName SID_DEFINE_DBNAME () [ @@ -1838,7 +1838,7 @@ SfxVoidItem DefineDBName SID_DEFINE_DBNAME GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem DefineLabelRange SID_DEFINE_COLROWNAMERANGES () [ @@ -1863,7 +1863,7 @@ SfxVoidItem DefineLabelRange SID_DEFINE_COLROWNAMERANGES GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DefineName FID_DEFINE_NAME (SfxStringItem Name FID_DEFINE_NAME,SfxStringItem Symbol FN_PARAM_1,SfxStringItem Options FN_PARAM_2) [ @@ -1888,7 +1888,7 @@ SfxVoidItem DefineName FID_DEFINE_NAME GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DefinePrintArea SID_DEFINE_PRINTAREA () [ @@ -1913,7 +1913,7 @@ SfxVoidItem DefinePrintArea SID_DEFINE_PRINTAREA GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DeleteCell FID_DELETE_CELL (SfxStringItem Flags FID_DELETE_CELL) [ @@ -1938,7 +1938,7 @@ SfxVoidItem DeleteCell FID_DELETE_CELL GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DeleteAllBreaks FID_DEL_MANUALBREAKS () [ @@ -1963,7 +1963,7 @@ SfxVoidItem DeleteAllBreaks FID_DEL_MANUALBREAKS GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DeleteColumnbreak FID_DEL_COLBRK () [ @@ -1988,7 +1988,7 @@ SfxVoidItem DeleteColumnbreak FID_DEL_COLBRK GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DeleteColumns SID_DEL_COLS () [ @@ -2013,7 +2013,7 @@ SfxVoidItem DeleteColumns SID_DEL_COLS GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DeletePivotTable SID_PIVOT_KILL () [ @@ -2038,7 +2038,7 @@ SfxVoidItem DeletePivotTable SID_PIVOT_KILL GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem DeletePrintArea SID_DELETE_PRINTAREA () [ @@ -2063,7 +2063,7 @@ SfxVoidItem DeletePrintArea SID_DELETE_PRINTAREA GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DeleteRowbreak FID_DEL_ROWBRK () [ @@ -2088,7 +2088,7 @@ SfxVoidItem DeleteRowbreak FID_DEL_ROWBRK GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DeleteRows SID_DEL_ROWS () [ @@ -2113,7 +2113,7 @@ SfxVoidItem DeleteRows SID_DEL_ROWS GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DeleteScenario SID_DELETE_SCENARIO (SfxStringItem ScenarioName SID_DELETE_SCENARIO) [ @@ -2138,7 +2138,7 @@ SfxVoidItem DeleteScenario SID_DELETE_SCENARIO GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem Deselect SID_SELECT_NONE () [ @@ -2163,7 +2163,7 @@ SfxVoidItem Deselect SID_SELECT_NONE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DrawChart SID_DRAW_CHART () [ @@ -2188,7 +2188,7 @@ SfxVoidItem DrawChart SID_DRAW_CHART GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DrawEditNote SID_DRAW_NOTEEDIT () [ @@ -2213,7 +2213,7 @@ SfxVoidItem DrawEditNote SID_DRAW_NOTEEDIT GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem EditHeaderAndFooter SID_HFEDIT () [ @@ -2238,7 +2238,7 @@ SfxVoidItem EditHeaderAndFooter SID_HFEDIT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem EditLinks SID_LINKS () [ @@ -2263,7 +2263,7 @@ SfxVoidItem EditLinks SID_LINKS GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem EditObject SID_SC_EDIT_OBJECT () [ @@ -2288,7 +2288,7 @@ SfxVoidItem EditObject SID_SC_EDIT_OBJECT GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem EditPrintArea SID_OPENDLG_EDIT_PRINTAREA () [ @@ -2313,7 +2313,7 @@ SfxVoidItem EditPrintArea SID_OPENDLG_EDIT_PRINTAREA GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem EditScenario SID_EDIT_SCENARIO (SfxStringItem ScenarioName SID_EDIT_SCENARIO) [ @@ -2338,7 +2338,7 @@ SfxVoidItem EditScenario SID_EDIT_SCENARIO GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem EuroConverter SID_EURO_CONVERTER () [ @@ -2363,7 +2363,7 @@ SfxVoidItem EuroConverter SID_EURO_CONVERTER GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FillDown FID_FILL_TO_BOTTOM () [ @@ -2388,7 +2388,7 @@ SfxVoidItem FillDown FID_FILL_TO_BOTTOM GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FillLeft FID_FILL_TO_LEFT () [ @@ -2413,7 +2413,7 @@ SfxVoidItem FillLeft FID_FILL_TO_LEFT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FillModeEnd SID_FILL_NONE () [ @@ -2438,7 +2438,7 @@ SfxVoidItem FillModeEnd SID_FILL_NONE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FillModeRemovePredescessor SID_FILL_DEL_PRED () [ @@ -2463,7 +2463,7 @@ SfxVoidItem FillModeRemovePredescessor SID_FILL_DEL_PRED GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem FillModeRemoveSuccessor SID_FILL_DEL_SUCC () [ @@ -2488,7 +2488,7 @@ SfxVoidItem FillModeRemoveSuccessor SID_FILL_DEL_SUCC GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem FillModeSelect SID_FILL_SELECT (SfxInt16Item PosX SID_RANGE_COL,SfxInt32Item PosY SID_RANGE_ROW) [ @@ -2513,7 +2513,7 @@ SfxVoidItem FillModeSelect SID_FILL_SELECT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FillModeTracePredescessor SID_FILL_ADD_PRED () [ @@ -2538,7 +2538,7 @@ SfxVoidItem FillModeTracePredescessor SID_FILL_ADD_PRED GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem FillModeTraceSuccessor SID_FILL_ADD_SUCC () [ @@ -2563,7 +2563,7 @@ SfxVoidItem FillModeTraceSuccessor SID_FILL_ADD_SUCC GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem FillRight FID_FILL_TO_RIGHT () [ @@ -2588,7 +2588,7 @@ SfxVoidItem FillRight FID_FILL_TO_RIGHT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FillSeries FID_FILL_SERIES (SfxStringItem FillDir FID_FILL_SERIES,SfxStringItem FillCmd FN_PARAM_1,SfxStringItem FillStep FN_PARAM_3,SfxStringItem FillDateCmd FN_PARAM_2,SfxStringItem FillStart FN_PARAM_4,SfxStringItem FillMax FN_PARAM_5) [ @@ -2613,7 +2613,7 @@ SfxVoidItem FillSeries FID_FILL_SERIES GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FillTable FID_FILL_TAB (SfxStringItem Flags FID_FILL_TAB) [ @@ -2638,7 +2638,7 @@ SfxVoidItem FillTable FID_FILL_TAB GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FillUp FID_FILL_TO_TOP () [ @@ -2663,7 +2663,7 @@ SfxVoidItem FillUp FID_FILL_TO_TOP GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FilterExecute FID_FILTER_OK () [ @@ -2688,7 +2688,7 @@ SfxVoidItem FilterExecute FID_FILTER_OK GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem FirstPage SID_PREVIEW_FIRST () [ @@ -2713,7 +2713,7 @@ SfxVoidItem FirstPage SID_PREVIEW_FIRST GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem FocusCellAddress FID_FOCUS_POSWND () [ @@ -2738,7 +2738,7 @@ SfxVoidItem FocusCellAddress FID_FOCUS_POSWND GroupId = GID_APPLICATION; ] -//-------------------------------------------------------------------------- + SfxVoidItem Collaborate SID_COLLABORATION () [ @@ -2763,7 +2763,7 @@ SfxVoidItem Collaborate SID_COLLABORATION GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem FormatCellDialog FID_CELL_FORMAT () [ @@ -2788,7 +2788,7 @@ SfxVoidItem FormatCellDialog FID_CELL_FORMAT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxStringItem Formula SID_RANGE_FORMULA [ @@ -2815,7 +2815,7 @@ SfxStringItem Formula SID_RANGE_FORMULA GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem FreezePanes SID_WINDOW_FIX () [ @@ -2840,7 +2840,7 @@ SfxVoidItem FreezePanes SID_WINDOW_FIX GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxBoolItem FunctionBox FID_FUNCTION_BOX [ @@ -2867,7 +2867,7 @@ SfxBoolItem FunctionBox FID_FUNCTION_BOX GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem FunctionDialog SID_OPENDLG_FUNCTION () [ @@ -2892,7 +2892,7 @@ SfxVoidItem FunctionDialog SID_OPENDLG_FUNCTION GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem GoalSeek SID_SOLVE () [ @@ -2917,7 +2917,7 @@ SfxVoidItem GoalSeek SID_SOLVE GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem GoalSeekDialog SID_OPENDLG_SOLVE () [ @@ -3158,7 +3158,7 @@ SfxVoidItem TTestDialog SID_TTEST_DIALOG GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem SolverDialog SID_OPENDLG_OPTSOLVER () [ @@ -3183,7 +3183,7 @@ SfxVoidItem SolverDialog SID_OPENDLG_OPTSOLVER GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem ValidityReference SID_VALIDITY_REFERENCE () [ @@ -3208,7 +3208,7 @@ SfxVoidItem ValidityReference SID_VALIDITY_REFERENCE GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem GoDownToEndOfData SID_CURSORBLKDOWN (SfxInt16Item By FN_PARAM_1,SfxBoolItem Sel FN_PARAM_2) [ @@ -3233,7 +3233,7 @@ SfxVoidItem GoDownToEndOfData SID_CURSORBLKDOWN GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem GoDownToEndOfDataSel SID_CURSORBLKDOWN_SEL (SfxInt16Item By FN_PARAM_1) [ @@ -3258,7 +3258,7 @@ SfxVoidItem GoDownToEndOfDataSel SID_CURSORBLKDOWN_SEL GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem GoLeftBlock SID_CURSORPAGELEFT_ (SfxInt16Item By FN_PARAM_1,SfxBoolItem Sel FN_PARAM_2) [ @@ -3283,7 +3283,7 @@ SfxVoidItem GoLeftBlock SID_CURSORPAGELEFT_ GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem GoLeftToStartOfData SID_CURSORBLKLEFT (SfxInt16Item By FN_PARAM_1,SfxBoolItem Sel FN_PARAM_2) [ @@ -3308,7 +3308,7 @@ SfxVoidItem GoLeftToStartOfData SID_CURSORBLKLEFT GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem GoLeftToStartOfDataSel SID_CURSORBLKLEFT_SEL (SfxInt16Item By FN_PARAM_1) [ @@ -3333,7 +3333,7 @@ SfxVoidItem GoLeftToStartOfDataSel SID_CURSORBLKLEFT_SEL GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem GoRightBlock SID_CURSORPAGERIGHT_ (SfxInt16Item By FN_PARAM_1,SfxBoolItem Sel FN_PARAM_2) [ @@ -3358,7 +3358,7 @@ SfxVoidItem GoRightBlock SID_CURSORPAGERIGHT_ GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem GoRightBlockSel SID_CURSORPAGERIGHT_SEL (SfxInt16Item By FN_PARAM_1) [ @@ -3383,7 +3383,7 @@ SfxVoidItem GoRightBlockSel SID_CURSORPAGERIGHT_SEL GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem GoRightToEndOfData SID_CURSORBLKRIGHT (SfxInt16Item By FN_PARAM_1,SfxBoolItem Sel FN_PARAM_2) [ @@ -3408,7 +3408,7 @@ SfxVoidItem GoRightToEndOfData SID_CURSORBLKRIGHT GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem GoRightToEndOfDataSel SID_CURSORBLKRIGHT_SEL (SfxInt16Item By FN_PARAM_1) [ @@ -3433,7 +3433,7 @@ SfxVoidItem GoRightToEndOfDataSel SID_CURSORBLKRIGHT_SEL GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxStringItem GoToCell SID_CURRENTCELL (SfxStringItem ToPoint SID_CURRENTCELL) [ @@ -3458,7 +3458,7 @@ SfxStringItem GoToCell SID_CURRENTCELL GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem GoToCurrentCell SID_ALIGNCURSOR () [ @@ -3483,7 +3483,7 @@ SfxVoidItem GoToCurrentCell SID_ALIGNCURSOR GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem GotoDocument SID_CURRENTDOC (SfxStringItem DocName SID_CURRENTDOC) [ @@ -3508,7 +3508,7 @@ SfxVoidItem GotoDocument SID_CURRENTDOC GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxStringItem GoToObject SID_CURRENTOBJECT (SfxStringItem ToObject SID_CURRENTOBJECT) [ @@ -3533,7 +3533,7 @@ SfxStringItem GoToObject SID_CURRENTOBJECT GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem GoUpToStartOfData SID_CURSORBLKUP (SfxInt16Item By FN_PARAM_1,SfxBoolItem Sel FN_PARAM_2) [ @@ -3558,7 +3558,7 @@ SfxVoidItem GoUpToStartOfData SID_CURSORBLKUP GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem GoUpToStartOfDataSel SID_CURSORBLKUP_SEL (SfxInt16Item By FN_PARAM_1) [ @@ -3583,7 +3583,7 @@ SfxVoidItem GoUpToStartOfDataSel SID_CURSORBLKUP_SEL GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem Hide FID_TABLE_HIDE (SfxStringItem aTableName FID_TABLE_HIDE) [ @@ -3608,7 +3608,7 @@ SfxVoidItem Hide FID_TABLE_HIDE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem HideColumn FID_COL_HIDE () [ @@ -3633,7 +3633,7 @@ SfxVoidItem HideColumn FID_COL_HIDE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem HideRow FID_ROW_HIDE () [ @@ -3658,7 +3658,7 @@ SfxVoidItem HideRow FID_ROW_HIDE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SvxHorJustifyItem HorizontalAlignment SID_H_ALIGNCELL [ @@ -3685,7 +3685,7 @@ SvxHorJustifyItem HorizontalAlignment SID_H_ALIGNCELL GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem Hyphenate SID_ENABLE_HYPHENATION () [ @@ -3710,7 +3710,7 @@ SfxVoidItem Hyphenate SID_ENABLE_HYPHENATION GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem CellTextDlg SID_PROPERTY_PANEL_CELLTEXT_DLG () @@ -3736,7 +3736,7 @@ SfxVoidItem CellTextDlg SID_PROPERTY_PANEL_CELLTEXT_DLG GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem InputLineBlock FID_INPUTLINE_BLOCK () [ @@ -3761,7 +3761,7 @@ SfxVoidItem InputLineBlock FID_INPUTLINE_BLOCK GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem InputLineEnter FID_INPUTLINE_ENTER () [ @@ -3786,7 +3786,7 @@ SfxVoidItem InputLineEnter FID_INPUTLINE_ENTER GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem InputLineMatrix FID_INPUTLINE_MATRIX () [ @@ -3811,7 +3811,7 @@ SfxVoidItem InputLineMatrix FID_INPUTLINE_MATRIX GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxUInt16Item InsCellsCtrl SID_TBXCTL_INSCELLS [ @@ -3838,7 +3838,7 @@ SfxUInt16Item InsCellsCtrl SID_TBXCTL_INSCELLS GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem Insert FID_INS_TABLE (SfxStringItem Name FID_INS_TABLE,SfxUInt16Item Index FN_PARAM_1) [ @@ -3863,7 +3863,7 @@ SfxVoidItem Insert FID_INS_TABLE GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertSheetFromFile FID_INS_TABLE_EXT (SfxStringItem Name FID_INS_TABLE,SfxUInt16Item Index FN_PARAM_1) [ @@ -3888,7 +3888,7 @@ SfxVoidItem InsertSheetFromFile FID_INS_TABLE_EXT GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertCell FID_INS_CELL (SfxStringItem Flags FID_INS_CELL) [ @@ -3913,7 +3913,7 @@ SfxVoidItem InsertCell FID_INS_CELL GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertCellsDown FID_INS_CELLSDOWN () [ @@ -3938,7 +3938,7 @@ SfxVoidItem InsertCellsDown FID_INS_CELLSDOWN GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertCellsRight FID_INS_CELLSRIGHT () [ @@ -3963,7 +3963,7 @@ SfxVoidItem InsertCellsRight FID_INS_CELLSRIGHT GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertColumnBreak FID_INS_COLBRK () [ @@ -3988,7 +3988,7 @@ SfxVoidItem InsertColumnBreak FID_INS_COLBRK GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertColumns FID_INS_COLUMN () [ @@ -4013,7 +4013,7 @@ SfxVoidItem InsertColumns FID_INS_COLUMN GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertContents FID_INS_CELL_CONTENTS (SfxStringItem Flags FID_INS_CELL_CONTENTS,SfxUInt16Item FormulaCommand FN_PARAM_1,SfxBoolItem SkipEmptyCells FN_PARAM_2,SfxBoolItem Transpose FN_PARAM_3,SfxBoolItem AsLink FN_PARAM_4,SfxInt16Item MoveMode FN_PARAM_5) [ @@ -4038,7 +4038,7 @@ SfxVoidItem InsertContents FID_INS_CELL_CONTENTS GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxUInt16Item InsertCtrl SID_TBXCTL_INSERT [ @@ -4065,7 +4065,7 @@ SfxUInt16Item InsertCtrl SID_TBXCTL_INSERT GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertExternalDataSource SID_EXTERNAL_SOURCE (SfxStringItem FileName SID_FILE_NAME,SfxStringItem FilterName SID_FILTER_NAME,SfxStringItem Options SID_FILE_FILTEROPTIONS,SfxStringItem Source FN_PARAM_1,SfxUInt32Item Refresh FN_PARAM_2) [ @@ -4090,7 +4090,7 @@ SfxVoidItem InsertExternalDataSource SID_EXTERNAL_SOURCE GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertFile FID_INSERT_FILE () [ @@ -4115,7 +4115,7 @@ SfxVoidItem InsertFile FID_INSERT_FILE GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertFunction SID_INS_FUNCTION () [ @@ -4140,7 +4140,7 @@ SfxVoidItem InsertFunction SID_INS_FUNCTION GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertMatrix SID_INSERT_MATRIX (SfxStringItem Formula SID_INSERT_MATRIX) [ @@ -4165,7 +4165,7 @@ SfxVoidItem InsertMatrix SID_INSERT_MATRIX GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem AddName FID_ADD_NAME () [ @@ -4190,7 +4190,7 @@ SfxVoidItem AddName FID_ADD_NAME GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertName FID_INSERT_NAME () [ @@ -4215,7 +4215,7 @@ SfxVoidItem InsertName FID_INSERT_NAME GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertObjectStarImage SID_INSERT_SIMAGE () [ @@ -4240,7 +4240,7 @@ SfxVoidItem InsertObjectStarImage SID_INSERT_SIMAGE GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertObjectStarMath SID_INSERT_SMATH () [ @@ -4265,7 +4265,7 @@ SfxVoidItem InsertObjectStarMath SID_INSERT_SMATH GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertRowBreak FID_INS_ROWBRK () [ @@ -4290,7 +4290,7 @@ SfxVoidItem InsertRowBreak FID_INS_ROWBRK GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertRows FID_INS_ROW () [ @@ -4315,7 +4315,7 @@ SfxVoidItem InsertRows FID_INS_ROW GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxUInt16Item InsObjCtrl SID_TBXCTL_INSOBJ [ @@ -4342,7 +4342,7 @@ SfxUInt16Item InsObjCtrl SID_TBXCTL_INSOBJ GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem JumpToNextCell SID_CURSORENTERDOWN () [ @@ -4367,7 +4367,7 @@ SfxVoidItem JumpToNextCell SID_CURSORENTERDOWN GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem JumpToNextTable SID_NEXT_TABLE () [ @@ -4392,7 +4392,7 @@ SfxVoidItem JumpToNextTable SID_NEXT_TABLE GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem JumpToNextTableSel SID_NEXT_TABLE_SEL () [ @@ -4417,7 +4417,7 @@ SfxVoidItem JumpToNextTableSel SID_NEXT_TABLE_SEL GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem JumpToNextUnprotected SID_NEXT_UNPROTECT () [ @@ -4442,7 +4442,7 @@ SfxVoidItem JumpToNextUnprotected SID_NEXT_UNPROTECT GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem JumpToPreviousCell SID_CURSORENTERUP () [ @@ -4467,7 +4467,7 @@ SfxVoidItem JumpToPreviousCell SID_CURSORENTERUP GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem JumpToPreviousUnprotected SID_PREV_UNPROTECT () [ @@ -4492,7 +4492,7 @@ SfxVoidItem JumpToPreviousUnprotected SID_PREV_UNPROTECT GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem JumpToPrevTable SID_PREV_TABLE () [ @@ -4517,7 +4517,7 @@ SfxVoidItem JumpToPrevTable SID_PREV_TABLE GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem JumpToPrevTableSel SID_PREV_TABLE_SEL () [ @@ -4542,7 +4542,7 @@ SfxVoidItem JumpToPrevTableSel SID_PREV_TABLE_SEL GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem JumpToTable SID_CURRENTTAB (SfxUInt16Item Nr SID_CURRENTTAB) [ @@ -4567,7 +4567,7 @@ SfxVoidItem JumpToTable SID_CURRENTTAB GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem LastPage SID_PREVIEW_LAST () [ @@ -4592,7 +4592,7 @@ SfxVoidItem LastPage SID_PREVIEW_LAST GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem MergeCells FID_MERGE_ON (SfxBoolItem MoveContents FID_MERGE_ON) [ @@ -4617,7 +4617,7 @@ SfxVoidItem MergeCells FID_MERGE_ON GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ToggleMergeCells FID_MERGE_TOGGLE (SfxBoolItem MoveContents FID_MERGE_TOGGLE) [ @@ -4642,7 +4642,7 @@ SfxVoidItem ToggleMergeCells FID_MERGE_TOGGLE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem Mirror SID_OBJECT_MIRROR () [ @@ -4667,7 +4667,7 @@ SfxBoolItem Mirror SID_OBJECT_MIRROR GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxVoidItem Move FID_TAB_MOVE (SfxStringItem DocName FID_TAB_MOVE,SfxUInt16Item Index FN_PARAM_1,SfxBoolItem Copy FN_PARAM_2) [ @@ -4692,7 +4692,7 @@ SfxVoidItem Move FID_TAB_MOVE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxStringItem Name FID_TAB_RENAME [ @@ -4719,7 +4719,7 @@ SfxStringItem Name FID_TAB_RENAME GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem NextPage SID_PREVIEW_NEXT () [ @@ -4744,7 +4744,7 @@ SfxVoidItem NextPage SID_PREVIEW_NEXT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxStringItem NoteText SID_RANGE_NOTETEXT [ @@ -4771,7 +4771,7 @@ SfxStringItem NoteText SID_RANGE_NOTETEXT GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxBoolItem NoteVisible FID_NOTE_VISIBLE [ @@ -4798,7 +4798,7 @@ SfxBoolItem NoteVisible FID_NOTE_VISIBLE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxBoolItem ShowNote FID_SHOW_NOTE [ @@ -4825,7 +4825,7 @@ SfxBoolItem ShowNote FID_SHOW_NOTE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxBoolItem HideNote FID_HIDE_NOTE [ @@ -4852,7 +4852,7 @@ SfxBoolItem HideNote FID_HIDE_NOTE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem DeleteNote SID_DELETE_NOTE () [ @@ -4877,7 +4877,7 @@ SfxVoidItem DeleteNote SID_DELETE_NOTE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxStringItem NumberFormat SID_NUMBER_FORMAT [ @@ -4904,7 +4904,7 @@ SfxStringItem NumberFormat SID_NUMBER_FORMAT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem NumberFormatCurrency SID_NUMBER_CURRENCY () [ @@ -4929,7 +4929,7 @@ SfxVoidItem NumberFormatCurrency SID_NUMBER_CURRENCY GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem NumberFormatDate SID_NUMBER_DATE () [ @@ -4954,7 +4954,7 @@ SfxVoidItem NumberFormatDate SID_NUMBER_DATE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem NumberFormatDecDecimals SID_NUMBER_DECDEC () [ @@ -4979,7 +4979,7 @@ SfxVoidItem NumberFormatDecDecimals SID_NUMBER_DECDEC GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem NumberFormatDecimal SID_NUMBER_TWODEC () [ @@ -5004,7 +5004,7 @@ SfxVoidItem NumberFormatDecimal SID_NUMBER_TWODEC GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem NumberFormatIncDecimals SID_NUMBER_INCDEC () [ @@ -5029,7 +5029,7 @@ SfxVoidItem NumberFormatIncDecimals SID_NUMBER_INCDEC GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem NumberFormatPercent SID_NUMBER_PERCENT () [ @@ -5054,7 +5054,7 @@ SfxVoidItem NumberFormatPercent SID_NUMBER_PERCENT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem NumberFormatScientific SID_NUMBER_SCIENTIFIC () [ @@ -5079,7 +5079,7 @@ SfxVoidItem NumberFormatScientific SID_NUMBER_SCIENTIFIC GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem NumberFormatStandard SID_NUMBER_STANDARD () [ @@ -5104,7 +5104,7 @@ SfxVoidItem NumberFormatStandard SID_NUMBER_STANDARD GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem NumberFormatTime SID_NUMBER_TIME () [ @@ -5129,7 +5129,7 @@ SfxVoidItem NumberFormatTime SID_NUMBER_TIME GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxInt32Item ObjectHeight SID_OBJECT_HEIGHT [ @@ -5156,7 +5156,7 @@ SfxInt32Item ObjectHeight SID_OBJECT_HEIGHT GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxInt32Item ObjectLeft SID_OBJECT_LEFT [ @@ -5183,7 +5183,7 @@ SfxInt32Item ObjectLeft SID_OBJECT_LEFT GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem ObjectMirrorHorizontal SID_MIRROR_HORIZONTAL () [ @@ -5208,7 +5208,7 @@ SfxVoidItem ObjectMirrorHorizontal SID_MIRROR_HORIZONTAL GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ObjectMirrorVertical SID_MIRROR_VERTICAL () [ @@ -5233,7 +5233,7 @@ SfxVoidItem ObjectMirrorVertical SID_MIRROR_VERTICAL GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxInt32Item ObjectTop SID_OBJECT_TOP [ @@ -5260,7 +5260,7 @@ SfxInt32Item ObjectTop SID_OBJECT_TOP GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxInt32Item ObjectWidth SID_OBJECT_WIDTH [ @@ -5287,7 +5287,7 @@ SfxInt32Item ObjectWidth SID_OBJECT_WIDTH GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxObjectItem Offset SID_RANGE_OFFSET (SfxInt16Item Column FN_PARAM_1,SfxInt32Item Row FN_PARAM_2,SfxInt16Item Table FN_PARAM_3) [ @@ -5312,7 +5312,7 @@ SfxObjectItem Offset SID_RANGE_OFFSET GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxObjectItem OleObject SID_OLE_OBJECT [ @@ -5339,7 +5339,7 @@ SfxObjectItem OleObject SID_OLE_OBJECT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem OriginalSize SID_ORIGINALSIZE () [ @@ -5364,7 +5364,7 @@ SfxVoidItem OriginalSize SID_ORIGINALSIZE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxBoolItem NormalViewMode FID_NORMALVIEWMODE [ @@ -5391,7 +5391,7 @@ SfxBoolItem NormalViewMode FID_NORMALVIEWMODE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxBoolItem PagebreakMode FID_PAGEBREAKMODE [ @@ -5418,7 +5418,7 @@ SfxBoolItem PagebreakMode FID_PAGEBREAKMODE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem PageFormatDialog SID_FORMATPAGE () [ @@ -5443,7 +5443,7 @@ SfxVoidItem PageFormatDialog SID_FORMATPAGE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem PreviousPage SID_PREVIEW_PREVIOUS () [ @@ -5468,7 +5468,7 @@ SfxVoidItem PreviousPage SID_PREVIEW_PREVIOUS GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem Protect FID_PROTECT_TABLE (SfxBoolItem Protect FID_PROTECT_TABLE) [ @@ -5493,7 +5493,7 @@ SfxVoidItem Protect FID_PROTECT_TABLE GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem ProtectTraceChangeMode SID_CHG_PROTECT () [ @@ -5518,7 +5518,7 @@ SfxVoidItem ProtectTraceChangeMode SID_CHG_PROTECT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem PutCell SID_SC_SETTEXT (SfxInt16Item Column FN_PARAM_1,SfxInt32Item Row FN_PARAM_2,SfxInt16Item Table FN_PARAM_3,SfxStringItem Text SID_SC_SETTEXT) [ @@ -5543,7 +5543,7 @@ SfxVoidItem PutCell SID_SC_SETTEXT GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxObjectItem Range SID_SC_RANGE (SfxStringItem Range SID_SC_RANGE,SfxBoolItem KeepSelect FN_PARAM_1) [ @@ -5568,7 +5568,7 @@ SfxObjectItem Range SID_SC_RANGE GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem RecalcPivotTable SID_PIVOT_RECALC () [ @@ -5593,7 +5593,7 @@ SfxVoidItem RecalcPivotTable SID_PIVOT_RECALC GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem RefreshArrows SID_DETECTIVE_REFRESH () [ @@ -5618,7 +5618,7 @@ SfxVoidItem RefreshArrows SID_DETECTIVE_REFRESH GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem ReImportAfterLoad SID_REIMPORT_AFTER_LOAD () [ @@ -5643,7 +5643,7 @@ SfxVoidItem ReImportAfterLoad SID_REIMPORT_AFTER_LOAD GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem Remove FID_DELETE_TABLE (SfxUInt16Item Index FID_DELETE_TABLE) [ @@ -5668,7 +5668,7 @@ SfxVoidItem Remove FID_DELETE_TABLE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + // #i68101# SfxVoidItem ObjectTitleDescription SID_TITLE_DESCRIPTION_OBJECT () @@ -5694,7 +5694,7 @@ SfxVoidItem ObjectTitleDescription SID_TITLE_DESCRIPTION_OBJECT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem RenameObject SID_RENAME_OBJECT () [ @@ -5719,7 +5719,7 @@ SfxVoidItem RenameObject SID_RENAME_OBJECT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem RepeatSearch FID_REPEAT_SEARCH () [ @@ -5744,7 +5744,7 @@ SfxVoidItem RepeatSearch FID_REPEAT_SEARCH GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem Replace FID_REPLACE (SfxStringItem SearchString FID_REPLACE,SfxStringItem ReplaceString FN_PARAM_1) [ @@ -5769,7 +5769,7 @@ SfxVoidItem Replace FID_REPLACE GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ReplaceAll FID_REPLACE_ALL (SfxStringItem SearchString FID_REPLACE_ALL,SfxStringItem ReplaceString FN_PARAM_1) [ @@ -5794,7 +5794,7 @@ SfxVoidItem ReplaceAll FID_REPLACE_ALL GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ResetAttributes SID_CELL_FORMAT_RESET () [ @@ -5819,7 +5819,7 @@ SfxVoidItem ResetAttributes SID_CELL_FORMAT_RESET GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ResetPrintZoom FID_RESET_PRINTZOOM () [ @@ -5844,7 +5844,7 @@ SfxVoidItem ResetPrintZoom FID_RESET_PRINTZOOM GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxInt32Item Row SID_RANGE_ROW [ @@ -5871,7 +5871,7 @@ SfxInt32Item Row SID_RANGE_ROW GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxUInt16Item RowHeight FID_ROW_HEIGHT [ @@ -5898,7 +5898,7 @@ SfxUInt16Item RowHeight FID_ROW_HEIGHT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SbaImport SID_SBA_IMPORT (SfxUsrAnyItem Query SID_SBA_IMPORT,SfxStringItem Target FN_PARAM_1) [ @@ -5923,7 +5923,7 @@ SfxVoidItem SbaImport SID_SBA_IMPORT GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem Scale FID_SCALE () [ @@ -5948,7 +5948,7 @@ SfxVoidItem Scale FID_SCALE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem ScenarioManager SID_SCENARIOS (SfxStringItem Name SID_SCENARIOS,SfxStringItem Comment SID_NEW_TABLENAME) [ @@ -5973,7 +5973,7 @@ SfxVoidItem ScenarioManager SID_SCENARIOS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem Search FID_SEARCH (SfxStringItem SearchString FID_SEARCH) [ @@ -5998,7 +5998,7 @@ SfxVoidItem Search FID_SEARCH GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SearchAll FID_SEARCH_ALL (SfxStringItem SearchString FID_SEARCH_ALL) [ @@ -6023,7 +6023,7 @@ SfxVoidItem SearchAll FID_SEARCH_ALL GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SelectArea SID_MARKAREA () [ @@ -6048,7 +6048,7 @@ SfxVoidItem SelectArea SID_MARKAREA GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem SelectOLE SID_OLE_SELECT () [ @@ -6073,7 +6073,7 @@ SfxVoidItem SelectOLE SID_OLE_SELECT GroupId = GID_SPECIAL; ] -//-------------------------------------------------------------------------- + SfxVoidItem SelectColumn SID_SELECT_COL () [ @@ -6098,7 +6098,7 @@ SfxVoidItem SelectColumn SID_SELECT_COL GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SelectData SID_MARKDATAAREA () [ @@ -6123,7 +6123,7 @@ SfxVoidItem SelectData SID_MARKDATAAREA GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SelectDB SID_SELECT_DB (SfxStringItem DbName SID_SELECT_DB) [ @@ -6268,7 +6268,7 @@ SfxObjectItem SelectedObject SID_SC_ACTIVEOBJECT GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxStringItem SelectedObjectName SID_ACTIVE_OBJ_NAME [ @@ -6295,7 +6295,7 @@ SfxStringItem SelectedObjectName SID_ACTIVE_OBJ_NAME GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxObjectItem Selection SID_SC_SELECTION [ @@ -6322,7 +6322,7 @@ SfxObjectItem Selection SID_SC_SELECTION GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem SelectRow SID_SELECT_ROW () [ @@ -6347,7 +6347,7 @@ SfxVoidItem SelectRow SID_SELECT_ROW GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxStringItem SelectScenario SID_SELECT_SCENARIO (SfxStringItem Name SID_SELECT_SCENARIO) [ @@ -6372,7 +6372,7 @@ SfxStringItem SelectScenario SID_SELECT_SCENARIO GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem SetAnchorToCell SID_ANCHOR_CELL () [ @@ -6397,7 +6397,7 @@ SfxBoolItem SetAnchorToCell SID_ANCHOR_CELL GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem SetAnchorToPage SID_ANCHOR_PAGE () [ @@ -6422,7 +6422,7 @@ SfxBoolItem SetAnchorToPage SID_ANCHOR_PAGE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SetInputMode SID_SETINPUTMODE () [ @@ -6447,7 +6447,7 @@ SfxVoidItem SetInputMode SID_SETINPUTMODE GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem SetOptimalColumnWidth FID_COL_OPT_WIDTH (SfxUInt16Item aExtraWidth FID_COL_OPT_WIDTH) [ @@ -6472,7 +6472,7 @@ SfxVoidItem SetOptimalColumnWidth FID_COL_OPT_WIDTH GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SetOptimalColumnWidthDirect FID_COL_OPT_DIRECT () [ @@ -6497,7 +6497,7 @@ SfxVoidItem SetOptimalColumnWidthDirect FID_COL_OPT_DIRECT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SetOptimalRowHeight FID_ROW_OPT_HEIGHT (SfxUInt16Item aExtraHeight FID_ROW_OPT_HEIGHT) [ @@ -6522,7 +6522,7 @@ SfxVoidItem SetOptimalRowHeight FID_ROW_OPT_HEIGHT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem Show FID_TABLE_SHOW (SfxStringItem aTableName FID_TABLE_SHOW) [ @@ -6547,7 +6547,7 @@ SfxVoidItem Show FID_TABLE_SHOW GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ShowChanges FID_CHG_SHOW () [ @@ -6572,7 +6572,7 @@ SfxVoidItem ShowChanges FID_CHG_SHOW GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ShowColumn FID_COL_SHOW () [ @@ -6597,7 +6597,7 @@ SfxVoidItem ShowColumn FID_COL_SHOW GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ShowDependents SID_DETECTIVE_ADD_SUCC () [ @@ -6622,7 +6622,7 @@ SfxVoidItem ShowDependents SID_DETECTIVE_ADD_SUCC GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem ShowErrors SID_DETECTIVE_ADD_ERR () [ @@ -6647,7 +6647,7 @@ SfxVoidItem ShowErrors SID_DETECTIVE_ADD_ERR GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem ShowInvalid SID_DETECTIVE_INVALID () [ @@ -6672,7 +6672,7 @@ SfxVoidItem ShowInvalid SID_DETECTIVE_INVALID GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem ShowPrecedents SID_DETECTIVE_ADD_PRED () [ @@ -6697,7 +6697,7 @@ SfxVoidItem ShowPrecedents SID_DETECTIVE_ADD_PRED GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem ShowRow FID_ROW_SHOW () [ @@ -6722,7 +6722,7 @@ SfxVoidItem ShowRow FID_ROW_SHOW GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SimpleReferenz WID_SIMPLE_REF () [ @@ -6747,7 +6747,7 @@ SfxVoidItem SimpleReferenz WID_SIMPLE_REF GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SortAscending SID_SORT_ASCENDING () [ @@ -6772,7 +6772,7 @@ SfxVoidItem SortAscending SID_SORT_ASCENDING GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem SortDescending SID_SORT_DESCENDING () [ @@ -6797,7 +6797,7 @@ SfxVoidItem SortDescending SID_SORT_DESCENDING GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem SplitCell FID_MERGE_OFF () [ @@ -6822,7 +6822,7 @@ SfxVoidItem SplitCell FID_MERGE_OFF GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SplitWindow SID_WINDOW_SPLIT () [ @@ -6847,7 +6847,7 @@ SfxVoidItem SplitWindow SID_WINDOW_SPLIT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem StandardFonts SID_STANDARD_FONTS () [ @@ -6872,7 +6872,7 @@ SfxVoidItem StandardFonts SID_STANDARD_FONTS GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + // ISSUE66550_HLINK_FOR_SHAPES SfxVoidItem EditShapeHyperlink SID_DRAW_HLINK_EDIT () @@ -6898,7 +6898,7 @@ SfxVoidItem EditShapeHyperlink SID_DRAW_HLINK_EDIT GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + // ISSUE66550_HLINK_FOR_SHAPES SfxVoidItem DeleteShapeHyperlink SID_DRAW_HLINK_DELETE () @@ -6924,7 +6924,7 @@ SfxVoidItem DeleteShapeHyperlink SID_DRAW_HLINK_DELETE GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem StandardTextAttributes SID_TEXT_STANDARD () [ @@ -6949,7 +6949,7 @@ SfxVoidItem StandardTextAttributes SID_TEXT_STANDARD GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxUInt16Item StatusBarFunc SID_PSZ_FUNCTION [ @@ -6976,7 +6976,7 @@ SfxUInt16Item StatusBarFunc SID_PSZ_FUNCTION GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxStringItem StatusDocPos SID_STATUS_DOCPOS [ @@ -7003,7 +7003,7 @@ SfxStringItem StatusDocPos SID_STATUS_DOCPOS GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxStringItem StatusFunction SID_STATUS_SUM [ @@ -7030,7 +7030,7 @@ SfxStringItem StatusFunction SID_STATUS_SUM GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem StatusInputLine FID_INPUTLINE_STATUS () [ @@ -7055,7 +7055,7 @@ SfxVoidItem StatusInputLine FID_INPUTLINE_STATUS GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxStringItem StatusPageStyle SID_STATUS_PAGESTYLE [ @@ -7082,7 +7082,7 @@ SfxStringItem StatusPageStyle SID_STATUS_PAGESTYLE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem StatusScale FID_SCALESTATUS () [ @@ -7107,7 +7107,7 @@ SfxVoidItem StatusScale FID_SCALESTATUS GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxUInt16Item StatusSelectionMode SID_STATUS_SELMODE [ @@ -7134,7 +7134,7 @@ SfxUInt16Item StatusSelectionMode SID_STATUS_SELMODE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxUInt16Item StatusSelectionModeExp SID_STATUS_SELMODE_ERG [ @@ -7161,7 +7161,7 @@ SfxUInt16Item StatusSelectionModeExp SID_STATUS_SELMODE_ERG GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxUInt16Item StatusSelectionModeExt SID_STATUS_SELMODE_ERW [ @@ -7188,7 +7188,7 @@ SfxUInt16Item StatusSelectionModeExt SID_STATUS_SELMODE_ERW GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxUInt16Item StatusSelectionModeNorm SID_STATUS_SELMODE_NORM [ @@ -7215,7 +7215,7 @@ SfxUInt16Item StatusSelectionModeNorm SID_STATUS_SELMODE_NORM GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxInt16Item Table SID_RANGE_TABLE [ @@ -7242,7 +7242,7 @@ SfxInt16Item Table SID_RANGE_TABLE GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxInt16Item TableCount SID_TABLES_COUNT [ @@ -7269,7 +7269,7 @@ SfxInt16Item TableCount SID_TABLES_COUNT GroupId = GID_DOCUMENT; ] -//-------------------------------------------------------------------------- + SfxVoidItem TableOperation SID_TABOP () [ @@ -7294,7 +7294,7 @@ SfxVoidItem TableOperation SID_TABOP GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem TableOperationDialog SID_OPENDLG_TABOP () [ @@ -7319,7 +7319,7 @@ SfxVoidItem TableOperationDialog SID_OPENDLG_TABOP GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxVoidItem RenameTable FID_TAB_MENU_RENAME (SfxStringItem Name FID_TAB_RENAME) [ @@ -7344,7 +7344,7 @@ SfxVoidItem RenameTable FID_TAB_MENU_RENAME GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxObjectItem Tables SID_TABLES_GET [ @@ -7371,7 +7371,7 @@ SfxObjectItem Tables SID_TABLES_GET GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem TableSelectAll FID_TAB_SELECTALL () [ @@ -7396,7 +7396,7 @@ SfxVoidItem TableSelectAll FID_TAB_SELECTALL GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem TableDeselectAll FID_TAB_DESELECTALL () [ @@ -7421,7 +7421,7 @@ SfxVoidItem TableDeselectAll FID_TAB_DESELECTALL GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem TableEvents FID_TAB_EVENTS () [ @@ -7446,7 +7446,7 @@ SfxVoidItem TableEvents FID_TAB_EVENTS GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem TextAttributes SID_DRAWTEXT_ATTR_DLG () [ @@ -7472,7 +7472,7 @@ SfxVoidItem TextAttributes SID_DRAWTEXT_ATTR_DLG ] -//-------------------------------------------------------------------------- + SfxVoidItem AssignMacro SID_ASSIGNMACRO () [ @@ -7497,7 +7497,7 @@ SfxVoidItem AssignMacro SID_ASSIGNMACRO GroupId = GID_DRAWING; ] -//-------------------------------------------------------------------------- + SfxVoidItem TextToColumns SID_TEXT_TO_COLUMNS () [ @@ -7522,7 +7522,7 @@ SfxVoidItem TextToColumns SID_TEXT_TO_COLUMNS GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + SfxStringItem TextValue SID_RANGE_TEXTVALUE [ @@ -7549,7 +7549,7 @@ SfxStringItem TextValue SID_RANGE_TEXTVALUE GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem ToggleAnchorType SID_ANCHOR_TOGGLE () [ @@ -7574,7 +7574,7 @@ SfxVoidItem ToggleAnchorType SID_ANCHOR_TOGGLE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ToggleRelative SID_TOGGLE_REL () [ @@ -7599,7 +7599,7 @@ SfxVoidItem ToggleRelative SID_TOGGLE_REL GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ToolProtectionDocument FID_PROTECT_DOC (SfxBoolItem Protect FID_PROTECT_DOC) [ @@ -7624,7 +7624,7 @@ SfxVoidItem ToolProtectionDocument FID_PROTECT_DOC GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem ToolsOptions SID_SCOPTIONS () [ @@ -7649,7 +7649,7 @@ SfxVoidItem ToolsOptions SID_SCOPTIONS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem TraceChangeMode FID_CHG_RECORD [ @@ -7676,7 +7676,7 @@ SfxBoolItem TraceChangeMode FID_CHG_RECORD GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxBoolItem UnderlineDotted SID_ULINE_VAL_DOTTED [ @@ -7703,7 +7703,7 @@ SfxBoolItem UnderlineDotted SID_ULINE_VAL_DOTTED GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem UnderlineDouble SID_ULINE_VAL_DOUBLE [ @@ -7730,7 +7730,7 @@ SfxBoolItem UnderlineDouble SID_ULINE_VAL_DOUBLE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem UnderlineNone SID_ULINE_VAL_NONE [ @@ -7757,7 +7757,7 @@ SfxBoolItem UnderlineNone SID_ULINE_VAL_NONE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxBoolItem UnderlineSingle SID_ULINE_VAL_SINGLE [ @@ -7784,7 +7784,7 @@ SfxBoolItem UnderlineSingle SID_ULINE_VAL_SINGLE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem UpdateChart SID_UPDATECHART (SfxBoolItem AllCharts SID_UPDATECHART) [ @@ -7809,7 +7809,7 @@ SfxVoidItem UpdateChart SID_UPDATECHART GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem UpdateTableLinks SID_UPDATETABLINKS () [ @@ -7834,7 +7834,7 @@ SfxVoidItem UpdateTableLinks SID_UPDATETABLINKS GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxVoidItem Validation FID_VALIDATION () [ @@ -7859,7 +7859,7 @@ SfxVoidItem Validation FID_VALIDATION GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + ScDoubleItem Value SID_RANGE_VALUE [ @@ -7886,7 +7886,7 @@ ScDoubleItem Value SID_RANGE_VALUE GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SvxVerJustifyItem VerticalAlignment SID_V_ALIGNCELL [ @@ -7913,7 +7913,7 @@ SvxVerJustifyItem VerticalAlignment SID_V_ALIGNCELL GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxBoolItem InputLineVisible FID_TOGGLEINPUTLINE [ @@ -7940,7 +7940,7 @@ SfxBoolItem InputLineVisible FID_TOGGLEINPUTLINE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxBoolItem ViewRowColumnHeaders FID_TOGGLEHEADERS [ @@ -7967,7 +7967,7 @@ SfxBoolItem ViewRowColumnHeaders FID_TOGGLEHEADERS GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxBoolItem ToggleFormula FID_TOGGLEFORMULA [ @@ -7995,7 +7995,7 @@ SfxBoolItem ToggleFormula FID_TOGGLEFORMULA ] -//-------------------------------------------------------------------------- + SfxBoolItem ViewValueHighlighting FID_TOGGLESYNTAX [ @@ -8022,7 +8022,7 @@ SfxBoolItem ViewValueHighlighting FID_TOGGLESYNTAX GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxBoolItem Visible FID_TABLE_VISIBLE [ @@ -8049,7 +8049,7 @@ SfxBoolItem Visible FID_TABLE_VISIBLE GroupId = GID_INTERN; ] -//-------------------------------------------------------------------------- + SfxBoolItem WrapText SID_ATTR_ALIGN_LINEBREAK [ @@ -8076,7 +8076,7 @@ SfxBoolItem WrapText SID_ATTR_ALIGN_LINEBREAK GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ZoomIn SID_PREVIEW_ZOOMIN () [ @@ -8101,7 +8101,7 @@ SfxVoidItem ZoomIn SID_PREVIEW_ZOOMIN GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem ZoomOut SID_PREVIEW_ZOOMOUT () [ @@ -8126,7 +8126,7 @@ SfxVoidItem ZoomOut SID_PREVIEW_ZOOMOUT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem FocusInputLine SID_FOCUS_INPUTLINE () [ @@ -8151,7 +8151,7 @@ SfxVoidItem FocusInputLine SID_FOCUS_INPUTLINE GroupId = GID_APPLICATION; ] -//-------------------------------------------------------------------------- + SfxVoidItem ClosePreview SID_PREVIEW_CLOSE () [ @@ -8176,7 +8176,7 @@ SfxVoidItem ClosePreview SID_PREVIEW_CLOSE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem Margins SID_PREVIEW_MARGIN () [ @@ -8201,7 +8201,7 @@ SfxVoidItem Margins SID_PREVIEW_MARGIN GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SvxZoomSliderItem ScalingFactor SID_PREVIEW_SCALINGFACTOR [ /* flags: */ @@ -8225,7 +8225,7 @@ SvxZoomSliderItem ScalingFactor SID_PREVIEW_SCALINGFACTOR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SelectTables SID_SELECT_TABLES (SfxIntegerListItem Tables SID_SELECT_TABLES) [ @@ -8250,7 +8250,7 @@ SfxVoidItem SelectTables SID_SELECT_TABLES GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem DataPilotFilter SID_DP_FILTER () [ @@ -8275,7 +8275,7 @@ SfxVoidItem DataPilotFilter SID_DP_FILTER GroupId = GID_DATA; ] -//-------------------------------------------------------------------------- + ScProtectionAttr Protection SID_SCATTR_PROTECTION [ @@ -8302,7 +8302,7 @@ ScProtectionAttr Protection SID_SCATTR_PROTECTION GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SelectArrayFormula SID_MARKARRAYFORMULA () [ @@ -8327,7 +8327,7 @@ SfxVoidItem SelectArrayFormula SID_MARKARRAYFORMULA GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxBoolItem SheetRightToLeft FID_TAB_RTL [ @@ -8352,7 +8352,7 @@ SfxBoolItem SheetRightToLeft FID_TAB_RTL GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ShareDocument SID_SHARE_DOC [ @@ -8377,7 +8377,7 @@ SfxVoidItem ShareDocument SID_SHARE_DOC GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem ToggleSheetGrid FID_TAB_TOGGLE_GRID [ @@ -8404,7 +8404,7 @@ SfxBoolItem ToggleSheetGrid FID_TAB_TOGGLE_GRID -//-------------------------------------------------------------------------- + SvxColorItem TabBgColor FID_TAB_SET_TAB_BG_COLOR [ @@ -8431,7 +8431,7 @@ SvxColorItem TabBgColor FID_TAB_SET_TAB_BG_COLOR GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem MarkPrecedents SID_DETECTIVE_MARK_PRED () [ @@ -8456,7 +8456,7 @@ SfxVoidItem MarkPrecedents SID_DETECTIVE_MARK_PRED GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem MarkDependents SID_DETECTIVE_MARK_SUCC () [ @@ -8481,7 +8481,7 @@ SfxVoidItem MarkDependents SID_DETECTIVE_MARK_SUCC GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertCurrentDate SID_INSERT_CURRENT_DATE () [ @@ -8506,7 +8506,7 @@ SfxVoidItem InsertCurrentDate SID_INSERT_CURRENT_DATE GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertCurrentTime SID_INSERT_CURRENT_TIME () [ @@ -8531,7 +8531,7 @@ SfxVoidItem InsertCurrentTime SID_INSERT_CURRENT_TIME GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem SetTabBgColor FID_TAB_MENU_SET_TAB_BG_COLOR (SvxColorItem TabBgColor FID_TAB_SET_TAB_BG_COLOR) [ @@ -8800,7 +8800,7 @@ SfxVoidItem ExportAsGraphic SID_EXPORT_AS_GRAPHIC GroupId = GID_CHART; ] -//-------------------------------------------------------------------------- + SfxBoolItem ViewGridLines SID_SCGRIDSHOW [ AutoUpdate = TRUE, @@ -8825,7 +8825,7 @@ SfxBoolItem ViewGridLines SID_SCGRIDSHOW GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxUInt16Item NumberFormatType SID_NUMBER_TYPE_FORMAT [ /* flags: */ diff --git a/sc/sdi/scslots.sdi b/sc/sdi/scslots.sdi index 7ef3eecbd0af..41a711fafc82 100644 --- a/sc/sdi/scslots.sdi +++ b/sc/sdi/scslots.sdi @@ -38,7 +38,7 @@ ModulePrefix( "Sc" ) item double ScDoubleItem; item INT32 SfxIntegerListItem; - //---------------------------------------------------------- + // bei Problemen ggF. "von Hand" includen (=Copy/Paste) include "sfxitems.sdi" include "sfx.sdi" diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi index 7bbdfca29166..633e887e78d6 100644 --- a/sc/sdi/tabvwsh.sdi +++ b/sc/sdi/tabvwsh.sdi @@ -17,7 +17,7 @@ */ - // =========================================================================== + interface TableOLEObject [ uuid ( "C04AA960-137B-11D3-B25B-006097DA68F3" ) @@ -34,7 +34,7 @@ interface TableOLEObject SID_OBJECT_HEIGHT [ ExecMethod = ExecuteObject; StateMethod = GetObjectState; ] } - //============================================================================ + interface Tables [ uuid = "5692EFC0-355B-11cf-89CB-008029E4B0B1" ; @@ -53,7 +53,7 @@ interface Tables FID_TAB_EVENTS [ ExecMethod = ExecuteTable; StateMethod = GetStateTable; ] } - // =========================================================================== + interface BaseSelection [ uuid = "02ABE040-137B-11D3-B25B-006097DA68F3" ; @@ -216,9 +216,9 @@ interface TableEditView } - // + // Pivot-Krempel - // + interface DataPilotTables [ @@ -256,7 +256,7 @@ interface DataPilotField [ HelpText = "" ; ] } - // =========================================================================== + shell ScTabViewShell { import TableSelection "ActiveDocument.ActiveTable"; diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 0ad67fca8261..352091cc1012 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -1105,9 +1105,9 @@ void ScAttrArray::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLine } } -// + // apply border -// + // ApplyFrame - on an entry into the array diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index d47a519b47da..c1f38a018032 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -55,9 +55,9 @@ TYPEINIT1(ScCondFormatItem, SfxPoolItem); -// + // General Help Function -// + bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxBorderLine* pOther ) { @@ -88,9 +88,9 @@ bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxB } -// + // Item - Implementierungen -// + // Merge @@ -1107,7 +1107,7 @@ ScDoubleItem::~ScDoubleItem() } -// ============================================================================ + ScPageScaleToItem::ScPageScaleToItem() : SfxPoolItem( ATTR_PAGE_SCALETO ), @@ -1217,7 +1217,7 @@ bool ScPageScaleToItem::PutValue( const uno::Any& rAny, sal_uInt8 nMemberId ) return bRet; } -// ============================================================================ + ScCondFormatItem::ScCondFormatItem(): SfxPoolItem( ATTR_CONDITIONAL ) diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 50e52ed23159..5409c6bc3bd8 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -842,7 +842,7 @@ ScDataBarInfo* ScDataBarFormat::GetDataBarInfo(const ScAddress& rAddr) const } // now we have for sure a value - // + double nValMin = getMinValue(); double nValMax = getMaxValue(); double nMin = getMin(nValMin, nValMax); diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 6fb99ea55fd5..6c6e47e4a98d 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -84,9 +84,9 @@ inline bool IsAmbiguousScript( sal_uInt8 nScript ) -// + // Data operations -// + diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index f006f0eb0d60..40b0729d875d 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -2051,9 +2051,9 @@ public: } -// + // GetDataEntries - Strings from continuous Section around nRow -// + // DATENT_MAX - max. number of entries in list for auto entry // DATENT_SEARCH - max. number of cells that get transparent - new: only count Strings diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index aed6fdbba116..a35a5421c59b 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -2218,7 +2218,7 @@ void ScConditionalFormatList::RenameCellStyle( const OUString& rOld, const OUStr bool ScConditionalFormatList::CheckAllEntries() { bool bValid = true; - // + // need to check which must be deleted iterator itr = begin(); while(itr != end()) diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 53d8af33421e..9b2178b0a234 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -314,7 +314,7 @@ bool ScValueIterator::GetNext(double& rValue, sal_uInt16& rErr) return GetThis(rValue, rErr); } -// ============================================================================ + ScDBQueryDataIterator::DataAccess::DataAccess(const ScDBQueryDataIterator* pParent) : mpParent(pParent) @@ -2553,7 +2553,7 @@ const ScPatternAttr* ScDocAttrIterator::GetNext( SCCOL& rCol, SCROW& rRow1, SCRO return NULL; // Nothing anymore } -// ============================================================================ + ScDocRowHeightUpdater::TabRanges::TabRanges(SCTAB nTab) : mnTab(nTab), mpRanges(new ScFlatBoolRowSegments) @@ -2712,7 +2712,7 @@ const ScPatternAttr* ScAttrRectIterator::GetNext( SCCOL& rCol1, SCCOL& rCol2, return NULL; // Nothing anymore } -// ============================================================================ + SCROW ScRowBreakIterator::NOT_FOUND = -1; diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index e614bac560fe..db06224d91ef 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -598,7 +598,7 @@ void ScDocumentPool::DeleteVersionMaps() } -// + // Fuer die Pattern-Attribute (SetItems) kann der sal_uInt16 RefCount leicht ueberlaufen // (z.B. 600 ganze Zeilen abwechselnd formatieren). // Darum wird der RefCount bei SC_MAX_POOLREF festgehalten und nicht mehr hoch- oder @@ -606,7 +606,7 @@ void ScDocumentPool::DeleteVersionMaps() // Die Differenz zwischen SC_MAX_POOLREF und SC_SAFE_POOLREF ist ein wenig groesser // als noetig, um zu erkennen, wenn der RefCount aus Versehen doch "normal" veraendert // wird (Assertions). -// + const SfxPoolItem& ScDocumentPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich ) { diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 299799390f35..3e4f8e43b017 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -1119,7 +1119,7 @@ void ScDocument::SetChangeViewSettings(const ScChangeViewSettings& rNew) *pChangeViewSettings=rNew; } -// ---------------------------------------------------------------------------- + ScFieldEditEngine* ScDocument::CreateFieldEditEngine() { @@ -1157,14 +1157,14 @@ void ScDocument::DisposeFieldEditEngine(ScFieldEditEngine*& rpEditEngine) rpEditEngine = NULL; } -// ---------------------------------------------------------------------------- + ScRecursionHelper* ScDocument::CreateRecursionHelperInstance() { return new ScRecursionHelper; } -// ---------------------------------------------------------------------------- + ScLookupCache & ScDocument::GetLookupCache( const ScRange & rRange ) { diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 5cafb2a17fa1..b1aeefdae604 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -1439,9 +1439,9 @@ bool ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, return ValidTab(nTab) && maTabs[nTab] && maTabs[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow ); } -// + // GetFilterEntries - Eintraege fuer AutoFilter-Listbox -// + bool ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, std::vector<ScTypedStrData>& rStrings, bool& rHasDates) @@ -1497,9 +1497,9 @@ bool ScDocument::GetFilterEntries( return false; } -// + // GetFilterEntriesArea - Eintraege fuer Filter-Dialog -// + bool ScDocument::GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bCaseSens, @@ -1515,9 +1515,9 @@ bool ScDocument::GetFilterEntriesArea( return false; } -// + // GetDataEntries - Eintraege fuer Auswahlliste-Listbox (keine Zahlen / Formeln) -// + bool ScDocument::GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, bool bCaseSens, @@ -1556,15 +1556,15 @@ bool ScDocument::GetDataEntries( return bRet; } -// + // GetFormulaEntries - Eintraege fuer Formel-AutoEingabe -// + bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings ) { - // + // Bereichsnamen - // + if ( pRangeName ) { @@ -1573,9 +1573,9 @@ bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings ) rStrings.insert(ScTypedStrData(itr->second->GetName(), 0.0, ScTypedStrData::Name)); } - // + // Datenbank-Bereiche - // + if ( pDBCollection ) { @@ -1585,9 +1585,9 @@ bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings ) rStrings.insert(ScTypedStrData(itr->GetName(), 0.0, ScTypedStrData::DbName)); } - // + // Inhalte von Beschriftungsbereichen - // + ScRangePairList* pLists[2]; pLists[0] = GetColNameRanges(); diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index bfd0d29fa0ba..3972f8e830f4 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -712,9 +712,9 @@ double ScDocument::RoundValueAsShown( double fVal, sal_uInt32 nFormat ) const return fVal; } -// + // bedingte Formate und Gueltigkeitsbereiche -// + sal_uLong ScDocument::AddCondFormat( ScConditionalFormat* pNew, SCTAB nTab ) { @@ -920,9 +920,9 @@ void ScDocument::SetDetOpList(ScDetOpList* pNew) } -// + // Vergleich von Dokumenten -// + // Pfriemel-Faktoren @@ -1168,9 +1168,9 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) bInFill = true; } - // + // Tabellen in der gefundenen Reihenfolge vergleichen - // + for (nThisTab=0; nThisTab<nThisCount; nThisTab++) { diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx index 3de5b0727127..fbfec2850272 100644 --- a/sc/source/core/data/documen6.cxx +++ b/sc/source/core/data/documen6.cxx @@ -37,10 +37,10 @@ using namespace com::sun::star; -// + // this file is compiled with exceptions enabled // put functions here that need exceptions! -// + diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 9cf34e3cbd4c..e14236df2d91 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -1165,7 +1165,7 @@ void ScDocument::KeyInput( const KeyEvent& ) apTemporaryChartLock->StartOrContinueLocking(); } -// ---------------------------------------------------------------------------- + bool ScDocument::CheckMacroWarn() { diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 9f4229f63a17..2ba1bf16c553 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -3811,9 +3811,9 @@ void ScDocument::ResetChanged( const ScRange& rRange ) maTabs[nTab]->ResetChanged(rRange); } -// + // Spaltenbreiten / Zeilenhoehen -------------------------------------- -// + void ScDocument::SetColWidth( SCCOL nCol, SCTAB nTab, sal_uInt16 nNewWidth ) @@ -4035,9 +4035,9 @@ void ScDocument::UpdateAllRowHeights( sc::RowHeightContext& rCxt, const ScMarkDa } -// + // Spalten-/Zeilen-Flags ---------------------------------------------- -// + void ScDocument::ShowCol(SCCOL nCol, SCTAB nTab, bool bShow) { @@ -4489,9 +4489,9 @@ void ScDocument::ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, S maTabs[nTab]->ExtendHidden( rX1, rY1, rX2, rY2 ); } -// + // Attribute ---------------------------------------------------------- -// + const SfxPoolItem* ScDocument::GetAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt16 nWhich ) const { @@ -5707,9 +5707,9 @@ void ScDocument::GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, maTabs[nTab]->GetNextPos( rCol, rRow, nMovX, nMovY, bMarked, bUnprotected, aCopyMark ); } -// + // Datei-Operationen -// + void ScDocument::UpdStlShtPtrsFrmNms() diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index 7f2025d89597..93ed4136810f 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -36,7 +36,7 @@ using namespace com::sun::star; -// ============================================================================ + ScDPSaveGroupItem::ScDPSaveGroupItem( const OUString& rName ) : aGroupName(rName) {} @@ -131,7 +131,7 @@ void ScDPSaveGroupItem::AddToData(ScDPGroupDimension& rDataDim) const rDataDim.AddItem(aGroup); } -// ============================================================================ + ScDPSaveGroupDimension::ScDPSaveGroupDimension( const OUString& rSource, const OUString& rName ) : aSourceDim( rSource ), @@ -426,7 +426,7 @@ void ScDPSaveGroupDimension::AddToCache(ScDPCache& rCache) const } } -// ============================================================================ + ScDPSaveNumGroupDimension::ScDPSaveNumGroupDimension( const OUString& rName, const ScDPNumGroupInfo& rInfo ) : aDimensionName( rName ), @@ -576,7 +576,7 @@ void ScDPSaveNumGroupDimension::SetDateInfo( const ScDPNumGroupInfo& rInfo, sal_ nDatePart = nPart; } -// ============================================================================ + namespace { @@ -855,6 +855,6 @@ OUString ScDPDimensionSaveData::CreateDateGroupDimName( return CreateGroupDimName( aPartName, rObject, bAllowSource, pDeletedNames ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index bf2c1654d34c..66f9af3cc7ef 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -1683,9 +1683,9 @@ bool ScDPObject::ParseFilters( std::vector<OUString> aFieldNames; // column/row/data fields std::vector< uno::Sequence<OUString> > aFieldValues; - // + // get all the field and item names - // + uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions(); uno::Reference<container::XIndexAccess> xIntDims = new ScNameToIndexAccess( xDimsName ); @@ -1750,9 +1750,9 @@ bool ScDPObject::ParseFilters( } } - // + // compare and build filters - // + SCSIZE nDataFields = aDataNames.size(); SCSIZE nFieldCount = aFieldNames.size(); @@ -3154,9 +3154,9 @@ uno::Reference<sdbc::XRowSet> ScDPCollection::DBCaches::createRowSet( return xRowSet; } - // + // set source parameters - // + uno::Any aAny; aAny <<= rDBName; xRowProp->setPropertyValue( diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index 76af9eda863c..854734b587f0 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -129,9 +129,9 @@ public: } -// + // function objects for sorting of the column and row members: -// + class ScDPRowMembersOrder { @@ -2357,9 +2357,9 @@ void ScDPDataMember::UpdateRunningTotals( long nRowPos = 0; long nColPos = 0; - // + // find the reference field in column or row dimensions - // + if ( bRefDimInRow ) // look in row dimensions { @@ -2441,9 +2441,9 @@ void ScDPDataMember::UpdateRunningTotals( if ( !bRefDimInCol && !bRefDimInRow ) // invalid dimension specified bNoDetailsInRef = true; // pSelectDim is then already NULL - // + // get the member for the reference item and do the calculation - // + if ( bRunningTotal ) { @@ -2590,9 +2590,9 @@ void ScDPDataMember::UpdateRunningTotals( eRefType == sheet::DataPilotFieldReferenceType::TOTAL_PERCENTAGE || eRefType == sheet::DataPilotFieldReferenceType::INDEX ) { - // + // set total values when they are encountered (always before their use) - // + ScDPAggData* pColTotalData = pRefMember->GetColTotal( nMemberMeasure ); ScDPAggData* pRowTotalData = rTotals.GetRowTotal( nMemberMeasure ); @@ -2609,9 +2609,9 @@ void ScDPDataMember::UpdateRunningTotals( if ( rTotals.IsInColRoot() && pColTotalData ) pColTotalData->SetAuxiliary( fTotalValue ); - // + // find relation to total values - // + switch ( eRefType ) { diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index b7d654a54825..d58723d09ec8 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -1083,9 +1083,9 @@ void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCR aTopLeft.Y() += aMove.Y(); } - // + // Detektiv-Pfeile: Zellpositionen anpassen - // + MoveCells( nTab, nCol1,nRow1, nCol2,nRow2, nDx,nDy, bUpdateNoteCaptionPos ); } diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index f9dd04db2568..f5012f7cf2e4 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -743,9 +743,9 @@ void ScDocument::FillInfo( // bedingte Formatierung Ende - // + // Daten von zusammengefassten Zellen anpassen - // + if (bAnyMerged) { @@ -954,7 +954,7 @@ void ScDocument::FillInfo( rTabInfo.mnArrCount = sal::static_int_cast<sal_uInt16>(nArrCount); rTabInfo.mbPageMode = bPageMode; - // ======================================================================== + // *** create the frame border array *** // RowInfo structs are filled in the range [ 0 , nArrCount-1 ] @@ -1123,7 +1123,7 @@ void ScDocument::FillInfo( rArray.MirrorSelfX( true, false ); } -// ============================================================================ + ScTableInfo::ScTableInfo() : mpRowInfo( new RowInfo[ ROWINFO_MAX ] ), @@ -1140,6 +1140,6 @@ ScTableInfo::~ScTableInfo() delete [] mpRowInfo; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index d0ebd2fa789e..852882896009 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -481,7 +481,7 @@ void ScFormulaCellGroup::compileCode( } } -// ============================================================================ + ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos ) : eTempGrammar(formula::FormulaGrammar::GRAM_DEFAULT), diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index 89c1fcb49dec..d0331dc3fa86 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -59,9 +59,9 @@ public: }; -//======================================================================== + // class ScFuncDesc: -//======================================================================== + ScFuncDesc::ScFuncDesc() : pFuncName (NULL), @@ -382,9 +382,9 @@ bool ScFuncDesc::compareByName(const ScFuncDesc* a, const ScFuncDesc* b) return (ScGlobal::GetCaseCollator()->compareString(*a->pFuncName, *b->pFuncName ) < 0); } -//=================================================================== + // class ScFunctionList: -//=================================================================== + ScFunctionList::ScFunctionList() : nMaxFuncNameLen ( 0 ) @@ -612,9 +612,9 @@ const ScFuncDesc* ScFunctionList::GetFunction( sal_uInt32 nIndex ) const return pDesc; } -//=================================================================== + // class ScFunctionCategory: -//=================================================================== + sal_uInt32 ScFunctionCategory::getCount() const { @@ -646,9 +646,9 @@ sal_uInt32 ScFunctionCategory::getNumber() const return m_nCategory; } -//======================================================================== + // class ScFunctionMgr: -//======================================================================== + ScFunctionMgr::ScFunctionMgr() : pFuncList( ScGlobal::GetStarCalcFunctionList() ) @@ -817,9 +817,9 @@ sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToke return 0; } -//======================================================================== + // class ScFuncRes: -//======================================================================== + ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed ) : Resource(aRes) diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 4a154f4aaac0..49e90cc757f4 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -142,11 +142,11 @@ sal_uInt16 nScFillModeMouseModifier = 0; //! dito void global_InitAppOptions(); -//======================================================================== -// + + // statische Funktionen -// -//======================================================================== + + bool ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs, const SfxItemSet& rOldAttrs, diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx index 40d977df360d..179c833b37f9 100644 --- a/sc/source/core/data/markarr.cxx +++ b/sc/source/core/data/markarr.cxx @@ -347,9 +347,9 @@ SCROW ScMarkArray::GetMarkEnd( SCROW nRow, bool bUp ) const return nRet; } -// + // -------------- Iterator ---------------------------------------------- -// + ScMarkArrayIter::ScMarkArrayIter( const ScMarkArray* pNewArray ) : pArray( pNewArray ), diff --git a/sc/source/core/data/pagepar.cxx b/sc/source/core/data/pagepar.cxx index 606aefd2a0dd..57ca8edee4e7 100644 --- a/sc/source/core/data/pagepar.cxx +++ b/sc/source/core/data/pagepar.cxx @@ -22,7 +22,7 @@ #include "pagepar.hxx" -//======================================================================== + // struct ScPageTableParam: ScPageTableParam::ScPageTableParam() @@ -57,7 +57,7 @@ bool ScPageTableParam::operator==( const ScPageTableParam& r ) const return ( memcmp( this, &r, sizeof(ScPageTableParam) ) == 0 ); } -//======================================================================== + // struct ScPageAreaParam: ScPageAreaParam::ScPageAreaParam() diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx index bf779f9456bc..c740feab89be 100644 --- a/sc/source/core/data/pivot2.cxx +++ b/sc/source/core/data/pivot2.cxx @@ -63,7 +63,7 @@ ScDPName::ScDPName() : mnDupCount(0) {} ScDPName::ScDPName(const OUString& rName, const OUString& rLayoutName, sal_uInt8 nDupCount) : maName(rName), maLayoutName(rLayoutName), mnDupCount(nDupCount) {} -// ============================================================================ + ScDPLabelData::Member::Member() : mbVisible(true), @@ -200,7 +200,7 @@ bool ScPivotParam::operator==( const ScPivotParam& r ) const return bEqual; } -// ============================================================================ + ScPivotFuncData::ScPivotFuncData( SCCOL nCol, sal_uInt16 nFuncMask ) : mnCol( nCol ), @@ -238,6 +238,6 @@ void ScPivotFuncData::Dump() const } #endif -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index 798eb8962469..2e6c96caf597 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -50,7 +50,7 @@ #include <utility> -// ============================================================================ + namespace { @@ -62,7 +62,7 @@ const long SC_NOTECAPTION_OFFSET_Y = -1500; /// Default Y offset of const long SC_NOTECAPTION_OFFSET_X = 1500; /// Default X offset of note captions to left border of anchor cell. const long SC_NOTECAPTION_BORDERDIST_TEMP = 100; /// Distance of temporary note captions to visible sheet area. -// ============================================================================ + /** Static helper functions for caption objects. */ class ScCaptionUtil @@ -158,7 +158,7 @@ void ScCaptionUtil::SetCaptionItems( SdrCaptionObj& rCaption, const SfxItemSet& rCaption.SetSpecialTextBoxShadow(); } -// ============================================================================ + /** Helper for creation and manipulation of caption drawing objects independent from cell annotations. */ @@ -404,7 +404,7 @@ void ScCaptionCreator::Initialize() } } -// ============================================================================ + /** Helper for creation of permanent caption drawing objects for cell notes. */ class ScNoteCaptionCreator : public ScCaptionCreator @@ -458,7 +458,7 @@ ScNoteCaptionCreator::ScNoteCaptionCreator( ScDocument& rDoc, const ScAddress& r } // namespace -// ============================================================================ + struct ScCaptionInitData { @@ -482,7 +482,7 @@ ScCaptionInitData::ScCaptionInitData() : { } -// ============================================================================ + ScNoteData::ScNoteData( bool bShown ) : mpCaption( 0 ), @@ -494,7 +494,7 @@ ScNoteData::~ScNoteData() { } -// ============================================================================ + ScPostIt::ScPostIt( ScDocument& rDoc, const ScAddress& rPos, bool bShown ) : mrDoc( rDoc ), @@ -791,7 +791,7 @@ void ScPostIt::RemoveCaption() maNoteData.mpCaption = 0; } -// ============================================================================ + SdrCaptionObj* ScNoteUtil::CreateTempCaption( ScDocument& rDoc, const ScAddress& rPos, SdrPage& rDrawPage, diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx index 22fb1636bcbc..bcd5469c5810 100644 --- a/sc/source/core/data/segmenttree.cxx +++ b/sc/source/core/data/segmenttree.cxx @@ -26,7 +26,7 @@ using ::std::numeric_limits; -// ============================================================================ + template<typename _ValueType, typename _ExtValueType = _ValueType> class ScFlatSegmentsImpl @@ -236,7 +236,7 @@ bool ScFlatSegmentsImpl<_ValueType, _ExtValueType>::getNext(RangeData& rData) return true; } -// ============================================================================ + class ScFlatUInt16SegmentsImpl : public ScFlatSegmentsImpl<sal_uInt16, sal_uInt32> { @@ -271,7 +271,7 @@ bool ScFlatBoolSegmentsImpl::setFalse(SCCOLROW nPos1, SCCOLROW nPos2) return setValue(nPos1, nPos2, false); } -// ============================================================================ + ScFlatBoolRowSegments::ForwardIterator::ForwardIterator(ScFlatBoolRowSegments& rSegs) : mrSegs(rSegs), mnCurPos(0), mnLastPos(-1), mbCurValue(false) @@ -400,7 +400,7 @@ SCROW ScFlatBoolRowSegments::findLastNotOf(bool bValue) const return static_cast<SCROW>(mpImpl->findLastNotOf(bValue)); } -// ============================================================================ + ScFlatBoolColSegments::ScFlatBoolColSegments() : mpImpl(new ScFlatBoolSegmentsImpl(static_cast<SCCOLROW>(MAXCOL))) @@ -448,7 +448,7 @@ void ScFlatBoolColSegments::insertSegment(SCCOL nCol, SCCOL nSize, bool bSkipSta mpImpl->insertSegment(static_cast<SCCOLROW>(nCol), static_cast<SCCOLROW>(nSize), bSkipStartBoundary); } -// ============================================================================ + ScFlatUInt16RowSegments::ForwardIterator::ForwardIterator(ScFlatUInt16RowSegments& rSegs) : mrSegs(rSegs), mnCurPos(0), mnLastPos(-1), mnCurValue(0) diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index dcd04fa0ebb9..455c483365f5 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -55,7 +55,7 @@ #include "patattr.hxx" -//======================================================================== + ScStyleSheetPool::ScStyleSheetPool( SfxItemPool& rPoolP, ScDocument* pDocument ) @@ -198,9 +198,9 @@ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool, } -// + // Standard-Vorlagen -// + #define SCSTR(id) ScGlobal::GetRscString(id) @@ -260,9 +260,9 @@ void ScStyleSheetPool::CreateStandardStyles() OUString aStrStandard = ScGlobal::GetRscString(STR_STYLENAME_STANDARD); - //========================================================== + // Zellformatvorlagen: - //========================================================== + // 1. Standard @@ -350,9 +350,9 @@ void ScStyleSheetPool::CreateStandardStyles() pSet = &pSheet->GetItemSet(); pSet->Put( SfxInt32Item( ATTR_ROTATE_VALUE, 9000 ) ); - //========================================================== + // Seitenformat-Vorlagen: - //========================================================== + // 1. Standard diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index ef19a93c0891..4e4a0a2517ec 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -48,7 +48,7 @@ TYPEINIT1(ScStyleSheet, SfxStyleSheet); #define TWO_CM 1134 #define HFDIST_CM 142 -//======================================================================== + ScStyleSheet::ScStyleSheet( const OUString& rName, ScStyleSheetPool& rPoolP, diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index ab50073f018d..9320de2b646e 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -432,9 +432,9 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal aCol[i].DeleteArea(nRow1, nRow2, nDelFlag); } - // + // Zellschutz auf geschuetzter Tabelle nicht setzen - // + if ( IsProtected() && (nDelFlag & IDF_ATTRIB) ) { @@ -473,9 +473,9 @@ void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, boo mpCondFormatList->DeleteArea( pRange->aStart.Col(), pRange->aStart.Row(), pRange->aEnd.Col(), pRange->aEnd.Row() ); } - // + // Zellschutz auf geschuetzter Tabelle nicht setzen - // + if ( IsProtected() && (nDelFlag & IDF_ATTRIB) ) { diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index e44d3f276617..f24889ed5521 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -477,9 +477,9 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if ( (nFillCount == 0) || !ValidColRow(nCol1, nRow1) || !ValidColRow(nCol2, nRow2) ) return; - // + // Detect direction - // + bool bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP); bool bPositive = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_RIGHT); @@ -555,9 +555,9 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if (pProgress) nProgress = pProgress->GetState(); - // + // execute - // + sal_uLong nActFormCnt = 0; for (rOuter = nOStart; rOuter <= nOEnd; rOuter++) @@ -1426,9 +1426,9 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, double nStepValue, double nMaxValue, sal_uInt16 nArgMinDigits, bool bAttribs, ScProgress* pProgress ) { - // + // Detect direction - // + bool bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP); bool bPositive = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_RIGHT); @@ -1507,9 +1507,9 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if (pProgress) nProgress = pProgress->GetState(); - // + // execute - // + sal_uLong nActFormCnt = 0; for (rOuter = nOStart; rOuter <= nOEnd; rOuter++) diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index bce8aca3399f..c030d3247d13 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::std::vector; -// ============================================================================ + bool ScPassHashHelper::needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash eHash1, ScPasswordHash eHash2) { @@ -83,13 +83,13 @@ ScPasswordHash ScPassHashHelper::getHashTypeFromURI(const OUString& rURI) return PASSHASH_UNSPECIFIED; } -// ============================================================================ + ScPassHashProtectable::~ScPassHashProtectable() { } -// ============================================================================ + class ScTableProtectionImpl { @@ -352,7 +352,7 @@ void ScTableProtectionImpl::setOption(SCSIZE nOptId, bool bEnabled) maOptions[nOptId] = bEnabled; } -// ============================================================================ + ScDocProtection::ScDocProtection() : mpImpl(new ScTableProtectionImpl(static_cast<SCSIZE>(ScDocProtection::NONE))) @@ -430,7 +430,7 @@ void ScDocProtection::setOption(Option eOption, bool bEnabled) mpImpl->setOption(eOption, bEnabled); } -// ============================================================================ + ScTableProtection::ScTableProtection() : mpImpl(new ScTableProtectionImpl(static_cast<SCSIZE>(ScTableProtection::NONE))) diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 5e684d2f787c..78893022fc6a 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -52,9 +52,9 @@ using namespace formula; -// + // Eintrag fuer Gueltigkeit (es gibt nur eine Bedingung) -// + ScValidationData::ScValidationData( ScValidationMode eMode, ScConditionMode eOper, const OUString& rExpr1, const OUString& rExpr2, @@ -902,8 +902,8 @@ bool ScValidationData::IsListValid( ScRefCellValue& rCell, const ScAddress& rPos return bIsValid; } -// ============================================================================ -// ============================================================================ + + ScValidationDataList::ScValidationDataList(const ScValidationDataList& rList) { diff --git a/sc/source/core/inc/addinhelpid.hxx b/sc/source/core/inc/addinhelpid.hxx index 6b484dea6ac8..7d9b46f17fe0 100644 --- a/sc/source/core/inc/addinhelpid.hxx +++ b/sc/source/core/inc/addinhelpid.hxx @@ -23,7 +23,7 @@ #include <rtl/ustring.hxx> #include <rtl/string.hxx> -// ============================================================================ + struct ScUnoAddInHelpId; @@ -46,7 +46,7 @@ public: }; -// ============================================================================ + #endif diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx index ca11dd975096..6974acf99197 100644 --- a/sc/source/core/inc/bcaslot.hxx +++ b/sc/source/core/inc/bcaslot.hxx @@ -69,7 +69,7 @@ inline bool ScBroadcastArea::operator==( const ScBroadcastArea & rArea ) const return aRange == rArea.aRange; } -//============================================================================= + struct ScBroadcastAreaEntry { @@ -97,7 +97,7 @@ struct ScBroadcastAreaEqual typedef ::boost::unordered_set< ScBroadcastAreaEntry, ScBroadcastAreaHash, ScBroadcastAreaEqual > ScBroadcastAreas; -//============================================================================= + struct ScBroadcastAreaBulkHash { @@ -118,7 +118,7 @@ struct ScBroadcastAreaBulkEqual typedef ::boost::unordered_set< const ScBroadcastArea*, ScBroadcastAreaBulkHash, ScBroadcastAreaBulkEqual > ScBroadcastAreasBulk; -//============================================================================= + class ScBroadcastAreaSlotMachine; diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx index 5de9c978d3eb..8d75bf3e0472 100644 --- a/sc/source/core/inc/doubleref.hxx +++ b/sc/source/core/inc/doubleref.hxx @@ -27,7 +27,7 @@ class ScDocument; struct ScDBQueryParamBase; struct ScQueryParamBase; -// ============================================================================ + /** * Base class for abstracting range data backends for database functions. @@ -88,7 +88,7 @@ private: RefType meType; }; -// ============================================================================ + class ScDBInternalRange : public ScDBRangeBase { @@ -131,7 +131,7 @@ private: ScRange maRange; }; -// ============================================================================ + class ScDBExternalRange : public ScDBRangeBase { diff --git a/sc/source/core/opencl/clcc/clew.cxx b/sc/source/core/opencl/clcc/clew.cxx index f80355211b7f..6a7c4c0a71e5 100644 --- a/sc/source/core/opencl/clcc/clew.cxx +++ b/sc/source/core/opencl/clcc/clew.cxx @@ -1,10 +1,9 @@ -////////////////////////////////////////////////////////////////////////// // Copyright (c) 2009-2011 Organic Vectory B.V. // Written by George van Venrooij // // Distributed under the Boost Software License, Version 1.0. // (See accompanying file license.txt) -////////////////////////////////////////////////////////////////////////// + #include "clew.h" diff --git a/sc/source/core/tool/cellkeywords.inl b/sc/source/core/tool/cellkeywords.inl index 0d6c57fb7145..02c872dd3405 100644 --- a/sc/source/core/tool/cellkeywords.inl +++ b/sc/source/core/tool/cellkeywords.inl @@ -18,9 +18,9 @@ // This file has been automatically generated. Do not hand-edit this! -// --------------------------------------------------------------------------- + // French language locale (automatically generated) -// --------------------------------------------------------------------------- + static const Locale aFr("fr", "", ""); // pre instantiations of localized function names @@ -73,9 +73,9 @@ static const TransItem pFr[] = { addToMap(pFr, aFr); -// --------------------------------------------------------------------------- + // Hungarian language locale (automatically generated) -// --------------------------------------------------------------------------- + static const Locale aHu("hu", "", ""); // pre instantiations of localized function names @@ -143,9 +143,9 @@ static const TransItem pHu[] = { addToMap(pHu, aHu); -// --------------------------------------------------------------------------- + // German language locale (automatically generated) -// --------------------------------------------------------------------------- + static const Locale aDe("de", "", ""); // pre instantiations of localized function names diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx index 40a6d91520a0..cc6311cc6afa 100644 --- a/sc/source/core/tool/chartarr.cxx +++ b/sc/source/core/tool/chartarr.cxx @@ -147,9 +147,9 @@ ScMemChart* ScChartArray::CreateMemChartSingle() SCSIZE nCol; SCSIZE nRow; - // + // real size (without hidden rows/columns) - // + SCCOL nColAdd = HasRowHeaders() ? 1 : 0; SCROW nRowAdd = HasColHeaders() ? 1 : 0; @@ -238,9 +238,9 @@ ScMemChart* ScChartArray::CreateMemChartSingle() aRows.push_back(nStrRow); } - // + // Data - // + ScMemChart* pMemChart = new ScMemChart( static_cast<short>(nColCount), static_cast<short>(nRowCount) ); @@ -268,9 +268,9 @@ ScMemChart* ScChartArray::CreateMemChartSingle() pMemChart->SetData( static_cast<short>(nCol), static_cast<short>(nRow), DBL_MIN ); } - // + // Column Header - // + for (nCol=0; nCol<nColCount; nCol++) { OUString aString; @@ -290,9 +290,9 @@ ScMemChart* ScChartArray::CreateMemChartSingle() pMemChart->SetColText( static_cast<short>(nCol), aString); } - // + // Row Header - // + for (nRow=0; nRow<nRowCount; nRow++) { OUString aString; @@ -340,9 +340,9 @@ ScMemChart* ScChartArray::CreateMemChartMulti() nRowCount = 1; } - // + // Data - // + ScMemChart* pMemChart = new ScMemChart( static_cast<short>(nColCount), static_cast<short>(nRowCount) ); @@ -384,9 +384,9 @@ ScMemChart* ScChartArray::CreateMemChartMulti() //TODO: Label when gaps - // + // Column header - // + SCCOL nPosCol = 0; for ( nCol = 0; nCol < nColCount; nCol++ ) @@ -411,9 +411,9 @@ ScMemChart* ScChartArray::CreateMemChartMulti() pMemChart->SetColText( static_cast<short>(nCol), aString); } - // + // Row header - // + SCROW nPosRow = 0; for ( nRow = 0; nRow < nRowCount; nRow++ ) diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx index 72ce90a8321f..e6d33f054125 100644 --- a/sc/source/core/tool/chartpos.cxx +++ b/sc/source/core/tool/chartpos.cxx @@ -362,9 +362,9 @@ void ScChartPositioner::CreatePositionMap() SCROW nRow, nRow1, nRow2; SCTAB nTab, nTab1, nTab2; - // + // real size (without hidden rows/columns) - // + SCSIZE nColCount = 0; SCSIZE nRowCount = 0; diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index 5d2e11c444ff..fee886bc1c2a 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -1143,9 +1143,9 @@ sal_uInt16 ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2 return nResult; } -// -// + + bool ScDetectiveFunc::ShowPred( SCCOL nCol, SCROW nRow ) { diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 0a8125ce35e5..f1206c003b4c 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -716,9 +716,9 @@ void ScTabEditEngine::Init( const ScPatternAttr& rPattern ) // Feldbefehle fuer Kopf- und Fusszeilen -// + // Zahlen aus \sw\source\core\doc\numbers.cxx -// + static OUString lcl_GetCharStr( sal_Int32 nNo ) { @@ -844,9 +844,9 @@ OUString ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField, return aRet; } -// + // Feld-Daten -// + ScFieldEditEngine::ScFieldEditEngine( ScDocument* pDoc, SfxItemPool* pEnginePoolP, diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 13d46272edc2..93f0f3240b60 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -1950,9 +1950,9 @@ void ScInterpreter::ScStyle() if (nTimeOut < 0) nTimeOut = 0; - // + // Request ausfuehren, um Vorlage anzuwenden - // + if ( !pDok->IsClipOrUndo() ) { diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index 994514054e4f..d10c721c8df8 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -249,9 +249,9 @@ double ScInterpreter::gauss(double x) return nVal; } -// + // #i26836# new gaussinv implementation by Martin Eitzenberger <m.eitzenberger@unix.net> -// + double ScInterpreter::gaussinv(double x) { diff --git a/sc/source/core/tool/prnsave.cxx b/sc/source/core/tool/prnsave.cxx index 7583b7123ed0..ea41a617b040 100644 --- a/sc/source/core/tool/prnsave.cxx +++ b/sc/source/core/tool/prnsave.cxx @@ -23,9 +23,9 @@ // STATIC DATA -// + // Daten pro Tabelle -// + ScPrintSaverTab::ScPrintSaverTab() : mpRepeatCol(NULL), @@ -68,9 +68,9 @@ bool ScPrintSaverTab::operator==( const ScPrintSaverTab& rCmp ) const (maPrintRanges == rCmp.maPrintRanges); } -// + // Daten fuer das ganze Dokument -// + ScPrintRangeSaver::ScPrintRangeSaver( SCTAB nCount ) : nTabCount( nCount ) diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index 775e8e6f7e9c..37c7a0e425c3 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -1233,7 +1233,7 @@ ScRangePair* ScRangePairList::Remove( ScRangePair* Adr) bool ScRangePairList::operator==( const ScRangePairList& r ) const { if ( this == &r ) - return true; // identische Referenz + return true; // identical reference if ( maPairs.size() != r.size() ) return false; for ( size_t nIdx = 0, nCnt = maPairs.size(); nIdx < nCnt; ++nIdx ) diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index c7c8e42314d5..eee7c9d2fd93 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -110,7 +110,7 @@ namespace // sheet index must be absolute for external refs rRef.SetAbsTab(0); } -// + } // namespace // Align MemPools on 4k boundaries - 64 bytes (4k is a MUST for OS/2) @@ -744,7 +744,7 @@ ScRefList* ScToken::GetRefList() OSL_FAIL( "ScToken::GetRefList: virtual dummy called" ); return NULL; } -// ========================================================================== + // real implementations of virtual functions @@ -852,7 +852,7 @@ FormulaToken* ScMatrixRangeToken::Clone() const return new ScMatrixRangeToken(*this); } -// ============================================================================ + ScExternalSingleRefToken::ScExternalSingleRefToken( sal_uInt16 nFileId, const svl::SharedString& rTabName, const ScSingleRefData& r ) : ScToken( svExternalSingleRef, ocPush), @@ -908,7 +908,7 @@ bool ScExternalSingleRefToken::operator ==( const FormulaToken& r ) const return maSingleRef == static_cast<const ScToken&>(r).GetSingleRef(); } -// ============================================================================ + ScExternalDoubleRefToken::ScExternalDoubleRefToken( sal_uInt16 nFileId, const svl::SharedString& rTabName, const ScComplexRefData& r ) : ScToken( svExternalDoubleRef, ocPush), @@ -984,7 +984,7 @@ bool ScExternalDoubleRefToken::operator ==( const FormulaToken& r ) const return maDoubleRef == static_cast<const ScToken&>(r).GetDoubleRef(); } -// ============================================================================ + ScExternalNameToken::ScExternalNameToken( sal_uInt16 nFileId, const svl::SharedString& rName ) : ScToken( svExternalName, ocPush), @@ -1023,7 +1023,7 @@ bool ScExternalNameToken::operator==( const FormulaToken& r ) const return maName.getData() == r.GetString().getData(); } -// ============================================================================ + ScJumpMatrix* ScJumpMatrixToken::GetJumpMatrix() const { return pJumpMatrix; } bool ScJumpMatrixToken::operator==( const FormulaToken& r ) const @@ -1187,7 +1187,7 @@ bool ScHybridCellToken::operator==( const FormulaToken& r ) const -////////////////////////////////////////////////////////////////////////// + bool ScTokenArray::AddFormulaToken(const com::sun::star::sheet::FormulaToken& _aToken,formula::ExternalReferenceHelper* _pRef) { @@ -1732,7 +1732,7 @@ bool ScTokenArray::IsValidReference( ScRange& rRange, const ScAddress& rPos ) co return ImplGetReference(rRange, rPos, true); } -//////////////////////////////////////////////////////////////////////////// + ScTokenArray::ScTokenArray() : FormulaTokenArray(), diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index daffb9e668c0..f2e5a4575d60 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -222,10 +222,10 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, return eERR_FORMAT; if( bSyntErrWarn ) - //############################################### + // ACHTUNG: Hier fehlt noch die richtige Warnung! return eERR_RNGOVRFLW; - //############################################### + else if( bOverflowWarn ) return eERR_RNGOVRFLW; else diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx index a6b2cf24de9f..534f44e4ca9a 100644 --- a/sc/source/filter/excel/colrowst.cxx +++ b/sc/source/filter/excel/colrowst.cxx @@ -32,14 +32,14 @@ // for filter manager #include "excimp8.hxx" -// ============================================================================ + const sal_uInt8 EXC_COLROW_USED = 0x01; const sal_uInt8 EXC_COLROW_DEFAULT = 0x02; const sal_uInt8 EXC_COLROW_HIDDEN = 0x04; const sal_uInt8 EXC_COLROW_MAN = 0x08; -// ============================================================================ + XclImpColRowSettings::XclImpColRowSettings( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 9a7b122e84ff..740c770e7844 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -79,7 +79,7 @@ ExcelToSc8::ExternalTabInfo::ExternalTabInfo() : { } -// ============================================================================ + ExcelToSc8::ExcelToSc8( const XclImpRoot& rRoot ) : ExcelToSc( rRoot ), diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 6c603d700b69..4c9485035656 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -538,7 +538,7 @@ void XclExpSheetProtection::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } } -// ============================================================================ + XclExpPassHash::XclExpPassHash(const Sequence<sal_Int8>& aHash) : XclExpRecord(EXC_ID_PASSWORD, 2), @@ -560,7 +560,7 @@ void XclExpPassHash::WriteBody(XclExpStream& rStrm) rStrm << mnHash; } -// ============================================================================ + XclExpFiltermode::XclExpFiltermode() : XclExpEmptyRecord( EXC_ID_FILTERMODE ) @@ -1103,6 +1103,6 @@ bool XclExpFilterManager::HasFilterMode( SCTAB nScTab ) return false; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index cfec247c9098..ecdc9cfcf8b0 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -3545,6 +3545,6 @@ XclExpChart::XclExpChart( const XclExpRoot& rRoot, Reference< XModel > xModel, c AppendNewRecord( new XclExpChChart( rRoot, xChartDoc, rChartRect ) ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 718ba0a40e49..14baaea48ae5 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -1974,6 +1974,6 @@ XclExpWebQueryBuffer::XclExpWebQueryBuffer( const XclExpRoot& rRoot ) } } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 24e54b31cdea..f3530b3c4e10 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -362,7 +362,7 @@ XclExpMsoDrawing::XclExpMsoDrawing( XclEscherEx& rEscherEx ) : { } -// ============================================================================ + XclExpImgData::XclExpImgData( const Graphic& rGraphic, sal_uInt16 nRecId ) : maGraphic( rGraphic ), @@ -423,7 +423,7 @@ void XclExpImgData::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } -// ============================================================================ + XclExpControlHelper::XclExpControlHelper( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), @@ -1208,7 +1208,7 @@ void XclExpChartObj::WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, pFS->endElementNS( XML_xdr, XML_xfrm ); } -// ============================================================================ + XclExpNote::XclExpNote( const XclExpRoot& rRoot, const ScAddress& rScPos, const ScPostIt* pScNote, const OUString& rAddText ) : @@ -1388,7 +1388,7 @@ void XclExpNote::WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm ) rComments->endElement( XML_comment ); } -// ============================================================================ + XclMacroHelper::XclMacroHelper( const XclExpRoot& rRoot ) : XclExpControlHelper( rRoot ) @@ -1454,7 +1454,7 @@ void XclExpShapeObj::WriteSubRecs( XclExpStream& rStrm ) WriteMacroSubRec( rStrm ); } -// ============================================================================ + XclExpComments::XclExpComments( SCTAB nTab, XclExpRecordList< XclExpNote >& rNotes ) : mnTab( nTab ), mrNotes( rNotes ) @@ -1653,6 +1653,6 @@ XclExpDffAnchorBase* XclExpEmbeddedObjectManager::CreateDffAnchor() const return new XclExpDffEmbeddedAnchor( GetRoot(), maPageSize, mnScaleX, mnScaleY ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index a01f3dbfa156..4e1dc5191e89 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -2552,7 +2552,7 @@ void XclExpFmlaCompImpl::AppendExt( const OUString& rString ) lclAppend( mxData->maExtDataVec, GetRoot(), rString, (meBiff == EXC_BIFF8) ? EXC_STR_DEFAULT : EXC_STR_8BITLENGTH ); } -// ============================================================================ + namespace { diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index 113d98c5c4ea..5d2526d06bca 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -1064,6 +1064,6 @@ void XclExpCachedMatrix::Save( XclExpStream& rStrm ) const } } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 23b59771bb6d..26d2b255025d 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -36,9 +36,9 @@ using ::std::find_if; using ::std::vector; using ::com::sun::star::uno::Any; -// ============================================================================ + // *** Helper classes *** -// ============================================================================ + // External names ============================================================= @@ -623,9 +623,9 @@ private: XclExpXtiVec maXtiVec; /// List of XTI structures for the EXTERNSHEET record. }; -// ============================================================================ + // *** Implementation *** -// ============================================================================ + // Excel sheet indexes ======================================================== @@ -2249,7 +2249,7 @@ sal_uInt16 XclExpLinkManagerImpl8::InsertXti( const XclExpXti& rXti ) return ulimit_cast< sal_uInt16 >( maXtiVec.size() - 1 ); } -// ============================================================================ + XclExpLinkManager::XclExpLinkManager( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) @@ -2348,6 +2348,6 @@ void XclExpLinkManager::Save( XclExpStream& rStrm ) mxImpl->Save( rStrm ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index 3e6734eda5b2..fad69b372e76 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -37,9 +37,9 @@ using namespace ::oox; -// ============================================================================ + // *** Helper classes *** -// ============================================================================ + /** Represents an internal defined name, supports writing it to a NAME record. */ class XclExpName : public XclExpRecord, protected XclExpRoot @@ -196,9 +196,9 @@ private: size_t mnFirstUserIdx; /// List index of first user-defined NAME record. }; -// ============================================================================ + // *** Implementation *** -// ============================================================================ + XclExpName::XclExpName( const XclExpRoot& rRoot, const OUString& rName ) : XclExpRecord( EXC_ID_NAME ), @@ -758,6 +758,6 @@ void XclExpNameManager::SaveXml( XclExpXmlStream& rStrm ) mxImpl->SaveXml( rStrm ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index 12ff6be5759d..23091a4e174b 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -428,6 +428,6 @@ void XclExpChartPageSettings::Save( XclExpStream& rStrm ) XclExpUInt16Record( EXC_ID_PRINTSIZE, EXC_PRINTSIZE_FULL ).Save( rStrm ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 609133a91a8d..42a2c002e047 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -57,9 +57,9 @@ using ::com::sun::star::sheet::DataPilotFieldLayoutInfo; using ::com::sun::star::sheet::DataPilotFieldReference; -// ============================================================================ + // Pivot cache -// ============================================================================ + namespace { @@ -72,7 +72,7 @@ const sal_uInt16 EXC_PCITEM_DATA_DATE = 0x0008; /// Date, time, date/tim /** Maps a bitfield consisting of EXC_PCITEM_DATA_* flags above to SXFIELD data type bitfield. */ static const sal_uInt16 spnPCItemFlags[] = { // STR DBL INT DAT - EXC_SXFIELD_DATA_NONE, // + EXC_SXFIELD_DATA_NONE, EXC_SXFIELD_DATA_STR, // x EXC_SXFIELD_DATA_INT, // x EXC_SXFIELD_DATA_STR_INT, // x x @@ -193,7 +193,7 @@ void XclExpPCItem::WriteBody( XclExpStream& rStrm ) } } -// ============================================================================ + XclExpPCField::XclExpPCField( const XclExpRoot& rRoot, const XclExpPivotCache& rPCache, sal_uInt16 nFieldIdx, @@ -624,7 +624,7 @@ void XclExpPCField::WriteBody( XclExpStream& rStrm ) rStrm << maFieldInfo; } -// ============================================================================ + XclExpPivotCache::XclExpPivotCache( const XclExpRoot& rRoot, const ScDPObject& rDPObj, sal_uInt16 nListIdx ) : XclExpRoot( rRoot ), @@ -911,9 +911,9 @@ void XclExpPivotCache::WriteSxindexlistList( XclExpStream& rStrm ) const } } -// ============================================================================ + // Pivot table -// ============================================================================ + namespace { @@ -951,7 +951,7 @@ OUString lclGetDataFieldCaption( const OUString& rFieldName, GeneralFunction eFu } // namespace -// ============================================================================ + XclExpPTItem::XclExpPTItem( const XclExpPCField& rCacheField, sal_uInt16 nCacheIdx ) : XclExpRecord( EXC_ID_SXVI, 8 ), @@ -994,7 +994,7 @@ void XclExpPTItem::WriteBody( XclExpStream& rStrm ) rStrm << maItemInfo; } -// ============================================================================ + XclExpPTField::XclExpPTField( const XclExpPivotTable& rPTable, sal_uInt16 nCacheIdx ) : mrPTable( rPTable ), @@ -1241,7 +1241,7 @@ void XclExpPTField::WriteSxvdex( XclExpStream& rStrm ) const rStrm.EndRecord(); } -// ============================================================================ + XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& rDPObj, const XclExpPivotCache& rPCache, size_t nId ) : XclExpRoot( rRoot ), @@ -1798,7 +1798,7 @@ void XclExpPivotTable::WriteSxViewEx9( XclExpStream& rStrm ) const } } -// ============================================================================ + namespace { @@ -1950,6 +1950,6 @@ const XclExpPivotCache* XclExpPivotTableManager::CreatePivotCache( const ScDPObj return 0; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx index 62b475c5ca81..74c37287b29e 100644 --- a/sc/source/filter/excel/xerecord.cxx +++ b/sc/source/filter/excel/xerecord.cxx @@ -231,7 +231,7 @@ void XclExpFutureRecord::Save( XclExpStream& rStrm ) rStrm.EndRecord(); } -// ============================================================================ + XclExpSubStream::XclExpSubStream( sal_uInt16 nSubStrmType ) : mnSubStrmType( nSubStrmType ) @@ -281,6 +281,6 @@ void XclExpSubStream::Save( XclExpStream& rStrm ) rStrm.EndRecord(); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 5708cc337f48..88ab3e3e2c4c 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -362,6 +362,6 @@ XclExpRootData::XclExpLinkMgrRef XclExpRoot::GetLocalLinkMgrRef() const return IsInGlobals() ? mrExpData.mxGlobLinkMgr : mrExpData.mxLocLinkMgr; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 3dc697d44479..2c37fb177666 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -77,7 +77,7 @@ using namespace ::com::sun::star::uno; using namespace ::formula; using namespace ::oox; -// ============================================================================ + XclExpStream::XclExpStream( SvStream& rOutStrm, const XclExpRoot& rRoot, sal_uInt16 nMaxRecSize ) : mrStrm( rOutStrm ), @@ -465,7 +465,7 @@ void XclExpStream::WriteRawZeroBytes( sal_Size nBytes ) mrStrm.Write( &nData, nBytesLeft ); } -// ============================================================================ + XclExpBiff8Encrypter::XclExpBiff8Encrypter( const XclExpRoot& rRoot ) : mnOldPos(STREAM_SEEK_TO_END), @@ -970,7 +970,7 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper } -// ============================================================================ + XclExpXmlStream::XclExpXmlStream( const Reference< XComponentContext >& rCC ) : XmlFilterBase( rCC ), diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index 80bfeb90d204..f3b8069c011e 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -28,7 +28,7 @@ using namespace ::oox; -// ============================================================================ + namespace { @@ -560,6 +560,6 @@ void XclExpString::PrepareWrite( XclExpStream& rStrm, sal_uInt16 nBytes ) const rStrm.SetSliceSize( nBytes + (mbIsUnicode ? 2 : 1) ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 086577958f66..fcf9e690d6c1 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -1039,7 +1039,7 @@ void XclExpBlindFont::Save( XclExpStream& /*rStrm*/ ) // do nothing } -// ============================================================================ + XclExpFontBuffer::XclExpFontBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), @@ -2998,7 +2998,7 @@ void XclExpDxfs::SaveXml( XclExpXmlStream& rStrm ) rStyleSheet->endElement( XML_dxfs ); } -// ============================================================================ + XclExpDxf::XclExpDxf( const XclExpRoot& rRoot, XclExpCellAlign* pAlign, XclExpCellBorder* pBorder, XclExpFont* pFont, XclExpNumFmt* pNumberFmt, XclExpCellProt* pProt, XclExpColor* pColor) @@ -3036,7 +3036,7 @@ void XclExpDxf::SaveXml( XclExpXmlStream& rStrm ) rStyleSheet->endElement( XML_dxf ); } -// ============================================================================ + XclExpXmlStyleSheet::XclExpXmlStyleSheet( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) @@ -3068,6 +3068,6 @@ void XclExpXmlStyleSheet::SaveXml( XclExpXmlStream& rStrm ) rStrm.PopStream(); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index eaf2586f3d6c..5655910990c9 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -40,9 +40,9 @@ using namespace ::oox; namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; -// ============================================================================ + // Helper records for cell records -// ============================================================================ + XclExpStringRec::XclExpStringRec( const XclExpRoot& rRoot, const OUString& rResult ) : XclExpRecord( EXC_ID3_STRING ), @@ -528,9 +528,9 @@ XclExpTableopRef XclExpTableopBuffer::TryCreate( const ScAddress& rScPos, const return xRec; } -// ============================================================================ + // Cell records -// ============================================================================ + XclExpCellBase::XclExpCellBase( sal_uInt16 nRecId, sal_Size nContSize, const XclAddress& rXclPos ) : @@ -1345,9 +1345,9 @@ void XclExpRkCell::WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ) rStrm << maRkValues[ nRelCol ]; } -// ============================================================================ + // Rows and Columns -// ============================================================================ + XclExpOutlineBuffer::XclExpOutlineBuffer( const XclExpRoot& rRoot, bool bRows ) : mpScOLArray( 0 ), @@ -1502,7 +1502,7 @@ void XclExpDimensions::WriteBody( XclExpStream& rStrm ) rStrm << sal_uInt16( 0 ); } -// ============================================================================ + namespace { @@ -1723,7 +1723,7 @@ void XclExpColinfoBuffer::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_cols ); } -// ============================================================================ + XclExpDefaultRowData::XclExpDefaultRowData() : mnFlags( EXC_DEFROW_DEFAULTFLAGS ), @@ -2270,9 +2270,9 @@ XclExpRow& XclExpRowBuffer::GetOrCreateRow( sal_uInt32 nXclRow, bool bRowAlwaysE } -// ============================================================================ + // Cell Table -// ============================================================================ + XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), @@ -2557,6 +2557,6 @@ void XclExpCellTable::SaveXml( XclExpXmlStream& rStrm ) mxExtLst->SaveXml( rStrm ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index ea466796d6bc..53cf362d562a 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -524,6 +524,6 @@ void XclExpTabViewSettings::WriteTabBgColor( XclExpStream& rStrm ) const if ( !maData.IsDefaultTabBgColor() ) XclExpTabBgColor( maData ).Save( rStrm ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 314c9259910e..026f64d97186 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -4383,6 +4383,6 @@ void XclImpChart::ReadChChart( XclImpStream& rStrm ) mxChartData->ReadRecordGroup( rStrm ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index ea32ced60b1f..31dd52dea22e 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -1329,6 +1329,6 @@ XclImpSheetProtectBuffer::Sheet* XclImpSheetProtectBuffer::GetSheetItem( SCTAB n return &itr->second; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 832003b8811c..f1c4430fc258 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -142,7 +142,7 @@ using ::com::sun::star::script::XEventAttacherManager; using ::com::sun::star::table::CellAddress; using ::com::sun::star::table::CellRangeAddress; -// ============================================================================ + namespace { @@ -4336,6 +4336,6 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclImpDffPropSet& rPropSet ) return rStrm; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx index 867f27de9561..f29636beb36a 100644 --- a/sc/source/filter/excel/xiformula.cxx +++ b/sc/source/filter/excel/xiformula.cxx @@ -114,6 +114,6 @@ const ScTokenArray* XclImpFormulaCompiler::CreateFormula( return mxImpl->CreateFormula(eType, rXclTokArr); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index d708f7c4e86b..b23c1d0b231f 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -897,6 +897,6 @@ ScMatrixRef XclImpCachedMatrix::CreateScMatrix( svl::SharedStringPool& rPool ) c return xScMatrix; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 4f62ad14c83d..8be264201a7e 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -37,9 +37,9 @@ using ::std::vector; -// ============================================================================ + // *** Helper classes *** -// ============================================================================ + // Cached external cells ====================================================== @@ -216,9 +216,9 @@ private: XclImpSupbookList maSupbookList; /// List of external documents. }; -// ============================================================================ + // *** Implementation *** -// ============================================================================ + // Excel sheet indexes ======================================================== @@ -866,7 +866,7 @@ void XclImpLinkManagerImpl::LoadCachedValues() itSupbook->LoadCachedValues(); } -// ============================================================================ + XclImpLinkManager::XclImpLinkManager( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), @@ -939,6 +939,6 @@ const OUString& XclImpLinkManager::GetMacroName( sal_uInt16 nExtSheet, sal_uInt1 return mxImpl->GetMacroName( nExtSheet, nExtName ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index 6f8094365dd3..6ae1dddfb1ca 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -27,9 +27,9 @@ #include "excimp8.hxx" #include "scextopt.hxx" #include "document.hxx" -// ============================================================================ + // *** Implementation *** -// ============================================================================ + XclImpName::TokenStrmData::TokenStrmData( XclImpStream& rStrm ) : mrStrm(rStrm), mnStrmPos(0), mnStrmSize(0) {} @@ -311,6 +311,6 @@ void XclImpNameManager::ConvertAllTokens() it->ConvertTokens(); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx index 086dba9cb61b..9c34d59ccdd0 100644 --- a/sc/source/filter/excel/xipage.cxx +++ b/sc/source/filter/excel/xipage.cxx @@ -380,6 +380,6 @@ void XclImpPageSettings::Finalize() } } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 01a7d545f27b..9ed241fe75e6 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -62,9 +62,9 @@ using ::com::sun::star::sheet::DataPilotFieldLayoutInfo; using ::com::sun::star::sheet::DataPilotFieldReference; using ::std::vector; -// ============================================================================ + // Pivot cache -// ============================================================================ + XclImpPCItem::XclImpPCItem( XclImpStream& rStrm ) { @@ -173,7 +173,7 @@ void XclImpPCItem::ReadSxempty( XclImpStream& rStrm ) SetEmpty(); } -// ============================================================================ + XclImpPCField::XclImpPCField( const XclImpRoot& rRoot, XclImpPivotCache& rPCache, sal_uInt16 nFieldIdx ) : XclPCField( EXC_PCFIELD_UNKNOWN, nFieldIdx ), @@ -582,7 +582,7 @@ const sal_Int16* XclImpPCField::GetDateGroupStep() const return 0; } -// ============================================================================ + XclImpPivotCache::XclImpPivotCache( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), @@ -880,9 +880,9 @@ bool XclImpPivotCache::IsValid() const return maSrcRange.IsValid(); } -// ============================================================================ + // Pivot table -// ============================================================================ + XclImpPTItem::XclImpPTItem( const XclImpPCField* pCacheField ) : mpCacheField( pCacheField ) @@ -915,7 +915,7 @@ void XclImpPTItem::ConvertItem( ScDPSaveDimension& rSaveDim ) const } } -// ============================================================================ + XclImpPTField::XclImpPTField( const XclImpPivotTable& rPTable, sal_uInt16 nCacheIdx ) : mrPTable( rPTable ) @@ -1191,7 +1191,7 @@ void XclImpPTField::ConvertItems( ScDPSaveDimension& rSaveDim ) const (*aIt)->ConvertItem( rSaveDim ); } -// ============================================================================ + XclImpPivotTable::XclImpPivotTable( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), @@ -1525,7 +1525,7 @@ void XclImpPivotTable::ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveD } } -// ============================================================================ + XclImpPivotTableManager::XclImpPivotTableManager( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) @@ -1648,6 +1648,6 @@ void XclImpPivotTableManager::MaybeRefreshPivotTables() (*aIt)->MaybeRefresh(); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx index 187509b07714..1d0d4be3011d 100644 --- a/sc/source/filter/excel/xiroot.cxx +++ b/sc/source/filter/excel/xiroot.cxx @@ -302,6 +302,6 @@ ScDocumentImport& XclImpRoot::GetDocImport() return *mrImpData.mxDocImport; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index 6bb02077fb17..75662a1d7d2c 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -30,9 +30,9 @@ using namespace ::com::sun::star; -// ============================================================================ + // Decryption -// ============================================================================ + XclImpDecrypter::XclImpDecrypter() : mnError( EXC_ENCR_ERROR_UNSUPP_CRYPT ), @@ -321,9 +321,9 @@ sal_uInt16 XclImpBiff8Decrypter::GetOffset( sal_Size nStrmPos ) const return static_cast< sal_uInt16 >( nStrmPos % EXC_ENCR_BLOCKSIZE ); } -// ============================================================================ + // Stream -// ============================================================================ + XclImpStreamPos::XclImpStreamPos() : mnPos( STREAM_SEEK_TO_BEGIN ), @@ -364,7 +364,7 @@ void XclImpStreamPos::Get( rbValid = mbValid; } -// ============================================================================ + XclBiff XclImpStream::DetectBiffVersion( SvStream& rStrm ) { @@ -1147,6 +1147,6 @@ sal_uInt16 XclImpStream::ReadRawData( void* pData, sal_uInt16 nBytes ) return nRet; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxx index e25838cfc86d..51b4a04d98dc 100644 --- a/sc/source/filter/excel/xistring.cxx +++ b/sc/source/filter/excel/xistring.cxx @@ -202,6 +202,6 @@ XclImpStringIterator& XclImpStringIterator::operator++() return *this; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 21bd97e9213a..5b2d03ccaa33 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -2021,6 +2021,6 @@ void XclImpXFRangeBuffer::Finalize() } } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xiview.cxx b/sc/source/filter/excel/xiview.cxx index 282c0d9d10e7..b4e196d151a5 100644 --- a/sc/source/filter/excel/xiview.cxx +++ b/sc/source/filter/excel/xiview.cxx @@ -293,6 +293,6 @@ void XclImpTabViewSettings::Finalize() rDoc.SetTabBgColor(nScTab, maData.maTabBgColor); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xladdress.cxx b/sc/source/filter/excel/xladdress.cxx index 19e32972a97b..694e1e071920 100644 --- a/sc/source/filter/excel/xladdress.cxx +++ b/sc/source/filter/excel/xladdress.cxx @@ -22,7 +22,7 @@ #include "xltracer.hxx" #include "xistream.hxx" -// ============================================================================ + void XclAddress::Read( XclImpStream& rStrm, bool bCol16Bit ) { @@ -119,7 +119,7 @@ void XclRangeList::WriteSubList( XclExpStream& rStrm, size_t nBegin, size_t nCou aIt->Write( rStrm, bCol16Bit ); } -// ============================================================================ + XclAddressConverterBase::XclAddressConverterBase( XclTracer& rTracer, const ScAddress& rMaxPos ) : mrTracer( rTracer ), @@ -149,6 +149,6 @@ bool XclAddressConverterBase::CheckScTab( SCTAB nScTab, bool bWarn ) return bValid; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index dbfedce07f6f..e49b2445280d 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -1231,7 +1231,7 @@ ScfPropSetHelper& XclChPropSetHelper::GetHatchHelper( XclChPropertyMode ePropMod return maHatchHlpCommon; } -// ============================================================================ + namespace { @@ -1343,6 +1343,6 @@ Reference< XShape > XclChRootData::GetTitleShape( const XclChTextKey& rTitleKey return xTitleShape; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index ce0ec44064ae..e1787d21bc19 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -287,7 +287,7 @@ void XclObjTextData::ReadTxo8( XclImpStream& rStrm ) rStrm >> mnFlags >> mnOrient >> mnButtonFlags >> mnShortcut >> mnShortcutEA >> mnTextLen >> mnFormatSize; } -// ============================================================================ + Reference< XControlModel > XclControlHelper::GetControlModel( Reference< XShape > xShape ) { @@ -342,6 +342,6 @@ OUString XclControlHelper::ExtractFromMacroDescriptor( return OUString(); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 967c96b83dbf..83a79ca2d112 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -943,6 +943,6 @@ bool XclTokenArrayHelper::GetMultipleOpRefs( return eState == stClose; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlpage.cxx b/sc/source/filter/excel/xlpage.cxx index dfe6b16dbd0d..a05aa1076dcf 100644 --- a/sc/source/filter/excel/xlpage.cxx +++ b/sc/source/filter/excel/xlpage.cxx @@ -261,6 +261,6 @@ void XclPageData::SetScPaperSize( const Size& rSize, bool bPortrait, bool bStric SetScPaperSize( rSize, bPortrait, true ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 82935f4c2804..8010d89cbb9a 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -34,9 +34,9 @@ namespace ScDPLayoutMode = ::com::sun::star::sheet::DataPilotFieldLayoutMode; namespace ScDPRefItemType = ::com::sun::star::sheet::DataPilotFieldReferenceItemType; namespace ScDPGroupBy = ::com::sun::star::sheet::DataPilotFieldGroupBy; -// ============================================================================ + // Pivot cache -// ============================================================================ + XclPCItem::XclPCItem() : meType( EXC_PCITEM_INVALID ), @@ -386,9 +386,9 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPCInfo& rInfo ) << XclExpString( rInfo.maUserName ); } -// ============================================================================ + // Pivot table -// ============================================================================ + // cached name ================================================================ @@ -935,7 +935,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTExtInfo& rInfo ) << EXC_PT_NOSTRING; // length of vacate style name } -// ============================================================================ + // Pivot table autoformat settings ============================================ diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index 0b363995463e..bf12dab002dc 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -408,6 +408,6 @@ XclTracer& XclRoot::GetTracer() const return *mrData.mxTracer; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index e3657b7c060b..d237a9b4ce4f 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -1475,7 +1475,7 @@ static const XclBuiltInFormatTable spBuiltInFormatTables[] = } // namespace -// ============================================================================ + XclNumFmtBuffer::XclNumFmtBuffer( const XclRoot& rRoot ) : meSysLang( rRoot.GetSysLanguage() ), @@ -1771,6 +1771,6 @@ bool XclXFBase::Equals( const XclXFBase& rCmp ) const (mbBorderUsed == rCmp.mbBorderUsed) && (mbAreaUsed == rCmp.mbAreaUsed); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index d12a85aa793d..a044442306e4 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -728,6 +728,6 @@ XclExpStream& operator<<( XclExpStream& rStrm, const Color& rColor ) return rStrm << rColor.GetRed() << rColor.GetGreen() << rColor.GetBlue() << sal_uInt8( 0 ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx index 5a83ae37c5de..a18b76decdab 100644 --- a/sc/source/filter/excel/xltracer.cxx +++ b/sc/source/filter/excel/xltracer.cxx @@ -146,6 +146,6 @@ void XclTracer::TraceDVType( bool bType) ProcessTraceOnce(eDVType); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlview.cxx b/sc/source/filter/excel/xlview.cxx index 6cb3c3e697f5..0942f25d49bc 100644 --- a/sc/source/filter/excel/xlview.cxx +++ b/sc/source/filter/excel/xlview.cxx @@ -101,6 +101,6 @@ XclSelectionData& XclTabViewData::CreateSelectionData( sal_uInt8 nPane ) return *rxSelData; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index 6a7e88ecea75..22a386487dba 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -278,7 +278,7 @@ void ScfPropertySet::SetProperties( const Sequence< OUString >& rPropNames, cons } } -// ============================================================================ + ScfPropSetHelper::ScfPropSetHelper( const sal_Char* const* ppcPropNames ) : mnNextIdx( 0 ) @@ -384,6 +384,6 @@ Any* ScfPropSetHelper::GetNextAny() return pAny; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx index cd23f69cbccd..379850f3d964 100644 --- a/sc/source/filter/ftools/fprogressbar.cxx +++ b/sc/source/filter/ftools/fprogressbar.cxx @@ -21,7 +21,7 @@ #include "global.hxx" #include "progress.hxx" -// ============================================================================ + ScfProgressBar::ScfProgressSegment::ScfProgressSegment( sal_Size nSize ) : mxProgress( 0 ), @@ -34,7 +34,7 @@ ScfProgressBar::ScfProgressSegment::~ScfProgressSegment() { } -// ============================================================================ + ScfProgressBar::ScfProgressBar( SfxObjectShell* pDocShell, const OUString& rText ) : maText( rText ) @@ -194,7 +194,7 @@ void ScfProgressBar::Progress( sal_Size nDelta ) ProgressAbs( mpCurrSegment ? (mpCurrSegment->mnPos + nDelta) : 0 ); } -// ============================================================================ + ScfSimpleProgressBar::ScfSimpleProgressBar( sal_Size nSize, SfxObjectShell* pDocShell, const OUString& rText ) : maProgress( pDocShell, rText ) @@ -237,6 +237,6 @@ void ScfStreamProgressBar::Init( SfxObjectShell* pDocShell, const OUString& rTex Progress(); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 38858afb7381..92516b239fda 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -42,7 +42,7 @@ #include <stdio.h> -// ============================================================================ + // ScFilterTools::ReadLongDouble() double ScfTools::ReadLongDouble( SvStream& rStrm ) diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 01faa7c2dd8c..269f924096fc 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -86,7 +86,7 @@ using ::editeng::SvxBorderLine; using namespace ::com::sun::star; -//======================================================================== + const static sal_Char sMyBegComment[] = "<!-- "; const static sal_Char sMyEndComment[] = " -->"; @@ -110,9 +110,9 @@ const sal_uInt16 ScHTMLExport::nCellSpacing = 0; const sal_Char ScHTMLExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; -//======================================================================== + // Macros for HTML export -//======================================================================== + #define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag ) #define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag, false ) #define OUT_STR( str ) HTMLOutFuncs::Out_String( rStrm, str, eDestEnc, &aNonConvertibleChars ) @@ -130,7 +130,7 @@ const sal_Char ScHTMLExport::sIndentSource[nIndentMax+1] = -//======================================================================== + FltError ScFormatFilterPluginImpl::ScExportHTML( SvStream& rStrm, const OUString& rBaseURL, ScDocument* pDoc, const ScRange& rRange, const rtl_TextEncoding /*eNach*/, bool bAll, @@ -206,7 +206,7 @@ static OString lcl_makeHTMLColorTriplet(const Color& rColor) return aStr.makeStringAndClear(); } -////////////////////////////////////////////////////////////////////////////// + ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const OUString& rBaseURL, ScDocument* pDocP, const ScRange& rRangeP, diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index d50f35dba36b..e8f69e926e73 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -185,9 +185,9 @@ void ScHTMLStyles::insertProp( pProps->insert(PropsType::value_type(aProp, aValue)); } -// ============================================================================ + // BASE class for HTML parser classes -// ============================================================================ + ScHTMLParser::ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ) : ScEEParser( pEditEngine ), @@ -212,7 +212,7 @@ ScDocument& ScHTMLParser::GetDoc() return *mpDoc; } -// ============================================================================ + ScHTMLLayoutParser::ScHTMLLayoutParser( EditEngine* pEditP, const OUString& rBaseURL, const Size& aPageSizeP, @@ -1769,9 +1769,9 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo ) -// ============================================================================ + // HTML DATA QUERY PARSER -// ============================================================================ + template< typename Type > inline Type getLimitedValue( const Type& rValue, const Type& rMin, const Type& rMax ) @@ -1829,7 +1829,7 @@ void ScHTMLEntry::Strip( const EditEngine& rEditEngine ) } } -// ============================================================================ + /** A map of ScHTMLTable objects. @@ -1955,7 +1955,7 @@ ScHTMLTableIterator::ScHTMLTableIterator( const ScHTMLTableMap* pTableMap ) : } } -// ============================================================================ + ScHTMLTableAutoId::ScHTMLTableAutoId( ScHTMLTableId& rnUnusedId ) : mnTableId( rnUnusedId ), @@ -2889,7 +2889,7 @@ void ScHTMLTable::RecalcDocPos( const ScHTMLPos& rBasePos ) } } -// ============================================================================ + ScHTMLGlobalTable::ScHTMLGlobalTable( SfxItemPool& rPool, @@ -2916,7 +2916,7 @@ void ScHTMLGlobalTable::Recalc() RecalcDocPos( GetDocPos() ); } -// ============================================================================ + ScHTMLQueryParser::ScHTMLQueryParser( EditEngine* pEditEngine, ScDocument* pDoc ) : ScHTMLParser( pEditEngine, pDoc ), @@ -3313,6 +3313,6 @@ IMPL_LINK( ScHTMLQueryParser, HTMLImportHdl, const ImportInfo*, pInfo ) return 0; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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 diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index 4538ba078b88..ccbeb9bd4a9c 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -36,8 +36,8 @@ FltError ImportLotus::Read() S_START, // analyse first BOF S_WK1, // in WK1-Stream S_WK3, // in WK3-Section - S_WK4, // ... - S_FM3, // ... + S_WK4, + S_FM3, S_END // Import finished }; diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index cac8530468b3..7362c9050b8d 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -31,7 +31,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; @@ -39,7 +39,7 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -// ============================================================================ + namespace { @@ -72,8 +72,8 @@ const sal_Int16 BIFF8_MAXTAB = BIFF5_MAXTAB; } // namespace -// ============================================================================ -// ============================================================================ + + CellAddress ApiCellRangeList::getBaseAddress() const { @@ -82,7 +82,7 @@ CellAddress ApiCellRangeList::getBaseAddress() const return CellAddress( front().Sheet, front().StartColumn, front().StartRow ); } -// ============================================================================ + void BinAddress::read( SequenceInputStream& rStrm ) { @@ -95,7 +95,7 @@ void BinAddress::read( BiffInputStream& rStrm, bool bCol16Bit, bool bRow32Bit ) mnCol = bCol16Bit ? rStrm.readuInt16() : rStrm.readuInt8(); } -// ============================================================================ + void BinRange::read( SequenceInputStream& rStrm ) { @@ -110,7 +110,7 @@ void BinRange::read( BiffInputStream& rStrm, bool bCol16Bit, bool bRow32Bit ) maLast.mnCol = bCol16Bit ? rStrm.readuInt16() : rStrm.readuInt8(); } -// ============================================================================ + void BinRangeList::read( SequenceInputStream& rStrm ) { @@ -120,7 +120,7 @@ void BinRangeList::read( SequenceInputStream& rStrm ) aIt->read( rStrm ); } -// ============================================================================ + AddressConverter::AddressConverter( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), @@ -544,7 +544,7 @@ void AddressConverter::initializeMaxPos( } } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index 12193a0a5200..148038d09a5c 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -// ============================================================================ + namespace { @@ -145,7 +145,7 @@ bool lclConvertWildcardsToRegExp( OUString& rValue ) } // namespace -// ============================================================================ + ApiFilterSettings::ApiFilterSettings() { @@ -188,7 +188,7 @@ void ApiFilterSettings::appendField( bool bAnd, const std::vector<OUString>& rVa } } -// ============================================================================ + FilterSettingsBase::FilterSettingsBase( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -208,7 +208,7 @@ ApiFilterSettings FilterSettingsBase::finalizeImport( sal_Int32 /*nMaxCount*/ ) return ApiFilterSettings(); } -// ============================================================================ + DiscreteFilter::DiscreteFilter( const WorkbookHelper& rHelper ) : FilterSettingsBase( rHelper ), @@ -285,7 +285,7 @@ ApiFilterSettings DiscreteFilter::finalizeImport( sal_Int32 nMaxCount ) return aSettings; } -// ============================================================================ + Top10Filter::Top10Filter( const WorkbookHelper& rHelper ) : FilterSettingsBase( rHelper ), @@ -326,7 +326,7 @@ ApiFilterSettings Top10Filter::finalizeImport( sal_Int32 /*nMaxCount*/ ) return aSettings; } -// ============================================================================ + FilterCriterionModel::FilterCriterionModel() : mnOperator( XML_equal ), @@ -501,7 +501,7 @@ void CustomFilter::appendCriterion( const FilterCriterionModel& rCriterion ) maCriteria.push_back( rCriterion ); } -// ============================================================================ + FilterColumn::FilterColumn( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), @@ -540,7 +540,7 @@ ApiFilterSettings FilterColumn::finalizeImport( sal_Int32 nMaxCount ) return aSettings; } -// ============================================================================ + AutoFilter::AutoFilter( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -648,7 +648,7 @@ void AutoFilter::finalizeImport( const Reference<XSheetFilterDescriptor3>& rxFil } } -// ============================================================================ + AutoFilterBuffer::AutoFilterBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -745,7 +745,7 @@ AutoFilter* AutoFilterBuffer::getActiveAutoFilter() return maAutoFilters.empty() ? 0 : maAutoFilters.back().get(); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/autofiltercontext.cxx b/sc/source/filter/oox/autofiltercontext.cxx index 4f351794fed5..4f98319bfc6b 100644 --- a/sc/source/filter/oox/autofiltercontext.cxx +++ b/sc/source/filter/oox/autofiltercontext.cxx @@ -27,7 +27,7 @@ namespace xls { using ::oox::core::ContextHandlerRef; -// ============================================================================ + FilterSettingsContext::FilterSettingsContext( WorksheetContextBase& rParent, FilterSettingsBase& rFilterSettings ) : WorksheetContextBase( rParent ), @@ -73,7 +73,7 @@ void FilterSettingsContext::onStartRecord( SequenceInputStream& rStrm ) mrFilterSettings.importRecord( getCurrentElement(), rStrm ); } -// ============================================================================ + FilterColumnContext::FilterColumnContext( WorksheetContextBase& rParent, FilterColumn& rFilterColumn ) : WorksheetContextBase( rParent ), @@ -119,7 +119,7 @@ void FilterColumnContext::onStartRecord( SequenceInputStream& rStrm ) mrFilterColumn.importFilterColumn( rStrm ); } -// ============================================================================ + AutoFilterContext::AutoFilterContext( WorksheetFragmentBase& rFragment, AutoFilter& rAutoFilter ) : WorksheetContextBase( rFragment ), @@ -151,7 +151,7 @@ void AutoFilterContext::onStartRecord( SequenceInputStream& rStrm ) mrAutoFilter.importAutoFilter( rStrm, getSheetIndex() ); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx index 9e44c140e4c8..74c0072bff8c 100644 --- a/sc/source/filter/oox/biffcodec.cxx +++ b/sc/source/filter/oox/biffcodec.cxx @@ -27,14 +27,14 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; -// ============================================================================ + BiffDecoderBase::BiffDecoderBase() : mbValid( false ) @@ -69,7 +69,7 @@ void BiffDecoderBase::decode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, } } -// ============================================================================ + BiffDecoder_XOR::BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder ) : BiffDecoderBase(), // must be called to prevent compiler warning @@ -130,7 +130,7 @@ void BiffDecoder_XOR::implDecode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcD maCodec.decode( pnDestData, pnSrcData, nBytes ); } -// ============================================================================ + namespace { @@ -244,7 +244,7 @@ void BiffCodecHelper::cloneDecoder( BiffInputStream& rStrm ) rStrm.setDecoder( BiffDecoderRef( mxDecoder->clone() ) ); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx index 08b274b87575..3344304d084b 100644 --- a/sc/source/filter/oox/biffhelper.cxx +++ b/sc/source/filter/oox/biffhelper.cxx @@ -28,10 +28,10 @@ namespace oox { namespace xls { -// ============================================================================ -// ============================================================================ + + namespace { @@ -50,7 +50,7 @@ union DecodedDouble } // namespace -// ============================================================================ + // conversion ----------------------------------------------------------------- diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx index 0782d8027ebd..b64f50a97504 100644 --- a/sc/source/filter/oox/biffinputstream.cxx +++ b/sc/source/filter/oox/biffinputstream.cxx @@ -25,10 +25,10 @@ namespace oox { namespace xls { -// ============================================================================ -// ============================================================================ + + namespace prv { @@ -154,7 +154,7 @@ void BiffInputRecordBuffer::updateDecoded() } // namespace prv -// ============================================================================ + BiffInputStream::BiffInputStream( BinaryInputStream& rInStream, bool bContLookup ) : BinaryStreamBase( true ), @@ -489,7 +489,7 @@ void BiffInputStream::readUniStringHeader( bool& orb16BitChars, sal_Int32& ornAd ornAddSize = 4 * nFontCount + ::std::max< sal_Int32 >( 0, nPhoneticSize ); } -// ============================================================================ + BiffInputStreamPos::BiffInputStreamPos( BiffInputStream& rStrm ) : mrStrm( rStrm ), @@ -506,7 +506,7 @@ bool BiffInputStreamPos::restorePosition() return bValidRec && !mrStrm.isEof(); } -// ============================================================================ + BiffInputStreamPosGuard::BiffInputStreamPosGuard( BiffInputStream& rStrm ) : BiffInputStreamPos( rStrm ) @@ -518,7 +518,7 @@ BiffInputStreamPosGuard::~BiffInputStreamPosGuard() restorePosition(); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx index f1aa4f4533fb..7c64569266a2 100644 --- a/sc/source/filter/oox/chartsheetfragment.cxx +++ b/sc/source/filter/oox/chartsheetfragment.cxx @@ -29,12 +29,12 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::oox::core; -// ============================================================================ + ChartsheetFragment::ChartsheetFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ) diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index 7a4218e18c4a..d3f0c661dcfe 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -44,7 +44,7 @@ using ::com::sun::star::text::XTextRange; namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::sheet; @@ -83,7 +83,7 @@ static sal_Int32 lcl_ToVertAlign( sal_Int32 nAlign ) } } -// ============================================================================ + CommentModel::CommentModel() : mnAuthorId( -1 ), @@ -221,7 +221,7 @@ void CommentsBuffer::finalizeImport() maComments.forEachMem( &Comment::finalizeImport ); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/commentsfragment.cxx b/sc/source/filter/oox/commentsfragment.cxx index 09d65f5467dd..febdb14aea0a 100644 --- a/sc/source/filter/oox/commentsfragment.cxx +++ b/sc/source/filter/oox/commentsfragment.cxx @@ -24,12 +24,12 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::oox::core; -// ============================================================================ + CommentsFragment::CommentsFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ) @@ -143,7 +143,7 @@ void CommentsFragment::importComment( SequenceInputStream& rStrm ) mxComment->importComment( rStrm ); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index a3c17e0dd3a2..c83b84b87df0 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -55,7 +55,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; @@ -65,7 +65,7 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -// ============================================================================ + namespace { @@ -256,7 +256,7 @@ void ColorScaleRule::AddEntries( ScColorScaleFormat* pFormat, ScDocument* pDoc, } } -// ============================================================================ + DataBarRule::DataBarRule( const CondFormat& rFormat ): WorksheetHelper( rFormat ), @@ -313,7 +313,7 @@ void DataBarRule::SetData( ScDataBarFormat* pFormat, ScDocument* pDoc, const ScA pFormat->SetDataBarData(mpFormat); } -// ============================================================================ + IconSetRule::IconSetRule( const CondFormat& rFormat ): WorksheetHelper( rFormat ), @@ -358,7 +358,7 @@ void IconSetRule::SetData( ScIconSetFormat* pFormat, ScDocument* pDoc, const ScA pFormat->SetIconSetData(mpFormatData); } -// ============================================================================ + CondFormatRuleModel::CondFormatRuleModel() : mnPriority( -1 ), @@ -393,7 +393,7 @@ void CondFormatRuleModel::setBiff12TextType( sal_Int32 nOperator ) mnOperator = STATIC_ARRAY_SELECT( spnOperators, nOperator, XML_TOKEN_INVALID ); } -// ============================================================================ + CondFormatRule::CondFormatRule( const CondFormat& rCondFormat, ScConditionalFormat* pFormat ) : WorksheetHelper( rCondFormat ), @@ -956,14 +956,14 @@ IconSetRule* CondFormatRule::getIconSet() return mpIconSet.get(); } -// ============================================================================ + CondFormatModel::CondFormatModel() : mbPivot( false ) { } -// ============================================================================ + CondFormat::CondFormat( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), @@ -1038,7 +1038,7 @@ void CondFormat::insertRule( CondFormatRuleRef xRule ) } } -// ============================================================================ + CondFormatBuffer::CondFormatBuffer( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) @@ -1211,7 +1211,7 @@ void ExtCfRule::importCfvo( const AttributeList& rAttribs ) mnRuleType = CFVO; maModel.maColorScaleType = rAttribs.getString( XML_type, OUString() ); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx index 67b1ed93a868..4cfd409ba698 100644 --- a/sc/source/filter/oox/condformatcontext.cxx +++ b/sc/source/filter/oox/condformatcontext.cxx @@ -23,11 +23,11 @@ namespace oox { namespace xls { -// ============================================================================ + using ::oox::core::ContextHandlerRef; -// ============================================================================ + ColorScaleContext::ColorScaleContext( CondFormatContext& rFragment, CondFormatRuleRef xRule ) : WorksheetContextBase( rFragment ), @@ -65,7 +65,7 @@ void ColorScaleContext::onStartElement( const AttributeList& rAttribs ) } } -// ============================================================================ + DataBarContext::DataBarContext( CondFormatContext& rFragment, CondFormatRuleRef xRule ) : WorksheetContextBase( rFragment ), @@ -106,7 +106,7 @@ void DataBarContext::onStartElement( const AttributeList& rAttribs ) } } -// ============================================================================ + IconSetContext::IconSetContext( CondFormatContext& rFragment, CondFormatRuleRef xRule ) : WorksheetContextBase( rFragment ), @@ -142,7 +142,7 @@ void IconSetContext::onStartElement( const AttributeList& rAttribs ) } } -// ============================================================================ + CondFormatContext::CondFormatContext( WorksheetFragmentBase& rFragment ) : WorksheetContextBase( rFragment ) @@ -236,7 +236,7 @@ void CondFormatContext::onEndRecord() } } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx index 631a333cbf72..6ee777e6f09c 100644 --- a/sc/source/filter/oox/connectionsbuffer.cxx +++ b/sc/source/filter/oox/connectionsbuffer.cxx @@ -25,12 +25,12 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::uno; -// ============================================================================ + namespace { @@ -68,7 +68,7 @@ const sal_uInt8 BIFF12_WEBPR_HAS_URL = 0x04; } // namespace -// ============================================================================ + WebPrModel::WebPrModel() : mnHtmlFormat( XML_none ), @@ -277,7 +277,7 @@ void Connection::importWebPrTable( SequenceInputStream& rStrm, sal_Int32 nRecId } } -// ============================================================================ + ConnectionsBuffer::ConnectionsBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), @@ -314,7 +314,7 @@ void ConnectionsBuffer::insertConnectionToMap( const ConnectionRef& rxConnection } } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx index 676bc408ee67..4ad7d92220d1 100644 --- a/sc/source/filter/oox/connectionsfragment.cxx +++ b/sc/source/filter/oox/connectionsfragment.cxx @@ -26,12 +26,12 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::oox::core; -// ============================================================================ + ConnectionContext::ConnectionContext( WorkbookFragmentBase& rParent, Connection& rConnection ) : WorkbookContextBase( rParent ), @@ -105,7 +105,7 @@ void ConnectionContext::onStartRecord( SequenceInputStream& rStrm ) mrConnection.importConnection( rStrm ); } -// ============================================================================ + ConnectionsFragment::ConnectionsFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : WorkbookFragmentBase( rHelper, rFragmentPath ) @@ -164,7 +164,7 @@ void ConnectionsFragment::finalizeImport() getConnections().finalizeImport(); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index ef142cfaa2eb..b06fec8fc7ba 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -41,14 +41,14 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -// ============================================================================ + namespace { @@ -183,7 +183,7 @@ Any lclConvertReference( const Any& rRefAny, const CellAddress& rBaseAddr, sal_u } // namespace -// ============================================================================ + DefinedNameModel::DefinedNameModel() : mnSheet( -1 ), @@ -195,7 +195,7 @@ DefinedNameModel::DefinedNameModel() : { } -// ============================================================================ + DefinedNameBase::DefinedNameBase( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -256,7 +256,7 @@ ApiTokenSequence DefinedNameBase::importBiffFormula( sal_Int16 nBaseSheet, BiffI getFormulaParser().convertErrorToFormula( BIFF_ERR_NAME ); } -// ============================================================================ + DefinedName::DefinedName( const WorkbookHelper& rHelper ) : DefinedNameBase( rHelper ), @@ -462,7 +462,7 @@ bool DefinedName::getAbsoluteRange( CellRangeAddress& orRange ) const return getFormulaParser().extractCellRange( orRange, aFTokenSeq, false ); } -// ============================================================================ + DefinedNamesBuffer::DefinedNamesBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -537,7 +537,7 @@ DefinedNameRef DefinedNamesBuffer::createDefinedName() return xDefName; } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index 0661e32a3dbe..d830c9f30956 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -29,13 +29,13 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::table; using namespace ::oox::drawingml; -// ============================================================================ + namespace { @@ -53,7 +53,7 @@ inline sal_Int32 lclEmuToHmm( sal_Int64 nValue ) } // namespace -// ============================================================================ + CellAnchorModel::CellAnchorModel() : mnCol( -1 ), @@ -71,7 +71,7 @@ AnchorClientDataModel::AnchorClientDataModel() : { } -// ============================================================================ + ShapeAnchor::ShapeAnchor( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), @@ -301,7 +301,7 @@ EmuPoint ShapeAnchor::calcCellAnchorEmu( const CellAnchorModel& rModel ) const return aEmuPoint; } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 890a6ff0d9c1..7d8c5ba3baf7 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -61,7 +61,7 @@ using ::com::sun::star::awt::Rectangle; using ::com::sun::star::awt::XControlModel; // no using's for ::oox::vml, that may clash with ::oox::drawingml types -// ============================================================================ + ShapeMacroAttacher::ShapeMacroAttacher( const OUString& rMacroName, const Reference< XShape >& rxShape ) : VbaMacroAttacherBase( rMacroName ), @@ -87,7 +87,7 @@ void ShapeMacroAttacher::attachMacro( const OUString& rMacroUrl ) } } -// ============================================================================ + Shape::Shape( const WorksheetHelper& rHelper, const AttributeList& rAttribs, const sal_Char* pcServiceName ) : ::oox::drawingml::Shape( pcServiceName ), @@ -120,7 +120,7 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >& } } -// ============================================================================ + GroupShapeContext::GroupShapeContext( ContextHandler2Helper& rParent, const WorksheetHelper& rHelper, const ShapePtr& rxParentShape, const ShapePtr& rxShape ) : @@ -176,7 +176,7 @@ ContextHandlerRef GroupShapeContext::onCreateContext( return xContext.get() ? xContext.get() : ShapeGroupContext::onCreateContext( nElement, rAttribs ); } -// ============================================================================ + DrawingFragment::DrawingFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), @@ -303,9 +303,9 @@ void DrawingFragment::onEndElement() } } -// ============================================================================ + // VML -// ============================================================================ + namespace { @@ -336,7 +336,7 @@ bool VmlFindNoteFunc::operator()( const ::oox::vml::ShapeBase& rShape ) const } // namespace -// ============================================================================ + VmlControlMacroAttacher::VmlControlMacroAttacher( const OUString& rMacroName, const Reference< XIndexContainer >& rxCtrlFormIC, sal_Int32 nCtrlIndex, sal_Int32 nCtrlType, sal_Int32 nDropStyle ) : @@ -401,7 +401,7 @@ void VmlControlMacroAttacher::attachMacro( const OUString& rMacroUrl ) } } -// ============================================================================ + VmlDrawing::VmlDrawing( const WorksheetHelper& rHelper ) : ::oox::vml::Drawing( rHelper.getOoxFilter(), rHelper.getDrawPage(), ::oox::vml::VMLDRAWING_EXCEL ), @@ -764,7 +764,7 @@ void VmlDrawing::convertControlBackground( AxMorphDataModelBase& rAxModel, const } } -// ============================================================================ + VmlDrawingFragment::VmlDrawingFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : ::oox::vml::DrawingFragment( rHelper.getOoxFilter(), rFragmentPath, rHelper.getVmlDrawing() ), @@ -778,7 +778,7 @@ void VmlDrawingFragment::finalizeImport() getVmlDrawing().convertAndInsert(); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx index 92909052cb94..7fe44081385c 100644 --- a/sc/source/filter/oox/drawingmanager.cxx +++ b/sc/source/filter/oox/drawingmanager.cxx @@ -36,7 +36,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::awt; using namespace ::com::sun::star::drawing; @@ -45,7 +45,7 @@ using namespace ::com::sun::star::uno; using namespace ::oox::drawingml; -// ============================================================================ + namespace { @@ -94,9 +94,9 @@ const sal_uInt8 BIFF_OBJ_FILL_AUTO = 0x01; } // namespace -// ============================================================================ + // Model structures for BIFF OBJ record data -// ============================================================================ + BiffObjLineModel::BiffObjLineModel() : mnColorIdx( BIFF_OBJ_LINE_AUTOCOLOR ), @@ -114,7 +114,7 @@ BiffInputStream& operator>>( BiffInputStream& rStrm, BiffObjLineModel& rModel ) return rStrm; } -// ============================================================================ + BiffObjFillModel::BiffObjFillModel() : mnBackColorIdx( BIFF_OBJ_LINE_AUTOCOLOR ), @@ -132,9 +132,9 @@ BiffInputStream& operator>>( BiffInputStream& rStrm, BiffObjFillModel& rModel ) return rStrm; } -// ============================================================================ + // BIFF drawing objects -// ============================================================================ + BiffDrawingObjectContainer::BiffDrawingObjectContainer() { @@ -145,7 +145,7 @@ void BiffDrawingObjectContainer::convertAndInsert( BiffDrawingBase& rDrawing, co maObjects.forEachMem( &BiffDrawingObjectBase::convertAndInsert, ::boost::ref( rDrawing ), ::boost::cref( rxShapes ), pParentRect ); } -// ============================================================================ + BiffDrawingObjectBase::BiffDrawingObjectBase( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), @@ -393,9 +393,9 @@ void BiffDrawingObjectBase::convertFillProperties( ShapePropertyMap& rPropMap, c aFillProps.pushToPropMap( rPropMap, getBaseFilter().getGraphicHelper() ); } -// ============================================================================ + // BIFF drawing page -// ============================================================================ + BiffDrawingBase::BiffDrawingBase( const WorksheetHelper& rHelper, const Reference< XDrawPage >& rxDrawPage ) : WorksheetHelper( rHelper ), @@ -419,7 +419,7 @@ void BiffDrawingBase::finalizeImport() maRawObjs.convertAndInsert( *this, xShapes ); } -// ============================================================================ + BiffSheetDrawing::BiffSheetDrawing( const WorksheetHelper& rHelper ) : BiffDrawingBase( rHelper, rHelper.getDrawPage() ) @@ -432,7 +432,7 @@ void BiffSheetDrawing::notifyShapeInserted( const Reference< XShape >& /*rxShape extendShapeBoundingBox( rShapeRect ); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/excelchartconverter.cxx b/sc/source/filter/oox/excelchartconverter.cxx index 59870a44cdce..467db26feeef 100644 --- a/sc/source/filter/oox/excelchartconverter.cxx +++ b/sc/source/filter/oox/excelchartconverter.cxx @@ -32,7 +32,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::chart2::data; @@ -42,7 +42,7 @@ using namespace ::com::sun::star::uno; using ::oox::drawingml::chart::DataSequenceModel; -// ============================================================================ + ExcelChartConverter::ExcelChartConverter( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -121,7 +121,7 @@ Reference< XDataSequence > ExcelChartConverter::createDataSequence( return xDataSeq; } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index af44c3266bcd..1cdd1036280e 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -33,7 +33,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sheet; @@ -43,7 +43,7 @@ using namespace ::oox::core; using ::oox::drawingml::table::TableStyleListPtr; -// ============================================================================ + OUString ExcelFilter_getImplementationName() { diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx index df1a8cb6a065..303b6cff59f4 100644 --- a/sc/source/filter/oox/excelhandlers.cxx +++ b/sc/source/filter/oox/excelhandlers.cxx @@ -25,13 +25,13 @@ namespace oox { namespace xls { -// ============================================================================ + using ::oox::core::FilterBase; using ::oox::core::FragmentHandler2; -// ============================================================================ -// ============================================================================ + + WorkbookFragmentBase::WorkbookFragmentBase( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : @@ -40,7 +40,7 @@ WorkbookFragmentBase::WorkbookFragmentBase( { } -// ============================================================================ + WorksheetFragmentBase::WorksheetFragmentBase( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : @@ -49,8 +49,8 @@ WorksheetFragmentBase::WorksheetFragmentBase( { } -// ============================================================================ -// ============================================================================ + + BiffContextHandler::~BiffContextHandler() { @@ -63,7 +63,7 @@ BiffWorksheetContextBase::BiffWorksheetContextBase( const WorksheetHelper& rHelp { } -// ============================================================================ + BiffFragmentHandler::BiffFragmentHandler( const FilterBase& rFilter, const OUString& rStrmName ) { @@ -85,7 +85,7 @@ bool BiffFragmentHandler::skipFragment() return !mxBiffStrm->isEof() && (mxBiffStrm->getRecId() == BIFF_ID_EOF); } -// ============================================================================ + BiffWorkbookFragmentBase::BiffWorkbookFragmentBase( const WorkbookHelper& rHelper, const OUString& rStrmName, bool bCloneDecoder ) : BiffFragmentHandler( rHelper.getBaseFilter(), rStrmName ), diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx index 65d4532cc6d5..6d5c27f7b018 100644 --- a/sc/source/filter/oox/excelvbaproject.cxx +++ b/sc/source/filter/oox/excelvbaproject.cxx @@ -35,7 +35,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::container; using namespace ::com::sun::star::document; @@ -46,7 +46,7 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; -// ============================================================================ + ExcelVbaProject::ExcelVbaProject( const Reference< XComponentContext >& rxContext, const Reference< XSpreadsheetDocument >& rxDocument ) : ::oox::ole::VbaProject( rxContext, Reference< XModel >( rxDocument, UNO_QUERY ), "Calc" ), @@ -132,7 +132,7 @@ void ExcelVbaProject::prepareImport() } } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index 899c1a4f0fba..dfe55b7af8f8 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -43,7 +43,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; @@ -52,7 +52,7 @@ using namespace ::com::sun::star::uno; using ::oox::core::Relation; using ::oox::core::Relations; -// ============================================================================ + namespace { @@ -68,7 +68,7 @@ const sal_uInt16 BIFF12_EXTNAME_ICONIFIED = 0x0020; } // namespace -// ============================================================================ + ExternalNameModel::ExternalNameModel() : mbBuiltIn( false ), @@ -80,7 +80,7 @@ ExternalNameModel::ExternalNameModel() : { } -// ============================================================================ + ExternalName::ExternalName( const ExternalLink& rParentLink ) : DefinedNameBase( rParentLink ), @@ -271,7 +271,7 @@ void ExternalName::setResultSize( sal_Int32 nColumns, sal_Int32 nRows ) maCurrIt = maResults.begin(); } -// ============================================================================ + void LinkSheetRange::setDeleted() { @@ -309,7 +309,7 @@ void LinkSheetRange::setExternalRange( sal_Int32 nDocLink, sal_Int32 nFirst, sal } } -// ============================================================================ + ExternalLink::ExternalLink( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), @@ -624,7 +624,7 @@ ExternalNameRef ExternalLink::createExternalName() return xExtName; } -// ============================================================================ + RefSheetsModel::RefSheetsModel() : mnExtRefId( -1 ), @@ -796,7 +796,7 @@ const RefSheetsModel* ExternalLinkBuffer::getRefSheets( sal_Int32 nRefId ) const &maRefSheets[ static_cast< size_t >( nRefId ) ] : 0; } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx index 348b50751407..605a54e4edd9 100644 --- a/sc/source/filter/oox/externallinkfragment.cxx +++ b/sc/source/filter/oox/externallinkfragment.cxx @@ -29,7 +29,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; @@ -37,8 +37,8 @@ using namespace ::com::sun::star::uno; using namespace ::oox::core; -// ============================================================================ -// ============================================================================ + + ExternalSheetDataContext::ExternalSheetDataContext( WorkbookFragmentBase& rFragment, const Reference< XExternalSheetCache >& rxSheetCache ) : @@ -159,7 +159,7 @@ void ExternalSheetDataContext::setCellValue( const Any& rValue ) } } -// ============================================================================ + ExternalLinkFragment::ExternalLinkFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath, ExternalLink& rExtLink ) : @@ -336,7 +336,7 @@ const RecordInfo* ExternalLinkFragment::getRecordInfos() const return spRecInfos; } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index c66dfc4160ba..37133efb0489 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -42,7 +42,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sheet; @@ -1764,7 +1764,7 @@ void FormulaProcessorBase::convertStringToStringList( } } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index f7d96d537d8c..1f218582bc47 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -38,7 +38,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::sheet::ReferenceFlags; @@ -46,7 +46,7 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -// ============================================================================ + namespace { @@ -2741,7 +2741,7 @@ bool BiffFormulaParserImpl::pushBiffFunction( sal_uInt16 nFuncId, sal_uInt8 nPar return pushFunctionOperator( OPCODE_NONAME, nParamCount ); } -// ============================================================================ + namespace { @@ -2902,7 +2902,7 @@ OUString FormulaParser::importMacroName( const OUString& rFormulaString ) return OUString(); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 8ec1cf59590b..a72a43645fba 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -43,7 +43,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -51,7 +51,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -// ============================================================================ + namespace { @@ -1795,7 +1795,7 @@ static const BuiltinFormatTable spBuiltinFormatTables[] = } // namespace -// ============================================================================ + NumFmtModel::NumFmtModel() : mnPredefId( -1 ) @@ -1949,7 +1949,7 @@ void NumberFormat::writeToPropertyMap( PropertyMap& rPropMap ) const rPropMap[ PROP_NumberFormat ] <<= maApiData.mnIndex; } -// ============================================================================ + NumberFormatsBuffer::NumberFormatsBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper(rHelper) @@ -2077,7 +2077,7 @@ void NumberFormatsBuffer::insertBuiltinFormats() } } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index 4b6883b614ba..2fb9aad1d4b2 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -26,7 +26,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sheet; @@ -35,7 +35,7 @@ using namespace ::com::sun::star::uno; using ::rtl::OUString; -// ============================================================================ + class OOXMLFormulaParserImpl : private FormulaFinalizer { @@ -103,7 +103,7 @@ const FunctionInfo* OOXMLFormulaParserImpl::resolveBadFuncName( const OUString& return 0; } -// ============================================================================ + Sequence< OUString > OOXMLFormulaParser_getSupportedServiceNames() { @@ -122,7 +122,7 @@ Reference< XInterface > OOXMLFormulaParser_create( const Reference< XComponentCo return static_cast< ::cppu::OWeakObject* >( new OOXMLFormulaParser ); } -// ============================================================================ + OOXMLFormulaParser::OOXMLFormulaParser() { @@ -185,7 +185,7 @@ OUString SAL_CALL OOXMLFormulaParser::printFormula( throw RuntimeException(); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index d474de7d3eea..1f504cbaccb2 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -47,7 +47,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star; using namespace ::com::sun::star::lang; @@ -55,7 +55,7 @@ using namespace ::com::sun::star::uno; using ::oox::core::Relations; -// ============================================================================ + namespace { @@ -90,7 +90,7 @@ const sal_uInt16 BIFF12_CHARTPAGESETUP_DRAFTQUALITY = 0x0020; } // namespace -// ============================================================================ + PageSettingsModel::PageSettingsModel() : mfLeftMargin( OOX_MARGIN_DEFAULT_LR ), @@ -133,7 +133,7 @@ void PageSettingsModel::setBiffPrintErrors( sal_uInt8 nPrintErrors ) mnPrintErrors = STATIC_ARRAY_SELECT( spnErrorIds, nPrintErrors, XML_none ); } -// ============================================================================ + PageSettings::PageSettings( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) @@ -331,8 +331,8 @@ void PageSettings::importPictureData( const Relations& rRelations, const OUStrin maModel.maGraphicUrl = getBaseFilter().getGraphicHelper().importEmbeddedGraphicObject( aPicturePath ); } -// ============================================================================ -// ============================================================================ + + enum HFPortionId { @@ -369,7 +369,7 @@ bool HFPortionInfo::initialize( const Reference<text::XText>& rxText ) return bRet; } -// ============================================================================ + class HeaderFooterParser : public WorkbookHelper { @@ -879,7 +879,7 @@ void HeaderFooterParser::setNewPortion( HFPortionId ePortion ) } } -// ============================================================================ + @@ -1063,7 +1063,7 @@ sal_Int32 PageSettingsConverter::writeHeaderFooter( return nHeight; } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index c09abc4ae584..3cd2d9036082 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -44,7 +44,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; @@ -54,7 +54,7 @@ using namespace ::com::sun::star::util; using ::oox::core::Relations; -// ============================================================================ + namespace { @@ -151,7 +151,7 @@ void lclAdjustBinDateTime( css::util::DateTime& orDateTime ) } // namespace -// ============================================================================ + PivotCacheItem::PivotCacheItem() : mnType( XML_m ), mbUnused( false ) @@ -424,7 +424,7 @@ void PivotCacheItemList::importArray( SequenceInputStream& rStrm ) } } -// ============================================================================ + PCFieldModel::PCFieldModel() : mnNumFmtId( 0 ), @@ -1033,7 +1033,7 @@ void PivotCacheField::writeSharedItemToSourceDataCell( writeItemToSourceDataCell( rSheetHelper, nCol, nRow, *pCacheItem ); } -// ============================================================================ + PCDefinitionModel::PCDefinitionModel() : mfRefreshedDate( 0.0 ), @@ -1396,7 +1396,7 @@ void PivotCache::updateSourceDataRow( WorksheetHelper& rSheetHelper, sal_Int32 n } } -// ============================================================================ + PivotCacheBuffer::PivotCacheBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -1484,7 +1484,7 @@ PivotCache& PivotCacheBuffer::createPivotCache( sal_Int32 nCacheId ) return *rxCache; } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx index 0b1bee51db88..f9d860d64d13 100644 --- a/sc/source/filter/oox/pivotcachefragment.cxx +++ b/sc/source/filter/oox/pivotcachefragment.cxx @@ -27,13 +27,13 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::uno; using namespace ::oox::core; -// ============================================================================ + PivotCacheFieldContext::PivotCacheFieldContext( WorkbookFragmentBase& rFragment, PivotCacheField& rCacheField ) : WorkbookContextBase( rFragment ), @@ -106,7 +106,7 @@ void PivotCacheFieldContext::onStartRecord( SequenceInputStream& rStrm ) mrCacheField.importPCDField( rStrm ); } -// ============================================================================ + PivotCacheDefinitionFragment::PivotCacheDefinitionFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath, PivotCache& rPivotCache ) : @@ -208,7 +208,7 @@ void PivotCacheDefinitionFragment::finalizeImport() } } -// ============================================================================ + PivotCacheRecordsFragment::PivotCacheRecordsFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath, const PivotCache& rPivotCache ) : @@ -323,8 +323,8 @@ void PivotCacheRecordsFragment::importPCRecordItem( sal_Int32 nRecId, SequenceIn } } -// ============================================================================ -// ============================================================================ + + namespace { @@ -383,7 +383,7 @@ bool BiffPivotCacheFragment::importFragment() return rStrm.getRecId() == BIFF_ID_EOF; } -// ============================================================================ + BiffPivotCacheRecordsContext::BiffPivotCacheRecordsContext( const WorksheetHelper& rHelper, const PivotCache& rPivotCache ) : BiffWorksheetContextBase( rHelper ), @@ -460,7 +460,7 @@ void BiffPivotCacheRecordsContext::startNextRow() mbInRow = true; } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index 0579cd322180..72a7c06b6661 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -52,7 +52,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; @@ -61,7 +61,7 @@ using namespace ::com::sun::star::uno; using namespace com::sun::star; -// ============================================================================ + namespace { @@ -158,7 +158,7 @@ const sal_uInt8 BIFF12_PTDEF_COLAXIS = 2; } // namespace -// ============================================================================ + PTFieldItemModel::PTFieldItemModel() : mnCacheItem( -1 ), @@ -747,7 +747,7 @@ Reference< XDataPilotField > PivotTableField::convertRowColPageField( sal_Int32 return xDPField; } -// ============================================================================ + PTFilterModel::PTFilterModel() : mfValue( 0.0 ), @@ -865,7 +865,7 @@ void PivotTableFilter::finalizeImport() } } -// ============================================================================ + PTDefinitionModel::PTDefinitionModel() : mnCacheId( -1 ), @@ -1345,7 +1345,7 @@ void PivotTable::importFields( IndexVector& orFields, SequenceInputStream& rStrm orFields.push_back( rStrm.readInt32() ); } -// ============================================================================ + PivotTableBuffer::PivotTableBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -1364,7 +1364,7 @@ void PivotTableBuffer::finalizeImport() maTables.forEachMem( &PivotTable::finalizeImport ); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx index efe077394338..c211b870bea1 100644 --- a/sc/source/filter/oox/pivottablefragment.cxx +++ b/sc/source/filter/oox/pivottablefragment.cxx @@ -25,12 +25,12 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::oox::core; -// ============================================================================ + PivotTableFieldContext::PivotTableFieldContext( WorksheetFragmentBase& rFragment, PivotTableField& rTableField ) : WorksheetContextBase( rFragment ), @@ -110,7 +110,7 @@ void PivotTableFieldContext::onStartRecord( SequenceInputStream& rStrm ) mrTableField.importPTField( rStrm ); } -// ============================================================================ + PivotTableFilterContext::PivotTableFilterContext( WorksheetFragmentBase& rFragment, PivotTableFilter& rTableFilter ) : WorksheetContextBase( rFragment ), @@ -164,7 +164,7 @@ void PivotTableFilterContext::onStartRecord( SequenceInputStream& rStrm ) mrTableFilter.importPTFilter( rStrm ); } -// ============================================================================ + PivotTableFragment::PivotTableFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), @@ -282,7 +282,7 @@ const RecordInfo* PivotTableFragment::getRecordInfos() const return spRecInfos; } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index feaecbbaa25c..362308cf095d 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -33,7 +33,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; @@ -41,7 +41,7 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -// ============================================================================ + namespace { @@ -132,7 +132,7 @@ Reference< XAreaLink > lclFindAreaLink( } // namespace -// ============================================================================ + QueryTableModel::QueryTableModel() : mnConnId( -1 ), @@ -268,7 +268,7 @@ void QueryTable::finalizeImport() } } -// ============================================================================ + QueryTableBuffer::QueryTableBuffer( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) @@ -287,7 +287,7 @@ void QueryTableBuffer::finalizeImport() maQueryTables.forEachMem( &QueryTable::finalizeImport ); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/querytablefragment.cxx b/sc/source/filter/oox/querytablefragment.cxx index 8ab45e52d0fb..dbd51f41a748 100644 --- a/sc/source/filter/oox/querytablefragment.cxx +++ b/sc/source/filter/oox/querytablefragment.cxx @@ -25,12 +25,12 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::oox::core; -// ============================================================================ + QueryTableFragment::QueryTableFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), @@ -73,7 +73,7 @@ const RecordInfo* QueryTableFragment::getRecordInfos() const return spRecInfos; } -// ============================================================================ + } // namespace xls diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index 5a73c08f5d19..d95da34b2ccf 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -30,13 +30,13 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; -// ============================================================================ + namespace { @@ -50,7 +50,7 @@ inline bool lclNeedsRichTextFormat( const Font* pFont ) } // namespace -// ============================================================================ + RichStringPortion::RichStringPortion( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), @@ -195,7 +195,7 @@ void FontPortionModelList::importPortions( SequenceInputStream& rStrm ) } } -// ============================================================================ + PhoneticDataModel::PhoneticDataModel() : mnFontId( -1 ), @@ -244,7 +244,7 @@ void PhoneticSettings::importStringData( SequenceInputStream& rStrm ) maModel.setBiffData( extractValue< sal_Int32 >( nFlags, 0, 2 ), extractValue< sal_Int32 >( nFlags, 2, 2 ) ); } -// ============================================================================ + RichStringPhonetic::RichStringPhonetic( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), @@ -314,7 +314,7 @@ void PhoneticPortionModelList::importPortions( SequenceInputStream& rStrm ) } } -// ============================================================================ + RichString::RichString( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), @@ -500,7 +500,7 @@ void RichString::createPhoneticPortions( const OUString& rText, PhoneticPortionM } } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/richstringcontext.cxx b/sc/source/filter/oox/richstringcontext.cxx index 7d83ead8c62b..ad8ebf32dbaf 100644 --- a/sc/source/filter/oox/richstringcontext.cxx +++ b/sc/source/filter/oox/richstringcontext.cxx @@ -24,11 +24,11 @@ namespace oox { namespace xls { -// ============================================================================ + using ::oox::core::ContextHandlerRef; -// ============================================================================ + ContextHandlerRef RichStringContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { @@ -90,7 +90,7 @@ void RichStringContext::onCharacters( const OUString& rChars ) } } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx index ed8801e4108a..62004a87ae77 100644 --- a/sc/source/filter/oox/scenariobuffer.cxx +++ b/sc/source/filter/oox/scenariobuffer.cxx @@ -35,14 +35,14 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -// ============================================================================ + ScenarioCellModel::ScenarioCellModel() : mnNumFmtId( 0 ), @@ -158,7 +158,7 @@ void Scenario::finalizeImport() } } -// ============================================================================ + SheetScenariosModel::SheetScenariosModel() : mnCurrent( 0 ), @@ -210,7 +210,7 @@ void SheetScenarios::finalizeImport() } } -// ============================================================================ + ScenarioBuffer::ScenarioBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -230,7 +230,7 @@ void ScenarioBuffer::finalizeImport() maSheetScenarios.forEachMem( &SheetScenarios::finalizeImport ); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/scenariocontext.cxx b/sc/source/filter/oox/scenariocontext.cxx index 466b6d1dc451..db921cc9ec0d 100644 --- a/sc/source/filter/oox/scenariocontext.cxx +++ b/sc/source/filter/oox/scenariocontext.cxx @@ -24,11 +24,11 @@ namespace oox { namespace xls { -// ============================================================================ + using ::oox::core::ContextHandlerRef; -// ============================================================================ + ScenarioContext::ScenarioContext( WorksheetContextBase& rParent, SheetScenarios& rSheetScenarios ) : WorksheetContextBase( rParent ), @@ -70,7 +70,7 @@ void ScenarioContext::onStartRecord( SequenceInputStream& rStrm ) mrScenario.importScenario( rStrm ); } -// ============================================================================ + ScenariosContext::ScenariosContext( WorksheetFragmentBase& rFragment ) : WorksheetContextBase( rFragment ), @@ -112,7 +112,7 @@ void ScenariosContext::onStartRecord( SequenceInputStream& rStrm ) mrSheetScenarios.importScenarios( rStrm ); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/sharedstringsbuffer.cxx b/sc/source/filter/oox/sharedstringsbuffer.cxx index cbe4f814c8b3..59951c3bc522 100644 --- a/sc/source/filter/oox/sharedstringsbuffer.cxx +++ b/sc/source/filter/oox/sharedstringsbuffer.cxx @@ -24,12 +24,12 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; -// ============================================================================ + SharedStringsBuffer::SharedStringsBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -53,7 +53,7 @@ RichStringRef SharedStringsBuffer::getString( sal_Int32 nStringId ) const return maStrings.get( nStringId ); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/sharedstringsfragment.cxx b/sc/source/filter/oox/sharedstringsfragment.cxx index 09f7b50610f6..19fdf3c551c8 100644 --- a/sc/source/filter/oox/sharedstringsfragment.cxx +++ b/sc/source/filter/oox/sharedstringsfragment.cxx @@ -25,12 +25,12 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::oox::core; -// ============================================================================ + SharedStringsFragment::SharedStringsFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : @@ -87,7 +87,7 @@ void SharedStringsFragment::finalizeImport() getSharedStrings().finalizeImport(); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 668a74ebec30..b7db26de045c 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -58,7 +58,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sheet; @@ -68,7 +68,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -// ============================================================================ + CellModel::CellModel() : mnCellType( XML_TOKEN_INVALID ), @@ -111,7 +111,7 @@ DataTableModel::DataTableModel() : { } -// ============================================================================ + CellBlockBuffer::CellBlockBuffer( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), @@ -131,7 +131,7 @@ void CellBlockBuffer::finalizeImport() { } -// ============================================================================ + SheetDataBuffer::SheetDataBuffer( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx index c22930f3feb6..43c15bb7a726 100644 --- a/sc/source/filter/oox/sheetdatacontext.cxx +++ b/sc/source/filter/oox/sheetdatacontext.cxx @@ -34,7 +34,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; @@ -43,7 +43,7 @@ using namespace ::com::sun::star::uno; using ::oox::core::ContextHandlerRef; -// ============================================================================ + namespace { @@ -66,7 +66,7 @@ const sal_uInt8 BIFF12_ROW_SHOWPHONETIC = 0x01; } // namespace -// ============================================================================ + SheetDataContextBase::SheetDataContextBase( const WorksheetHelper& rHelper ) : mrAddressConv( rHelper.getAddressConverter() ), @@ -80,7 +80,7 @@ SheetDataContextBase::~SheetDataContextBase() { } -// ============================================================================ + SheetDataContext::SheetDataContext( WorksheetFragmentBase& rFragment ) : WorksheetContextBase( rFragment ), diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 13bc1f8be438..915fb92c6b71 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -82,7 +82,7 @@ using ::com::sun::star::table::BorderLine2; namespace oox { namespace xls { -// ============================================================================ + using namespace com::sun::star; using namespace ::com::sun::star::awt; @@ -94,7 +94,7 @@ using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; -// ============================================================================ + namespace { @@ -224,7 +224,7 @@ sal_Int32 lclReadRgbColor( BinaryInputStream& rStrm ) } // namespace -// ============================================================================ + ExcelGraphicHelper::ExcelGraphicHelper( const WorkbookHelper& rHelper ) : GraphicHelper( rHelper.getBaseFilter().getComponentContext(), rHelper.getBaseFilter().getTargetFrame(), rHelper.getBaseFilter().getStorage() ), @@ -244,7 +244,7 @@ sal_Int32 ExcelGraphicHelper::getPaletteColor( sal_Int32 nPaletteIdx ) const return getStyles().getPaletteColor( nPaletteIdx ); } -// ============================================================================ + void Color::setAuto() { @@ -341,7 +341,7 @@ SequenceInputStream& operator>>( SequenceInputStream& rStrm, Color& orColor ) return rStrm; } -// ============================================================================ + namespace { @@ -470,7 +470,7 @@ void ColorPalette::appendColor( sal_Int32 nRGBValue ) ++mnAppendIndex; } -// ============================================================================ + namespace { @@ -597,7 +597,7 @@ ApiFontData::ApiFontData() : maLatinFont.maName = maDesc.Name; } -// ============================================================================ + Font::Font( const WorkbookHelper& rHelper, bool bDxf ) : WorkbookHelper( rHelper ), @@ -1117,7 +1117,7 @@ void Font::writeToPropertySet( PropertySet& rPropSet, FontPropertyType ePropType rPropSet.setProperties( aPropMap ); } -// ============================================================================ + AlignmentModel::AlignmentModel() : mnHorAlign( XML_general ), @@ -1177,7 +1177,7 @@ bool operator==( const ApiAlignmentData& rLeft, const ApiAlignmentData& rRight ) (rLeft.mbShrink == rRight.mbShrink); } -// ============================================================================ + Alignment::Alignment( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -1391,7 +1391,7 @@ void Alignment::writeToPropertyMap( PropertyMap& rPropMap ) const rPropMap[ PROP_ShrinkToFit ] <<= maApiData.mbShrink; } -// ============================================================================ + ProtectionModel::ProtectionModel() : mbLocked( true ), // default in Excel and Calc @@ -1415,7 +1415,7 @@ bool operator==( const ApiProtectionData& rLeft, const ApiProtectionData& rRight (rLeft.maCellProt.IsPrintHidden == rRight.maCellProt.IsPrintHidden); } -// ============================================================================ + Protection::Protection( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -1450,7 +1450,7 @@ void Protection::fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) const ScfTools::PutItem( rItemSet, ScProtectionAttr( maApiData.maCellProt.IsLocked, maApiData.maCellProt.IsFormulaHidden ), bSkipPoolDefs ); } -// ============================================================================ + namespace { @@ -1534,7 +1534,7 @@ bool operator==( const ApiBorderData& rLeft, const ApiBorderData& rRight ) (rLeft.mbDiagUsed == rRight.mbDiagUsed); } -// ============================================================================ + namespace { @@ -1757,7 +1757,7 @@ bool Border::convertBorderLine( BorderLine2& rBorderLine, const BorderLineModel& } -// ============================================================================ + PatternFillModel::PatternFillModel( bool bDxf ) : mnPattern( XML_none ), @@ -1834,7 +1834,7 @@ bool operator==( const ApiSolidFillData& rLeft, const ApiSolidFillData& rRight ) (rLeft.mbUsed == rRight.mbUsed); } -// ============================================================================ + namespace { @@ -2084,7 +2084,7 @@ void Fill::writeToPropertyMap( PropertyMap& rPropMap ) const } } -// ============================================================================ + XfModel::XfModel() : mnStyleXfId( -1 ), @@ -2102,7 +2102,7 @@ XfModel::XfModel() : { } -// ============================================================================ + Xf::Xf( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), @@ -2367,7 +2367,7 @@ Xf::createPattern( bool bSkipPoolDefs ) return *mpPattern; } -// ============================================================================ + Dxf::Dxf( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -2491,7 +2491,7 @@ void Dxf::fillToItemSet( SfxItemSet& rSet ) const mxFill->fillToItemSet(rSet); } -// ============================================================================ + namespace { @@ -2600,7 +2600,7 @@ bool CellStyleModel::isDefaultStyle() const return mbBuiltin && (mnBuiltinId == OOX_STYLE_NORMAL); } -// ============================================================================ + CellStyle::CellStyle( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), @@ -2681,7 +2681,7 @@ void CellStyle::finalizeImport( const OUString& rFinalName ) createCellStyle(); } -// ============================================================================ + CellStyleBuffer::CellStyleBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -2852,7 +2852,7 @@ OUString CellStyleBuffer::createCellStyle( const CellStyleRef& rxCellStyle ) con return lclGetBuiltinStyleName( OOX_STYLE_NORMAL, OUString() ); } -// ============================================================================ + AutoFormatModel::AutoFormatModel() : mnAutoFormatId( 0 ), @@ -2865,7 +2865,7 @@ AutoFormatModel::AutoFormatModel() : { } -// ============================================================================ + StylesBuffer::StylesBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), diff --git a/sc/source/filter/oox/stylesfragment.cxx b/sc/source/filter/oox/stylesfragment.cxx index ee21b2a07877..bc06d4fb9db7 100644 --- a/sc/source/filter/oox/stylesfragment.cxx +++ b/sc/source/filter/oox/stylesfragment.cxx @@ -24,12 +24,12 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::oox::core; -// ============================================================================ + IndexedColorsContext::IndexedColorsContext( WorkbookFragmentBase& rFragment ) : WorkbookContextBase( rFragment ) @@ -58,7 +58,7 @@ ContextHandlerRef IndexedColorsContext::onCreateRecordContext( sal_Int32 nRecId, return 0; } -// ============================================================================ + ContextHandlerRef FontContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { @@ -67,7 +67,7 @@ ContextHandlerRef FontContext::onCreateContext( sal_Int32 nElement, const Attrib return 0; } -// ============================================================================ + void BorderContext::onStartElement( const AttributeList& rAttribs ) { @@ -90,7 +90,7 @@ ContextHandlerRef BorderContext::onCreateContext( sal_Int32 nElement, const Attr return 0; } -// ============================================================================ + ContextHandlerRef FillContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { @@ -125,7 +125,7 @@ ContextHandlerRef FillContext::onCreateContext( sal_Int32 nElement, const Attrib return 0; } -// ============================================================================ + void XfContext::onStartElement( const AttributeList& rAttribs ) { @@ -148,7 +148,7 @@ ContextHandlerRef XfContext::onCreateContext( sal_Int32 nElement, const Attribut return 0; } -// ============================================================================ + ContextHandlerRef DxfContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { @@ -172,7 +172,7 @@ ContextHandlerRef DxfContext::onCreateContext( sal_Int32 nElement, const Attribu return 0; } -// ============================================================================ + StylesFragment::StylesFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : WorkbookFragmentBase( rHelper, rFragmentPath ) @@ -314,7 +314,7 @@ void StylesFragment::finalizeImport() getStyles().finalizeImport(); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx index 4dc61a06c137..ee1a0fe46c60 100644 --- a/sc/source/filter/oox/tablebuffer.cxx +++ b/sc/source/filter/oox/tablebuffer.cxx @@ -30,14 +30,14 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; -// ============================================================================ + TableModel::TableModel() : mnId( -1 ), @@ -47,7 +47,7 @@ TableModel::TableModel() : { } -// ============================================================================ + Table::Table( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), @@ -123,7 +123,7 @@ void Table::applyAutoFilters() } } -// ============================================================================ + TableBuffer::TableBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -176,7 +176,7 @@ void TableBuffer::insertTableToMaps( const TableRef& rxTable ) } } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/tablefragment.cxx b/sc/source/filter/oox/tablefragment.cxx index 334f29c13ff8..0e4148294a2d 100644 --- a/sc/source/filter/oox/tablefragment.cxx +++ b/sc/source/filter/oox/tablefragment.cxx @@ -26,12 +26,12 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::oox::core; -// ============================================================================ + TableFragment::TableFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), @@ -91,7 +91,7 @@ const RecordInfo* TableFragment::getRecordInfos() const return spRecInfos; } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/themebuffer.cxx b/sc/source/filter/oox/themebuffer.cxx index 1970ce846f31..cc80aa0e41eb 100644 --- a/sc/source/filter/oox/themebuffer.cxx +++ b/sc/source/filter/oox/themebuffer.cxx @@ -24,11 +24,11 @@ namespace oox { namespace xls { -// ============================================================================ + using ::oox::drawingml::ClrScheme; -// ============================================================================ + ThemeBuffer::ThemeBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), @@ -60,7 +60,7 @@ sal_Int32 ThemeBuffer::getColorByToken( sal_Int32 nToken ) const return getClrScheme().getColor( nToken, nColor ) ? nColor : API_RGB_TRANSPARENT; } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/threadpool.cxx b/sc/source/filter/oox/threadpool.cxx index 834966109de7..d02095b81ff6 100644 --- a/sc/source/filter/oox/threadpool.cxx +++ b/sc/source/filter/oox/threadpool.cxx @@ -58,7 +58,7 @@ public: return pRet; } - // + // Why a condition per worker thread - you may ask. // // Unfortunately the Windows synchronisation API that we wrap @@ -67,7 +67,7 @@ public: // The existing osl::Condition API should only ever be used // between one producer and one consumer thread to avoid the // lost wakeup problem. - // + void signalNewWork() { maNewWork.set(); diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx index 6428a627cd2f..30b4c9e8ea4c 100644 --- a/sc/source/filter/oox/unitconverter.cxx +++ b/sc/source/filter/oox/unitconverter.cxx @@ -34,14 +34,14 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; -// ============================================================================ + namespace { @@ -237,7 +237,7 @@ double UnitConverter::getCoefficient( Unit eUnit ) const return maCoeffs[ static_cast< size_t >( eUnit ) ]; } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx index 62e5d437aec0..c4c7d50ababb 100644 --- a/sc/source/filter/oox/viewsettings.cxx +++ b/sc/source/filter/oox/viewsettings.cxx @@ -42,7 +42,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::awt; using namespace ::com::sun::star::container; @@ -52,7 +52,7 @@ using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; -// ============================================================================ + namespace { @@ -109,7 +109,7 @@ sal_Int32 lclGetOoxPaneId( sal_Int32 nBiffPaneId, sal_Int32 nDefaultPaneId ) } // namespace -// ============================================================================ + PaneSelectionModel::PaneSelectionModel() : mnActiveCellId( 0 ) @@ -460,7 +460,7 @@ SheetViewModelRef SheetViewSettings::createSheetView() return xModel; } -// ============================================================================ + WorkbookViewModel::WorkbookViewModel() : mnWinX( 0 ), @@ -633,7 +633,7 @@ WorkbookViewModel& ViewSettings::createWorkbookView() return *xModel; } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 5342fde0401b..149ad06d9768 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -67,7 +67,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::io; using namespace ::com::sun::star::table; @@ -77,7 +77,7 @@ using namespace ::oox::core; using ::oox::drawingml::ThemeFragmentHandler; -// ============================================================================ + namespace { @@ -85,7 +85,7 @@ const double PROGRESS_LENGTH_GLOBALS = 0.1; /// 10% of progress bar } // namespace -// ============================================================================ + WorkbookFragment::WorkbookFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : WorkbookFragmentBase( rHelper, rFragmentPath ) diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 0a9c770614bb..8039f7bcbac7 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -90,7 +90,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::awt; using namespace ::com::sun::star::container; @@ -106,7 +106,7 @@ using ::oox::core::FragmentHandler; using ::oox::core::XmlFilterBase; using ::oox::drawingml::Theme; -// ============================================================================ + bool IgnoreCaseCompare::operator()( const OUString& rName1, const OUString& rName2 ) const { @@ -115,7 +115,7 @@ bool IgnoreCaseCompare::operator()( const OUString& rName1, const OUString& rNam rName1.getStr(), rName1.getLength(), rName2.getStr(), rName2.getLength() ) < 0; } -// ============================================================================ + class WorkbookGlobals : boost::noncopyable { @@ -707,7 +707,7 @@ void WorkbookGlobals::recalcFormulaCells() rDoc.CalcFormulaTree(false, true, false); } -// ============================================================================ + WorkbookHelper::~WorkbookHelper() { @@ -1034,7 +1034,7 @@ BiffCodecHelper& WorkbookHelper::getCodecHelper() const return mrBookGlob.getCodecHelper(); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx index ba0576111f4c..53cedc8d354a 100644 --- a/sc/source/filter/oox/workbooksettings.cxx +++ b/sc/source/filter/oox/workbooksettings.cxx @@ -34,7 +34,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sheet; @@ -43,7 +43,7 @@ using namespace ::com::sun::star::util; using ::oox::core::CodecHelper; -// ============================================================================ + namespace { @@ -65,7 +65,7 @@ const sal_Int16 API_SHOWMODE_PLACEHOLDER = 2; /// Show placeholder } // namespace -// ============================================================================ + FileSharingModel::FileSharingModel() : mnPasswordHash( 0 ), @@ -73,7 +73,7 @@ FileSharingModel::FileSharingModel() : { } -// ============================================================================ + WorkbookSettingsModel::WorkbookSettingsModel() : mnShowObjectMode( XML_all ), @@ -91,7 +91,7 @@ void WorkbookSettingsModel::setBiffObjectMode( sal_uInt16 nObjMode ) mnShowObjectMode = STATIC_ARRAY_SELECT( spnObjModes, nObjMode, XML_all ); } -// ============================================================================ + CalcSettingsModel::CalcSettingsModel() : mfIterateDelta( 0.001 ), @@ -109,7 +109,7 @@ CalcSettingsModel::CalcSettingsModel() : { } -// ============================================================================ + WorkbookSettings::WorkbookSettings( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -276,7 +276,7 @@ void WorkbookSettings::setDateMode( bool bDateMode1904, bool bDateCompatibility getUnitConverter().finalizeNullDate( getNullDate() ); } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index 53f45b9c4bb0..a0f0cafafba3 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -37,14 +37,14 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; -// ============================================================================ + SheetInfoModel::SheetInfoModel() : mnBiffHandle( -1 ), @@ -53,7 +53,7 @@ SheetInfoModel::SheetInfoModel() : { } -// ============================================================================ + WorksheetBuffer::WorksheetBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -221,7 +221,7 @@ void WorksheetBuffer::insertSheet( const SheetInfoModel& rModel ) maSheetInfosByName[ lclQuoteName( rModel.maName ) ] = xSheetInfo; } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index 9ad408a8bf92..cd46a2aabae8 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -47,14 +47,14 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace ::oox::core; -// ============================================================================ + namespace { @@ -80,7 +80,7 @@ const sal_uInt16 BIFF12_OLEOBJECT_AUTOLOAD = 0x0002; } // namespace -// ============================================================================ + DataValidationsContext::DataValidationsContext( WorksheetFragmentBase& rFragment ) : WorksheetContextBase( rFragment ) @@ -197,7 +197,7 @@ void DataValidationsContext::importDataValidation( SequenceInputStream& rStrm ) setValidation( aModel ); } -// ============================================================================ + WorksheetFragment::WorksheetFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ) diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 0061e6d1c52f..32cff08bf2e1 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -81,7 +81,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star; using namespace ::com::sun::star::beans; @@ -94,7 +94,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -// ============================================================================ + namespace { @@ -106,8 +106,8 @@ void lclUpdateProgressBar( const ISegmentProgressBarRef& rxProgressBar, double f } // namespace -// ============================================================================ -// ============================================================================ + + ColumnModel::ColumnModel() : maRange( -1 ), @@ -215,8 +215,8 @@ void ValidationModel::setBiffErrorStyle( sal_uInt8 nErrorStyle ) mnErrorStyle = STATIC_ARRAY_SELECT( spnErrorStyles, nErrorStyle, XML_stop ); } -// ============================================================================ -// ============================================================================ + + class WorksheetGlobals : public WorkbookHelper, public IWorksheetProgress { @@ -1377,8 +1377,8 @@ void WorksheetGlobals::finalizeDrawings() } } -// ============================================================================ -// ============================================================================ + + WorksheetHelper::WorksheetHelper( WorksheetGlobals& rSheetGlob ) : WorkbookHelper( rSheetGlob ), @@ -1639,8 +1639,8 @@ void WorksheetHelper::createSharedFormulaMapEntry( getFormulaBuffer().createSharedFormulaMapEntry(rAddress, rRange, nSharedId, rTokens); } -// ============================================================================ -// ============================================================================ + + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx index ddaf69a6857b..906df7b47a69 100644 --- a/sc/source/filter/oox/worksheetsettings.cxx +++ b/sc/source/filter/oox/worksheetsettings.cxx @@ -32,7 +32,7 @@ namespace oox { namespace xls { -// ============================================================================ + using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; @@ -40,7 +40,7 @@ using namespace ::com::sun::star::util; using ::oox::core::CodecHelper; -// ============================================================================ + namespace { @@ -53,7 +53,7 @@ const sal_uInt16 BIFF_SHEETPR_FITTOPAGES = 0x0100; } // namespace -// ============================================================================ + SheetSettingsModel::SheetSettingsModel() : mbFilterMode( false ), @@ -63,7 +63,7 @@ SheetSettingsModel::SheetSettingsModel() : { } -// ============================================================================ + SheetProtectionModel::SheetProtectionModel() : mnPasswordHash( 0 ), @@ -86,7 +86,7 @@ SheetProtectionModel::SheetProtectionModel() : { } -// ============================================================================ + WorksheetSettings::WorksheetSettings( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), @@ -254,7 +254,7 @@ void WorksheetSettings::finalizeImport() } } -// ============================================================================ + } // namespace xls } // namespace oox diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index 870d80aaca81..88616d3979df 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -911,9 +911,9 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) if ( pRepeatRow || pRepeatCol ) { - // + // an allen Tabellen setzen - // + for ( SCTAB nTab = 0, nTabCount = pDoc->GetTableCount(); nTab < nTabCount; ++nTab ) { pDoc->SetRepeatColRange( nTab, pRepeatCol ); diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx index cc05e719a9ec..82282f7fa6c3 100644 --- a/sc/source/filter/starcalc/scfobj.cxx +++ b/sc/source/filter/starcalc/scfobj.cxx @@ -43,7 +43,7 @@ using namespace com::sun::star; // STATIC DATA ----------------------------------------------------------- -//================================================================== + void Sc10InsertObject::InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rectangle& rRect, SCTAB nSrcTab, sal_uInt16 nX1, sal_uInt16 nY1, sal_uInt16 nX2, sal_uInt16 nY2 ) diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index b7f557a20f80..fcef451a1fa1 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -75,7 +75,7 @@ using ::com::sun::star::io::XOutputStream; using ::com::sun::star::script::ScriptEventDescriptor; using ::com::sun::star::script::XEventAttacherManager; -// ============================================================================ + XclEscherExGlobal::XclEscherExGlobal( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) @@ -95,7 +95,7 @@ SvStream* XclEscherExGlobal::ImplQueryPictureStream() return mxPicStrm.get(); } -// ============================================================================ + XclEscherEx::XclEscherEx( const XclExpRoot& rRoot, XclExpObjectManager& rObjMgr, SvStream& rStrm, const XclEscherEx* pParent ) : EscherEx( pParent ? pParent->mxGlobal : EscherExGlobalRef( new XclEscherExGlobal( rRoot ) ), &rStrm ), @@ -527,7 +527,7 @@ void XclEscherEx::DeleteCurrAppData() } } -// ============================================================================ + // --- class XclEscherClientData ------------------------------------- diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 0477d32aa531..d3a9b5b706dd 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -90,7 +90,7 @@ using ::oox::drawingml::ShapeExport; using ::oox::vml::VMLExport; using namespace oox; -// ============================================================================ + sal_Int32 XclExpObjList::mnDrawingMLCount; sal_Int32 XclExpObjList::mnVmlCount; @@ -1411,7 +1411,7 @@ sal_Size ExcEScenarioManager::GetLen() const return 8; } -// ============================================================================ + struct XclExpTabProtectOption { @@ -1477,7 +1477,7 @@ void XclExpSheetProtectOptions::WriteBody( XclExpStream& rStrm ) rStrm << nBytes; } -// ============================================================================ + @@ -1582,7 +1582,7 @@ void XclDelta::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } -// ============================================================================ + XclExpFileEncryption::XclExpFileEncryption( const XclExpRoot& rRoot ) : XclExpRecord(0x002F, 54), @@ -1620,7 +1620,7 @@ void XclExpFileEncryption::WriteBody( XclExpStream& rStrm ) rStrm.SetEncrypter(xEnc); } -// ============================================================================ + XclExpInterfaceHdr::XclExpInterfaceHdr( sal_uInt16 nCodePage ) : XclExpUInt16Record( EXC_ID_INTERFACEHDR, nCodePage ) @@ -1633,7 +1633,7 @@ void XclExpInterfaceHdr::WriteBody( XclExpStream& rStrm ) rStrm << GetValue(); } -// ============================================================================ + XclExpInterfaceEnd::XclExpInterfaceEnd() : XclExpRecord(0x00E2, 0) {} @@ -1646,7 +1646,7 @@ void XclExpInterfaceEnd::WriteBody( XclExpStream& rStrm ) rStrm.EnableEncryption(); } -// ============================================================================ + XclExpWriteAccess::XclExpWriteAccess() : XclExpRecord(0x005C, 112) @@ -1680,7 +1680,7 @@ void XclExpWriteAccess::WriteBody( XclExpStream& rStrm ) rStrm << aData[i]; } -// ============================================================================ + XclExpFileSharing::XclExpFileSharing( const XclExpRoot& rRoot, sal_uInt16 nPasswordHash, bool bRecommendReadOnly ) : XclExpRecord( EXC_ID_FILESHARING ), @@ -1704,7 +1704,7 @@ void XclExpFileSharing::WriteBody( XclExpStream& rStrm ) rStrm << sal_uInt16( mbRecommendReadOnly ? 1 : 0 ) << mnPasswordHash << maUserName; } -// ============================================================================ + XclExpProt4Rev::XclExpProt4Rev() : XclExpRecord(0x01AF, 2) @@ -1720,7 +1720,7 @@ void XclExpProt4Rev::WriteBody( XclExpStream& rStrm ) rStrm << static_cast<sal_uInt16>(0x0000); } -// ============================================================================ + XclExpProt4RevPass::XclExpProt4RevPass() : XclExpRecord(0x01BC, 2) @@ -1736,7 +1736,7 @@ void XclExpProt4RevPass::WriteBody( XclExpStream& rStrm ) rStrm << static_cast<sal_uInt16>(0x0000); } -// ============================================================================ + static const sal_uInt8 nDataRecalcId[] = { 0xC1, 0x01, 0x00, 0x00, 0x54, 0x8D, 0x01, 0x00 @@ -1747,7 +1747,7 @@ XclExpRecalcId::XclExpRecalcId() : { } -// ============================================================================ + static const sal_uInt8 nDataBookExt[] = { 0x63, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1760,7 +1760,7 @@ XclExpBookExt::XclExpBookExt() : { } -// ============================================================================ + XclRefmode::XclRefmode( const ScDocument& rDoc ) : XclExpBoolRecord( 0x000F, rDoc.GetAddressConvention() != formula::FormulaGrammar::CONV_XL_R1C1 ) diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index 568a8dc32d2e..e71bc2b4d93f 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -25,7 +25,7 @@ class ScXMLImport; -//___________________________________________________________________ + struct ScMyImpCellRangeSource { @@ -41,7 +41,7 @@ struct ScMyImpCellRangeSource }; -//___________________________________________________________________ + class ScXMLCellRangeSourceContext : public SvXMLImportContext { diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index be1e376dae8e..49f5d6ce7ed2 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -27,7 +27,7 @@ class ScXMLImport; -//___________________________________________________________________ + class ScXMLConsolidationContext : public SvXMLImportContext { diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index b208c219be56..2c4a62b1e78a 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -363,7 +363,7 @@ void ScXMLConverter::ConvertAPIToCoreDateTime(const util::DateTime& aDateTime, D rDateTime = aTempDateTime; } -// ============================================================================ + namespace { @@ -650,6 +650,6 @@ OUString ScXMLConditionHelper::getExpression( const sal_Unicode*& rpcString, con return aExp; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx index 241151360b0a..325f7a5cf6c8 100644 --- a/sc/source/filter/xml/XMLConverter.hxx +++ b/sc/source/filter/xml/XMLConverter.hxx @@ -35,7 +35,7 @@ class ScDocument; class DateTime; -//___________________________________________________________________ + class ScXMLConverter { @@ -104,7 +104,7 @@ public: static void ConvertAPIToCoreDateTime(const com::sun::star::util::DateTime& aDateTime, DateTime& rDateTime); }; -// ============================================================================ + enum ScXMLConditionToken { @@ -124,7 +124,7 @@ enum ScXMLConditionToken XML_COND_ISTRUEFORMULA /// The 'is-true-formula' token. }; -// ---------------------------------------------------------------------------- + /** Result of an attempt to parse a single condition in a 'condition' attribute value of e.g. conditional formatting or data validation. @@ -141,7 +141,7 @@ struct ScXMLConditionParseResult sal_Int32 mnEndIndex; /// Index of first character following the condition. }; -// ---------------------------------------------------------------------------- + class ScXMLConditionHelper { @@ -161,7 +161,7 @@ private: ~ScXMLConditionHelper(); }; -// ============================================================================ + #endif diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index 9925a1362429..ef099baf3fc2 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -30,7 +30,7 @@ class ScXMLImport; -//___________________________________________________________________ + struct ScMyImpDetectiveObj { @@ -44,7 +44,7 @@ struct ScMyImpDetectiveObj typedef ::std::vector< ScMyImpDetectiveObj > ScMyImpDetectiveObjVec; -//___________________________________________________________________ + struct ScMyImpDetectiveOp { @@ -75,7 +75,7 @@ public: }; -//___________________________________________________________________ + class ScXMLDetectiveContext : public SvXMLImportContext { @@ -103,7 +103,7 @@ public: }; -//___________________________________________________________________ + class ScXMLDetectiveHighlightedContext : public SvXMLImportContext { @@ -134,7 +134,7 @@ public: }; -//___________________________________________________________________ + class ScXMLDetectiveOperationContext : public SvXMLImportContext { diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index 31d7fdca54be..edccba9a9a5a 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star; -//============================================================================== + ScMyIteratorBase::ScMyIteratorBase() { @@ -58,7 +58,7 @@ void ScMyIteratorBase::UpdateAddress( table::CellAddress& rCellAddress ) } -//============================================================================== + bool ScMyShape::operator<(const ScMyShape& aShape) const { @@ -182,7 +182,7 @@ void ScMyNoteShapesContainer::Sort() aNoteShapeList.sort(); } -//============================================================================== + bool ScMyMergedRange::operator<(const ScMyMergedRange& aRange) const { @@ -274,7 +274,7 @@ void ScMyMergedRangesContainer::Sort() aRangeList.sort(); } -//============================================================================== + bool ScMyAreaLink::Compare( const ScMyAreaLink& rAreaLink ) const { @@ -356,7 +356,7 @@ void ScMyAreaLinksContainer::Sort() aAreaLinkList.sort(); } -//============================================================================== + ScMyCellRangeAddress::ScMyCellRangeAddress(const table::CellRangeAddress& rRange) : table::CellRangeAddress(rRange) @@ -436,7 +436,7 @@ void ScMyEmptyDatabaseRangesContainer::Sort() aDatabaseList.sort(); } -//============================================================================== + bool ScMyDetectiveObj::operator<( const ScMyDetectiveObj& rDetObj) const { @@ -524,7 +524,7 @@ void ScMyDetectiveObjContainer::Sort() aDetectiveObjList.sort(); } -//============================================================================== + bool ScMyDetectiveOp::operator<( const ScMyDetectiveOp& rDetOp) const { @@ -590,7 +590,7 @@ void ScMyDetectiveOpContainer::Sort() aDetectiveOpList.sort(); } -//============================================================================== + ScMyCell::ScMyCell() : aShapeList(), @@ -614,7 +614,7 @@ ScMyCell::~ScMyCell() { } -//============================================================================== + ScMyNotEmptyCellsIterator::ScMyNotEmptyCellsIterator(ScXMLExport& rTempXMLExport) : pShapes(NULL), diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 83380ae3e03d..b03132435d88 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -44,7 +44,7 @@ struct ScMyCell; class ScXMLExport; class ScFormatRangeStyles; -//============================================================================== + class ScMyIteratorBase { @@ -61,7 +61,7 @@ public: virtual void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress ); }; -//============================================================================== + struct ScMyShape { @@ -124,7 +124,7 @@ public: void SkipTable(SCTAB nSkip); }; -//============================================================================== + struct ScMyMergedRange { @@ -153,7 +153,7 @@ public: void SkipTable(SCTAB nSkip); }; -//============================================================================== + struct ScMyAreaLink { @@ -194,7 +194,7 @@ public: void SkipTable(SCTAB nSkip); }; -//============================================================================== + struct ScMyCellRangeAddress : com::sun::star::table::CellRangeAddress { @@ -221,7 +221,7 @@ public: void SkipTable(SCTAB nSkip); }; -//============================================================================== + struct ScMyDetectiveObj { @@ -258,7 +258,7 @@ public: void SkipTable(SCTAB nSkip); }; -//============================================================================== + struct ScMyDetectiveOp { @@ -289,7 +289,7 @@ public: void SkipTable(SCTAB nSkip); }; -//============================================================================== + // contains data to export for the current cell position struct ScMyCell @@ -330,7 +330,7 @@ struct ScMyCell ~ScMyCell(); }; -//============================================================================== + class ScMyNotEmptyCellsIterator : boost::noncopyable { diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 6a50503764a4..decd8e9f294c 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -450,7 +450,7 @@ const OUString& ScMyValidationsContainer::GetValidationName(const sal_Int32 nInd return aValidationVec[nIndex].sName; } -//============================================================================== + sal_Int32 ScMyDefaultStyles::GetStyleNameIndex(const ScFormatRangeStyles* pCellStyles, const sal_Int32 nTable, const sal_Int32 nPos, @@ -686,7 +686,7 @@ void ScRowFormatRanges::Sort() aRowFormatRanges.sort(); } -// ============================================================================ + ScMyFormatRange::ScMyFormatRange() : nStyleNameIndex(-1), nValidationIndex(-1), @@ -990,7 +990,7 @@ void ScFormatRangeStyles::Sort() aTables[i]->sort(); } -//=========================================================================== + ScColumnRowStylesBase::ScColumnRowStylesBase() : aStyleNames() @@ -1051,7 +1051,7 @@ OUString* ScColumnRowStylesBase::GetStyleNameByIndex(const sal_Int32 nIndex) return aStyleNames[nIndex]; } -//=========================================================================== + ScColumnStyles::ScColumnStyles() : ScColumnRowStylesBase(), @@ -1109,7 +1109,7 @@ OUString* ScColumnStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 n return GetStyleNameByIndex(GetStyleNameIndex(nTable, nField, bTemp)); } -//=========================================================================== + ScRowStyles::Cache::Cache() : mnTable(-1), mnStart(-1), mnEnd(-1), mnStyle(-1) {} diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index cdb618e95710..22bd61250e36 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -97,7 +97,7 @@ public: const OUString& GetValidationName(const sal_Int32 nIndex); }; -//============================================================================== + struct ScMyDefaultStyle { diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx index c34b6227dd7d..0f80a8c56d5e 100644 --- a/sc/source/filter/xml/xmlexternaltabi.cxx +++ b/sc/source/filter/xml/xmlexternaltabi.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; -// ============================================================================ + ScXMLExternalRefTabSourceContext::ScXMLExternalRefTabSourceContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, @@ -124,7 +124,7 @@ void ScXMLExternalRefTabSourceContext::EndElement() pRefMgr->setFilterData(mrExternalRefInfo.mnFileId, maFilterName, maFilterOptions); } -// ============================================================================ + ScXMLExternalRefRowsContext::ScXMLExternalRefRowsContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, @@ -167,7 +167,7 @@ void ScXMLExternalRefRowsContext::EndElement() { } -// ============================================================================ + ScXMLExternalRefRowContext::ScXMLExternalRefRowContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, @@ -244,7 +244,7 @@ void ScXMLExternalRefRowContext::EndElement() mrExternalRefInfo.mnRow += mnRepeatRowCount; } -// ============================================================================ + ScXMLExternalRefCellContext::ScXMLExternalRefCellContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, @@ -397,7 +397,7 @@ void ScXMLExternalRefCellContext::SetCellString(const OUString& rStr) maCellString = rStr; } -// ============================================================================ + ScXMLExternalRefCellTextContext::ScXMLExternalRefCellTextContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index 4edf3f89dbf5..050a751d1ffa 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -53,7 +53,7 @@ private: OUString maFilterOptions; }; -// ============================================================================ + class ScXMLExternalRefRowsContext : public SvXMLImportContext { @@ -77,7 +77,7 @@ private: ScXMLExternalTabData& mrExternalRefInfo; }; -// ============================================================================ + class ScXMLExternalRefRowContext : public SvXMLImportContext { @@ -102,7 +102,7 @@ private: sal_Int32 mnRepeatRowCount; }; -// ============================================================================ + class ScXMLExternalRefCellContext : public SvXMLImportContext { @@ -136,7 +136,7 @@ private: bool mbIsEmpty; }; -// ============================================================================ + class ScXMLExternalRefCellTextContext : public SvXMLImportContext { diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index 89e7366d3179..31a0cbd069d3 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -521,7 +521,7 @@ void ScXMLSetItemContext::EndElement() { } -//========================================================================== + ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index 70b9d9517a44..3ca64e632f97 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -24,7 +24,7 @@ class ScXMLImport; -//___________________________________________________________________ + class ScXMLLabelRangesContext : public SvXMLImportContext { @@ -50,7 +50,7 @@ public: }; -//___________________________________________________________________ + class ScXMLLabelRangeContext : public SvXMLImportContext { diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index a933a1ee22c1..df8164d76a96 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -425,7 +425,7 @@ void ScXMLTableContext::EndElement() } } -// ============================================================================ + ScXMLImport& ScXMLTableProtectionContext::GetScImport() { diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index 670e29d43246..d88b504f1984 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -65,7 +65,7 @@ public: virtual void EndElement(); }; -// ============================================================================ + class ScXMLTableProtectionContext : public SvXMLImportContext { diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 73432cce6f9e..f476434571f2 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -1435,7 +1435,7 @@ ScAccessibleCsvControl* ScAccessibleCsvGrid::implCreateCellObj( sal_Int32 nRow, } -// ============================================================================ + DBG_NAME( ScAccessibleCsvCell ) @@ -1644,6 +1644,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH } SAL_WNODEPRECATED_DECLARATIONS_POP -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx index 6272dadfce61..fba49063987a 100644 --- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx @@ -572,7 +572,7 @@ Rectangle ScAccessibleDataPilotControl::GetBoundingBox(void) const } -//=============================================================================== + ScAccessibleDataPilotButton::ScAccessibleDataPilotButton( const ::com::sun::star::uno::Reference< diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index b5ab757d6b23..ff18c4a88ace 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1398,7 +1398,7 @@ void ScChildrenShapes::VisAreaChanged() const std::for_each(maZOrderedShapes.begin(), maZOrderedShapes.end(), aVisAreaChanged); } -// ============================================================================ + ScAccessibleDocument::ScAccessibleDocument( const uno::Reference<XAccessible>& rxParent, diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 496806294feb..7a538168bcd8 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -62,7 +62,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -//========================================================================= + typedef std::list< uno::Reference< XAccessible > > ScXAccList; diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index 5d64347d9155..ba055d14f976 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -51,7 +51,7 @@ using ::com::sun::star::uno::RuntimeException; using ::std::for_each; using ::std::vector; -// ============================================================================ + namespace { @@ -82,7 +82,7 @@ private: } -// ============================================================================ + ScAccessibleFilterMenu::ScAccessibleFilterMenu(const Reference<XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos) : ScAccessibleContextBase(rxParent, AccessibleRole::MENU), diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 87e533ccc353..923cfeab6811 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -45,7 +45,7 @@ #include <vcl/svapp.hxx> -// ============================================================================ + class ScViewForwarder : public SvxViewForwarder { @@ -144,7 +144,7 @@ void ScViewForwarder::SetInvalid() mpViewShell = NULL; } -// ============================================================================ + class ScEditObjectViewForwarder : public SvxViewForwarder { diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index b283f1abce44..2c93ddf3fed5 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -97,9 +97,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain bDragWasInternal( false ), nSourceDocID( 0 ) { - // + // check what kind of objects are contained - // + SdrPage* pPage = pModel->GetPage(0); if (pPage) @@ -108,9 +108,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain SdrObject* pObject = aIter.Next(); if (pObject && !aIter.Next()) // exactly one object? { - // + // OLE object - // + sal_uInt16 nSdrObjKind = pObject->GetObjIdentifier(); if (nSdrObjKind == OBJ_OLE2) @@ -127,9 +127,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain // aOleData is initialized later } - // + // Graphic object - // + if (nSdrObjKind == OBJ_GRAF) { @@ -138,9 +138,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain bGrIsBit = true; } - // + // URL button - // + SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, pObject); if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) @@ -202,9 +202,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain } } - // + // get size for object descriptor - // + // #i71538# use complete SdrViews // SdrExchangeView aView(pModel); @@ -223,9 +223,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain aObjDesc.maSize = aSrcSize; PrepareOLE( aObjDesc ); - // + // remember a unique ID of the source document - // + if ( pContainerShell ) { ScDocument* pDoc = pContainerShell->GetDocument(); @@ -719,9 +719,9 @@ SdrOle2Obj* ScDrawTransferObj::GetSingleObject() return NULL; } -// + // initialize aDocShellRef with a live document from the ClipDoc -// + void ScDrawTransferObj::InitDocShell() { diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index b629b51a810d..6a1eae25dad7 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -382,7 +382,7 @@ void ScInputHandler::DeleteRangeFinder() } } -//================================================================== + inline OUString GetEditText(EditEngine* pEng) { @@ -492,7 +492,7 @@ static sal_Int32 lcl_MatchParenthesis( const OUString& rStr, sal_Int32 nPos ) return (sal_Int32) (p - p0); } -//================================================================== + ScInputHandler::ScInputHandler() : pInputWin( NULL ), @@ -703,9 +703,9 @@ void ScInputHandler::UpdateSpellSettings( bool bFromStartTab ) } } -// + // Funktionen/Bereichsnamen etc. als Tip-Hilfe -// + // die anderen Typen sind in ScDocument::GetFormulaEntries festgelegt @@ -1303,9 +1303,9 @@ void ScInputHandler::PasteFunctionData() pActiveView->ShowCursor(); } -// + // Selektion berechnen und als Tip-Hilfe anzeigen -// + static OUString lcl_Calculate( const OUString& rFormula, ScDocument* pDoc, const ScAddress &rPos ) { @@ -1511,9 +1511,9 @@ void ScInputHandler::SkipClosingPar() --nAutoPar; } -// + // Auto-Eingabe -// + void ScInputHandler::GetColData() { @@ -1674,9 +1674,9 @@ void ScInputHandler::NextAutoEntry( bool bBack ) pActiveView->ShowCursor(); } -// + // Klammern hervorheben -// + void ScInputHandler::UpdateParenthesis() { @@ -2381,9 +2381,9 @@ void ScInputHandler::InvalidateAttribs() } } -// + // --------------- public Methoden -------------------------------------------- -// + void ScInputHandler::SetMode( ScInputMode eNewMode ) { @@ -3919,9 +3919,9 @@ void ScInputHandler::InputTurnOffWinEngine() bInOwnChange = false; } -//======================================================================== + // ScInputHdlState -//======================================================================== + ScInputHdlState::ScInputHdlState( const ScAddress& rCurPos, const ScAddress& rStartPos, diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index e9d3923fc205..7bda59d42ae4 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -117,9 +117,9 @@ ScTextWndBase::ScTextWndBase( Window* pParent, WinBits nStyle ) } } -//================================================================== + // class ScInputWindowWrapper -//================================================================== + SFX_IMPL_CHILDWINDOW_WITHID(ScInputWindowWrapper,FID_INPUTLINE_STATUS) @@ -148,7 +148,7 @@ SfxChildWinInfo ScInputWindowWrapper::GetInfo() const return aInfo; } -//================================================================== + #define IMAGE(id) pImgMgr->SeekImage(id) static bool lcl_isExperimentalMode() @@ -158,9 +158,9 @@ static bool lcl_isExperimentalMode() return true; } -//================================================================== + // class ScInputWindow -//================================================================== + static ScTextWndBase* lcl_chooseRuntimeImpl( Window* pParent, SfxBindings* pBind ) { @@ -908,9 +908,9 @@ void ScInputWindow::MouseButtonUp( const MouseEvent& rMEvt ) } -//======================================================================== + // ScInputBarGroup -//======================================================================== + ScInputBarGroup::ScInputBarGroup(Window* pParent, ScTabViewShell* pViewSh) : ScTextWndBase ( pParent, WinBits(WB_HIDE | WB_TABSTOP ) ), @@ -1157,9 +1157,9 @@ void ScInputBarGroup::TextGrabFocus() aMultiTextWnd.TextGrabFocus(); } -//======================================================================== + // ScMultiTextWnd -//======================================================================== + ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen, ScTabViewShell* pViewSh ) : @@ -1457,9 +1457,9 @@ void ScMultiTextWnd::SetTextString( const OUString& rNewString ) SetScrollBarRange(); DoScroll(); } -//======================================================================== + // ScTextWnd -//======================================================================== + ScTextWnd::ScTextWnd( Window* pParent, ScTabViewShell* pViewSh ) : ScTextWndBase ( pParent, WinBits(WB_HIDE | WB_BORDER) ), @@ -2081,9 +2081,9 @@ void ScTextWnd::TextGrabFocus() GrabFocus(); } -//======================================================================== + // Positionsfenster -//======================================================================== + ScPosWnd::ScPosWnd( Window* pParent ) : ComboBox ( pParent, WinBits(WB_HIDE | WB_DROPDOWN) ), diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index aa2e77b5bdfd..d52be0e37f7d 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -46,7 +46,7 @@ ScMessagePool::ScMessagePool() : SfxItemPool ( OUString("ScMessagePool"), MSGPOOL_START, MSGPOOL_END, aMsgItemInfos, NULL ), - // + aGlobalStringItem ( SfxStringItem ( SCITEM_STRING, OUString() ) ), aGlobalSearchItem ( SvxSearchItem ( SCITEM_SEARCHDATA ) ), aGlobalSortItem ( ScSortItem ( SCITEM_SORTDATA, NULL ) ), @@ -56,7 +56,7 @@ ScMessagePool::ScMessagePool() aGlobalPivotItem ( ScPivotItem ( SCITEM_PIVOTDATA, NULL, NULL, false ) ), aGlobalSolveItem ( ScSolveItem ( SCITEM_SOLVEDATA, NULL ) ), aGlobalUserListItem ( ScUserListItem ( SCITEM_USERLIST ) ), - // + aPrintWarnItem ( SfxBoolItem ( SCITEM_PRINTWARN, false ) ) { ppPoolDefaults = new SfxPoolItem*[MSGPOOL_END - MSGPOOL_START + 1]; diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx index b3c16f4a5245..febc7e23c55c 100644 --- a/sc/source/ui/app/rfindlst.cxx +++ b/sc/source/ui/app/rfindlst.cxx @@ -27,7 +27,7 @@ static const ColorData aColNames[SC_RANGECOLORS] = { COL_LIGHTBLUE, COL_LIGHTRED, COL_LIGHTMAGENTA, COL_GREEN, COL_BLUE, COL_RED, COL_MAGENTA, COL_BROWN }; -//================================================================== + ScRangeFindList::ScRangeFindList(const OUString& rName) : aDocName( rName ), @@ -55,6 +55,6 @@ ColorData ScRangeFindList::GetColorName( const size_t nIndex ) return aColNames[nIndex % SC_RANGECOLORS]; } -//================================================================== + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index b6773b47c007..496062b27629 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -371,9 +371,9 @@ void ScModule::DeleteCfg() } -// + // von der Applikation verschoben: -// + void ScModule::Execute( SfxRequest& rReq ) @@ -973,15 +973,15 @@ sal_uInt16 ScModule::GetOptDigitLanguage() } -// + // Optionen -// -// + + // ModifyOptions - Items aus Calc-Options-Dialog // und SID_AUTOSPELL_CHECK -// + void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) { @@ -1052,9 +1052,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - //============================================ + // DefaultsOptions - //============================================ + if (rOptSet.HasItem(SID_SCDEFAULTSOPTIONS, &pItem)) { @@ -1062,9 +1062,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) SetDefaultsOptions( rOpt ); } - //============================================ + // FormulaOptions - //============================================ + if (rOptSet.HasItem(SID_SCFORMULAOPTIONS, &pItem)) { @@ -1090,9 +1090,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - //============================================ + // ViewOptions - //============================================ + if (rOptSet.HasItem(SID_SCVIEWOPTIONS, &pItem)) { @@ -1125,10 +1125,10 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - //============================================ + // GridOptions, Auswertung nach ViewOptions, // da GridOptions Member der ViewOptions ist! - //============================================ + if ( rOptSet.HasItem(SID_ATTR_GRID_OPTIONS,&pItem) ) { @@ -1160,9 +1160,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } - //============================================ + // DocOptions - //============================================ + if ( rOptSet.HasItem(SID_SCDOCOPTIONS,&pItem) ) { @@ -1246,9 +1246,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) pBindings->Invalidate( SID_AUTOSPELL_CHECK ); } - //============================================ + // InputOptions - //============================================ + if ( rOptSet.HasItem(SID_SC_INPUT_SELECTIONPOS,&pItem) ) { @@ -1308,9 +1308,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) bSaveInputOptions = true; } - //============================================ + // PrintOptions - //============================================ + if ( rOptSet.HasItem(SID_SCPRINTOPTIONS,&pItem) ) { @@ -1418,9 +1418,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } -// + // Input-Handler -// + ScInputHandler* ScModule::GetInputHdl( ScTabViewShell* pViewSh, bool bUseRef ) @@ -1603,9 +1603,9 @@ void ScModule::ActivateInputWindow( const OUString* pStrFormula, bool bMatrix ) } -// + // Referenz - Dialoge -// + void ScModule::SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* pViewFrm ) @@ -1911,9 +1911,9 @@ void ScModule::EndReference() } -// + // Idle / Online-Spelling -// + void ScModule::AnythingChanged() @@ -2050,7 +2050,7 @@ SfxItemSet* ScModule::CreateItemSet( sal_uInt16 nId ) SID_SCPRINTOPTIONS, SID_SCPRINTOPTIONS, // TP_GRID: SID_ATTR_GRID_OPTIONS, SID_ATTR_GRID_OPTIONS, - // + SID_ATTR_METRIC, SID_ATTR_METRIC, SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP, // TP_COMPATIBILITY diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 350701ef8ae6..47d04da48901 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -130,9 +130,9 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDesc { OSL_ENSURE(pDoc->IsClipboard(), "wrong document"); - // + // get aBlock from clipboard doc - // + SCCOL nCol1; SCROW nRow1; @@ -586,9 +586,9 @@ ScMarkData ScTransferObj::GetSourceMarkData() return aMarkData; } -// + // initialize aDocShellRef with a live document from the ClipDoc -// + // #i123405# added parameter to allow size calculation without limitation // to PageSize, e.g. used for Metafile creation for clipboard. diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index 449b281c5e44..fca4f6262935 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -105,9 +105,9 @@ const std::vector<editeng::MisspellRanges>* ScInputStatusItem::GetMisspellRanges return mpMisspellRanges; } -// + // ScPaintHint ist nach schints.cxx verschoben -// + // ScTablesHint - Views anpassen, wenn Tabellen eingefuegt / geloescht diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index ca79984636cb..e86b9d884955 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -37,7 +37,7 @@ #include <editeng/flstitem.hxx> #include <sfx2/app.hxx> -//================================================================== + ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, Window* pParent, const SfxItemSet* pCellAttrs) : SfxTabDialog(pFrameP, pParent, "FormatCellsDialog", "modules/scalc/ui/formatcellsdialog.ui", pCellAttrs) diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 1802a4eaac9a..a74674ca8962 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -387,7 +387,7 @@ class ScAbstractTabDialog_Impl : public SfxAbstractTabDialog virtual OUString GetText() const; }; -//------------------------------------------------------------------------ + //AbstractDialogFactory_Impl implementations class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory { diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index e87cf53c5a0b..5e3e436460b2 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -38,9 +38,9 @@ static sal_uInt16 pProtectionRanges[] = 0 }; -//======================================================================== + // Zellschutz-Tabpage: -//======================================================================== + ScTabPageProtection::ScTabPageProtection(Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "CellProtectionPage", diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx index 5bba027c5f8b..9dddba67b4db 100644 --- a/sc/source/ui/cctrl/cbuttonw.cxx +++ b/sc/source/ui/cctrl/cbuttonw.cxx @@ -25,9 +25,9 @@ #include <vcl/settings.hxx> #include "cbutton.hxx" -//======================================================================== + // class ScDDComboBoxButton -//======================================================================== + ScDDComboBoxButton::ScDDComboBoxButton( OutputDevice* pOutputDevice ) : pOut( pOutputDevice ) diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 4fc7c08ea82b..bf9a61df65a4 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -859,7 +859,7 @@ ScDocument* ScMenuFloatingWindow::getDoc() return mpDoc; } -// ============================================================================ + ScCheckListMenuWindow::Config::Config() : mbAllowEmptySet(true), mbRTL(false) diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index 481eef06571a..8171f97b1f95 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -28,7 +28,7 @@ #include <vcl/builder.hxx> #include "global.hxx" -// ============================================================================ + namespace { @@ -44,7 +44,7 @@ sal_Unicode lclGetGroupSep() } // namespace -// ============================================================================ + ScDoubleField::ScDoubleField( Window* pParent, const ResId& rResId ) : Edit( pParent, rResId ) @@ -82,6 +82,6 @@ void ScDoubleField::SetValue( double fValue, sal_Int32 nDecPlaces, bool bEraseTr nDecPlaces, lclGetDecSep(), bEraseTrailingDecZeros ) ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index f6d1f9047ff6..6ec692a02415 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -39,9 +39,9 @@ SFX_IMPL_TOOLBOX_CONTROL( ScTbxInsertCtrl, SfxUInt16Item); -// + // ToolBox - Controller -// + ScTbxInsertCtrl::ScTbxInsertCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 8d5a26212f7f..6ad81991568e 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -35,9 +35,9 @@ #include "scitems.hxx" #include "printfun.hxx" -//======================================================================== + // class ScZoomSliderControl --------------------------------------- -//======================================================================== + @@ -140,8 +140,8 @@ const long nButtonWidth = 10; const long nButtonHeight = 10; const long nIncDecWidth = 11; const long nIncDecHeight = 11; -const long nSliderHeight = 2; // -const long nSliderWidth = 4; // +const long nSliderHeight = 2; +const long nSliderWidth = 4; const long nSnappingHeight = 4; const long nSliderXOffset = 20; const long nSnappingEpsilon = 5; // snapping epsilon in pixels diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 2720893f1552..83b4eef07ad9 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -146,9 +146,9 @@ IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit) return 0; } -// + //condition -// + namespace { void FillStyleListBox( ScDocument* pDoc, ListBox& rLbStyle ) diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index 1072a89b71be..cdfe83a26dd0 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -29,13 +29,13 @@ // ause #include "editutil.hxx" -// ============================================================================ + static const sal_Char pStrFix[] = "FIX"; static const sal_Char pStrMrg[] = "MRG"; -// ============================================================================ + ScAsciiOptions::ScAsciiOptions() : bFixedLen ( false ), diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index e8c188a2dbc5..8277afc4b63e 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -23,7 +23,7 @@ #include "AccessibleCsvControl.hxx" -// ============================================================================ + ScCsvLayoutData::ScCsvLayoutData() : mnPosCount( 1 ), @@ -60,7 +60,7 @@ ScCsvDiff ScCsvLayoutData::GetDiff( const ScCsvLayoutData& rData ) const } -// ============================================================================ + ScCsvControl::ScCsvControl( ScCsvControl& rParent ) : Control( &rParent, WB_TABSTOP | WB_NODIALOGCONTROL ), @@ -312,6 +312,6 @@ ScCsvControl::XAccessibleRef ScCsvControl::CreateAccessible() } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 485021dfe540..d0ee530ab6a7 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -45,7 +45,7 @@ // *** edit engine *** -// ============================================================================ + struct Func_SetType { @@ -64,7 +64,7 @@ struct Func_Select }; -// ============================================================================ + ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) : ScCsvControl( rParent ), @@ -1365,6 +1365,6 @@ ScAccessibleCsvControl* ScCsvGrid::ImplCreateAccessible() } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index 2f31ce13bb6d..e5a08fa6a479 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -33,12 +33,12 @@ using namespace com::sun::star::uno; -// ============================================================================ + #define SEP_PATH "Office.Calc/Dialogs/CSVImport" #define FIXED_WIDTH_LIST "FixedWidthList" -// ============================================================================ + static void load_FixedWidthList(ScCsvSplits &aSplits) { @@ -667,6 +667,6 @@ ScAccessibleCsvControl* ScCsvRuler::ImplCreateAccessible() } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxx index 2f9fdc6daf37..49c60d3ec8ad 100644 --- a/sc/source/ui/dbgui/csvsplits.cxx +++ b/sc/source/ui/dbgui/csvsplits.cxx @@ -22,7 +22,7 @@ #include <algorithm> -// ============================================================================ + bool ScCsvSplits::Insert( sal_Int32 nPos ) { @@ -102,6 +102,6 @@ sal_uInt32 ScCsvSplits::GetIterIndex( const_iterator aIter ) const } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 9551630fcb99..5cd4a45caaa8 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -25,7 +25,7 @@ // ause #include "editutil.hxx" -// ============================================================================ + ScCsvTableBox::ScCsvTableBox( Window* pParent, WinBits nBits ) : ScCsvControl( pParent, maData, nBits ), @@ -428,6 +428,6 @@ ScAccessibleCsvControl* ScCsvTableBox::ImplCreateAccessible() } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index 63a07ffd13e1..80306d7dfdd0 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -106,7 +106,7 @@ IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, RadioButton*, pBtn ) ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent, const uno::Sequence<OUString>& rServices ) : ModalDialog ( pParent, ScResId( RID_SCDLG_DAPISERVICE ) ), - // + aFlFrame ( this, ScResId( FL_FRAME ) ), aFtService ( this, ScResId( FT_SERVICE ) ), aLbService ( this, ScResId( LB_SERVICE ) ), diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 019cfe2e2d39..e5b919426340 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -29,7 +29,7 @@ #include "dbnamdlg.hxx" -//============================================================================ + #define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE @@ -45,7 +45,7 @@ static DBSaveData* pSaveObj = NULL; #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute() -//============================================================================ + // class DBSaveData class DBSaveData @@ -109,7 +109,7 @@ void DBSaveData::Restore() } -//============================================================================ + // class ScDbNameDlg @@ -389,7 +389,7 @@ bool ScDbNameDlg::IsRefInputMode() const // Handler: -// ======== + IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl) { diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index e94e2c50fc95..e545ee175f2f 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp> -// ============================================================================ + namespace { @@ -60,7 +60,7 @@ static const sal_uInt16 nDatePartResIds[] = } // namespace -// ============================================================================ + ScDPGroupEditHelper::ScDPGroupEditHelper( RadioButton& rRbAuto, RadioButton& rRbMan, Edit& rEdValue ) : mrRbAuto( rRbAuto ), @@ -157,8 +157,8 @@ void ScDPDateGroupEditHelper::ImplSetValue( double fValue ) mrEdValue.SetDate( aDate ); } -// ============================================================================ -// ============================================================================ + + ScDPNumGroupDlg::ScDPNumGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo ) : ModalDialog ( pParent, ScResId( RID_SCDLG_DPNUMGROUP ) ), @@ -214,7 +214,7 @@ ScDPNumGroupInfo ScDPNumGroupDlg::GetGroupInfo() const return aInfo; } -// ============================================================================ + ScDPDateGroupDlg::ScDPDateGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ) : @@ -355,6 +355,6 @@ IMPL_LINK( ScDPDateGroupDlg, CheckHdl, SvxCheckListBox*, pListBox ) return 0; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/dpgroupdlg.src b/sc/source/ui/dbgui/dpgroupdlg.src index d5426d19a6ff..11715f59f239 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.src +++ b/sc/source/ui/dbgui/dpgroupdlg.src @@ -19,7 +19,7 @@ #include "dpgroupdlg.hrc" -// ---------------------------------------------------------------------------- + ModalDialog RID_SCDLG_DPNUMGROUP { @@ -126,7 +126,7 @@ ModalDialog RID_SCDLG_DPNUMGROUP Text [ en-US ] = "Grouping" ; } ; -// ---------------------------------------------------------------------------- + ModalDialog RID_SCDLG_DPDATEGROUP { @@ -261,6 +261,6 @@ ModalDialog RID_SCDLG_DPDATEGROUP Text [ en-US ] = "Grouping" ; } ; -// ---------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx index 65fd7a6cc826..788f029f498f 100644 --- a/sc/source/ui/dbgui/fieldwnd.cxx +++ b/sc/source/ui/dbgui/fieldwnd.cxx @@ -892,7 +892,7 @@ void ScDPFieldControlBase::Resize() CalcSize(); } -//============================================================================= + ScDPHorFieldControl::ScDPHorFieldControl ( Window* pParent ) : ScDPFieldControlBase( pParent ), @@ -1153,7 +1153,7 @@ IMPL_LINK_NOARG(ScDPHorFieldControl, EndScrollHdl) return 0; } -//============================================================================= + ScDPPageFieldControl::ScDPPageFieldControl ( Window* pParent ) : ScDPHorFieldControl( pParent ) @@ -1180,7 +1180,7 @@ OUString ScDPPageFieldControl::GetDescription() const return ScResId(STR_ACC_DATAPILOT_PAGE_DESCR); } -//============================================================================= + ScDPColFieldControl::ScDPColFieldControl ( Window* pParent ) : ScDPHorFieldControl( pParent ) @@ -1206,7 +1206,7 @@ OUString ScDPColFieldControl::GetDescription() const return ScResId(STR_ACC_DATAPILOT_COL_DESCR); } -//============================================================================= + ScDPRowFieldControl::ScDPRowFieldControl ( Window* pParent ) : ScDPFieldControlBase( pParent ), @@ -1442,7 +1442,7 @@ IMPL_LINK_NOARG(ScDPRowFieldControl, EndScrollHdl) return 0; } -//============================================================================= + ScDPSelectFieldControl::ScDPSelectFieldControl( Window* pParent ): ScDPHorFieldControl( pParent ) @@ -1469,7 +1469,7 @@ OUString ScDPSelectFieldControl::GetDescription() const return ScResId(STR_ACC_DATAPILOT_SEL_DESCR); } -//============================================================================= + ScDPDataFieldControl::ScDPDataFieldControl( Window* pParent ): ScDPHorFieldControl( pParent ) diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index ce067fb1c9cc..3581c09c8eac 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -185,7 +185,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) pBtnCancel->SetClickHdl ( LINK( this, ScFilterDlg, EndDlgHdl ) ); pBtnHeader->SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) ); pBtnCase->SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) ); - // + pLbField1->SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); pLbField2->SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); pLbField3->SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); @@ -692,7 +692,7 @@ bool ScFilterDlg::IsRefInputMode() const // Handler: -// ======== + IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) { diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 4d1b0100643f..a9aca83417cb 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -44,14 +44,14 @@ #include <svl/zforlist.hxx> #include "svl/sharedstringpool.hxx" -//================================================================== + ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent, const SfxItemSet& rArgSet, SCTAB nSourceTab ) : ModalDialog ( pParent, ScResId( RID_SCDLG_PIVOTFILTER ) ), - // + aFlCriteria ( this, ScResId( FL_CRITERIA ) ), aLbField1 ( this, ScResId( LB_FIELD1 ) ), aLbCond1 ( this, ScResId( LB_COND1 ) ), @@ -83,7 +83,7 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent, aStrEmpty ( SC_RESSTR(SCSTR_FILTER_EMPTY) ), aStrNotEmpty ( SC_RESSTR(SCSTR_FILTER_NOTEMPTY) ), aStrColumn ( SC_RESSTR(SCSTR_COLUMN) ), - // + nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), theQueryData ( ((const ScQueryItem&) rArgSet.Get( nWhichQuery )).GetQueryData() ), diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 04948dd5768b..e7a08189a83d 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -40,14 +40,14 @@ #include <vector> -// ============================================================================ + using namespace ::com::sun::star::sheet; using ::com::sun::star::uno::Sequence; using ::std::vector; -// ============================================================================ + namespace { @@ -154,7 +154,7 @@ static const ScDPListBoxWrapper::MapEntryType spShowFromMap[] = } // namespace -// ============================================================================ + ScDPFunctionListBox::ScDPFunctionListBox(Window* pParent, WinBits nStyle) : ListBox(pParent, nStyle) @@ -197,7 +197,7 @@ void ScDPFunctionListBox::FillFunctionNames() InsertEntry( aArr.GetString( nIndex ) ); } -// ============================================================================ + ScDPFunctionDlg::ScDPFunctionDlg( Window* pParent, const ScDPLabelDataVector& rLabelVec, @@ -413,7 +413,7 @@ IMPL_LINK_NOARG(ScDPFunctionDlg, DblClickHdl) return 0; } -// ============================================================================ + ScDPSubtotalDlg::ScDPSubtotalDlg( Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, @@ -519,7 +519,7 @@ IMPL_LINK( ScDPSubtotalDlg, ClickHdl, PushButton*, pBtn ) return 0; } -// ============================================================================ + ScDPSubtotalOptDlg::ScDPSubtotalOptDlg( Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScDPNameVec& rDataFields, @@ -771,7 +771,7 @@ IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox*, pLBox ) return 0; } -// ============================================================================ + ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ) : ModalDialog ( pParent, ScResId( RID_SCDLG_DPSHOWDETAIL ) ), @@ -841,6 +841,6 @@ IMPL_LINK( ScDPShowDetailDlg, DblClickHdl, ListBox*, pLBox ) return 0; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src index 98af0ca57cf7..d2c08c0389f6 100644 --- a/sc/source/ui/dbgui/pvfundlg.src +++ b/sc/source/ui/dbgui/pvfundlg.src @@ -37,7 +37,7 @@ StringArray SCSTR_DPFUNCLISTBOX }; }; -// ---------------------------------------------------------------------------- + ModalDialog RID_SCDLG_DPSHOWDETAIL { @@ -85,6 +85,6 @@ ModalDialog RID_SCDLG_DPSHOWDETAIL Text [ en-US ] = "Show Detail"; }; -// ---------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 09dbf93b7efd..e6cbda50c621 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -39,7 +39,7 @@ #include "scresid.hxx" #include "scendlg.hxx" -//======================================================================== + ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const OUString& rName, bool bEdit, bool bSheetProtected) diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index f36e9b1aed4a..04b2483ac9c1 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -58,7 +58,7 @@ using namespace com::sun::star::uno; #define SEP_PATH_CLPBRD "Office.Calc/Dialogs/ClipboardTextImport" #define SEP_PATH_TEXT2COL "Office.Calc/Dialogs/TextToColumnsImport" -// ============================================================================ + static void lcl_FillCombo( ComboBox& rCombo, const OUString& rList, sal_Unicode cSelect ) { diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index f2d250b292f2..133834bf64e2 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -30,9 +30,9 @@ #include <osl/thread.h> #include <rtl/tencinfo.h> -//======================================================================== + // ScDelimiterTable -//======================================================================== + class ScDelimiterTable { @@ -105,9 +105,9 @@ OUString ScDelimiterTable::GetDelimiter( sal_Unicode nCode ) const return aStrDel; } -//======================================================================== + // ScImportOptionsDlg -//======================================================================== + ScImportOptionsDlg::ScImportOptionsDlg( Window* pParent, diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index a17354739c4e..0367f38122d9 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -42,7 +42,7 @@ ScGlobal::GetRscString(rid) ).Execute() -//============================================================================ + // class ScSpecialFilterDialog @@ -51,8 +51,8 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi const SfxItemSet& rArgSet ) : ScAnyRefDlg ( pB, pCW, pParent, "AdvancedFilterDialog", "modules/scalc/ui/advancedfilterdialog.ui" ), - // - // + + aStrUndefined ( SC_RESSTR(SCSTR_UNDEFINED) ), pOptionsMgr ( NULL ), nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), @@ -287,7 +287,7 @@ bool ScSpecialFilterDlg::IsRefInputMode() const // Handler: -// ======== + IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) { diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx index 10ba466b96f6..3bc234fbe93c 100644 --- a/sc/source/ui/dbgui/sortdlg.cxx +++ b/sc/source/ui/dbgui/sortdlg.cxx @@ -35,7 +35,7 @@ ScSortDlg::ScSortDlg(Window* pParent, const SfxItemSet* pArgSet) AddTabPage("options", ScTabPageSortOptions::Create, 0); } -//================================================================== + ScSortWarningDlg::ScSortWarningDlg(Window* pParent, const OUString& rExtendText, const OUString& rCurrentText) : ModalDialog(pParent, "SortWarning", "modules/scalc/ui/sortwarning.ui") @@ -65,6 +65,6 @@ IMPL_LINK( ScSortWarningDlg, BtnHdl, PushButton*, pBtn ) } return 0; } -//========================================================================// + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx index 436bd96c6213..39eaa7773c63 100644 --- a/sc/source/ui/dbgui/sortkeydlg.cxx +++ b/sc/source/ui/dbgui/sortkeydlg.cxx @@ -11,7 +11,7 @@ #include "sortdlg.hxx" #include <vcl/layout.hxx> -// ======================================================================= + ScSortKeyItem::ScSortKeyItem(Window* pParent) { @@ -41,7 +41,7 @@ void ScSortKeyItem::EnableField() m_pFrame->Enable(); } -// ======================================================================= + ScSortKeyWindow::ScSortKeyWindow(SfxTabPage* pParent, ScSortKeyItems& rSortKeyItems) : mrSortKeyItems(rSortKeyItems) @@ -84,7 +84,7 @@ void ScSortKeyWindow::DoScroll(sal_Int32 nNewPos) m_pBox->SetPosPixel(Point(0, nNewPos)); } -// ======================================================================= + ScSortKeyCtrl::ScSortKeyCtrl(SfxTabPage* pParent, ScSortKeyItems& rItems) : m_aSortWin(pParent, rItems) diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index ba77cba95248..56c99d66e19e 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -27,7 +27,7 @@ #include "subtdlg.hxx" -//================================================================== + ScSubTotalDlg::ScSubTotalDlg(Window* pParent, const SfxItemSet* pArgSet) : SfxTabDialog(pParent, "SubTotalDialog", diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 4a8544635b32..899ec67524fb 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -68,8 +68,8 @@ using namespace com::sun::star; * This still needs to be changed! */ -//======================================================================== -//======================================================================== + + // Sort Criteria Tab page ScTabPageSortFields::ScTabPageSortFields(Window* pParent, @@ -77,11 +77,11 @@ ScTabPageSortFields::ScTabPageSortFields(Window* pParent, : SfxTabPage(pParent, "SortCriteriaPage", "modules/scalc/ui/sortcriteriapage.ui", rArgSet) , - // + aStrUndefined ( SC_RESSTR( SCSTR_UNDEFINED ) ), aStrColumn ( SC_RESSTR( SCSTR_COLUMN ) ), aStrRow ( SC_RESSTR( SCSTR_ROW ) ), - // + nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), pDlg ( (ScSortDlg*)(GetParentDialog()) ), pViewData ( NULL ), @@ -501,9 +501,9 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) return 0; } -//======================================================================== + // Sort option Tab Page: -//======================================================================== + ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, const SfxItemSet& rArgSet ) diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 3f74086ecbff..cb728fece561 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -31,7 +31,7 @@ #include "subtdlg.hxx" #include "tpsubt.hxx" -//======================================================================== + // Subtotals group tabpage: ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, @@ -404,7 +404,7 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb ) return 0; } -//======================================================================== + // Derived Group TabPages: SfxTabPage* ScTpSubTotalGroup1::Create( Window* pParent, @@ -454,7 +454,7 @@ sal_Bool ScTpSubTotalGroup2::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET sal_Bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(3); } #undef FILL -//======================================================================== + // Optionen-Tabpage: ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 291b0d618e55..b2d7c2c40602 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -49,7 +49,7 @@ #include <sfx2/childwin.hxx> #include "reffact.hxx" -// ============================================================================ + static sal_uInt16 pValueRanges[] = { @@ -59,7 +59,7 @@ static sal_uInt16 pValueRanges[] = }; -// ============================================================================ + ScValidationDlg::ScValidationDlg(Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabViewSh, SfxBindings *pB /*= NULL*/) @@ -166,7 +166,7 @@ ScValidationDlg::~ScValidationDlg() RemoveRefDlg( false ); } -// ============================================================================ + namespace { @@ -674,8 +674,8 @@ IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl) } -//======================================================================== -//======================================================================== + + // Input Help Page ScTPValidationHelp::ScTPValidationHelp( Window* pParent, @@ -754,8 +754,8 @@ sal_Bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet ) return sal_True; } -//======================================================================== -//======================================================================== + + // Error Alert Page ScTPValidationError::ScTPValidationError( Window* pParent, diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 19c1ed176ff2..8a590db78f8d 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -168,7 +168,7 @@ bool ScDBDocFunc::RenameDBRange( const OUString& rOld, const OUString& rNew ) bool bInserted = rDBs.insert(pNewData); if (!bInserted) // Fehler -> alten Zustand wiederherstellen pDoc->SetDBCollection(pUndoColl); // gehoert dann dem Dokument - // + pDoc->CompileDBFormula( false ); // CompileFormulaString if (bInserted) // Einfuegen hat geklappt @@ -1667,8 +1667,8 @@ void ScDBDocFunc::RefreshPivotTableGroups(ScDPObject* pDPObj) } } -//================================================================== -// + + // database import void ScDBDocFunc::UpdateImport( const OUString& rTarget, const svx::ODataAccessDescriptor& rDescriptor ) diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 41c045096300..3b8ee69953d0 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -192,9 +192,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, ScDocument* pImportDoc = new ScDocument( SCDOCMODE_UNDO ); pImportDoc->InitUndo( pDoc, nTab, nTab ); - // + // get data from database into import document - // + try { @@ -216,9 +216,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, OSL_ENSURE( xRowProp.is(), "can't get RowSet" ); if ( xRowProp.is() ) { - // + // set source parameters - // + sal_Int32 nType = rParam.bSql ? sdb::CommandType::COMMAND : ( (rParam.nType == ScDbQuery) ? sdb::CommandType::QUERY : @@ -251,9 +251,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } if ( xRowSet.is() ) { - // + // get column descriptions - // + long nColCount = 0; uno::Reference<sdbc::XResultSetMetaData> xMeta; @@ -401,9 +401,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, OSL_FAIL("Unexpected exception in database"); } - // + // test for cell protection - // + sal_Bool bKeepFormat = !bAddrInsert && pDBData->IsKeepFmt(); sal_Bool bMoveCells = !bAddrInsert && pDBData->IsDoSize(); @@ -449,9 +449,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } } - // + // copy data from import doc into real document - // + if ( bSuccess ) { @@ -489,9 +489,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, pImportDoc->ApplyPatternAreaTab( 0,0,MAXCOL,MAXROW, nTab, aPattern ); } - // + // copy old data for undo - // + SCCOL nUndoEndCol = std::max( nEndCol, rParam.nCol2 ); // rParam = old end SCROW nUndoEndRow = std::max( nEndRow, rParam.nRow2 ); @@ -529,9 +529,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, nCopyFlags, false, pUndoDoc ); } - // + // move new data - // + if (bMoveCells) { diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index c1deef098d9b..182cf6cd4a20 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -98,7 +98,7 @@ using ::std::vector; // STATIC DATA ----------------------------------------------------------- -//======================================================================== + IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction ) { @@ -2296,9 +2296,9 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, } } - // + // ausfuehren - // + WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference @@ -2660,9 +2660,9 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, sal_uInt16 nDestExt = 0; rDocShell.UpdatePaintExt( nDestExt, nDestCol,nDestRow,nDestTab, nDestEndCol,nDestEndRow,nDestEndTab ); - // + // ausfuehren - // + ScDocument* pUndoDoc = NULL; ScDocument* pRefUndoDoc = NULL; diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 23ce64cc8085..5de3b11dcf53 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -64,9 +64,9 @@ -// + // Redraw - Benachrichtigungen -// + void ScDocShell::PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos ) @@ -732,9 +732,9 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc ) } -// + // Merge (Aenderungen zusammenfuehren) -// + static inline sal_Bool lcl_Equal( const ScChangeAction* pA, const ScChangeAction* pB, sal_Bool bIgnore100Sec ) diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index c1ef3e4aa811..c68d39486c1a 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1868,10 +1868,10 @@ void ScDocShell::GetSbxState( SfxItemSet &rSet ) // SID_TABLES_GET (Tables), // SID_PIVOT_GET (DataPilotTables) - removed (old Basic) - // + // Wenn hier Slots von der View-Shell executed werden, muss auch der // GetState weitergeleitet werden! - // + ScTabViewShell* pVisibleSh = GetBestViewShell(); // sichtbare View if ( pVisibleSh ) diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index e901ddb416ed..0366dccae1cf 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -63,9 +63,9 @@ using ::std::vector; -// + // former viewfunc/dbfunc methods -// + void ScDocShell::ErrorMessage( sal_uInt16 nGlobStrId ) { diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 73fc57356d4d..a0d29a893948 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -67,9 +67,9 @@ struct ScStylePair -// + // Ole -// + void ScDocShell::SetVisArea( const Rectangle & rVisArea ) { @@ -215,9 +215,9 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, bool bSnapSize ) SetVisAreaOrSize( aNewArea, true ); // hier muss auch der Start angepasst werden } -// + // Style-Krempel fuer Organizer etc. -// + SfxStyleSheetBasePool* ScDocShell::GetStyleSheetPool() { diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index a41ee468e478..5b6384832bb5 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -243,7 +243,7 @@ void removeRangeNamesBySrcDoc(ScRangeName& rRanges, sal_uInt16 nFileId) } -// ============================================================================ + ScExternalRefCache::Table::Table() : meReferenced( REFERENCED_MARKED ) @@ -1228,7 +1228,7 @@ ScExternalRefCache::DocItem* ScExternalRefCache::getDocItem(sal_uInt16 nFileId) return &itrDoc->second; } -// ============================================================================ + ScExternalRefLink::ScExternalRefLink(ScDocument* pDoc, sal_uInt16 nFileId, const OUString& rFilter) : ::sfx2::SvBaseLink(::sfx2::LINKUPDATE_ONCALL, FORMAT_FILE), @@ -1298,7 +1298,7 @@ IMPL_LINK_NOARG(ScExternalRefLink, ExternalRefEndEditHdl) return 0; } -// ============================================================================ + static FormulaToken* convertToToken( ScDocument* pHostDoc, ScDocument* pSrcDoc, ScRefCellValue& rCell ) { @@ -1574,7 +1574,7 @@ ScExternalRefCache::TableTypeRef ScExternalRefManager::getCacheTable( return maRefCache.getCacheTable(nFileId, rTabName, bCreateNew, pnIndex); } -// ============================================================================ + ScExternalRefManager::LinkListener::LinkListener() { diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 3b2928a6121a..46215811392d 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -56,7 +56,7 @@ #include <boost/scoped_ptr.hpp> -//======================================================================== + // We don't want to end up with 2GB read in one line just because of malformed // multiline fields, so chop it _somewhere_, which is twice supported columns @@ -206,7 +206,7 @@ bool ScImportExport::IsFormatSupported( sal_uLong nFormat ) } -////////////////////////////////////////////////////////////////////////////// + // Vorbereitung fuer Undo: Undo-Dokument erzeugen @@ -264,7 +264,7 @@ void ScImportExport::EndPaste(bool bAutoRowHeight) } -///////////////////////////////////////////////////////////////////////////// + bool ScImportExport::ImportData( const OUString& /* rMimeType */, const ::com::sun::star::uno::Any & /* rValue */ ) @@ -862,7 +862,7 @@ static inline void lcl_WriteSimpleString( SvStream& rStrm, const OUString& rStri ScImportExport::WriteUnicodeOrByteString( rStrm, rString ); } -////////////////////////////////////////////////////////////////////////////// + bool ScImportExport::Text2Doc( SvStream& rStrm ) @@ -957,9 +957,9 @@ bool ScImportExport::Text2Doc( SvStream& rStrm ) return bOk; } - // + // erweiterter Ascii-Import - // + static bool lcl_PutString( diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 8b2d75af5f18..9d6efe8cadbf 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -36,7 +36,7 @@ using ::std::list; using ::std::for_each; using ::std::pair; -// ============================================================================ + /** * A simple container to keep track of cells that depend on basic modules @@ -92,7 +92,7 @@ private: }; -// ============================================================================ + ScMacroManager::ScMacroManager(ScDocument* pDoc) : mpDepTracker(new ScUserMacroDepTracker), diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx index 034b61fe14a2..5759666d14da 100644 --- a/sc/source/ui/docshell/olinefun.cxx +++ b/sc/source/ui/docshell/olinefun.cxx @@ -28,7 +28,7 @@ #include "sc.hrc" -//======================================================================== + static void lcl_InvalidateOutliner( SfxBindings* pBindings ) { diff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxx index 4128244cd6dd..cad02c397574 100644 --- a/sc/source/ui/docshell/pagedata.cxx +++ b/sc/source/ui/docshell/pagedata.cxx @@ -21,7 +21,7 @@ #include "pagedata.hxx" -//============================================================================ + ScPrintRangeData::ScPrintRangeData() { @@ -64,7 +64,7 @@ void ScPrintRangeData::SetPagesY( size_t nCount, const SCROW* pData ) nPagesY = nCount; } -//============================================================================ + ScPageBreakData::ScPageBreakData(size_t nMax) { diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index 93ab7847d891..0117dc47991a 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -29,9 +29,9 @@ #include "tpstat.hxx" -//======================================================================== + // Dokumentinfo-Tabpage: -//======================================================================== + SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet& rSet ) { diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index cc27e2e81713..30e1e7630ec4 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -179,9 +179,9 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) break; } - //===== + return; - //===== + } if( pView->AreObjectsMarked() ) diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index fa2126e5bbcc..1d39426d5025 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -282,9 +282,9 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl svx::FontworkBar::getState( pView, rSet ); } -// + // Attribute fuer Drawing-Objekte -// + void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet ) { diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 4193e80977aa..4370c18e826a 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -244,9 +244,9 @@ sal_uInt16 ScGetFontWorkId(); -// + // Funktionen auf Drawing-Objekten -// + void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) { @@ -258,7 +258,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) //!!! // wer weiss, wie lange das funktioniert? (->vom Abreisscontrol funktioniert es) - // + if (nSlotId == SID_OBJECT_ALIGN && pArgs) nSlotId = SID_OBJECT_ALIGN + ((SfxEnumItem&)pArgs->Get(SID_OBJECT_ALIGN)).GetValue() + 1; diff --git a/sc/source/ui/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.src index 6d720833445a..0709803f63f5 100644 --- a/sc/source/ui/drawfunc/drformsh.src +++ b/sc/source/ui/drawfunc/drformsh.src @@ -20,9 +20,9 @@ #include "sc.hrc" #include "submenu.hrc" #include <svx/globlmn.hrc> - // + // Defines ------------------------------------------------------------------------------- - // + #define MN_LAYER\ ToolBoxItem\ {\ @@ -167,14 +167,14 @@ // Popup-Menues --------------------------------------------------------------------- - // + String RID_POPUP_DRAWFORM { Text [ en-US ] = "Popup menu for form objects"; }; - // + // Popup-Menue fuer (Uno-) Controls - // + Menu RID_POPUP_DRAWFORM { ItemList = @@ -187,21 +187,21 @@ Menu RID_POPUP_DRAWFORM MN_RENAME_OBJECT //-#i68101#---------------------- - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { ITEM_FORM_CONTROL_PROPERTIES }; MenuItem { ITEM_FORM_PROPERTIES }; MenuItem { ITEM_REPLACE_CONTROL }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + ITEM_GROUP_MENU }; }; diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 7492bf84390e..db575fc90a27 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -141,11 +141,11 @@ ScDrawTextObjectBar::~ScDrawTextObjectBar() } } -//======================================================================== -// + + // Funktionen -// -//======================================================================== + + void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) { @@ -544,11 +544,11 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet ) } } -//======================================================================== -// + + // Attribute -// -//======================================================================== + + void ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq ) { diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 57f16e9b1570..b8b5e66457fb 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -278,9 +278,9 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) // try to select the clicked object if ( pView->MarkObj( aMDPos, -2, false, rMEvt.IsMod1() ) ) { - //********************************************************* + //Objekt verschieben - //******************************************************** + if (pView->IsMarkedHit(aMDPos)) { // Don't start drag timer if inplace editing of an OLE object @@ -304,9 +304,9 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) if (pViewShell->IsDrawSelMode()) { - //********************************************************* + //Objekt selektieren - //******************************************************** + pView->BegMarkObj(aMDPos); bReturn = true; } @@ -523,9 +523,9 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); - // + // OLE: aktivieren - // + if (nSdrObjKind == OBJ_OLE2) { @@ -538,11 +538,11 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) } } - // + // Edit text // not in UNO controls // #i32352# not in media objects - // + else if ( pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) && !pObj->ISA(SdrMediaObj) ) { OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx index b8de82e13cd2..d19236b9991f 100644 --- a/sc/source/ui/drawfunc/fusel2.cxx +++ b/sc/source/ui/drawfunc/fusel2.cxx @@ -163,7 +163,7 @@ void FuSelection::ActivateNoteHandles(SdrObject* pObject) } } -//================================================================== + diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src index 1c6be53daa81..8ae856d4cb3a 100644 --- a/sc/source/ui/drawfunc/objdraw.src +++ b/sc/source/ui/drawfunc/objdraw.src @@ -20,9 +20,9 @@ #include "sc.hrc" #include "submenu.hrc" #include <svx/globlmn.hrc> - // + // Defines ------------------------------------------------------------------------------- - // + #define MN_RESET\ MenuItem\ {\ @@ -364,40 +364,40 @@ };\ }; - // - // ------------------------------------------------------------------------------ - // - // + + + + // Objekt-Leisten - // + String RID_DRAW_OBJECTBAR { Text [ en-US ] = "Drawing Object Bar" ; }; - // + // Text-Toolbox - // + String RID_TEXT_TOOLBOX { Text [ en-US ] = "Text Object Bar" ; }; - // + // Graphics toolbox - // + String RID_GRAPHIC_OBJECTBAR { Text [ en-US ] = "Image Object Bar"; }; - // + // Popup-Menues --------------------------------------------------------------------- - // + String RID_POPUP_DRAW { Text [ en-US ] = "Pop-up menu for drawing objects" ; }; - // + // Pop-up menu for drawing objects - // + Menu RID_POPUP_DRAW { ItemList = @@ -413,17 +413,17 @@ Menu RID_POPUP_DRAW MN_RENAME_OBJECT //-#i68101#---------------------- - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_MIRRORSUB MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB MN_ASSIGNMACRO - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { ITEM_FORMAT_BEZIER_EDIT @@ -434,22 +434,22 @@ Menu RID_POPUP_DRAW { ITEM_FORMAT_FONTWORK }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + ITEM_GROUP_MENU - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_EDITLNK MN_DELLNK MenuItem { ITEM_OPEN_HYPERLINK }; }; }; - // + // Popup-Menue fuer (Uno-) Controls - // + Menu RID_POPUP_CONTROL { @@ -463,27 +463,27 @@ Menu RID_POPUP_CONTROL MN_RENAME_OBJECT //-#i68101#---------------------- - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { ITEM_FORM_CONTROL_PROPERTIES }; MenuItem { ITEM_FORM_PROPERTIES }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + ITEM_GROUP_MENU }; }; - // + // Grafik - // + Menu RID_POPUP_GRAPHIC { @@ -501,21 +501,21 @@ Menu RID_POPUP_GRAPHIC MN_RENAME_OBJECT //-#i68101#---------------------- - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_MIRRORSUB MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB MN_ASSIGNMACRO - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + ITEM_GROUP_MENU - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_EDITLNK MN_DELLNK MenuItem { ITEM_OPEN_HYPERLINK }; @@ -524,9 +524,9 @@ Menu RID_POPUP_GRAPHIC }; }; - // + // Media - // + Menu RID_POPUP_MEDIA { @@ -540,23 +540,23 @@ Menu RID_POPUP_MEDIA MN_RENAME_OBJECT //-#i68101#---------------------- - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_MIRRORSUB MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + ITEM_GROUP_MENU }; }; - // + // Ole-Objekt - // + Menu RID_POPUP_OLE { @@ -577,22 +577,22 @@ Menu RID_POPUP_OLE MN_RENAME_OBJECT //-#i68101#---------------------- - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + ITEM_GROUP_MENU }; }; - // + // Charts - // + Menu RID_POPUP_CHART { @@ -613,15 +613,15 @@ Menu RID_POPUP_CHART MN_RENAME_OBJECT //-#i68101#---------------------- - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + ITEM_GROUP_MENU MenuItem { @@ -632,9 +632,9 @@ Menu RID_POPUP_CHART }; }; - // + // PopUpDraw Text - // + String RID_POPUP_DRAWTEXT { diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index ef0928e7ee4c..4b25d2aa6da3 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -991,7 +991,7 @@ IMPL_LINK( ScFunctionDockWin, SetSelectionHdl, void*, pCtrl ) { DoEnter(); // Uebernimmt die Eingabe } - //... + return 0; } @@ -1027,7 +1027,7 @@ IMPL_LINK( ScFunctionDockWin, SetSplitHdl, ScPrivatSplit*, pCtrl ) aFiFuncDesc.SetPosPixel(aFDTopLeft); aFiFuncDesc.SetSizePixel(aFDSize); } - //... + return 0; } diff --git a/sc/source/ui/formdlg/formdata.cxx b/sc/source/ui/formdlg/formdata.cxx index 8b4853566f96..9767be0b8147 100644 --- a/sc/source/ui/formdlg/formdata.cxx +++ b/sc/source/ui/formdlg/formdata.cxx @@ -19,7 +19,7 @@ #include "formdata.hxx" -//============================================================================ + ScFormEditData::ScFormEditData() : formula::FormEditData() { diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index fda461cd58fd..7c3c58ae1531 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -55,7 +55,7 @@ #include <com/sun/star/table/CellAddress.hpp> -//============================================================================ + using namespace formula; using namespace com::sun::star; @@ -64,9 +64,9 @@ ScAddress ScFormulaDlg::aCursorPos; -// -------------------------------------------------------------------------- + // Initialisierung / gemeinsame Funktionen fuer Dialog -// -------------------------------------------------------------------------- + ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* pViewData,formula::IFunctionManager* _pFunctionMgr ) @@ -305,9 +305,9 @@ bool ScFormulaDlg::Close() return true; } -// -------------------------------------------------------------------------- + // Funktionen fuer rechte Seite -// -------------------------------------------------------------------------- + bool ScFormulaDlg::calculateValue( const OUString& rStrExp, OUString& rStrResult ) { boost::scoped_ptr<ScSimpleFormulaCalculator> pFCell( new ScSimpleFormulaCalculator( pDoc, aCursorPos, rStrExp ) ); diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 0ea96cd947f0..28435ab7b0e1 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef _SC_ACCESSIBLECSVCONTROL_HXX #define _SC_ACCESSIBLECSVCONTROL_HXX @@ -34,7 +34,7 @@ #include "AccessibleContextBase.hxx" -// ============================================================================ + class ScCsvControl; namespace utl { class AccessibleStateSetHelper; } @@ -126,7 +126,7 @@ protected: }; -// ============================================================================ + class ScCsvRuler; @@ -299,7 +299,7 @@ private: }; -// ============================================================================ + class ScCsvGrid; @@ -544,7 +544,7 @@ private: }; -// ============================================================================ + /** Accessible class representing a cell of the CSV grid control. */ class ScAccessibleCsvCell : public ScAccessibleCsvControl, public accessibility::AccessibleStaticTextBase @@ -648,7 +648,7 @@ private: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index acea9d87141a..58ab48c97938 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -38,7 +38,7 @@ class ScCsvViewForwarder; class ScAccessibleCell; -// ============================================================================ + class ScAccessibleTextData : public SfxListener { @@ -67,7 +67,7 @@ private: }; -// ============================================================================ + class ScAccessibleCellBaseTextData : public ScAccessibleTextData, public ScCellTextData @@ -85,7 +85,7 @@ public: }; -// ============================================================================ + // ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object @@ -122,7 +122,7 @@ private: }; -// ============================================================================ + class ScAccessibleEditObjectTextData : public ScAccessibleTextData { @@ -155,7 +155,7 @@ protected: }; -// ============================================================================ + class ScAccessibleEditLineTextData : public ScAccessibleEditObjectTextData { @@ -179,7 +179,7 @@ private: }; -// ============================================================================ + class ScAccessiblePreviewCellTextData : public ScAccessibleCellBaseTextData { @@ -208,7 +208,7 @@ private: }; -// ============================================================================ + class ScAccessiblePreviewHeaderCellTextData : public ScAccessibleCellBaseTextData { @@ -240,7 +240,7 @@ private: }; -// ============================================================================ + class ScAccessibleHeaderTextData : public ScAccessibleTextData { @@ -273,7 +273,7 @@ private: }; -// ============================================================================ + class ScAccessibleNoteTextData : public ScAccessibleTextData { @@ -306,7 +306,7 @@ private: }; -// ============================================================================ + class ScAccessibleCsvTextData : public ScAccessibleTextData { @@ -345,7 +345,7 @@ public: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index 804309b8948b..b736c8c0650a 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -52,7 +52,7 @@ private: OKButton* mpButtonOk; CloseButton* mpButtonClose; - // + formula::RefEdit* mpActiveEdit; // Data diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index c32f3a848a3a..b135e0231475 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -91,7 +91,7 @@ typedef long LExpNum; //@ Expand entrys are ambiguous and therefore removed //DECLARE_TABLE( ScChgTrackExps, LExpNum) -//================================================================== + class ScAcceptChgDlg : public SfxModelessDialog { diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 751f00dd4ac4..c269390d63e9 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -103,7 +103,7 @@ public: bool CanInputDone( bool bForced ){ return pRefEdit && (bForced || !pRefBtn); } }; -//============================================================================ + class SC_DLLPUBLIC ScRefHandler : public IAnyRefDialog @@ -173,7 +173,7 @@ public: inline bool CanInputDone( bool bForced ); }; -//============================================================================ + class ScRefHdlModalImpl : public ModalDialog, public ScRefHandler @@ -275,7 +275,7 @@ public: const OUString& rUIXMLDescription); }; -//============================================================================ + template<class TDerived, class TBase, bool bBindRef = true> struct ScRefHdlrImpl: ScRefHdlrImplBase< TBase, bBindRef > { @@ -300,7 +300,7 @@ struct ScRefHdlrImpl: ScRefHdlrImplBase< TBase, bBindRef > SC_MOD()->UnregisterRefWindow( static_cast<sal_uInt16>( static_cast<TDerived*>(this)->SLOTID ), this ); } }; -//============================================================================ + struct ScAnyRefDlg : ::ScRefHdlrImpl< ScAnyRefDlg, SfxModelessDialog> { template<class T1, class T2, class T3, class T4> @@ -315,7 +315,7 @@ struct ScAnyRefDlg : ::ScRefHdlrImpl< ScAnyRefDlg, SfxModelessDialog> { } }; -//============================================================================ + inline bool ScRefHandler::CanInputStart( const formula::RefEdit *pEdit ) { diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index 7a344ab2f172..2965b9a871b4 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -30,7 +30,7 @@ class ScDocument; class ScViewData; -//============================================================================ + class ScPrintAreasDlg : public ScAnyRefDlg { diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx index c114d389c8a3..8630a4e50b88 100644 --- a/sc/source/ui/inc/asciiopt.hxx +++ b/sc/source/ui/inc/asciiopt.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef SC_ASCIIOPT_HXX #define SC_ASCIIOPT_HXX @@ -33,7 +33,7 @@ #include "csvtablebox.hxx" #include "i18nlangtag/lang.h" -// ============================================================================ + class ScAsciiOptions { diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index 111190d6572a..fea35429a65f 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -26,7 +26,7 @@ class Window; class SfxViewFrame; class SfxItemSet; -//================================================================== + class ScAttrDlg : public SfxTabDialog { diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index 4a2a7e1aa4dd..f15e86cee9b8 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -30,7 +30,7 @@ #include <svx/framelinkarray.hxx> #include "scdllapi.h" -//------------------------------------------------------------------------ + class ScAutoFormatData; class SvxBoxItem; @@ -39,11 +39,11 @@ class ScAutoFmtPreview; // s.u. class SvNumberFormatter; class ScDocument; -//------------------------------------------------------------------------ + enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; -//======================================================================== + class SC_DLLPUBLIC ScAutoFmtPreview : public Window { @@ -77,7 +77,7 @@ private: const OUString aStrSouth; const OUString aStrSum; SvNumberFormatter* pNumFmt; - //------------------------------------------- + SAL_DLLPRIVATE void Init (); SAL_DLLPRIVATE void DoPaint ( const Rectangle& rRect ); SAL_DLLPRIVATE void CalcCellArray ( bool bFitWidth ); diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx index 2d7b101fbad8..54f7f07d55f1 100644 --- a/sc/source/ui/inc/cbutton.hxx +++ b/sc/source/ui/inc/cbutton.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//------------------------------------------------------------------ + #ifndef SC_CBUTTON_HXX #define SC_CBUTTON_HXX @@ -28,7 +28,7 @@ class OutputDevice; -//================================================================== + class ScDDComboBoxButton { diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index a21a7d9c45fd..93a53e7760d0 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -32,7 +32,7 @@ class ScViewData; -//============================================================================= + enum ScConflictAction { @@ -44,9 +44,9 @@ enum ScConflictAction typedef ::std::vector< sal_uLong > ScChangeActionList; -//============================================================================= + // struct ScConflictsListEntry -//============================================================================= + struct ScConflictsListEntry { @@ -59,14 +59,14 @@ struct ScConflictsListEntry }; -//============================================================================= + typedef ::std::vector< ScConflictsListEntry > ScConflictsList; -//============================================================================= + // class ScConflictsListHelper -//============================================================================= + class ScConflictsListHelper { @@ -84,9 +84,9 @@ public: }; -//============================================================================= + // class ScConflictsFinder -//============================================================================= + class ScConflictsFinder { @@ -111,9 +111,9 @@ public: }; -//============================================================================= + // class ScConflictsResolver -//============================================================================= + class ScConflictsResolver { @@ -130,9 +130,9 @@ public: }; -//============================================================================= + // class ScConflictsDlg -//============================================================================= + class ScConflictsDlg : public ModalDialog { diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 51e432588b88..205ba5b4e491 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -34,7 +34,7 @@ class ScRangeUtil; class ScAreaData; -//============================================================================ + class ScConsolidateDlg : public ScAnyRefDlg { diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 929ef05d6744..f5c06a695d1a 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -31,7 +31,7 @@ class ScViewData; class ScDocument; -//============================================================================ + class ScColRowNameRangesDlg : public ScAnyRefDlg { diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index 6898bd2252ad..714a656801a8 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef _SC_CSVCONTROL_HXX #define _SC_CSVCONTROL_HXX @@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { namespace accessibility { } } } } -// ============================================================================ + /** Minimum character count for a column in separators mode. */ const sal_Int32 CSV_MINCOLWIDTH = 8; @@ -69,7 +69,7 @@ const sal_uInt8 SC_COL_SKIP = 9; const sal_uInt8 SC_COL_ENGLISH = 10; -// ============================================================================ + /** Exported data of a column (data used in the dialog). */ struct ScCsvExpData @@ -85,7 +85,7 @@ struct ScCsvExpData typedef ::std::vector< ScCsvExpData > ScCsvExpDataVec; -// ============================================================================ + /** Specifies which element should be used to perform an action. */ enum ScMoveMode @@ -100,7 +100,7 @@ enum ScMoveMode }; -// ============================================================================ + /** Flags for comparison of old and new control layout data. */ typedef sal_uInt32 ScCsvDiff; @@ -122,7 +122,7 @@ const ScCsvDiff CSV_DIFF_VERTICAL = CSV_DIFF_LINECOUNT | CSV_DIFF_LINEOFFS const ScCsvDiff CSV_DIFF_CURSOR = CSV_DIFF_RULERCURSOR | CSV_DIFF_GRIDCURSOR; -// ---------------------------------------------------------------------------- + /** A structure containing all layout data valid for both ruler and data grid (i.e. scroll position or column width). */ @@ -169,7 +169,7 @@ inline bool operator!=( const ScCsvLayoutData& rData1, const ScCsvLayoutData& rD } -// ============================================================================ + /** Enumeration of possible commands to change any settings of the CSV controls. @descr Controls have to send commands instead of changing their settings directly. @@ -215,7 +215,7 @@ enum ScCsvCmdType }; -// ---------------------------------------------------------------------------- + /** Data for a CSV control command. The stored position data is aways character based, it's never a column index (required for internal consistency). */ @@ -243,7 +243,7 @@ inline void ScCsvCmd::Set( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nPar } -// ============================================================================ + /** Base class for the CSV ruler and the data grid control. Implements command handling. */ class SC_DLLPUBLIC ScCsvControl : public Control @@ -264,7 +264,7 @@ private: ScAccessibleCsvControl* mpAccessible; /// Pointer to the accessible implementation object. bool mbValidGfx; /// Content of virtual devices valid? - // ------------------------------------------------------------------------ + public: explicit ScCsvControl( ScCsvControl& rParent ); explicit ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ); @@ -417,7 +417,7 @@ protected: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index 769d274f235a..d0607cd1224e 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef _SC_CSVGRID_HXX #define _SC_CSVGRID_HXX @@ -33,7 +33,7 @@ #include "csvsplits.hxx" -// ---------------------------------------------------------------------------- + namespace svtools { class ColorConfig; } class EditEngine; @@ -42,7 +42,7 @@ class ScAsciiOptions; class ScAccessibleCsvControl; -// ============================================================================ + const sal_uInt8 CSV_COLFLAG_NONE = 0x00; /// Nothing set. const sal_uInt8 CSV_COLFLAG_SELECT = 0x01; /// Column is selected. @@ -50,7 +50,7 @@ const sal_uInt8 CSV_COLFLAG_SELECT = 0x01; /// Column is selected. const sal_uInt32 CSV_COLUMN_INVALID = CSV_VEC_NOTFOUND; -// ---------------------------------------------------------------------------- + /** This struct contains the state of one table column. */ struct ScCsvColState @@ -78,12 +78,12 @@ inline void ScCsvColState::Select( bool bSel ) } -// ---------------------------------------------------------------------------- + typedef ::std::vector< ScCsvColState > ScCsvColStateVec; -// ============================================================================ + /** A data grid control for the CSV import dialog. The design of this control simulates a Calc spreadsheet with row and column headers. */ @@ -123,7 +123,7 @@ private: sal_uInt32 mnMTCurrCol; /// Current column of mouse tracking. bool mbMTSelecting; /// Mouse tracking: true = select, false = deselect. - // ------------------------------------------------------------------------ + public: explicit ScCsvGrid( ScCsvControl& rParent ); virtual ~ScCsvGrid(); @@ -347,7 +347,7 @@ protected: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx index b7d7eb55b719..ca78c37811f8 100644 --- a/sc/source/ui/inc/csvruler.hxx +++ b/sc/source/ui/inc/csvruler.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef _SC_CSVRULER_HXX #define _SC_CSVRULER_HXX @@ -30,7 +30,7 @@ class ScAccessibleCsvControl; -// ============================================================================ + /** A ruler control for the CSV import dialog. Supports setting and moving splits (which divide lines of data into several columns). */ @@ -57,7 +57,7 @@ private: Rectangle maActiveRect; /// The active area of the ruler. sal_Int32 mnSplitSize; /// Size of a split circle. - // ------------------------------------------------------------------------ + public: explicit ScCsvRuler( ScCsvControl& rParent ); ~ScCsvRuler(); @@ -185,7 +185,7 @@ protected: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/csvsplits.hxx b/sc/source/ui/inc/csvsplits.hxx index c436801ebf3a..18b8888f4adf 100644 --- a/sc/source/ui/inc/csvsplits.hxx +++ b/sc/source/ui/inc/csvsplits.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef _SC_CSVSPLITS_HXX #define _SC_CSVSPLITS_HXX @@ -27,7 +27,7 @@ #include <vector> -// ============================================================================ + /** Constant for an invalid vector index. */ const sal_uInt32 CSV_VEC_NOTFOUND = SAL_MAX_UINT32; @@ -35,7 +35,7 @@ const sal_uInt32 CSV_VEC_NOTFOUND = SAL_MAX_UINT32; const sal_Int32 CSV_POS_INVALID = -1; -// ---------------------------------------------------------------------------- + /** A vector of column splits that supports inserting, removing and moving splits. */ class ScCsvSplits @@ -89,7 +89,7 @@ private: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index 3fb5db70b3d7..8f9d71f82104 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef _SC_CSVTABLEBOX_HXX #define _SC_CSVTABLEBOX_HXX @@ -64,7 +64,7 @@ private: bool mbFixedMode; /// false = Separators, true = Fixed width. - // ------------------------------------------------------------------------ + public: explicit ScCsvTableBox( Window* pParent, WinBits nBits ); @@ -144,7 +144,7 @@ protected: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index f2be47d008a8..899e14cb9bda 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -27,7 +27,7 @@ #include <vcl/lstbox.hxx> #include <com/sun/star/uno/Sequence.hxx> -//------------------------------------------------------------------------ + class ScDataPilotSourceTypeDlg : public ModalDialog { diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 91f17b00591d..704fee82d2a4 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -36,7 +36,7 @@ class ScDPSaveData; struct ScDPNumGroupInfo; struct ScSubTotalParam; -// --------------------------------------------------------------------------- + class ScDBFunc : public ScViewFunc { diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index e893fd4cd47f..7011f7edf735 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -33,7 +33,7 @@ class ScViewData; class ScDocument; -//============================================================================ + class ScDbNameDlg : public ScAnyRefDlg { diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx index 56d08968f059..59eaf1dce39d 100644 --- a/sc/source/ui/inc/delcldlg.hxx +++ b/sc/source/ui/inc/delcldlg.hxx @@ -28,7 +28,7 @@ #include "global.hxx" -//------------------------------------------------------------------------ + class ScDeleteCellDlg : public ModalDialog { diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index 34b10253e3d0..35805d95bf5b 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -24,7 +24,7 @@ #include <vcl/button.hxx> #include "global.hxx" -//------------------------------------------------------------------------ + class ScDeleteContentsDlg : public ModalDialog { diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index 36c984aded9c..49c95c8761cf 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -52,8 +52,6 @@ struct ColRowSpan; } -// --------------------------------------------------------------------------- - class ScDocFunc { protected: diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 3e3d143e72fc..49215fd72426 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -76,7 +76,7 @@ struct DocShell_Impl; typedef ::boost::unordered_map< sal_uLong, sal_uLong > ScChangeActionMergeMap; -//================================================================== + //enum ScDBFormat { SC_FORMAT_SDF, SC_FORMAT_DBF }; diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 045997ca88de..ddc2b797624f 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -28,7 +28,7 @@ #include "editfield.hxx" #include "dpgroup.hxx" -// ============================================================================ + class ScDPGroupEditHelper { @@ -56,7 +56,7 @@ private: Edit& mrEdValue; }; -// ---------------------------------------------------------------------------- + class ScDPNumGroupEditHelper : public ScDPGroupEditHelper { @@ -75,7 +75,7 @@ private: ScDoubleField& mrEdValue; }; -// ---------------------------------------------------------------------------- + class ScDPDateGroupEditHelper : public ScDPGroupEditHelper { @@ -95,8 +95,8 @@ private: Date maNullDate; }; -// ============================================================================ -// ============================================================================ + + class ScDPNumGroupDlg : public ModalDialog { @@ -123,7 +123,7 @@ private: ScDPNumGroupEditHelper maEndHelper; }; -// ============================================================================ + class ScDPDateGroupDlg : public ModalDialog { @@ -159,7 +159,7 @@ private: ScDPDateGroupEditHelper maEndHelper; }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx index 97aebe70fcec..bbcdf1390260 100644 --- a/sc/source/ui/inc/editfield.hxx +++ b/sc/source/ui/inc/editfield.hxx @@ -22,7 +22,7 @@ #include <vcl/field.hxx> -// ============================================================================ + /** An edit control that contains a double precision floating-point value. */ class ScDoubleField : public Edit @@ -37,7 +37,7 @@ public: bool bEraseTrailingDecZeros = true ); }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx index e8ec44610607..f6c7f5004b9d 100644 --- a/sc/source/ui/inc/fieldwnd.hxx +++ b/sc/source/ui/inc/fieldwnd.hxx @@ -263,7 +263,7 @@ private: com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible > mxAccessible; }; -// ============================================================================ + /** * Base class for field control with a horizontal scroll bar at the bottom. @@ -308,7 +308,7 @@ private: size_t mnFieldBtnColCount; }; -// ============================================================================ + class ScDPPageFieldControl : public ScDPHorFieldControl { @@ -320,7 +320,7 @@ public: virtual OUString GetDescription() const; }; -// ============================================================================ + class ScDPColFieldControl : public ScDPHorFieldControl { @@ -332,7 +332,7 @@ public: virtual OUString GetDescription() const; }; -// ============================================================================ + /** * Row field control with a vertical scroll bar. @@ -375,7 +375,7 @@ private: size_t mnColumnBtnCount; }; -// ============================================================================ + class ScDPSelectFieldControl : public ScDPHorFieldControl { @@ -387,7 +387,7 @@ public: virtual OUString GetDescription() const; }; -// ============================================================================ + class ScDPDataFieldControl : public ScDPHorFieldControl { diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 7fcd1b0ef7fd..96e080744858 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -28,10 +28,10 @@ class ScDocument; -//---------------------------------------------------------------------------- + #include "scui_def.hxx" -//============================================================================ + class ScFillSeriesDlg : public ModalDialog { @@ -88,7 +88,7 @@ private: const OUString aErrMsgInvalidVal; - //---------------------------------------------------------- + ScDocument& rDoc; FillDir theFillDir; diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 8677bbafe231..6ba9480fabb2 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -38,7 +38,7 @@ #include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> -//---------------------------------------------------------------------------- + class ScFilterOptionsMgr; class ScViewData; @@ -74,22 +74,22 @@ private: ListBox* pLbField1; ListBox* pLbCond1; ComboBox* pEdVal1; - //---------------------------- + ListBox* pLbConnect2; ListBox* pLbField2; ListBox* pLbCond2; ComboBox* pEdVal2; - //---------------------------- + ListBox* pLbConnect3; ListBox* pLbField3; ListBox* pLbCond3; ComboBox* pEdVal3; - //---------------------------- + ListBox* pLbConnect4; ListBox* pLbField4; ListBox* pLbCond4; ComboBox* pEdVal4; - //---------------------------- + ScrollBar* pScrollBar; VclExpander* pExpander; diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 59ac707bc950..6cfa1cb9fd21 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -25,7 +25,7 @@ #include <vcl/lstbox.hxx> #include <vcl/button.hxx> -//---------------------------------------------------------------------------- + namespace formula { @@ -35,7 +35,7 @@ struct ScQueryParam; class ScDocument; class ScViewData; -//---------------------------------------------------------------------------- + class ScFilterOptionsMgr { diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx index 9fad6707bb9e..475dee99e9cc 100644 --- a/sc/source/ui/inc/formdata.hxx +++ b/sc/source/ui/inc/formdata.hxx @@ -24,7 +24,7 @@ class ScInputHandler; class ScDocShell; -//============================================================================ + class ScFormEditData : public formula::FormEditData { diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 46d829822177..5137ce1852e9 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -40,9 +40,9 @@ class ScInputHandler; class ScDocShell; class ScFormulaCell; -//============================================================================ + typedef ScTabViewShell* PtrTabViewShell; -//============================================================================ + class ScFormulaDlg : public formula::FormulaDlg, public IAnyRefDialog diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx index 57301c22cd00..04580c9998aa 100644 --- a/sc/source/ui/inc/funcpage.hxx +++ b/sc/source/ui/inc/funcpage.hxx @@ -35,11 +35,11 @@ class ScFuncDesc; -//============================================================================ + #define LRU_MAX 10 -//============================================================================ + class ScListBox : public ListBox { protected: @@ -54,7 +54,7 @@ public: -//============================================================================ + class ScFuncPage : public TabPage { private: diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index b862aba4187b..e0319b1cbf22 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -80,7 +80,7 @@ struct SpellCallbackInfo; #define SC_PD_BREAK_V 32 -// --------------------------------------------------------------------------- + // predefines namespace sdr { namespace overlay { class OverlayObjectList; }} diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx index 66806dee5552..beee811022b3 100644 --- a/sc/source/ui/inc/groupdlg.hxx +++ b/sc/source/ui/inc/groupdlg.hxx @@ -25,7 +25,7 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> -//------------------------------------------------------------------------ + class ScGroupDlg : public ModalDialog { diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index cd8335b9658e..8418d756e6d6 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/sc/source/ui/inc/hfedtdlg.hxx @@ -27,7 +27,7 @@ #include "sc.hrc" -//================================================================== + class ScHFEditDlg : public SfxTabDialog { diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index 1927159bfed4..cc113c2dd837 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -48,7 +48,7 @@ class ScDocument; #define FLT_DATE_SAVE 5 #endif -//================================================================== + class ScHighlightChgDlg : public ScAnyRefDlg { diff --git a/sc/source/ui/inc/hiranges.hxx b/sc/source/ui/inc/hiranges.hxx index 62680fb2964e..40775b9b7fd2 100644 --- a/sc/source/ui/inc/hiranges.hxx +++ b/sc/source/ui/inc/hiranges.hxx @@ -24,7 +24,7 @@ #include "global.hxx" #include "address.hxx" -//================================================================== + struct ScHighlightEntry { diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx index 668e0db0dae9..883dd0078682 100644 --- a/sc/source/ui/inc/imoptdlg.hxx +++ b/sc/source/ui/inc/imoptdlg.hxx @@ -29,7 +29,7 @@ #include "scdllapi.h" #include "global.hxx" -//=================================================================== + class SC_DLLPUBLIC ScImportOptions { diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index 10f1f0a01041..a70fb223897c 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -49,9 +49,9 @@ class CommandEvent; struct ESelection; -//======================================================================== + // ScInputHandler -//======================================================================== + class ScInputHandler : boost::noncopyable { @@ -262,9 +262,9 @@ public: static void SetAutoComplete(bool bSet) { bAutoComplete = bSet; } }; -//======================================================================== + // ScInputHdlState -//======================================================================== + class ScInputHdlState { friend class ScInputHandler; diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 4b88ede4bab6..104c03c1bcd6 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -40,7 +40,7 @@ class ScRangeList; class ScTabViewShell; class Accelerator; -//======================================================================== + class ScTextWndBase : public Window { @@ -130,7 +130,7 @@ private: ScTabViewShell* mpViewShell; }; -//======================================================================== + class ScPosWnd : public ComboBox, public SfxListener // Display position { @@ -164,7 +164,7 @@ private: void ReleaseFocus_Impl(); }; -//======================================================================== + class ScInputBarGroup; class ScMultiTextWnd : public ScTextWnd @@ -304,7 +304,7 @@ private: bool mbIsMultiLine; }; -//================================================================== + class ScInputWindowWrapper : public SfxChildWindow { diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx index 008206df3f15..7e44c86a5dc9 100644 --- a/sc/source/ui/inc/inscldlg.hxx +++ b/sc/source/ui/inc/inscldlg.hxx @@ -27,7 +27,7 @@ #include "global.hxx" -//------------------------------------------------------------------------ + class ScInsertCellDlg : public ModalDialog { diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index 02402c40db34..cc508f7ec6b8 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -25,7 +25,7 @@ #include <vcl/fixed.hxx> #include "global.hxx" -//------------------------------------------------------------------------ + #include "scui_def.hxx" class ScInsertContentsDlg : public ModalDialog diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index 754b03b304d2..6c9791f9305a 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -39,7 +39,7 @@ class ScDocShell; namespace sfx2 { class DocumentInserter; } namespace sfx2 { class FileDialogHelper; } -//------------------------------------------------------------------------ + class ScInsertTableDlg : public ModalDialog { diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index d2c093df81ab..260ff9fbbe31 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -29,7 +29,7 @@ #include <vcl/dialog.hxx> -//------------------------------------------------------------------------ + class ScSelEntryDlg : public ModalDialog { diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 2bf86f07a0ce..17dd3d78a55a 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -34,7 +34,7 @@ namespace sfx2 { class FileDialogHelper; } class ScDocShell; -//------------------------------------------------------------------------ + class ScLinkedAreaDlg : public ModalDialog { diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index 960656a0ff0b..982b1f6ee330 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -31,11 +31,11 @@ #include "uiitems.hxx" -//------------------------------------------------------------------------ + class ScDocumentPool; -//------------------------------------------------------------------------ + class ScMessagePool: public SfxItemPool { diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index d49780e74155..448c77345069 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -26,7 +26,7 @@ #include <vcl/fixed.hxx> -//------------------------------------------------------------------------ + class ScMetricInputDlg : public ModalDialog { diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 1bbc2826ff19..1f0d729c8c8f 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -28,7 +28,7 @@ #include <vcl/fixed.hxx> #include <vcl/edit.hxx> -//------------------------------------------------------------------------ + class ScMoveTableDlg : public ModalDialog { @@ -76,7 +76,7 @@ private: bool bRenameTable:1; bool mbEverEdited:1; - //-------------------------------------- + void Init (); void InitBtnRename (); void InitDocListBox (); diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 266133fe703a..93a204bf2648 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -40,7 +40,7 @@ class ScViewData; class ScDocument; -//================================================================== + //logic behind the manage names dialog class ScNameDlg : public ScAnyRefDlg diff --git a/sc/source/ui/inc/navcitem.hxx b/sc/source/ui/inc/navcitem.hxx index f97782eb2b0f..ae855327f5eb 100644 --- a/sc/source/ui/inc/navcitem.hxx +++ b/sc/source/ui/inc/navcitem.hxx @@ -24,7 +24,7 @@ #include <sfx2/ctrlitem.hxx> -//================================================================== + class ScNavigatorDlg; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 43135b09fba1..05b0a236bce0 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -41,7 +41,7 @@ class ScNavigatorDialogWrapper; class ScNavigatorDlg; class ScNavigatorSettings; -//======================================================================== + #define SC_DROPMODE_URL 0 #define SC_DROPMODE_LINK 1 @@ -53,9 +53,9 @@ enum NavListMode { NAV_LMODE_NONE = 0x4000, NAV_LMODE_DOCS = 0x800, NAV_LMODE_SCENARIOS = 0x400 }; -//======================================================================== + // class ScScenarioListBox ----------------------------------------------- -//======================================================================== + class ScScenarioListBox : public ListBox { @@ -94,9 +94,9 @@ private: ScenarioList maEntries; }; -//======================================================================== + // class ScScenarioWindow ------------------------------------------------ -//======================================================================== + class ScScenarioWindow : public Window { public: @@ -118,9 +118,9 @@ private: MultiLineEdit aEdComment; }; -//================================================================== + // class ColumnEdit -//================================================================== + class ColumnEdit : public SpinField { public: @@ -151,9 +151,9 @@ private: }; -//================================================================== + // class RowEdit -//================================================================== + class RowEdit : public NumericField { public: @@ -174,9 +174,9 @@ private: }; -//================================================================== + // class ScDocListBox -//================================================================== + class ScDocListBox : public ListBox { public: @@ -191,9 +191,9 @@ private: }; -//================================================================== + // class CommandToolBox -//================================================================== + class CommandToolBox : public ToolBox { public: @@ -216,9 +216,9 @@ private: ScNavigatorDlg& rDlg; }; -//================================================================== + // class ScNavigatorDlg -//================================================================== + class ScNavigatorDlg : public Window, public SfxListener { @@ -334,7 +334,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; -//================================================================== + class ScNavigatorDialogWrapper: public SfxChildWindowContext { diff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxx index 17edeac72e65..fd66ba03966a 100644 --- a/sc/source/ui/inc/olinefun.hxx +++ b/sc/source/ui/inc/olinefun.hxx @@ -26,7 +26,7 @@ class ScDocShell; class ScRange; -// --------------------------------------------------------------------------- + class ScOutlineDocFunc { diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index 92ff757d4a2f..f3cfe8f4dd88 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -26,12 +26,12 @@ class ScOutlineEntry; class ScOutlineArray; -// ============================================================================ + enum ScOutlineMode { SC_OUTLINE_HOR, SC_OUTLINE_VER }; -// ---------------------------------------------------------------------------- + /** The window left of or above the spreadsheet containing the outline groups and controls to expand/collapse them. */ @@ -229,7 +229,7 @@ public: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index a41c2ba06ea7..34d4f83eb0d0 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -//============================================================================ + class ScCursorRefEdit : public formula::RefEdit { diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index 890a2a2aa467..915f23a74900 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -50,12 +50,12 @@ class FmFormView; class ScFieldEditEngine; class SdrPaintWindow; -// --------------------------------------------------------------------------- + #define SC_SCENARIO_HSPACE 60 #define SC_SCENARIO_VSPACE 50 -// --------------------------------------------------------------------------- + enum ScOutputType { OUTTYPE_WINDOW, OUTTYPE_PRINTER }; diff --git a/sc/source/ui/inc/pagedata.hxx b/sc/source/ui/inc/pagedata.hxx index fc31e6ea1686..8ed128d1baf8 100644 --- a/sc/source/ui/inc/pagedata.hxx +++ b/sc/source/ui/inc/pagedata.hxx @@ -23,7 +23,7 @@ #include "global.hxx" #include "address.hxx" -//============================================================================ + class ScPrintRangeData { diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index cf4ef4e27543..649f3a53b1db 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -30,14 +30,14 @@ #include "address.hxx" #include "queryparam.hxx" -//------------------------------------------------------------------ + class ScViewData; class ScDocument; class ScQueryItem; class ScTypedStrData; -//================================================================== + class ScPivotFilterDlg : public ModalDialog { @@ -50,21 +50,21 @@ public: private: FixedLine aFlCriteria; - //---------------------------- + ListBox aLbField1; ListBox aLbCond1; ComboBox aEdVal1; - //---------------------------- + ListBox aLbConnect1; ListBox aLbField2; ListBox aLbCond2; ComboBox aEdVal2; - //---------------------------- + ListBox aLbConnect2; ListBox aLbField3; ListBox aLbCond3; ComboBox aEdVal3; - //---------------------------- + FixedText aFtConnect; FixedText aFtField; FixedText aFtCond; diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index af476e3e3c90..524da0bef6f0 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -36,7 +36,7 @@ struct ScHeaderFieldData; class ScPreviewLocationData; class CommandEvent; -//================================================================== + class ScPreviewShell: public SfxViewShell diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index f1de479b2f8a..6bdf14b76154 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -40,13 +40,13 @@ #include <boost/scoped_ptr.hpp> #include <boost/unordered_map.hpp> -// ============================================================================ + typedef sfx::ListBoxWrapper< sal_Int32 > ScDPListBoxWrapper; class ScDPObject; -// ============================================================================ + class ScDPFunctionListBox : public ListBox { @@ -60,7 +60,7 @@ private: void FillFunctionNames(); }; -// ============================================================================ + class ScDPFunctionDlg : public ModalDialog { @@ -103,7 +103,7 @@ private: bool mbEmptyItem; /// true = Empty base item in listbox. }; -// ============================================================================ + class ScDPSubtotalDlg : public ModalDialog { @@ -140,7 +140,7 @@ private: bool mbEnableLayout; /// true = Enable Layout mode controls. }; -// ============================================================================ + class ScDPSubtotalOptDlg : public ModalDialog { @@ -194,7 +194,7 @@ private: NameMapType maDataFieldNameMap; /// Cache for displayed name to field name mapping. }; -// ============================================================================ + class ScDPShowDetailDlg : public ModalDialog { @@ -225,7 +225,7 @@ private: ScDPObject& mrDPObj; }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index 6619fa2adb19..b3849219c814 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -35,7 +35,7 @@ SFX_DECL_CHILDWINDOW_WITHID(Class); \ }; -//================================================================== + DECL_WRAPPER_WITHID(ScNameDlgWrapper) DECL_WRAPPER_WITHID(ScNameDefDlgWrapper) @@ -165,7 +165,7 @@ public: void Show( sal_uInt16 nFlags ){ if( !m_bVisibleLock ) SfxChildWindow::Show( nFlags ); } }; -//================================================================== + #endif // SC_REFFACT_HXX diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 90c4863ca87b..72cd2e979ec7 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -121,7 +121,7 @@ private: ScPasswordHash meDesiredHash; }; -// ============================================================================ + class ScRetypePassInputDlg : public ModalDialog { diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx index 5ebeff1d0019..066daa363985 100644 --- a/sc/source/ui/inc/rfindlst.hxx +++ b/sc/source/ui/inc/rfindlst.hxx @@ -24,7 +24,7 @@ #include "global.hxx" #include "address.hxx" -//================================================================== + struct ScRangeFindData { diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index b075cf01ddf3..4d7f63e4b541 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -28,7 +28,7 @@ #include <svtools/svmedit.hxx> #include <svtools/ctrlbox.hxx> -//=================================================================== + class ScNewScenarioDlg : public ModalDialog { diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 514bec86a37a..139108376f8e 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef SCUI_ASCIIOPT_HXX #define SCUI_ASCIIOPT_HXX @@ -26,7 +26,7 @@ #include "asciiopt.hxx" #include "svx/langbox.hxx" -// ============================================================================ + class ScImportAsciiDlg : public ModalDialog { diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index fb016b233785..c3da04ee885e 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -57,7 +57,7 @@ private: OUString aStrDelMsg; OUString aStrRename; - //------------------------ + ScAutoFormat* pFormat; const ScAutoFormatData* pSelFmtData; sal_uInt16 nIndex; @@ -66,7 +66,7 @@ private: void Init (); void UpdateChecks (); - //------------------------ + DECL_LINK( CheckHdl, Button * ); DECL_LINK( AddHdl, void * ); DECL_LINK( RemoveHdl, void * ); diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 281c851ae1fb..721dc0fe80aa 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -23,7 +23,7 @@ #include <vcl/layout.hxx> #include "imoptdlg.hxx" -//=================================================================== + class ScDelimiterTable; diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 46f2e3eaf248..bf1b3aac6dc4 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -23,7 +23,7 @@ #include "tphfedit.hxx" //#include <boost/graph/graph_concepts.hpp> -//=================================================================== + enum ScHFEntryId { eNoneEntry , @@ -103,7 +103,7 @@ private: DECL_LINK( MenuHdl, ScExtIButton* ); }; -//=================================================================== + class ScRightHeaderEditPage : public ScHFEditPage { @@ -114,7 +114,7 @@ private: ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); }; -//=================================================================== + class ScLeftHeaderEditPage : public ScHFEditPage { @@ -125,7 +125,7 @@ private: ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); }; -//=================================================================== + class ScRightFooterEditPage : public ScHFEditPage { @@ -136,7 +136,7 @@ private: ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet ); }; -//=================================================================== + class ScLeftFooterEditPage : public ScHFEditPage { diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx index 355e1cafb7f5..5c472044ea15 100644 --- a/sc/source/ui/inc/select.hxx +++ b/sc/source/ui/inc/select.hxx @@ -24,7 +24,7 @@ #include "viewdata.hxx" -// --------------------------------------------------------------------------- + class ScTabView; class ScViewData; @@ -78,7 +78,7 @@ public: }; -// --------------------------------------------------------------------------- + class ScHeaderFunctionSet : public FunctionSet // Column / row headers diff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxx index 1a6fcc756ecf..25a2fe0abdc8 100644 --- a/sc/source/ui/inc/selectionstate.hxx +++ b/sc/source/ui/inc/selectionstate.hxx @@ -23,7 +23,7 @@ #include <editeng/editdata.hxx> #include "rangelst.hxx" -// ============================================================================ + /** Enumerates all possible types of selections in a Calc document. */ enum ScSelectionType @@ -35,7 +35,7 @@ enum ScSelectionType SC_SELECTTYPE_EDITDRAW /// Edit mode in drawing object (with or without selection). }; -// ---------------------------------------------------------------------------- + class ScViewData; @@ -65,7 +65,7 @@ private: bool operator==( const ScSelectionState& rL, const ScSelectionState& rR ); inline bool operator!=( const ScSelectionState& rL, const ScSelectionState& rR ) { return !(rL == rR); } -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index bd76d8ebae02..bfc93121df91 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -29,9 +29,9 @@ class ScViewData; class ScDocShell; -//============================================================================= + // class ScShareDocumentDlg -//============================================================================= + class ScShareDocumentDlg : public ModalDialog { diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index c7a12d3fe07b..ce4994b48847 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -25,7 +25,7 @@ #include <vcl/layout.hxx> #include <vcl/lstbox.hxx> -//------------------------------------------------------------------------ + class ScShowTabDlg : public ModalDialog { diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index 45074f973556..1ce82043adf1 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -34,7 +34,7 @@ class ScViewData; class ScDocument; -//============================================================================ + class ScSimpleRefDlg: public ScAnyRefDlg { diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index cb23af64d664..fcd5f2d0c654 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -28,7 +28,7 @@ #include <vcl/fixed.hxx> #include <vcl/group.hxx> -//---------------------------------------------------------------------------- + enum ScSolverErr { @@ -39,7 +39,7 @@ enum ScSolverErr }; -//============================================================================ + class ScSolverDlg : public ScAnyRefDlg { diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx index 849ee46e9b69..a775b791c4d4 100644 --- a/sc/source/ui/inc/sortkeydlg.hxx +++ b/sc/source/ui/inc/sortkeydlg.hxx @@ -23,7 +23,7 @@ #include <svtools/stdctrl.hxx> #include <svx/langbox.hxx> -// ======================================================================= + struct ScSortKeyItem : public VclBuilderContainer { @@ -43,7 +43,7 @@ struct ScSortKeyItem : public VclBuilderContainer typedef boost::ptr_vector<ScSortKeyItem> ScSortKeyItems; -// ======================================================================= + class ScSortKeyWindow { @@ -63,7 +63,7 @@ public: sal_Int32 GetTotalHeight() const { return m_pBox->GetSizePixel().Height(); } }; -// ======================================================================= + class ScSortKeyCtrl { diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx index 4eaf6566f877..0023d354283d 100644 --- a/sc/source/ui/inc/spelldialog.hxx +++ b/sc/source/ui/inc/spelldialog.hxx @@ -23,7 +23,7 @@ #include <memory> #include <svx/SpellDialogChildWindow.hxx> -// ============================================================================ + class ScConversionEngineBase; class ScSelectionState; @@ -92,7 +92,7 @@ private: bool mbOldIdleEnabled; }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx index e62c2288eb62..fa190bad5bff 100644 --- a/sc/source/ui/inc/spelleng.hxx +++ b/sc/source/ui/inc/spelleng.hxx @@ -28,7 +28,7 @@ class ScDocShell; class ScDocument; class SfxItemPool; -// ============================================================================ + /** Base class for special type of edit engines, i.e. for spell checker and text conversion. */ class ScConversionEngineBase : public ScEditEngineDefaulter @@ -92,7 +92,7 @@ private: bool mbFinished; /// true = Entire document/selection finished. }; -// ============================================================================ + /** Edit engine for spell checking. */ class ScSpellingEngine : public ScConversionEngineBase @@ -128,7 +128,7 @@ private: Window* GetDialogParent(); }; -// ============================================================================ + /** Edit engine for text conversion. */ class ScTextConversionEngine : public ScConversionEngineBase @@ -155,7 +155,7 @@ private: ScConversionParam maConvParam; /// Conversion parameters. }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx index 4b62732c94e3..3a11bfac1374 100644 --- a/sc/source/ui/inc/spellparam.hxx +++ b/sc/source/ui/inc/spellparam.hxx @@ -21,7 +21,7 @@ #include <vcl/font.hxx> -// ============================================================================ + /** Specifiers for sheet conversion (functions iterating over the sheet and modifying cells). */ enum ScConversionType @@ -31,7 +31,7 @@ enum ScConversionType SC_CONVERSION_CHINESE_TRANSL /// Chinese simplified/traditional converter. }; -// --------------------------------------------------------------------------- + /** Parameters for conversion. */ class ScConversionParam @@ -73,7 +73,7 @@ private: bool mbIsInteractive; /// True = Text conversion has (specific) dialog that may be raised. }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx index 5201fecee35e..f16bfd8649c9 100644 --- a/sc/source/ui/inc/styledlg.hxx +++ b/sc/source/ui/inc/styledlg.hxx @@ -22,7 +22,7 @@ #include <sfx2/styledlg.hxx> -//================================================================== + class SfxStyleSheetBase; diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 1a387c8b960c..61efeddfc702 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -24,7 +24,7 @@ #include "scui_def.hxx" -//================================================================== + class ScSubTotalDlg : public SfxTabDialog { diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index fb8330f38b4e..bf363ff009da 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -25,7 +25,7 @@ #include <vcl/button.hxx> #include <svx/SvxColorValueSet.hxx> -//------------------------------------------------------------------------ + class ScTabBgColorDlg : public ModalDialog { diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index e784dcff1eff..06fc4042e575 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -27,7 +27,7 @@ class ScViewData; -// --------------------------------------------------------------------------- + // initial size #define SC_TABBAR_DEFWIDTH 270 diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 8d87cfb27c08..db1fcd58a216 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -27,7 +27,7 @@ #include "anyrefdg.hxx" -//------------------------------------------------------------------------ + enum ScTabOpErr { @@ -40,7 +40,7 @@ enum ScTabOpErr TABOPERR_NOROWFORMULA }; -//======================================================================== + class ScTabOpDlg : public ScAnyRefDlg { diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 4e954d098299..08ce230f2bc4 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -24,7 +24,7 @@ #include <svtools/stdctrl.hxx> #include <sfx2/tabdlg.hxx> -//======================================================================== + class ScTabPageProtection : public SfxTabPage { diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index c188d1a130ae..c05baefffdde 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -60,7 +60,7 @@ namespace chart2 { namespace data { #define SC_FORCEMODE_NONE 0xff -// --------------------------------------------------------------------------- + // Help - Window class ScCornerButton : public Window @@ -82,7 +82,7 @@ public: }; -// --------------------------------------------------------------------------- + class ScTabView : boost::noncopyable { diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index b4b6b682f28f..5fdc286087f1 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -89,7 +89,7 @@ enum ObjectSelectionType OST_Media }; -//================================================================== + class ScTabViewShell: public SfxViewShell, public ScDBFunc @@ -421,7 +421,7 @@ public: void SetForceFocusOnCurCell(bool bFlag) { bForceFocusOnCurCell=bFlag; } }; -//================================================================== + #endif diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 645d98fb0405..886dde6bac05 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -28,7 +28,7 @@ #include <svtools/stdctrl.hxx> #include "editfield.hxx" -//=================================================================== + class ScDocOptions; @@ -75,7 +75,7 @@ private: private: void Init(); - //------------------------------------ + // Handler: DECL_LINK( RadioClickHdl, RadioButton* ); DECL_LINK( CheckClickHdl, CheckBox* ); diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 63b068a2fda8..d87eb644df49 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -24,7 +24,7 @@ class ScStyleDlg; -//======================================================================== + class ScHFPage : public SvxHFPage { @@ -62,7 +62,7 @@ private: #endif }; -//======================================================================== + class ScHeaderPage : public ScHFPage { @@ -74,7 +74,7 @@ private: ScHeaderPage( Window* pParent, const SfxItemSet& rSet ); }; -//======================================================================== + class ScFooterPage : public ScHFPage { diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index c4e523c4eb1c..64517b0e5e92 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <cppuhelper/weakref.hxx> -//=================================================================== + class ScHeaderEditEngine; class ScPatternAttr; @@ -98,7 +98,7 @@ private: Link aObjectSelectLink; }; -//=================================================================== + class SC_DLLPUBLIC ScExtIButton : public ImageButton { private: diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index 60a0126fd987..ca9a42fc536f 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -23,7 +23,7 @@ #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> -//=================================================================== + class ScTpPrintOptions : public SfxTabPage { diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index cf8412659322..ec3ed8c67629 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -35,7 +35,7 @@ #include "address.hxx" #include "sortparam.hxx" -//------------------------------------------------------------------------ + // +1 because one field is reserved for the "- undefined -" entry #define SC_MAXFIELDS MAXCOLCOUNT+1 @@ -44,7 +44,7 @@ class ScViewData; class ScSortDlg; struct ScSortParam; -//======================================================================== + // Sort Criteria class ScTabPageSortFields : public SfxTabPage @@ -100,7 +100,7 @@ private: DECL_LINK( SelectHdl, ListBox * ); }; -//======================================================================== + // Sort Options class ScDocument; diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index 081399a368f4..50b83e56e115 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -27,7 +27,7 @@ -//======================================================================== + class ScDocStatPage: public SfxTabPage { diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index a7ebe1f0cb89..fdc093ca2b7a 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -25,7 +25,7 @@ #include <vcl/fixed.hxx> #include "global.hxx" -//------------------------------------------------------------------------ + // +1 because one field is reserved for the "- none -" entry #define SC_MAXFIELDS MAXCOLCOUNT+1 @@ -34,7 +34,7 @@ class ScViewData; class ScDocument; struct ScSubTotalParam; -//======================================================================== + class ScTpSubTotalGroup : public SfxTabPage { @@ -76,7 +76,7 @@ private: DECL_LINK( CheckHdl, ListBox * ); }; -//------------------------------------------------------------------------ + class ScTpSubTotalGroup1 : public ScTpSubTotalGroup { @@ -93,7 +93,7 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ); }; -//------------------------------------------------------------------------ + class ScTpSubTotalGroup2 : public ScTpSubTotalGroup { @@ -110,7 +110,7 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ); }; -//------------------------------------------------------------------------ + class ScTpSubTotalGroup3 : public ScTpSubTotalGroup { @@ -127,7 +127,7 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ); }; -//======================================================================== + class ScTpSubTotalOptions : public SfxTabPage { diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 827acf03ac4d..bb064000a5e2 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -69,7 +69,7 @@ private: NumericField* m_pEdScalePageNum; private: - //------------------------------------ + // Handler: DECL_LINK(PageDirHdl, void *); DECL_LINK( PageNoHdl, CheckBox* ); diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index bfb77da2f9c7..0879cd0a1dcf 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -25,7 +25,7 @@ #include <vcl/lstbox.hxx> #include <vcl/vclmedit.hxx> -//======================================================================== + class ScUserList; class ScDocument; diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 2b99c09d6637..547864673588 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -27,11 +27,11 @@ #include <svtools/ctrlbox.hxx> #include <svx/strarray.hxx> -//======================================================================== + class ScViewOptions; -//======================================================================== + class ScTpContentOptions : public SfxTabPage { @@ -85,7 +85,7 @@ public: }; -//======================================================================== + class ScDocument; class ScTpLayoutOptions : public SfxTabPage @@ -135,7 +135,7 @@ public: void SetDocument(ScDocument* pPtr){pDoc = pPtr;} }; -//======================================================================== + #endif // SC_TPUSRLST_HXX diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 8e6299917ffc..19a045cd787d 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -40,7 +40,7 @@ class ScViewData; class ScDPSaveData; struct ScQueryParam; -// --------------------------------------------------------------------------- + // Items @@ -146,7 +146,7 @@ public: sal_uInt16 GetIndex() const { return nIndex; } }; -//---------------------------------------------------------------------------- + // Parameter item for the sort dialog: class SC_DLLPUBLIC ScSortItem : public SfxPoolItem @@ -174,7 +174,7 @@ private: ScSortParam theSortData; }; -//---------------------------------------------------------------------------- + class SC_DLLPUBLIC ScQueryItem : public SfxPoolItem { @@ -205,7 +205,7 @@ private: bool bIsAdvanced; }; -//---------------------------------------------------------------------------- + class SC_DLLPUBLIC ScSubTotalItem : public SfxPoolItem { @@ -232,7 +232,7 @@ private: ScSubTotalParam theSubTotalData; }; -//---------------------------------------------------------------------------- + class SC_DLLPUBLIC ScUserListItem : public SfxPoolItem { @@ -253,7 +253,7 @@ private: ScUserList* pUserList; }; -//---------------------------------------------------------------------------- + class ScConsolidateItem : public SfxPoolItem { @@ -274,7 +274,7 @@ private: ScConsolidateParam theConsData; }; -//---------------------------------------------------------------------------- + class ScPivotItem : public SfxPoolItem { @@ -299,7 +299,7 @@ private: bool bNewSheet; }; -//---------------------------------------------------------------------------- + class ScSolveItem : public SfxPoolItem { @@ -320,7 +320,7 @@ private: ScSolveParam theSolveData; }; -//---------------------------------------------------------------------------- + class ScTabOpItem : public SfxPoolItem { diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 87d602825362..b04784928643 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -31,7 +31,7 @@ class SdrUndoAction; class ScRefUndoData; class ScDBData; -//---------------------------------------------------------------------------- + class ScSimpleUndo: public SfxUndoAction { @@ -63,7 +63,7 @@ protected: static void ShowTable( const ScRange& rRange ); }; -//---------------------------------------------------------------------------- + enum ScBlockUndoMode { SC_UNDO_SIMPLE, SC_UNDO_MANUALHEIGHT, SC_UNDO_AUTOHEIGHT }; @@ -110,7 +110,7 @@ protected: void ShowBlock(); }; -//---------------------------------------------------------------------------- + // for functions that act on a database range - takes care of the unnamed database range // (collected separately, before the undo action, for showing dialogs etc.) @@ -135,7 +135,7 @@ public: void EndRedo(); }; -//---------------------------------------------------------------------------- + enum ScMoveUndoMode { SC_UNDO_REFFIRST, SC_UNDO_REFLAST }; @@ -163,7 +163,7 @@ private: void UndoRef(); }; -//---------------------------------------------------------------------------- + class ScUndoWrapper: public SfxUndoAction // for manual merging of actions { diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index e2cb6f6b7f6a..520e2f974696 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -41,7 +41,7 @@ class SvxSearchItem; class SdrUndoAction; class ScEditDataArray; -//---------------------------------------------------------------------------- + class ScUndoInsertCells: public ScMoveUndo { diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 6bda9c7b8c88..199eae3fd021 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -254,7 +254,7 @@ private: void SetChangeTrack( const ScCellValue& rOldCell ); }; -// ============================================================================ + /** Undo action for inserting, removing, and replacing a cell note. */ class ScUndoReplaceNote : public ScSimpleUndo @@ -298,7 +298,7 @@ private: SdrUndoAction* mpDrawUndo; }; -// ============================================================================ + /** Undo action for showing or hiding a cell note caption. */ class ScUndoShowHideNote : public ScSimpleUndo @@ -320,7 +320,7 @@ private: bool mbShown; }; -// ============================================================================ + class ScUndoDetective: public ScSimpleUndo { diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index feb658d1187e..20c6ba836b0e 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -40,7 +40,7 @@ class ScDPObject; class SdrUndoAction; class ScMarkData; -//---------------------------------------------------------------------------- + class ScUndoDoOutline: public ScSimpleUndo { diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index 49e1ab654a44..34d00c043a51 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -26,7 +26,7 @@ class ScDocShell; class SfxStyleSheetBase; -//---------------------------------------------------------------------------- + class ScStyleSaveData { diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index b0276ca67ce5..e24f0d94e66a 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -42,7 +42,7 @@ class ScDocProtection; class ScTableProtection; class ScMarkData; -//---------------------------------------------------------------------------- + class ScUndoInsertTab : public ScSimpleUndo { @@ -351,7 +351,7 @@ private: void DoChange( bool bShow ) const; }; -// ============================================================================ + /** This class implements undo & redo of document protect & unprotect operations. */ @@ -378,7 +378,7 @@ private: void DoProtect(bool bProtect); }; -// ============================================================================ + /** This class implements undo & redo of both protect and unprotect of sheet. */ diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index e6a0a04654f0..9bc029af93ed 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -30,7 +30,7 @@ #include "anyrefdg.hxx" -// ============================================================================ + struct ScRefHandlerCaller{ virtual ~ScRefHandlerCaller(){} @@ -176,7 +176,7 @@ public: }; -// ============================================================================ + /** The tab page "Criteria" from the Validation dialog. */ class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage @@ -259,7 +259,7 @@ public: }; -//================================================================== + class ScTPValidationHelp : public SfxTabPage { @@ -283,7 +283,7 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ); }; -//================================================================== + class ScTPValidationError : public SfxTabPage { diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 87c380e7ca9a..d8eb8a2188b2 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -25,7 +25,7 @@ #include <boost/scoped_ptr.hpp> -// --------------------------------------------------------------------------- + #define SC_SMALL3DSHADOW COL_BLACK #define SC_SIZE_NONE 65535 @@ -104,7 +104,7 @@ class ScExtDocOptions; class ScViewData; class ScMarkData; -//-------------------------------------------------------------------------- + class ScViewDataTable // per-sheet data { @@ -154,7 +154,7 @@ public: ~ScViewDataTable(); }; -// --------------------------------------------------------------------------- + class SC_DLLPUBLIC ScViewData { @@ -501,7 +501,7 @@ public: }; -// --------------------------------------------------------------------------- + inline long ScViewData::ToPixel( sal_uInt16 nTwips, double nFactor ) { diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 241a09cdbe56..bc9408bc7070 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -60,7 +60,7 @@ struct ColRowSpan; namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable; } } } } -//================================================================== + class ScViewFunc : public ScTabView { diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx index 2218abf037b8..d06257872971 100644 --- a/sc/source/ui/inc/warnbox.hxx +++ b/sc/source/ui/inc/warnbox.hxx @@ -23,7 +23,7 @@ #include <vcl/msgbox.hxx> -// ============================================================================ + /** Message box with warning image and "Do not show again" checkbox. */ class ScCbWarningBox : public WarningBox @@ -45,7 +45,7 @@ public: }; -// ---------------------------------------------------------------------------- + /** Warning box for "Replace cell contents?". */ class ScReplaceWarnBox : public ScCbWarningBox @@ -60,7 +60,7 @@ public: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 547cb9ea8b0e..83d0f488485c 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -52,7 +52,7 @@ #define RD_SPECIAL_CONTENT 1 #define RD_SPECIAL_VISCONTENT 2 -//============================================================================ + // class ScRedlinData ScRedlinData::ScRedlinData() @@ -79,7 +79,7 @@ ScRedlinData::~ScRedlinData() bIsAcceptable=false; } -//============================================================================ + // class ScAcceptChgDlg ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 7d874cce6690..2e29bea0002b 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -763,7 +763,7 @@ static void lcl_HideAllReferences() } } -//============================================================================ + //The class of ScAnyRefDlg is rewritten by PengYunQuan for Validity Cell Range Picker // class ScRefHandler @@ -947,10 +947,10 @@ bool ScRefHandler::IsTableLocked() const } -// + // RefInputStart/Done: Zoom-In (AutoHide) auf einzelnes Feld // (per Button oder Bewegung) -// + void ScRefHandler::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton ) diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 1d3bc2874a0c..6b80b79bd0f0 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -53,7 +53,7 @@ #define FRAME_OFFSET 4 -//======================================================================== + // ScAutoFmtPreview ScAutoFmtPreview::ScAutoFmtPreview( Window* pParent, const ResId& rRes, ScDocument* pDoc ) : diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 9dafeb60bf32..05b1fbe61067 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -27,9 +27,9 @@ #include "dbfunc.hxx" -//============================================================================= + // struct ScConflictsListEntry -//============================================================================= + bool ScConflictsListEntry::HasSharedAction( sal_uLong nSharedAction ) const { @@ -60,9 +60,9 @@ bool ScConflictsListEntry::HasOwnAction( sal_uLong nOwnAction ) const } -//============================================================================= + // class ScConflictsListHelper -//============================================================================= + bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, sal_uLong nOwnAction ) { @@ -148,9 +148,9 @@ void ScConflictsListHelper::TransformConflictsList( ScConflictsList& rConflictsL } -//============================================================================= + // class ScConflictsFinder -//============================================================================= + ScConflictsFinder::ScConflictsFinder( ScChangeTrack* pTrack, sal_uLong nStartShared, sal_uLong nEndShared, sal_uLong nStartOwn, sal_uLong nEndOwn, ScConflictsList& rConflictsList ) @@ -284,9 +284,9 @@ bool ScConflictsFinder::Find() return bReturn; } -//============================================================================= + // class ScConflictsResolver -//============================================================================= + ScConflictsResolver::ScConflictsResolver( ScChangeTrack* pTrack, ScConflictsList& rConflictsList ) :mpTrack ( pTrack ) @@ -380,9 +380,9 @@ void ScConflictsResolver::HandleAction( ScChangeAction* pAction, bool bIsSharedA } } -//============================================================================= + // class ScConflictsDlg -//============================================================================= + ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ) :ModalDialog( pParent, ScResId( RID_SCDLG_CONFLICTS ) ) diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 951d8cf5945a..974063a049ab 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -29,7 +29,7 @@ #include <vcl/msgbox.hxx> -//============================================================================ + #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute() #define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute() @@ -39,7 +39,7 @@ const sal_uLong nEntryDataRow = 1; const sal_uLong nEntryDataDelim = 2; -//============================================================================ + // class ScColRowNameRangesDlg @@ -668,7 +668,7 @@ bool ScColRowNameRangesDlg::IsRefInputMode() const // Handler: -// ======== + /************************************************************************* #* Handler: OkBtnHdl diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx index 0f5cc7dce2a2..b26a0f87bcfe 100644 --- a/sc/source/ui/miscdlgs/delcldlg.cxx +++ b/sc/source/ui/miscdlgs/delcldlg.cxx @@ -31,7 +31,7 @@ static sal_uInt8 nDelItemChecked=0; -//================================================================== + ScDeleteCellDlg::ScDeleteCellDlg(Window* pParent, bool bDisallowCellMove) : ModalDialog(pParent, "DeleteCellsDialog", "modules/scalc/ui/deletecells.ui") diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index deb5e2d58a2b..98ea97518511 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -26,7 +26,7 @@ #include "miscdlgs.hrc" -//================================================================== + bool ScDeleteContentsDlg::bPreviousAllCheck = false; sal_uInt16 ScDeleteContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING | @@ -38,7 +38,7 @@ sal_uInt16 ScDeleteContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent, sal_uInt16 nCheckDefaults ) : ModalDialog ( pParent, "DeleteContentsDialog", "modules/scalc/ui/deletecontents.ui" ), - // + bObjectsDisabled( false ) { get( aBtnDelAll, "deleteall" ); diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 409498d92996..72cf476ab215 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -39,7 +39,7 @@ -//============================================================================ + // class ScFillSeriesDlg diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index f5689f338bdf..2a1388b235cf 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.cxx @@ -28,7 +28,7 @@ #include "scresid.hxx" -//================================================================== + ScGroupDlg::ScGroupDlg(Window* pParent, bool bUngroup, bool bRows) : ModalDialog(pParent, diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 58b32da9dd70..29ba0666356f 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -36,7 +36,7 @@ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE #define ABS_DREF3D ABS_DREF | SCA_TAB_3D -//============================================================================ + // class ScHighlightChgDlg diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index ac7760f6bf2c..b5b59a5f2fd9 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.cxx @@ -31,7 +31,7 @@ static sal_uInt8 nInsItemChecked=0; -//================================================================== + ScInsertCellDlg::ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove) : ModalDialog ( pParent, "InsertCellsDialog", "modules/scalc/ui/insertcells.ui") diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 3c979b539e74..08b1a163f6e4 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -29,7 +29,7 @@ #include "miscdlgs.hrc" -//================================================================== + bool ScInsertContentsDlg::bPreviousAllCheck = false; sal_uInt16 ScInsertContentsDlg::nPreviousChecks = (IDF_VALUE | IDF_DATETIME | IDF_STRING); diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index ade61782d536..5ab17d9ea542 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -41,7 +41,7 @@ #define SC_INSTBDLG_CXX #include "instbdlg.hxx" -//================================================================== + ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile ) : ModalDialog(pParent, "InsertSheetDialog", "modules/scalc/ui/insertsheet.ui") diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index 71bb8561f00a..6e38b9d547ba 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -30,7 +30,7 @@ #include "scresid.hxx" #include "miscdlgs.hrc" -//================================================================== + ScSelEntryDlg::ScSelEntryDlg(Window* pParent, const std::vector<OUString> &rEntryList) : ModalDialog(pParent, "SelectRangeDialog", "modules/scalc/ui/selectrange.ui") diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 879afd4d1aae..37a814c02182 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -40,7 +40,7 @@ #include "docsh.hxx" #include "tablink.hxx" -//================================================================== + ScLinkedAreaDlg::ScLinkedAreaDlg(Window* pParent) : ModalDialog(pParent, "ExternalDataDialog", "modules/scalc/ui/externaldata.ui") diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 99bcb8ced250..0ef64464f46d 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -29,7 +29,7 @@ #include "miscdlgs.hrc" -//================================================================== + ScMetricInputDlg::ScMetricInputDlg( Window* pParent, OString sDialogName, diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 9e7bda9667ed..54453fa97321 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -34,7 +34,7 @@ #include "scresid.hxx" #include "globstr.hrc" -//================================================================== + ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const OUString& rDefault) diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index a8f50292ccca..b771e8f67eaf 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -151,7 +151,7 @@ ScOptSolverSave::ScOptSolverSave( const OUString& rObjective, bool bMax, bool bM { } -//============================================================================ + // class ScOptSolverDlg @@ -161,7 +161,7 @@ ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP : ScAnyRefDlg(pB, pCW, pParent, "SolverDialog", "modules/scalc/ui/solverdlg.ui") , maInputError(ScGlobal::GetRscString(STR_INVALIDINPUT)) , maConditionError(ScGlobal::GetRscString(STR_INVALIDCONDITION)) - // + , mpDocShell(pDocSh) , mpDoc(pDocSh->GetDocument()) , mnCurTab(aCursorPos.Tab()) diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 8079316fdc65..6f1e6b376757 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -392,7 +392,7 @@ IMPL_LINK_NOARG(ScRetypePassDlg, ScrollHdl) return 0; } -// ============================================================================ + ScRetypePassInputDlg::ScRetypePassInputDlg(Window* pParent, ScPassHashProtectable* pProtected) : ModalDialog(pParent, "RetypePasswordDialog", diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 4b1d4fa7f3c2..7186c5e02a44 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -53,7 +53,7 @@ #include "scresid.hxx" #include "document.hxx" -//======================================================================== + // AutoFormat-Dialog: ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, @@ -62,7 +62,7 @@ ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, ScDocument* pDoc ) : ModalDialog ( pParent, ScResId( RID_SCDLG_AUTOFORMAT ) ), - // + aFlFormat ( this, ScResId( FL_FORMAT ) ), aLbFormat ( this, ScResId( LB_FORMAT ) ), pWndPreview ( new ScAutoFmtPreview( this, ScResId( WND_PREVIEW ), pDoc ) ), @@ -86,7 +86,7 @@ ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, aStrDelTitle ( ScResId( STR_DEL_TITLE ) ), aStrDelMsg ( ScResId( STR_DEL_MSG ) ) , aStrRename ( ScResId( STR_RENAME_TITLE ) ), - // + pFormat ( pAutoFormat ), pSelFmtData ( pSelFormatData ), nIndex ( 0 ), diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index d845ebab89a6..5200e2f9d2b8 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -69,9 +69,9 @@ public: } }; -//============================================================================= + // class ScShareDocumentDlg -//============================================================================= + ScShareDocumentDlg::ScShareDocumentDlg( Window* pParent, ScViewData* pViewData ) : ModalDialog(pParent, "ShareDocumentDialog", "modules/scalc/ui/sharedocumentdlg.ui") diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 7a1f93d39f13..6f511c5139fa 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -31,7 +31,7 @@ #include "miscdlgs.hrc" -//================================================================== + ScShowTabDlg::ScShowTabDlg(Window* pParent) : ModalDialog(pParent, "ShowSheetDialog", "modules/scalc/ui/showsheetdialog.ui") diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index e9ab70bb22cc..07023e96f3fa 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -28,7 +28,7 @@ #include "simpref.hxx" #include "scmod.hxx" -//============================================================================ + #define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE @@ -195,7 +195,7 @@ void ScSimpleRefDlg::RefInputDone( bool bForced) } // Handler: -// ======== + IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl) { bAutoReOpen=false; diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 76ed6391f3ce..97a63b8fd083 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -39,7 +39,7 @@ using namespace com::sun::star; -//================================================================== + /// Helper for sorting properties struct ScSolverOptionsEntry diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 26000471746e..a03a2839fe5a 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -38,7 +38,7 @@ #include <boost/scoped_ptr.hpp> -//================================================================== + #define HDL(hdl) LINK(this,ScTabBgColorDlg,hdl) diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 5c74f8e76b4f..adbfbc8b1c59 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -31,7 +31,7 @@ #include "tabopdlg.hxx" -//============================================================================ + // class ScTabOpDlg diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index 606e4d113c11..acb908faacce 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -25,7 +25,7 @@ #include "sc.hrc" -// ============================================================================ + ScCbWarningBox::ScCbWarningBox( Window* pParent, const OUString& rMsgStr, bool bDefYes ) : WarningBox( pParent, WB_YES_NO | (bDefYes ? WB_DEF_YES : WB_DEF_NO), rMsgStr ) @@ -80,6 +80,6 @@ void ScReplaceWarnBox::DisableDialog() } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 1fb8a11f8412..550ed6b11dae 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -56,7 +56,7 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, , maErrInvalidNameStr(ScGlobal::GetRscString(STR_ERR_NAME_INVALID)) , maErrNameInUse(ScGlobal::GetRscString(STR_ERR_NAME_EXISTS)) , maStrMultiSelect(ScGlobal::GetRscString(STR_MULTI_SELECT)) - // + , mpViewData(ptrViewData) , mpDoc(ptrViewData->GetDocument()) , maCursorPos(aCursorPos) diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index 0bae7989c7b5..3f188c3efe3b 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -32,7 +32,7 @@ #include "viewdata.hxx" -//================================================================== + ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool ) : ModalDialog( pParent, "InsertNameDialog", "modules/scalc/ui/insertname.ui" ) diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index e145143b87d0..08e19e38b264 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -111,9 +111,9 @@ ScDocShell* ScContentTree::GetManualOrCurrent() return pSh; } -// + // ScContentTree -// + ScContentTree::ScContentTree( Window* pParent, const ResId& rResId ) : SvTreeListBox ( pParent, rResId ), diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx index a3be41e53ba7..2f89813ded20 100644 --- a/sc/source/ui/navipi/navcitem.cxx +++ b/sc/source/ui/navipi/navcitem.cxx @@ -89,9 +89,9 @@ void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemStat break; case SID_CURRENTDOC: - // + // gar nix mehr, wird ueber SFX_HINT_DOCCHANGED erledigt - // + break; diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 4255ee90d796..56fc3e0d201a 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -78,9 +78,9 @@ void ScNavigatorDlg::ReleaseFocus() } } -//================================================================== + // class ColumnEdit -//================================================================== + ColumnEdit::ColumnEdit( ScNavigatorDlg* pParent, const ResId& rResId ) : SpinField ( pParent, rResId ), @@ -281,9 +281,9 @@ SCCOL ColumnEdit::NumToAlpha( SCCOL nColNo, OUString& rStr ) return nColNo; } -//================================================================== + // class RowEdit -//================================================================== + RowEdit::RowEdit( ScNavigatorDlg* pParent, const ResId& rResId ) : NumericField( pParent, rResId ), @@ -337,9 +337,9 @@ void RowEdit::ExecuteRow() rDlg.SetCurrentCell( nCol-1, nRow-1 ); } -//================================================================== + // class ScDocListBox -//================================================================== + ScDocListBox::ScDocListBox( ScNavigatorDlg* pParent, const ResId& rResId ) : ListBox ( pParent, rResId ), @@ -363,9 +363,9 @@ void ScDocListBox::Select() rDlg.aLbEntries.SelectDoc( aDocName ); } -//================================================================== + // class CommandToolBox -//================================================================== + CommandToolBox::CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId ) : ToolBox ( pParent, rResId ), @@ -526,9 +526,9 @@ void CommandToolBox::DataChanged( const DataChangedEvent& rDCEvt ) ToolBox::DataChanged( rDCEvt ); } -//================================================================== + // class ScNavigatorSettings -//================================================================== + ScNavigatorSettings::ScNavigatorSettings() : maExpandedVec( SC_CONTENT_COUNT, false ), @@ -537,9 +537,9 @@ ScNavigatorSettings::ScNavigatorSettings() : { } -//================================================================== + // class ScNavigatorDlgWrapper -//================================================================== + SFX_IMPL_CHILDWINDOWCONTEXT( ScNavigatorDialogWrapper, SID_NAVIGATOR ) @@ -609,9 +609,9 @@ void ScNavigatorDialogWrapper::Resizing( Size& rSize ) ((ScNavigatorDlg*)GetWindow())->Resizing(rSize); } -//======================================================================== + // class ScNavigatorPI -//======================================================================== + #define CTRL_ITEMS 4 @@ -1309,9 +1309,9 @@ void ScNavigatorDlg::ShowScenarios( bool bShow, bool bSetSize ) -// + // Dokumente fuer Dropdown-Listbox -// + void ScNavigatorDlg::GetDocNames( const OUString* pManualSel ) diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src index d72d00633d94..9a38df0baa86 100644 --- a/sc/source/ui/navipi/navipi.src +++ b/sc/source/ui/navipi/navipi.src @@ -147,12 +147,12 @@ Window RID_SCDLG_NAVIGATOR HelpId = HID_SC_NAVIPI_DOWN ; Text [ en-US ] = "End" ; }; - //-------------------------------------------- + // ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR; }; - //-------------------------------------------- - //---------------------------------------- + + ToolBoxItem { Type = TOOLBOXITEM_BREAK ; }; - //---------------------------------------- + ToolBoxItem { Identifier = IID_ZOOMOUT ; diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index eb88a4b375a9..5b578f0ecffe 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -31,9 +31,9 @@ #include "sc.hrc" #include "globstr.hrc" -//======================================================================== + // class ScScenarioWindow ------------------------------------------------ -//======================================================================== + ScScenarioListBox::ScScenarioListBox( ScScenarioWindow& rParent ) : ListBox( &rParent, WB_BORDER | WB_TABSTOP ), @@ -194,9 +194,9 @@ void ScScenarioListBox::DeleteScenario( bool bQueryBox ) ExecuteScenarioSlot( SID_DELETE_SCENARIO ); } -//======================================================================== + // class ScScenarioWindow ------------------------------------------------ -//======================================================================== + ScScenarioWindow::ScScenarioWindow( Window* pParent, const OUString& aQH_List, const OUString& aQH_Comment) diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 2b9dcbae11e0..5c3a4d6363e5 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -38,7 +38,7 @@ #include <math.h> -//======================================================================== + ScTpCalcOptions::ScTpCalcOptions(Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "OptCalculatePage", diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 731073f88ca8..e680b7fa6f47 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -47,7 +47,7 @@ static const sal_Unicode cDelimiter = ','; -//======================================================================== + // Benutzerdefinierte Listen: diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 278dfef35328..da72cedbd1f1 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -52,7 +52,7 @@ const sal_uInt16 SC_AREASDLG_RR_NONE = 0; const sal_uInt16 SC_AREASDLG_RR_USER = 1; const sal_uInt16 SC_AREASDLG_RR_OFFSET = 2; -//============================================================================ + #define HDL(hdl) LINK( this, ScPrintAreasDlg, hdl ) @@ -91,7 +91,7 @@ static void printAddressFlags(sal_uInt16 nFlag) } #endif -//============================================================================ + // class ScPrintAreasDlg @@ -668,7 +668,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) } -//============================================================================ + // globale Funktionen: diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index 9e04835ba7a7..a4fdbe80f641 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -47,7 +47,7 @@ ((SvxSetItem&)(set).Get(ATTR_PAGE_FOOTERSET)).GetItemSet(). \ Get(ATTR_PAGE_SHARED)).GetValue() -//================================================================== + ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, Window* pParent, diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc index f9060ff5e71d..b8df46eea585 100644 --- a/sc/source/ui/pagedlg/pagedlg.hrc +++ b/sc/source/ui/pagedlg/pagedlg.hrc @@ -21,7 +21,7 @@ #include "sc.hrc" // -> RID_SCPAGE_AREAS -//================================================ + // TabPage: Tabelle #define IMG_LEFTRIGHT (SC_DIALOGS_START + 43 + 23) diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 1847642b2285..0f5c3002e019 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -56,9 +56,9 @@ static ScEditWindow* pActiveEdWnd = NULL; -//======================================================================== + // class ScHFEditPage -// + ScHFEditPage::ScHFEditPage( Window* pParent, const SfxItemSet& rCoreAttrs, @@ -840,9 +840,9 @@ IMPL_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn ) return 0; } -//======================================================================== + // class ScRightHeaderEditPage -//======================================================================== + ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, @@ -856,9 +856,9 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& SfxTabPage* ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScRightHeaderEditPage( pParent, rCoreSet ) ); }; -//======================================================================== + // class ScLeftHeaderEditPage -//======================================================================== + ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, @@ -872,9 +872,9 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& r SfxTabPage* ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScLeftHeaderEditPage( pParent, rCoreSet ) ); }; -//======================================================================== + // class ScRightFooterEditPage -//======================================================================== + ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, @@ -888,9 +888,9 @@ ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& SfxTabPage* ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScRightFooterEditPage( pParent, rCoreSet ) ); }; -//======================================================================== + // class ScLeftFooterEditPage -//======================================================================== + ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 3b566e527545..203102c1e4d6 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -46,9 +46,9 @@ -//================================================================== + // class ScHFPage -//================================================================== + ScHFPage::ScHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) @@ -264,9 +264,9 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl) return 0; } -//================================================================== + // class ScHeaderPage -//================================================================== + ScHeaderPage::ScHeaderPage( Window* pParent, const SfxItemSet& rSet ) : ScHFPage( pParent, rSet, SID_ATTR_PAGE_HEADERSET ) @@ -287,9 +287,9 @@ sal_uInt16* ScHeaderPage::GetRanges() return SvxHeaderPage::GetRanges(); } -//================================================================== + // class ScFooterPage -//================================================================== + ScFooterPage::ScFooterPage( Window* pParent, const SfxItemSet& rSet ) : ScHFPage( pParent, rSet, SID_ATTR_PAGE_FOOTERSET ) diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 8456893d21ee..a6736a87e02f 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -55,7 +55,7 @@ ScEditWindow* GetScEditWindow () return pActiveEdWnd; } -//======================================================================== + static void lcl_GetFieldData( ScHeaderFieldData& rData ) { @@ -69,9 +69,9 @@ static void lcl_GetFieldData( ScHeaderFieldData& rData ) } } -//======================================================================== + // class ScEditWindow -//======================================================================== + ScEditWindow::ScEditWindow( Window* pParent, WinBits nBits, ScEditWindowLocation eLoc ) : Control( pParent, nBits ), diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index a00819222c89..256fd3aaccf5 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -44,12 +44,12 @@ const char UNO_ALIGNRIGHT[] = ".uno:AlignRight"; const char UNO_ALIGNTOP[] = ".uno:AlignTop"; const char UNO_ALIGNVCENTER[] = ".uno:AlignVCenter"; -////////////////////////////////////////////////////////////////////////////// + // namespace open namespace sc { namespace sidebar { -////////////////////////////////////////////////////////////////////////////// + AlignmentPropertyPanel::AlignmentPropertyPanel( Window* pParent, @@ -87,13 +87,13 @@ AlignmentPropertyPanel::AlignmentPropertyPanel( mpFtRotate->SetBackground(Wallpaper()); } -////////////////////////////////////////////////////////////////////////////// + AlignmentPropertyPanel::~AlignmentPropertyPanel() { } -////////////////////////////////////////////////////////////////////////////// + void AlignmentPropertyPanel::Initialize() { @@ -146,7 +146,7 @@ void AlignmentPropertyPanel::Initialize() #endif } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK( AlignmentPropertyPanel, AngleModifiedHdl, void *, EMPTYARG ) { @@ -168,7 +168,7 @@ IMPL_LINK( AlignmentPropertyPanel, AngleModifiedHdl, void *, EMPTYARG ) return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK( AlignmentPropertyPanel, RotationHdl, void *, EMPTYARG ) { @@ -181,7 +181,7 @@ IMPL_LINK( AlignmentPropertyPanel, RotationHdl, void *, EMPTYARG ) return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK( AlignmentPropertyPanel, ClickStackHdl, void *, EMPTYARG ) { @@ -192,7 +192,7 @@ IMPL_LINK( AlignmentPropertyPanel, ClickStackHdl, void *, EMPTYARG ) return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(AlignmentPropertyPanel, TbxHorAlignSelectHdl, ToolBox*, pToolBox) { @@ -232,7 +232,7 @@ IMPL_LINK(AlignmentPropertyPanel, TbxHorAlignSelectHdl, ToolBox*, pToolBox) return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(AlignmentPropertyPanel, TbxVerAlignSelectHdl, ToolBox*, pToolBox) { @@ -265,7 +265,7 @@ IMPL_LINK(AlignmentPropertyPanel, TbxVerAlignSelectHdl, ToolBox*, pToolBox) return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(AlignmentPropertyPanel, MFLeftIndentMdyHdl, void*, EMPTYARG) { @@ -277,7 +277,7 @@ IMPL_LINK(AlignmentPropertyPanel, MFLeftIndentMdyHdl, void*, EMPTYARG) return( 0L ); } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(AlignmentPropertyPanel, CBOXMergnCellClkHdl, void*, EMPTYARG) { @@ -296,7 +296,7 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXMergnCellClkHdl, void*, EMPTYARG) return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, void*, EMPTYARG) { @@ -306,7 +306,7 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, void*, EMPTYARG) return 0; } -////////////////////////////////////////////////////////////////////////////// + AlignmentPropertyPanel* AlignmentPropertyPanel::Create ( Window* pParent, @@ -326,7 +326,7 @@ AlignmentPropertyPanel* AlignmentPropertyPanel::Create ( pBindings); } -////////////////////////////////////////////////////////////////////////////// + void AlignmentPropertyPanel::DataChanged( const DataChangedEvent& rEvent) @@ -334,7 +334,7 @@ void AlignmentPropertyPanel::DataChanged( (void)rEvent; } -////////////////////////////////////////////////////////////////////////////// + void AlignmentPropertyPanel::HandleContextChange( const ::sfx2::sidebar::EnumContext aContext) @@ -352,7 +352,7 @@ void AlignmentPropertyPanel::HandleContextChange( // todo } -////////////////////////////////////////////////////////////////////////////// + void AlignmentPropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, @@ -520,14 +520,14 @@ void AlignmentPropertyPanel::NotifyItemUpdate( } } -////////////////////////////////////////////////////////////////////////////// + SfxBindings* AlignmentPropertyPanel::GetBindings() { return mpBindings; } -////////////////////////////////////////////////////////////////////////////// + void AlignmentPropertyPanel::FormatDegrees(double& dTmp) { @@ -537,7 +537,7 @@ void AlignmentPropertyPanel::FormatDegrees(double& dTmp) dTmp = 359; } -////////////////////////////////////////////////////////////////////////////// + void AlignmentPropertyPanel::UpdateHorAlign() { @@ -589,7 +589,7 @@ void AlignmentPropertyPanel::UpdateHorAlign() } } -////////////////////////////////////////////////////////////////////////////// + void AlignmentPropertyPanel::UpdateVerAlign() { @@ -610,12 +610,12 @@ void AlignmentPropertyPanel::UpdateVerAlign() } } -////////////////////////////////////////////////////////////////////////////// + // namespace close }} // end of namespace ::sc::sidebar -////////////////////////////////////////////////////////////////////////////// + // eof /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index 6149faba9245..2ebc5bfc964c 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -52,7 +52,7 @@ const char UNO_SETBORDERSTYLE[] = ".uno:SetBorderStyle"; const char UNO_LINESTYLE[] = ".uno:LineStyle"; const char UNO_FRAMELINECOLOR[] = ".uno:FrameLineColor"; -////////////////////////////////////////////////////////////////////////////// + // helpers namespace @@ -63,12 +63,12 @@ namespace } } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + // namespace open namespace sc { namespace sidebar { -////////////////////////////////////////////////////////////////////////////// + svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateFillColorPopupControl(svx::sidebar::PopupContainer* pParent) { @@ -94,7 +94,7 @@ void CellAppearancePropertyPanel::SetFillColor( maBackColor = aColor; } -////////////////////////////////////////////////////////////////////////////// + svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateLineColorPopupControl(svx::sidebar::PopupContainer* pParent) { @@ -118,7 +118,7 @@ void CellAppearancePropertyPanel::SetLineColor( maLineColor = aColor; } -////////////////////////////////////////////////////////////////////////////// + svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellLineStylePopupControl(svx::sidebar::PopupContainer* pParent) { @@ -133,7 +133,7 @@ void CellAppearancePropertyPanel::EndCellLineStylePopupMode(void) } } -////////////////////////////////////////////////////////////////////////////// + svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent) { @@ -148,7 +148,7 @@ void CellAppearancePropertyPanel::EndCellBorderStylePopupMode(void) } } -////////////////////////////////////////////////////////////////////////////// + CellAppearancePropertyPanel::CellAppearancePropertyPanel( Window* pParent, @@ -230,13 +230,13 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel( Initialize(); } -////////////////////////////////////////////////////////////////////////////// + CellAppearancePropertyPanel::~CellAppearancePropertyPanel() { } -////////////////////////////////////////////////////////////////////////////// + void CellAppearancePropertyPanel::Initialize() { @@ -275,7 +275,7 @@ void CellAppearancePropertyPanel::Initialize() mpTBLineStyle->SetAccessibleRelationLabeledBy(mpTBLineStyle); } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(CellAppearancePropertyPanel, TbxBKColorSelectHdl, ToolBox*, pToolBox) { @@ -289,7 +289,7 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxBKColorSelectHdl, ToolBox*, pToolBox) return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(CellAppearancePropertyPanel, TbxLineColorSelectHdl, ToolBox*, pToolBox) { @@ -303,7 +303,7 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxLineColorSelectHdl, ToolBox*, pToolBox return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBox) { @@ -328,7 +328,7 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBo return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pToolBox) { @@ -354,7 +354,7 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pToolBox return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, void*, EMPTYARG) { @@ -364,7 +364,7 @@ IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, void*, EMPTYARG) return 0; } -////////////////////////////////////////////////////////////////////////////// + CellAppearancePropertyPanel* CellAppearancePropertyPanel::Create ( Window* pParent, @@ -384,7 +384,7 @@ CellAppearancePropertyPanel* CellAppearancePropertyPanel::Create ( pBindings); } -////////////////////////////////////////////////////////////////////////////// + void CellAppearancePropertyPanel::DataChanged( const DataChangedEvent& rEvent) @@ -392,7 +392,7 @@ void CellAppearancePropertyPanel::DataChanged( (void)rEvent; } -////////////////////////////////////////////////////////////////////////////// + void CellAppearancePropertyPanel::HandleContextChange( const ::sfx2::sidebar::EnumContext aContext) @@ -410,7 +410,7 @@ void CellAppearancePropertyPanel::HandleContextChange( // todo } -////////////////////////////////////////////////////////////////////////////// + void CellAppearancePropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, @@ -690,14 +690,14 @@ void CellAppearancePropertyPanel::NotifyItemUpdate( } } -////////////////////////////////////////////////////////////////////////////// + SfxBindings* CellAppearancePropertyPanel::GetBindings() { return mpBindings; } -////////////////////////////////////////////////////////////////////////////// + void CellAppearancePropertyPanel::SetStyleIcon() { @@ -828,12 +828,12 @@ void CellAppearancePropertyPanel::UpdateControlState() } } -////////////////////////////////////////////////////////////////////////////// + // namespace close }} // end of namespace ::sc::sidebar -////////////////////////////////////////////////////////////////////////////// + // eof /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src index 4542e4cb184f..838cac4ebfe0 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src @@ -31,7 +31,7 @@ #define PB_BORDER_MOREBTN 57 #define POPUPPANEL_MARGIN_SMALL_PIXEL 8 -////////////////////////////////////////////////////////////////////////////// + Image IMG_CELL_BORDER { @@ -75,7 +75,7 @@ Image IMG_LINE_STYLE9 ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_750.png";}; }; -////////////////////////////////////////////////////////////////////////////// + // fill color popup Control RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR @@ -101,7 +101,7 @@ Control RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR }; }; -////////////////////////////////////////////////////////////////////////////// + // line color popup Control RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR @@ -122,7 +122,7 @@ Control RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR }; }; -////////////////////////////////////////////////////////////////////////////// + // cell line style popup Control RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE @@ -158,7 +158,7 @@ Control RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE }; }; -////////////////////////////////////////////////////////////////////////////// + // cell border style popup Control RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index 88f3883bae6b..2d0ec3d17645 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -214,7 +214,7 @@ IMPL_LINK(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox) nValidFlags |= FRM_VALID_LEFT; break; case TBI_BORDER2_RIGHT: - // + if(!Application::GetSettings().GetLayoutRTL()) { pRight = &theDefLine; diff --git a/sc/source/ui/src/hdrcont.src b/sc/source/ui/src/hdrcont.src index 0c37902939b4..9c3c3921b4c4 100644 --- a/sc/source/ui/src/hdrcont.src +++ b/sc/source/ui/src/hdrcont.src @@ -49,16 +49,16 @@ Text [ en-US ] = "~Paste" ; \ }; - //------------------------------------------------------------------------------- + Menu RID_POPUP_ROWHEADER { ItemList = { PART1 - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_ROW_HEIGHT ; @@ -71,9 +71,9 @@ Menu RID_POPUP_ROWHEADER HelpId = CMD_FID_ROW_OPT_HEIGHT ; Text [ en-US ] = "Optimal ~Row Height..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_INS_ROW ; @@ -92,9 +92,9 @@ Menu RID_POPUP_ROWHEADER HelpId = CMD_SID_DELETE ; Text [ en-US ] = "De~lete Row Contents..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_ROW_HIDE ; @@ -107,9 +107,9 @@ Menu RID_POPUP_ROWHEADER HelpId = CMD_FID_ROW_SHOW ; Text [ en-US ] = "~Show" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + PART2 MenuItem { @@ -120,16 +120,16 @@ Menu RID_POPUP_ROWHEADER }; }; - //------------------------------------------------------------------- + Menu RID_POPUP_COLHEADER { ItemList = { PART1 - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_COL_WIDTH ; @@ -142,9 +142,9 @@ Menu RID_POPUP_COLHEADER HelpId = CMD_FID_COL_OPT_WIDTH ; Text [ en-US ] = "O~ptimal Column Width..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_INS_COLUMN ; @@ -163,9 +163,9 @@ Menu RID_POPUP_COLHEADER HelpId = CMD_SID_DELETE ; Text [ en-US ] = "D~elete Column Contents..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_COL_HIDE ; @@ -178,9 +178,9 @@ Menu RID_POPUP_COLHEADER HelpId = CMD_FID_COL_SHOW ; Text [ en-US ] = "~Show" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + PART2 MenuItem { diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src index 4a52c793d1ac..1a7d0d5380ed 100644 --- a/sc/source/ui/src/popup.src +++ b/sc/source/ui/src/popup.src @@ -38,18 +38,18 @@ Menu RID_POPUP_CELLS HelpId = CMD_SID_CELL_FORMAT_RESET ; Text [ en-US ] = "Clear ~Direct Formatting" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_CELL_FORMAT ; HelpId = CMD_FID_CELL_FORMAT ; Text [ en-US ] = "~Format Cells..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_INS_CELL ; @@ -80,9 +80,9 @@ Menu RID_POPUP_CELLS HelpId = CMD_FID_MERGE_OFF ; Text [ en-US ] = "Split Cells..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = SID_INSERT_POSTIT ; @@ -107,9 +107,9 @@ Menu RID_POPUP_CELLS HelpId = CMD_FID_HIDE_NOTE ; Text [ en-US ] = "~Hide Comment" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { @@ -168,9 +168,9 @@ Menu RID_POPUP_CELLS }; }; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = SID_DATA_SELECT ; @@ -237,9 +237,9 @@ Menu RID_POPUP_TAB HelpId = CMD_FID_TAB_EVENTS ; Text [ en-US ] = "Sheet E~vents..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_TABLE_HIDE ; @@ -252,9 +252,9 @@ Menu RID_POPUP_TAB HelpId = CMD_FID_TABLE_SHOW ; Text [ en-US ] = "~Show..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_TAB_SELECTALL ; @@ -365,9 +365,9 @@ Menu RID_POPUP_EDIT HelpId = CMD_SID_CELL_FORMAT_RESET ; Text [ en-US ] = "~Default" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem // Menu-Controller // Menu-Controller // Menu-Controller @@ -444,9 +444,9 @@ Menu RID_POPUP_EDIT }; }; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Text [ en-US ] = "Insert Fields" ; @@ -477,9 +477,9 @@ Menu RID_POPUP_EDIT { ITEM_FORMAT_CHAR_DLG }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { ITEM_OPEN_HYPERLINK @@ -550,18 +550,18 @@ Menu RID_POPUP_PAGEBREAK HelpId = CMD_SID_CELL_FORMAT_RESET ; Text [ en-US ] = "~Default" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_CELL_FORMAT ; HelpId = CMD_FID_CELL_FORMAT ; Text [ en-US ] = "~Format Cells..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_INS_ROWBRK ; @@ -586,9 +586,9 @@ Menu RID_POPUP_PAGEBREAK HelpId = CMD_FID_RESET_PRINTZOOM ; Text [ en-US ] = "Reset Scale" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = SID_DEFINE_PRINTAREA ; @@ -607,18 +607,18 @@ Menu RID_POPUP_PAGEBREAK HelpId = CMD_SID_DELETE_PRINTAREA ; Text [ en-US ] = "Undo Print Range" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = SID_FORMATPAGE ; HelpId = CMD_SID_FORMATPAGE ; Text [ en-US ] = "Page Format..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_SHOW_NOTE ; diff --git a/sc/source/ui/src/scerrors.src b/sc/source/ui/src/scerrors.src index 6cf19a15ec1a..593ac86bfe33 100644 --- a/sc/source/ui/src/scerrors.src +++ b/sc/source/ui/src/scerrors.src @@ -22,9 +22,9 @@ Resource RID_ERRHDLSC { - //------------------------------------------------------------ + // ERRORS ----------------------------------------------------- - //------------------------------------------------------------ + String SCERR_IMPORT_CONNECT & ERRCODE_RES_MASK { Text [ en-US ] = "Impossible to connect to the file." ; @@ -103,9 +103,9 @@ Resource RID_ERRHDLSC { Text [ en-US ] = "Cell $(ARG1) contains a string that is longer in the selected target character set \"$(ARG2)\" than the given field width." ; }; - //------------------------------------------------------------ + // WARNINGS --------------------------------------------------- - //------------------------------------------------------------ + String SCWARN_EXPORT_ASCII & ERRCODE_RES_MASK { Text [ en-US ] = "Only the active sheet was saved." ; diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src index e56680045317..42d650831c07 100644 --- a/sc/source/ui/src/scstring.src +++ b/sc/source/ui/src/scstring.src @@ -106,7 +106,7 @@ String SCSTR_AUDITSHELL Text [ en-US ] = "Detective Fill Mode" ; }; - // ----------------------------------------------------------------------- + String STR_ROWHEIGHT { diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index cfaa6b14a2f6..523adc891643 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -43,7 +43,7 @@ #include <editeng/flstitem.hxx> #include <svl/aeitem.hxx> #include <svx/flagsdef.hxx> -//================================================================== + ScStyleDlg::ScStyleDlg( Window* pParent, SfxStyleSheetBase& rStyleBase, diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index ae5b177673b4..0bea09ef8713 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -35,9 +35,9 @@ TYPEINIT1(ScUndoModifyStyle, ScSimpleUndo); TYPEINIT1(ScUndoApplyPageStyle, ScSimpleUndo); -// + // modify style (cell or page style) -// + ScStyleSaveData::ScStyleSaveData() : pItems( NULL ) @@ -231,9 +231,9 @@ bool ScUndoModifyStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const } -// + // apply page style -// + ScUndoApplyPageStyle::ApplyStyleEntry::ApplyStyleEntry( SCTAB nTab, const OUString& rOldStyle ) : mnTab( nTab ), maOldStyle( rOldStyle ) diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index 46f09484211c..d921aa596d47 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -27,10 +27,10 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <cppuhelper/supportsservice.hxx> -//......................................................................... + namespace calc { -//......................................................................... + #define PROP_HANDLE_RANGE_ADDRESS 1 @@ -44,9 +44,9 @@ namespace calc using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::binding; - //===================================================================== + //= OCellListSource - //===================================================================== + DBG_NAME( OCellListSource ) #ifdef DBG_UTIL @@ -422,8 +422,8 @@ namespace calc m_bInitialized = true; } -//......................................................................... + } // namespace calc -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index 6d280c6e604e..3e8039acbfbd 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -35,14 +35,14 @@ #include <com/sun/star/util/XModifyListener.hpp> -//......................................................................... + namespace calc { -//......................................................................... - //===================================================================== + + //= OCellListSource - //===================================================================== + class OCellListSource; // the base for our interfaces typedef ::cppu::WeakAggComponentImplHelper4 < ::com::sun::star::form::binding::XListEntrySource @@ -160,9 +160,9 @@ namespace calc #endif }; -//......................................................................... + } // namespace calc -//......................................................................... + #endif // SC_CELLLISTSOURCE_HXX diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 83a68a8ad6b0..fa46980e3a18 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -5686,9 +5686,9 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe if (xPropSet.is()) lcl_CopyProperties( aImpl, *(beans::XPropertySet*)xPropSet.get() ); - // + // ausfuehren... - // + if (pDocSh) { @@ -9555,9 +9555,9 @@ void ScUniqueCellFormatsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -// + // Fill the list of formats from the document -// + // hash code to access the range lists by ScPatternAttr pointer struct ScPatternHashCode diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index e51adc65c90f..9d4a9bb7a9ca 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -31,10 +31,10 @@ #include <com/sun/star/util/NumberFormat.hpp> #include <cppuhelper/supportsservice.hxx> -//......................................................................... + namespace calc { -//......................................................................... + #define PROP_HANDLE_BOUND_CELL 1 @@ -48,9 +48,9 @@ namespace calc using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::binding; - //===================================================================== + //= OCellValueBinding - //===================================================================== + DBG_NAME( OCellValueBinding ) #ifdef DBG_UTIL @@ -635,8 +635,8 @@ namespace calc } -//......................................................................... + } // namespace calc -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 4562eb6935fe..6a77e0c0b337 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -36,14 +36,14 @@ #include <com/sun/star/lang/XInitialization.hpp> -//......................................................................... + namespace calc { -//......................................................................... - //===================================================================== + + //= OCellValueBinding - //===================================================================== + class OCellValueBinding; // the base for our interfaces typedef ::cppu::WeakAggComponentImplHelper5 < ::com::sun::star::form::binding::XValueBinding @@ -156,9 +156,9 @@ namespace calc #endif }; -//......................................................................... + } // namespace calc -//......................................................................... + #endif // SC_CELLVALUEBINDING_HXX diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 2a3873b56a16..4c2989dc4fbe 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -243,7 +243,7 @@ vector<ScTokenRef>* TokenTable::getAllRanges() const return pTokens.release(); } -// ============================================================================ + typedef std::map<sal_uInt32, FormulaToken*> FormulaTokenMap; typedef std::map<sal_uInt32, FormulaTokenMap*> FormulaTokenMapMap; @@ -830,7 +830,7 @@ void Chart2Positioner::createPositionMap() } } -// ============================================================================ + /** * Function object to create a range string from a token list. @@ -1266,7 +1266,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScTokenRef>& rRefTokens, } // Check if the following conditions are met: - // + // 1) The upper-left corner cell is not included. // 2) The three adjacent cells of that corner cell are included. diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index d8ff144058ef..e2794163e398 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -87,7 +87,7 @@ using ::com::sun::star::lang::WrappedTargetException; using ::com::sun::star::table::CellAddress; using ::com::sun::star::table::CellRangeAddress; -// ============================================================================ + namespace { @@ -171,7 +171,7 @@ bool lclCheckMinMaxStep( const DataPilotFieldGroupInfo& rInfo ) } // namespace -// ============================================================================ + SC_SIMPLE_SERVICE_INFO( ScDataPilotDescriptor, "ScDataPilotDescriptor", "stardiv::one::sheet::DataPilotDescriptor" ) SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldObj, "ScDataPilotFieldObj", "com.sun.star.sheet.DataPilotField" ) @@ -1407,7 +1407,7 @@ void ScDataPilotTableObj::Refreshed_Impl() pDoc->AddUnoListenerCall( aModifyListeners[n], aEvent ); } -// ============================================================================ + ScDataPilotDescriptor::ScDataPilotDescriptor(ScDocShell* pDocSh) : ScDataPilotDescriptorBase( pDocSh ), @@ -1473,7 +1473,7 @@ void SAL_CALL ScDataPilotDescriptor::setTag( const OUString& aNewTag ) mpDPObject->SetTag( aNewTag ); } -// ============================================================================ + ScDataPilotChildObjBase::ScDataPilotChildObjBase( ScDataPilotDescriptorBase& rParent ) : mrParent( rParent ) @@ -1560,7 +1560,7 @@ ScDocShell* ScDataPilotChildObjBase::GetDocShell() const return mrParent.GetDocShell(); } -// ============================================================================ + ScDataPilotFieldsObj::ScDataPilotFieldsObj( ScDataPilotDescriptorBase& rParent ) : ScDataPilotChildObjBase( rParent ) @@ -2830,7 +2830,7 @@ Reference < XDataPilotField > SAL_CALL ScDataPilotFieldObj::createDateGroup( con return xRet; } -// ============================================================================ + namespace { @@ -3049,7 +3049,7 @@ ScFieldGroups::iterator ScDataPilotFieldGroupsObj::implFindByName( const OUStrin return maGroups.end(); } -// ============================================================================ + namespace { @@ -3223,7 +3223,7 @@ void SAL_CALL ScDataPilotFieldGroupObj::setName( const OUString& rName ) throw(R maGroupName = rName; } -// ============================================================================ + ScDataPilotFieldGroupItemObj::ScDataPilotFieldGroupItemObj( ScDataPilotFieldGroupObj& rParent, const OUString& rName ) : mrParent( rParent ), @@ -3253,7 +3253,7 @@ void SAL_CALL ScDataPilotFieldGroupItemObj::setName( const OUString& rName ) thr maName = rName; } -// ============================================================================ + ScDataPilotItemsObj::ScDataPilotItemsObj( ScDataPilotDescriptorBase& rParent, const ScFieldIdentifier& rFieldId ) : ScDataPilotChildObjBase( rParent, rFieldId ) diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 078112773671..c2ac19067b0d 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -510,9 +510,9 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, ScCompiler aCompiler(pDoc,aAdr); aCompiler.SetGrammar(pDoc->GetGrammar()); - // + // find function - // + ScTokenArray aTokenArr; if ( !lcl_AddFunctionToken( aTokenArr, aName,aCompiler ) ) @@ -521,16 +521,16 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, throw container::NoSuchElementException(); } - // + // set options (null date, etc.) - // + if ( pOptions ) pDoc->SetDocOptions( *pOptions ); - // + // add arguments to token array - // + sal_Bool bArgErr = false; sal_Bool bOverflow = false; @@ -632,9 +632,9 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, aTokenArr.AddOpCode(ocClose); aTokenArr.AddOpCode(ocStop); - // + // execute formula - // + uno::Any aRet; if ( !bArgErr && !bOverflow && nDocRow <= MAXROWCOUNT ) diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 1ad67180df8a..559e538e9814 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -1470,7 +1470,7 @@ uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( return xLink; } -// ============================================================================ + ScExternalSheetCacheObj::ScExternalSheetCacheObj(ScDocShell* pDocShell, ScExternalRefCache::TableTypeRef pTable, size_t nIndex) : mpDocShell(pDocShell), @@ -1577,7 +1577,7 @@ sal_Int32 SAL_CALL ScExternalSheetCacheObj::getTokenIndex() return static_cast< sal_Int32 >( mnIndex ); } -// ============================================================================ + ScExternalDocLinkObj::ScExternalDocLinkObj(ScDocShell* pDocShell, ScExternalRefManager* pRefMgr, sal_uInt16 nFileId) : mpDocShell(pDocShell), mpRefMgr(pRefMgr), mnFileId(nFileId) @@ -1713,7 +1713,7 @@ sal_Int32 SAL_CALL ScExternalDocLinkObj::getTokenIndex() return static_cast<sal_Int32>(mnFileId); } -// ============================================================================ + ScExternalDocLinksObj::ScExternalDocLinksObj(ScDocShell* pDocShell) : mpDocShell(pDocShell), diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 13879463915f..d87a197784bd 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -85,7 +85,7 @@ const sal_Char pFilterSylk[] = "SYLK"; // 0x0100: ein Byte ueberlesen (don't care) // 0x02nn: ein Byte aus 0xnn Alternativen folgt // 0x8000: Erkennung abgeschlossen -// + #define M_DC 0x0100 #define M_ALT(ANZ) (0x0200+(ANZ)) diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index d68a162011fe..c1a979ab2f89 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -57,9 +57,9 @@ public: impl_createInstance( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ) throw (com::sun::star::uno::Exception); - //---------------------------------------------------------------------------------- + // XExtendedFilterDetect - //---------------------------------------------------------------------------------- + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) throw (com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 651854331dae..522f02d15993 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -246,7 +246,7 @@ public: }; -// + struct ProvNamesId_Type { const char * pName; @@ -318,10 +318,10 @@ static const ProvNamesId_Type aProvNamesId[] = { "ooo.vba.VBAGlobals", SC_SERVICE_VBAGLOBALS }, }; -// + // old service names that were in 567 still work in createInstance, // in case some macro is still using them -// + static const sal_Char* aOldNames[SC_SERVICE_COUNT] = { diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 73488df18d76..4a1b148febed 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -188,7 +188,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {OUString(SC_UNO_PAGE_CENTERVER), ATTR_PAGE_VERCENTER,::getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,::getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNO_PAGE_FIRSTPAGE), ATTR_PAGE_FIRSTPAGENO,::getCppuType((const sal_Int16*)0), 0, 0 }, -// + {OUString(SC_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,::getCppuType((const sal_Int32*)0), 0, 0 }, {OUString(SC_UNO_PAGE_FTRGRFFILT), SC_WID_UNO_FOOTERSET,::getCppuType((const OUString*)0), 0, 0 }, {OUString(SC_UNO_PAGE_FTRGRFLOC), SC_WID_UNO_FOOTERSET,::getCppuType((const style::GraphicLocation*)0), 0, 0 }, @@ -215,7 +215,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {OUString(OLD_UNO_PAGE_FTRSHARED), SC_WID_UNO_FOOTERSET,::getBooleanCppuType(), 0, 0 }, {OUString(SC_UNO_PAGE_FTRTOPBOR), SC_WID_UNO_FOOTERSET,::getCppuType((const table::BorderLine*)0), 0, 0 }, {OUString(SC_UNO_PAGE_FTRTOPBDIS), SC_WID_UNO_FOOTERSET,::getCppuType((const sal_Int32*)0), 0, 0 }, -// + {OUString(SC_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,::getCppuType((const sal_Int32*)0), 0, 0 }, {OUString(SC_UNO_PAGE_HDRGRFFILT), SC_WID_UNO_HEADERSET,::getCppuType((const OUString*)0), 0, 0 }, {OUString(SC_UNO_PAGE_HDRGRFLOC), SC_WID_UNO_HEADERSET,::getCppuType((const style::GraphicLocation*)0), 0, 0 }, @@ -242,7 +242,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {OUString(OLD_UNO_PAGE_HDRSHARED), SC_WID_UNO_HEADERSET,::getBooleanCppuType(), 0, 0 }, {OUString(SC_UNO_PAGE_HDRTOPBOR), SC_WID_UNO_HEADERSET,::getCppuType((const table::BorderLine*)0), 0, 0 }, {OUString(SC_UNO_PAGE_HDRTOPBDIS), SC_WID_UNO_HEADERSET,::getCppuType((const sal_Int32*)0), 0, 0 }, -// + {OUString(SC_UNO_PAGE_HEIGHT), ATTR_PAGE_SIZE, ::getCppuType((const sal_Int32*)0), 0, MID_SIZE_HEIGHT | CONVERT_TWIPS }, {OUString(OLD_UNO_PAGE_BACKTRANS), ATTR_BACKGROUND, ::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, {OUString(SC_UNO_PAGE_LANDSCAPE), ATTR_PAGE, ::getBooleanCppuType(), 0, MID_PAGE_ORIENTATION }, diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index aff414231135..c348635f16f5 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -45,7 +45,7 @@ using namespace ::formula; using namespace ::com::sun::star; -// ============================================================================ + static const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap() { @@ -63,7 +63,7 @@ static const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap() SC_SIMPLE_SERVICE_INFO( ScFormulaParserObj, "ScFormulaParserObj", SC_SERVICENAME_FORMULAPARS ) -// ============================================================================ + ScFormulaParserObj::ScFormulaParserObj(ScDocShell* pDocSh) : mpDocShell( pDocSh ), @@ -284,7 +284,7 @@ uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const OUString& aPropert SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFormulaParserObj ) -// ============================================================================ + static void lcl_ExternalRefToApi( sheet::SingleReference& rAPI, const ScSingleRefData& rRef ) { @@ -496,7 +496,7 @@ bool ScTokenConversion::ConvertToTokenSequence( const ScDocument& rDoc, return !bError; } -// ============================================================================ + SAL_WNODEPRECATED_DECLARATIONS_PUSH ScFormulaOpCodeMapperObj::ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> _pCompiler) @@ -505,6 +505,6 @@ ScFormulaOpCodeMapperObj::ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::Form } SAL_WNODEPRECATED_DECLARATIONS_POP -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index b18bcab97dbc..cb724e0a99d3 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -43,7 +43,7 @@ namespace ooo { namespace vba { namespace excel { -// ============================================================================ + uno::Reference< sheet::XUnnamedDatabaseRanges > GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException ) @@ -377,7 +377,7 @@ ScVbaCellRangeAccess::GetDataSet( ScCellRangesBase* pRangeObj ) return pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : 0; } -// ============================================================================ + } // namespace excel } // namespace vba diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 057f306df037..47301b14bc8e 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -36,7 +36,7 @@ namespace ooo { namespace vba { namespace excel { -// ============================================================================ + // nTabs empty means apply zoom to all sheets void implSetZoom( const css::uno::Reference< css::frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs ); @@ -61,7 +61,7 @@ css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const cs ScDocShell* GetDocShellFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException ); void setUpDocumentModules( const css::uno::Reference< css::sheet::XSpreadsheetDocument >& xDoc ); -// ============================================================================ + class ScVbaCellRangeAccess { @@ -82,7 +82,7 @@ template < typename ImplObject > throw css::uno::RuntimeException("Internal error, can't exctract implementation object", rxWrapperIf ); return pObj; } -// ============================================================================ + } // namespace excel } // namespace vba diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx index 76dbc359e736..95d622195a73 100644 --- a/sc/source/ui/vba/service.cxx +++ b/sc/source/ui/vba/service.cxx @@ -21,9 +21,9 @@ #include "com/sun/star/registry/XRegistryKey.hpp" #include "comphelper/servicedecl.hxx" -// ============================================================================= + // component exports -// ============================================================================= + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index a9265b06c37c..01e9f4843c62 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -100,7 +100,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::UNO_QUERY; -// ============================================================================ + /** Global application settings shared by all open workbooks. */ struct ScVbaAppSettings @@ -128,7 +128,7 @@ ScVbaAppSettings::ScVbaAppSettings() : struct ScVbaStaticAppSettings : public ::rtl::Static< ScVbaAppSettings, ScVbaStaticAppSettings > {}; -// ============================================================================ + ScVbaApplication::ScVbaApplication( const uno::Reference<uno::XComponentContext >& xContext ) : ScVbaApplication_BASE( xContext ), diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 06b4a955add7..cf5d250699fa 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -33,7 +33,7 @@ using namespace ::ooo::vba::excel::XlAxisGroup; // each 'Item' in the Axes collection is indexed via 2 indexes, group and type. // We need to 'flatten' this into a single index in order to be able to wrap // iteration over the set of Axis(s) in a XIndexAccess implementation -// + typedef ::std::pair<sal_Int32, sal_Int32 > AxesCoordinate; // type and group combination typedef ::std::vector< AxesCoordinate > vecAxesIndices; diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 10f3a4bc369f..87e854df89ad 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::script::vba::VBAEventId; using namespace ::ooo::vba; -// ============================================================================ + namespace { @@ -110,7 +110,7 @@ uno::Reference< awt::XWindow > lclGetWindowForController( const uno::Reference< } // namespace -// ============================================================================ + typedef ::cppu::WeakImplHelper4< awt::XTopWindowListener, awt::XWindowListener, frame::XBorderResizeListener, util::XChangesListener > ScVbaEventListener_BASE; @@ -511,7 +511,7 @@ IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, Window*, EMPTYARG pWind return 0; } -// ============================================================================ + ScVbaEventsHelper::ScVbaEventsHelper( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& xContext ) : VbaEventsHelperBase( rArgs, xContext ), diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx index 2412a6c577d5..284eb782f250 100644 --- a/sc/source/ui/vba/vbaeventshelper.hxx +++ b/sc/source/ui/vba/vbaeventshelper.hxx @@ -27,7 +27,7 @@ class ScVbaEventListener; -// ============================================================================ + class ScVbaEventsHelper : public VbaEventsHelperBase { @@ -67,7 +67,7 @@ private: bool mbOpened; }; -// ============================================================================ + #endif diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 7ccc6f4ed363..0634dff631ef 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -253,7 +253,7 @@ ScVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception ) return ScVbaFont_BASE::getColorIndex(); } -////////////////////////////////////////////////////////////////////////////////////////// + void SAL_CALL ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException, std::exception ) { diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index c9b9aa61e6ba..6c2fb0520a81 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -36,9 +36,9 @@ using namespace ::ooo::vba; -// ============================================================================= + // ScVbaGlobals -// ============================================================================= + //ScVbaGlobals::ScVbaGlobals( css::uno::Reference< css::uno::XComponentContext >const& rxContext, ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext ) @@ -60,9 +60,9 @@ ScVbaGlobals::~ScVbaGlobals() OSL_TRACE("ScVbaGlobals::~ScVbaGlobals"); } -// ============================================================================= + // XGlobals -// ============================================================================= + uno::Reference<excel::XApplication > ScVbaGlobals::getApplication() throw (uno::RuntimeException) { diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index 5759bcbc4670..f6ced397a255 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -29,9 +29,9 @@ #include "excelvbahelper.hxx" #include <vbahelper/vbaglobalbase.hxx> - // ============================================================================= + // class ScVbaGlobals - // ============================================================================= + typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > ScVbaGlobals_BASE; @@ -85,6 +85,6 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc virtual OUString getServiceImplName(); virtual css::uno::Sequence<OUString> getServiceNames(); }; -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx index dc204fc922d8..420c1a8123ac 100644 --- a/sc/source/ui/vba/vbahyperlink.cxx +++ b/sc/source/ui/vba/vbahyperlink.cxx @@ -30,7 +30,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -// ============================================================================ + ScVbaHyperlink::ScVbaHyperlink( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& rxContext ) throw (lang::IllegalArgumentException) : @@ -233,6 +233,6 @@ extern sdecl::ServiceDecl const serviceDecl( "ooo.vba.excel.Hyperlink" ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index 776ed4e902fa..c5c02d516e59 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -28,7 +28,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -// ============================================================================ + namespace { @@ -102,7 +102,7 @@ bool EqualAnchorFunctor::operator()( const uno::Reference< excel::XHyperlink >& } // namespace -// ============================================================================ + namespace detail { @@ -185,7 +185,7 @@ sal_Bool SAL_CALL ScVbaHlinkContainer::hasElements() throw (uno::RuntimeExceptio return !maHlinks.empty(); } -// ============================================================================ + ScVbaHlinkContainerMember::ScVbaHlinkContainerMember( ScVbaHlinkContainer* pContainer ) : mxContainer( pContainer ) @@ -198,7 +198,7 @@ ScVbaHlinkContainerMember::~ScVbaHlinkContainerMember() } // namespace detail -// ============================================================================ + ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext ) throw (uno::RuntimeException) : @@ -281,6 +281,6 @@ uno::Any ScVbaHyperlinks::createCollectionObject( const uno::Any& rSource ) VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaHyperlinks, "ooo.vba.excel.Hyperlinks" ) -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbahyperlinks.hxx b/sc/source/ui/vba/vbahyperlinks.hxx index 6b471214ac3e..641dfac13a8a 100644 --- a/sc/source/ui/vba/vbahyperlinks.hxx +++ b/sc/source/ui/vba/vbahyperlinks.hxx @@ -26,7 +26,7 @@ class ScRangeList; -// ============================================================================ + namespace detail { @@ -46,7 +46,7 @@ struct ScVbaHlinkContainerMember } // namespace detail -// ============================================================================ + class ScVbaHyperlinks; typedef ::rtl::Reference< ScVbaHyperlinks > ScVbaHyperlinksRef; @@ -137,7 +137,7 @@ private: ScVbaHyperlinksRef mxSheetHlinks; }; -// ============================================================================ + #endif diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 8750d52126d0..5f1badf94afd 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -// ============================================================================ + ScVbaButtonCharacters::ScVbaButtonCharacters( const uno::Reference< XHelperInterface >& rxParent, @@ -152,7 +152,7 @@ void ScVbaButtonCharacters::setFullString( const OUString& rString ) throw (uno: mxPropSet->setPropertyValue( "Label", uno::Any( rString ) ); } -// ============================================================================ + ScVbaSheetObjectBase::ScVbaSheetObjectBase( const uno::Reference< XHelperInterface >& rxParent, @@ -291,7 +291,7 @@ void ScVbaSheetObjectBase::implSetDefaultProperties() throw (uno::RuntimeExcepti { } -// ============================================================================ + ScVbaControlObjectBase::ScVbaControlObjectBase( const uno::Reference< XHelperInterface >& rxParent, @@ -419,7 +419,7 @@ sal_Int32 ScVbaControlObjectBase::getModelIndexInForm() const throw (uno::Runtim throw uno::RuntimeException(); } -// ============================================================================ + ScVbaButton::ScVbaButton( const uno::Reference< XHelperInterface >& rxParent, @@ -535,6 +535,6 @@ void ScVbaButton::implSetDefaultProperties() throw (uno::RuntimeException) setCaption( getName() ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx index 6861ceec15ee..462bc1b4ab64 100644 --- a/sc/source/ui/vba/vbasheetobject.hxx +++ b/sc/source/ui/vba/vbasheetobject.hxx @@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace drawing { class XControlShape; } } } } -// ============================================================================ + typedef InheritedHelperInterfaceImpl1< ov::excel::XCharacters > ScVbaButtonCharacters_BASE; @@ -75,7 +75,7 @@ private: sal_Int32 mnLength; }; -// ============================================================================ + typedef InheritedHelperInterfaceImpl1< ov::excel::XSheetObject > ScVbaSheetObject_BASE; @@ -121,7 +121,7 @@ protected: css::uno::Reference< css::beans::XPropertySet > mxShapeProps; }; -// ============================================================================ + typedef ::cppu::ImplInheritanceHelper1< ScVbaSheetObjectBase, ov::excel::XControlObject > ScVbaControlObject_BASE; @@ -168,7 +168,7 @@ protected: OUString maEventMethod; }; -// ============================================================================ + typedef ::cppu::ImplInheritanceHelper1< ScVbaControlObjectBase, ov::excel::XButton > ScVbaButton_BASE; @@ -206,7 +206,7 @@ protected: virtual void implSetDefaultProperties() throw (css::uno::RuntimeException); }; -// ============================================================================ + #endif diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 50bf20727054..0ffdf3dce4a6 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -// ============================================================================ + namespace { @@ -60,9 +60,9 @@ inline double lclPointsToHmm( const uno::Any& rPoints ) throw (uno::RuntimeExcep } // namespace -// ============================================================================ + // Base implementations -// ============================================================================ + /** Container for a specific type of drawing object in a spreadsheet. @@ -239,7 +239,7 @@ void ScVbaObjectContainer::implOnShapeCreated( const uno::Reference< drawing::XS { } -// ============================================================================ + class ScVbaObjectEnumeration : public SimpleEnumerationBase { @@ -264,7 +264,7 @@ uno::Any ScVbaObjectEnumeration::createCollectionObject( const uno::Any& rSource return mxContainer->createCollectionObject( rSource ); } -// ============================================================================ + ScVbaSheetObjectsBase::ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (css::uno::RuntimeException) : ScVbaSheetObjects_BASE( rxContainer->getParent(), rxContainer->getContext(), rxContainer.get() ), @@ -308,9 +308,9 @@ uno::Any ScVbaSheetObjectsBase::getItemByStringIndex( const OUString& rIndex ) t return mxContainer->getItemByStringIndex( rIndex ); } -// ============================================================================ + // Graphic object containers supporting ooo.vba.excel.XGraphicObject -// ============================================================================ + ScVbaGraphicObjectsBase::ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (uno::RuntimeException) : ScVbaGraphicObjects_BASE( rxContainer ) @@ -340,9 +340,9 @@ uno::Any SAL_CALL ScVbaGraphicObjectsBase::Add( const uno::Any& rLeft, const uno return uno::Any( uno::Reference< excel::XSheetObject >( xVbaObject.get() ) ); } -// ============================================================================ + // Drawing controls -// ============================================================================ + class ScVbaControlContainer : public ScVbaObjectContainer { @@ -455,9 +455,9 @@ void ScVbaControlContainer::implOnShapeCreated( const uno::Reference< drawing::X xControlShape->setControl( xControlModel ); } -// ============================================================================ + // Push button -// ============================================================================ + class ScVbaButtonContainer : public ScVbaControlContainer { @@ -501,7 +501,7 @@ bool ScVbaButtonContainer::implCheckProperties( const uno::Reference< beans::XPr return lclGetProperty( bToggle, rxModelProps, "Toggle" ) && !bToggle; } -// ============================================================================ + ScVbaButtons::ScVbaButtons( const uno::Reference< XHelperInterface >& rxParent, @@ -514,6 +514,6 @@ ScVbaButtons::ScVbaButtons( VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaButtons, "ooo.vba.excel.Buttons" ) -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx index d0b0aca0d47e..dadfab59057b 100644 --- a/sc/source/ui/vba/vbasheetobjects.hxx +++ b/sc/source/ui/vba/vbasheetobjects.hxx @@ -30,12 +30,12 @@ namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheet; } } } } -// ============================================================================ + class ScVbaObjectContainer; typedef ::rtl::Reference< ScVbaObjectContainer > ScVbaObjectContainerRef; -// ============================================================================ + typedef CollTestImplHelper< ov::XCollection > ScVbaSheetObjects_BASE; @@ -65,7 +65,7 @@ protected: ScVbaObjectContainerRef mxContainer; }; -// ============================================================================ + typedef ::cppu::ImplInheritanceHelper1< ScVbaSheetObjectsBase, ov::excel::XGraphicObjects > ScVbaGraphicObjects_BASE; @@ -85,7 +85,7 @@ public: const css::uno::Any& rHeight ) throw (css::uno::RuntimeException, std::exception); }; -// ============================================================================ + /** Collection containing all button controls from a sheet (not ActiveX controls). */ class ScVbaButtons : public ScVbaGraphicObjectsBase @@ -100,7 +100,7 @@ public: VBAHELPER_DECL_XHELPERINTERFACE }; -// ============================================================================ + #endif diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 780c08e69f0d..bf9cc0b28d82 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -131,9 +131,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) switch ( nSlot ) { - // + // insert / delete cells / rows / columns - // + case FID_INS_ROW: pTabViewShell->InsertCells(INS_INSROWS); @@ -309,9 +309,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // + // delete contents from cells - // + case SID_DELETE_CONTENTS: pTabViewShell->DeleteContents( IDF_CONTENTS ); @@ -405,9 +405,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // + // fill... - // + case FID_FILL_TO_BOTTOM: pTabViewShell->FillSimple( FILL_TO_BOTTOM ); @@ -640,7 +640,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } } - // + OUString aStartStr; // suggest default Startvalue only, when just 1 row or column @@ -985,10 +985,10 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // + // disposal (Outlines) // SID_AUTO_OUTLINE, SID_OUTLINE_DELETEALL in Execute (in docsh.idl) - // + case SID_OUTLINE_HIDE: if ( GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(), @@ -1195,9 +1195,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // + // Clipboard - // + case SID_COPY: // for graphs in DrawShell @@ -1580,9 +1580,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pTabViewShell->CellContentChanged(); // => PasteFromSystem() ??? break; - // + // other - // + case FID_INS_ROWBRK: pTabViewShell->InsertPageBreak( false ); @@ -2415,9 +2415,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // - // - // + + + default: OSL_FAIL("incorrect slot in ExecuteEdit"); diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 5ee73670f36b..1fddad09ab8c 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -886,7 +886,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) } break; - // ---------------------------------------------------------------- + case FID_INPUTLINE_STATUS: OSL_FAIL("Execute von InputLine-Status"); diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index 415bce141e75..1700c0069341 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -32,7 +32,7 @@ // STATIC DATA ----------------------------------------------------------- -//================================================================== + static OUString lcl_MetricString( long nTwips, const OUString& rText ) { @@ -54,7 +54,7 @@ static OUString lcl_MetricString( long nTwips, const OUString& rText ) } } -//================================================================== + ScColBar::ScColBar( Window* pParent, ScViewData* pData, ScHSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) : @@ -215,7 +215,7 @@ bool ScColBar::IsLayoutRTL() const // overloaded only for columns return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() ); } -//================================================================== + ScRowBar::ScRowBar( Window* pParent, ScViewData* pData, ScVSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) : diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index d2d8aad41169..09e32bb30eae 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -37,7 +37,7 @@ #include "queryentry.hxx" #include "markdata.hxx" -//================================================================== + ScDBFunc::ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : ScViewFunc( pParent, rDocSh, pViewShell ) @@ -48,9 +48,9 @@ ScDBFunc::~ScDBFunc() { } -// + // auxiliary functions -// + void ScDBFunc::GotoDBArea( const OUString& rDBName ) { @@ -240,9 +240,9 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const std:: } } -// + // main functions -// + // Sort diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx index 58b5d93993dc..8932146f1562 100644 --- a/sc/source/ui/view/dbfunc2.cxx +++ b/sc/source/ui/view/dbfunc2.cxx @@ -24,7 +24,7 @@ #include "sc.hrc" #include "globstr.hrc" -//================================================================== + void ScDBFunc::UpdateCharts( bool bAllCharts ) { diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index fe69d7f0a0b1..0b1f41a73d65 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -87,11 +87,11 @@ using ::std::vector; // STATIC DATA ----------------------------------------------------------- -//================================================================== -// + + // Outliner -// + // Outline-Gruppierung erzeugen @@ -363,11 +363,11 @@ void ScDBFunc::HideMarkedOutlines( bool bRecord ) ErrorMessage(STR_NOMULTISELECT); } -// -------------------------------------------------------------------------- -// + + // Teilergebnisse -// + void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, const ScSortParam* pForceNewSort ) @@ -539,9 +539,9 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, } } -// + // Consolidate -// + void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, bool bRecord ) { @@ -550,9 +550,9 @@ void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, bool bRecord ) SetTabNo( rParam.nTab, true ); } -// + // Pivot -// + static OUString lcl_MakePivotTabName( const OUString& rPrefix, SCTAB nNumber ) { @@ -2074,9 +2074,9 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet pMgr->LeaveListAction(); } -// + // DB-Operationen (Sortieren, Filtern, Teilergebnisse) wiederholen -// + void ScDBFunc::RepeatDB( bool bRecord ) { diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx index ec6bd68e6f6f..17492f82927b 100644 --- a/sc/source/ui/view/dbfunc4.cxx +++ b/sc/source/ui/view/dbfunc4.cxx @@ -29,7 +29,7 @@ using namespace com::sun::star; -//================================================================== + sal_uInt16 ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bool bAllCharts ) { diff --git a/sc/source/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx index 8e630933731e..de9f5c4ffd14 100644 --- a/sc/source/ui/view/drawattr.cxx +++ b/sc/source/ui/view/drawattr.cxx @@ -36,7 +36,7 @@ OUString SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const switch (nVal) { case 0 : p = "SVX_SNAP_DRAW_SELECT" ; break; - // + case 1 : p = "SVX_SNAP_DRAW_LINE" ; break; case 2 : p = "SVX_SNAP_DRAW_RECT" ; break; case 3 : p = "SVX_SNAP_DRAW_ELLIPSE" ; break; diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 92c3c4a5cc67..ea82c505cd80 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -662,7 +662,7 @@ SdrObject* ScDrawView::GetObjectByName(const OUString& rName) } //realize multi-selection of objects -//================================================== + bool ScDrawView::SelectCurrentViewObject( const OUString& rName ) { sal_uInt16 nObjectTab = 0; diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 9ddedd59fa09..00928e562577 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -1035,9 +1035,9 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) break; } - // + // anwenden - // + EditEngine* pEngine = pEditView->GetEditEngine(); sal_Bool bOld = pEngine->GetUpdateMode(); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index d05aaa063b70..b482fd92d974 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -173,7 +173,7 @@ struct ScGridWindow::MouseEventState #define SC_FILTERLISTBOX_LINES 12 -// ============================================================================ + ScGridWindow::VisibleRange::VisibleRange() : mnCol1(0), mnCol2(MAXCOL), mnRow1(0), mnRow2(MAXROW) @@ -197,7 +197,7 @@ bool ScGridWindow::VisibleRange::set(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCRO return bChanged; } -// ============================================================================ + class ScFilterListBox : public ListBox { @@ -333,7 +333,7 @@ void ScFilterListBox::SelectHdl() } } -// ============================================================================ + // use a System floating window for the above filter listbox class ScFilterFloatingWindow : public FloatingWindow @@ -360,7 +360,7 @@ Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow() return GetWindow(WINDOW_FIRSTCHILD) ? GetWindow(WINDOW_FIRSTCHILD)->GetPreferredKeyInputWindow() : NULL; // will be the FilterBox } -// ============================================================================ + static sal_Bool lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange ) { @@ -1897,9 +1897,9 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta } } - // + // scenario selection - // + ScRange aScenRange; if ( rMEvt.IsLeft() && HasScenarioButton( aPos, aScenRange ) ) @@ -1908,9 +1908,9 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta return; } - // + // Doppelklick angefangen ? - // + // StopMarking kann aus DrawMouseButtonDown gerufen werden @@ -1925,9 +1925,9 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta nMouseStatus = SC_GM_TABDOWN; } - // + // Links in Edit-Zellen - // + sal_Bool bAlt = rMEvt.IsMod2(); if ( !bAlt && rMEvt.IsLeft() && @@ -1938,9 +1938,9 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta return; } - // + // Gridwin - SelectionEngine - // + if ( rMEvt.IsLeft() ) { @@ -2159,9 +2159,9 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) if (bRefMode) pScMod->EndReference(); - // + // Giesskannen-Modus (Gestalter) - // + if (pScMod->GetIsWaterCan()) { @@ -2213,9 +2213,9 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) pView->ResetBrushDocument(); // invalidates pBrushDoc pointer } - // + // double click (only left button) - // + sal_Bool bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() ); if ( bDouble && !bRefMode && nMouseStatus == SC_GM_DBLDOWN && !pScMod->IsRefDialogOpen() ) @@ -2298,9 +2298,9 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) return; } - // + // Links in edit cells - // + sal_Bool bAlt = rMEvt.IsMod2(); if ( !bAlt && !bRefMode && !bDouble && nMouseStatus == SC_GM_URLDOWN ) @@ -2383,9 +2383,9 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) } } - // + // Gridwin - SelectionEngine - // + // SelMouseButtonDown is called only for left button, but SelMouseButtonUp would return // sal_True for any call, so IsLeft must be checked here, too. @@ -5662,9 +5662,9 @@ void ScGridWindow::UpdateCursorOverlay() std::vector<Rectangle> aPixelRects; - // + // determine the cursor rectangles in pixels (moved from ScGridWindow::DrawCursor) - // + SCTAB nTab = pViewData->GetTabNo(); SCCOL nX = pViewData->GetCurX(); @@ -5839,9 +5839,9 @@ void ScGridWindow::UpdateAutoFillOverlay() DeleteAutoFillOverlay(); - // + // get the AutoFill handle rectangle in pixels - // + if ( bAutoMarkVisible && aAutoMarkPos.Tab() == pViewData->GetTabNo() && !pViewData->HasEditView(eWhich) && pViewData->IsActive() ) @@ -5916,9 +5916,9 @@ void ScGridWindow::UpdateDragRectOverlay() DeleteDragRectOverlay(); - // + // get the rectangles in pixels (moved from DrawDragRect) - // + if ( bDragRect || bPagebreakDrawn ) { @@ -6092,9 +6092,9 @@ void ScGridWindow::UpdateShrinkOverlay() DeleteShrinkOverlay(); - // + // get the rectangle in pixels - // + Rectangle aPixRect; ScRange aRange; diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 359cf3ae376d..ec917c96888a 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -241,9 +241,9 @@ void ScGridWindow::DoPushPivotButton( SCCOL nCol, SCROW nRow, const MouseEvent& } -// + // Data Pilot interaction -// + void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, bool bMove ) { @@ -278,7 +278,7 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, bool bMove ) bTimer = sal_True; } - // --- + SCsCOL nPosX; SCsROW nPosY; diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 6fdddac99ee2..c1c48d9a29df 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -67,7 +67,7 @@ #include <boost/scoped_ptr.hpp> -//------------------------------------------------------------------------ + static void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible ) { @@ -387,9 +387,9 @@ void ScGridWindow::Paint( const Rectangle& rRect ) bIsInPaint = false; } -// + // Draw ---------------------------------------------------------------- -// + void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMode eMode ) { @@ -873,10 +873,10 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod if ( pNoteMarker ) pNoteMarker->Draw(); // ueber den Cursor, im Drawing-MapMode - // + // Wenn waehrend des Paint etwas invertiert wurde (Selektion geaendert aus Basic-Macro), // ist das jetzt durcheinandergekommen und es muss neu gemalt werden - // + OSL_ENSURE(nPaintCount, "nPaintCount falsch"); --nPaintCount; diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 16039fb5b57a..dcf157e05ee9 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -413,10 +413,10 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) } } - // + // loop through entries several times to avoid changing the line color too often // and to allow merging of lines - // + ScGridMerger aGrid( this, 1, 1 ); diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx index a4d662a5c91e..7e23d925731b 100644 --- a/sc/source/ui/view/hintwin.cxx +++ b/sc/source/ui/view/hintwin.cxx @@ -24,7 +24,7 @@ #define HINT_INDENT 3 #define HINT_MARGIN 4 -//================================================================== + ScHintWindow::ScHintWindow( Window* pParent, const OUString& rTit, const OUString& rMsg ) : Window( pParent, WinBits( WB_BORDER ) ), diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx index ec0a02fb5f0d..d6c73c2d5bbe 100644 --- a/sc/source/ui/view/invmerge.cxx +++ b/sc/source/ui/view/invmerge.cxx @@ -43,9 +43,9 @@ void ScInvertMerger::Flush() if ( pRects ) { - // + // also join vertically if there are non-adjacent columns involved - // + size_t nComparePos = 0; while ( nComparePos < pRects->size() ) diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index 93a44348d9a5..b6bcb4ba784e 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -27,7 +27,7 @@ #include "dbfunc.hxx" #include "sc.hrc" -// ============================================================================ + const long SC_OL_BITMAPSIZE = 12; const long SC_OL_POSOFFSET = 2; @@ -40,7 +40,7 @@ const sal_uInt16 SC_OL_IMAGE_MINUS = SC_OL_IMAGE_PLUS + 1; const sal_uInt16 SC_OL_IMAGE_NOTPRESSED = SC_OL_IMAGE_MINUS + 1; const sal_uInt16 SC_OL_IMAGE_PRESSED = SC_OL_IMAGE_NOTPRESSED + 1; -// ============================================================================ + ScOutlineWindow::ScOutlineWindow( Window* pParent, ScOutlineMode eMode, ScViewData* pViewData, ScSplitPos eWhich ) : Window( pParent ), @@ -1023,6 +1023,6 @@ void ScOutlineWindow::KeyInput( const KeyEvent& rKEvt ) } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 432f2fe44af6..54f977c5faef 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -184,7 +184,7 @@ private: void TextChanged(); }; -//================================================================== + ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, bool bPTL) : pOutput ( pData ), @@ -395,10 +395,10 @@ void ScDrawStringsVars::SetPattern( aMetric = pFmtDevice->GetFontMetric(); - // + // Wenn auf dem Drucker das Leading 0 ist, gibt es Probleme // -> Metric vom Bildschirm nehmen (wie EditEngine!) - // + if ( pFmtDevice->GetOutDevType() == OUTDEV_PRINTER && aMetric.GetIntLeading() == 0 ) { @@ -807,7 +807,7 @@ sal_uLong ScDrawStringsVars::GetResultValueFormat() const return nValueFormat; } -//================================================================== + double ScOutputData::GetStretch() { @@ -835,11 +835,11 @@ double ScOutputData::GetStretch() } } -//================================================================== -// + + // output strings -// + static void lcl_DoHyperlinkResult( OutputDevice* pDev, const Rectangle& rRect, ScRefCellValue& rCell ) { @@ -1248,9 +1248,9 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY rParam.mnColWidth = nMergeSizeX; // store the actual column width. - // + // construct the rectangles using logical left/right values (justify is called at the end) - // + // rAlignRect is the single cell or merged area, used for alignment. @@ -1505,9 +1505,9 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bool bDoCell = false; bool bNeedEdit = false; - // + // Part of a merged cell? - // + bool bOverlapped = (pInfo->bHOverlapped || pInfo->bVOverlapped); if ( bOverlapped ) @@ -1527,9 +1527,9 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bMergeEmpty = true; } - // + // Rest of a long text further to the left? - // + if ( bEmpty && !bMergeEmpty && nX < nX1 && !bOverlapped ) { @@ -1546,9 +1546,9 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) } } - // + // Rest of a long text further to the right? - // + if ( bEmpty && !bMergeEmpty && nX == nX2 && !bOverlapped ) { @@ -1567,16 +1567,16 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) } } - // + // normal visible cell - // + if (!bEmpty) bDoCell = true; - // + // don't output the cell that's being edited - // + if ( bDoCell && bEditMode && nCellX == nEditCol && nCellY == nEditRow ) bDoCell = false; @@ -1590,9 +1590,9 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bDoCell = false; } - // + // output the cell text - // + ScRefCellValue aCell; if (bDoCell) @@ -1885,9 +1885,9 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bVClip = true; } - // + // horizontalen Platz testen - // + bool bRightAdjusted = false; // to correct text width calculation later bool bNeedEditEngine = false; @@ -2076,7 +2076,7 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) mpDoc->EnableIdle(bWasIdleEnabled); } -// ------------------------------------------------------------------------------- + ScFieldEditEngine* ScOutputData::CreateOutputEditEngine() { @@ -2758,9 +2758,9 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // + // Initial page size - large for normal text, cell size for automatic line breaks - // + Size aPaperSize = Size( 1000000, 1000000 ); if (rParam.mbBreak) @@ -2793,9 +2793,9 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // + // Fill the EditEngine (cell attributes and text) - // + // default alignment for asian vertical mode is top-right if ( rParam.mbAsianVertical && rParam.meVerJust == SVX_VER_JUSTIFY_STANDARD ) @@ -2818,9 +2818,9 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // + // Get final output area using the calculated width - // + long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -3261,9 +3261,9 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // + // Initial page size - large for normal text, cell size for automatic line breaks - // + Size aPaperSize = Size( 1000000, 1000000 ); if (rParam.mbBreak) @@ -3286,9 +3286,9 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // + // Fill the EditEngine (cell attributes and text) - // + rParam.setPatternToEngine(mbUseStyleColor); rParam.setAlignmentToEngine(); @@ -3307,9 +3307,9 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // + // Get final output area using the calculated width - // + long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -3527,9 +3527,9 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // + // Initial page size - large for normal text, cell size for automatic line breaks - // + Size aPaperSize = Size( 1000000, 1000000 ); if (rParam.hasLineBreak()) @@ -3552,9 +3552,9 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // + // Fill the EditEngine (cell attributes and text) - // + rParam.setPatternToEngine(mbUseStyleColor); rParam.setAlignmentToEngine(); @@ -3573,9 +3573,9 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // + // Get final output area using the calculated width - // + long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -3800,9 +3800,9 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // + // Initial page size - large for normal text, cell size for automatic line breaks - // + Size aPaperSize = Size( 1000000, 1000000 ); // call GetOutputArea with nNeeded=0, to get only the cell width @@ -3833,9 +3833,9 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // + // Fill the EditEngine (cell attributes and text) - // + rParam.setPatternToEngine(mbUseStyleColor); rParam.setAlignmentToEngine(); @@ -3854,9 +3854,9 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // + // Get final output area using the calculated width - // + long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -4203,9 +4203,9 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // + // Initial page size - large for normal text, cell size for automatic line breaks - // + Size aPaperSize = Size( 1000000, 1000000 ); // call GetOutputArea with nNeeded=0, to get only the cell width @@ -4236,9 +4236,9 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // + // Fill the EditEngine (cell attributes and text) - // + // default alignment for asian vertical mode is top-right if ( rParam.meVerJust == SVX_VER_JUSTIFY_STANDARD ) @@ -4261,9 +4261,9 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // + // Get final output area using the calculated width - // + long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -4711,7 +4711,7 @@ void ScOutputData::DrawEdit(bool bPixelToLogic) DrawRotated(bPixelToLogic); //! von aussen rufen ? } -// ------------------------------------------------------------------------------- + void ScOutputData::DrawRotated(bool bPixelToLogic) { diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index b64163517f18..5412c0bd604d 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -35,7 +35,7 @@ #include <svx/fmview.hxx> -//================================================================== + // #i72502# Point ScOutputData::PrePrintDrawingLayer(long nLogStX, long nLogStY ) diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 095ef7226bc9..013d92bdd845 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -63,7 +63,7 @@ // STATIC DATA ----------------------------------------------------------- -//================================================================== + #define SC_PREVIEW_SHADOWSIZE 2 diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx index 19180d5531f5..08ced7a6c71d 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.cxx @@ -535,9 +535,9 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev } } - // + // get column info - // + SCCOL nColCount = 0; SCCOL nCol; @@ -605,9 +605,9 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev else rInfo.SetColInfo( 0, NULL ); - // + // get row info - // + SCROW nRowCount = 0; if ( bHasHeaderRow ) @@ -674,9 +674,9 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev else rInfo.SetRowInfo( 0, NULL ); - // + // limit to visible area - // + rInfo.SetTab( nTab ); rInfo.LimitToArea( rVisiblePixel ); diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index ab56da2b97f4..4ddbf6c21bca 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -391,7 +391,7 @@ static void lcl_HidePrint( ScTableInfo& rTabInfo, SCCOL nX1, SCCOL nX2 ) } } -// + // output to Device (static) // // us used for: @@ -595,9 +595,9 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr delete pDrawView; } -// + // Printing -// + static void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet ) { @@ -1016,9 +1016,9 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) nRepeatStartRow = nRepeatEndRow = SCROW_REPEAT_NONE; } - // + // Split pages - // + if (!bState) { @@ -1186,7 +1186,7 @@ static void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, Out // operation, and k2 is the number of chars // per bitmap pixel. This is approximately 50 // and 7 for current PDF writer, respectively. - // + const double k1( 50 ); const double k2( 7 ); const Size aSize( rOrg.GetSize() ); @@ -2371,10 +2371,10 @@ void ScPrintFunc::SetExclusivelyDrawOleAndDrawObjects() aTableParam.bNullVals = false; } -// + // UpdatePages is only called from outside to set the breaks correctly for viewing // - always without UserArea -// + bool ScPrintFunc::UpdatePages() { @@ -2578,9 +2578,9 @@ void ScPrintFunc::ApplyPrintSettings() { if ( pPrinter ) { - // + // Configure Printer to Printing - // + Size aEnumSize = aPageSize; @@ -3015,10 +3015,10 @@ void ScPrintFunc::CalcPages() // calculates aPageRect and pages fr maPageRows.resize(nRealCnt+1, ScPageRowEntry()); } - // + // Page alignment/splitting after breaks in Col/RowFlags // Of several breaks in a hidden area, only one counts. - // + nPagesX = 0; nPagesY = 0; diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx index 3753396d825f..c6b750fb054b 100644 --- a/sc/source/ui/view/scextopt.cxx +++ b/sc/source/ui/view/scextopt.cxx @@ -23,7 +23,7 @@ #include <map> #include <boost/shared_ptr.hpp> -// ============================================================================ + ScExtDocSettings::ScExtDocSettings() : mfTabBarWidth( -1.0 ), @@ -32,7 +32,7 @@ ScExtDocSettings::ScExtDocSettings() : { } -// ============================================================================ + ScExtTabSettings::ScExtTabSettings() : maUsedArea( ScAddress::INITIALIZE_INVALID ), @@ -52,7 +52,7 @@ ScExtTabSettings::ScExtTabSettings() : { } -// ============================================================================ + /** A container for ScExtTabSettings objects. @descr Internally, a std::map with shared pointers to ScExtTabSettings is @@ -123,7 +123,7 @@ void ScExtTabSettingsCont::CopyFromMap( const ScExtTabSettingsMap& rMap ) maMap[ aIt->first ].reset( new ScExtTabSettings( *aIt->second ) ); } -// ============================================================================ + /** Implementation struct for ScExtDocOptions containing all members. */ struct ScExtDocOptionsImpl @@ -223,6 +223,6 @@ void ScExtDocOptions::SetCodeName( SCTAB nTab, const OUString& rCodeName ) } } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/selectionstate.cxx b/sc/source/ui/view/selectionstate.cxx index bbbe313bd0da..3fda4b0dd124 100644 --- a/sc/source/ui/view/selectionstate.cxx +++ b/sc/source/ui/view/selectionstate.cxx @@ -23,7 +23,7 @@ #include "viewdata.hxx" #include "markdata.hxx" -// ============================================================================ + ScSelectionState::ScSelectionState( ScViewData& rViewData ) : meType( SC_SELECTTYPE_NONE ) @@ -76,6 +76,6 @@ bool operator==( const ScSelectionState& rL, const ScSelectionState& rR ) return bEqual; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx index 35a0aa135e56..664be169177e 100644 --- a/sc/source/ui/view/spelldialog.cxx +++ b/sc/source/ui/view/spelldialog.cxx @@ -35,7 +35,7 @@ #include "editable.hxx" #include "undoblk.hxx" -// ============================================================================ + SFX_IMPL_CHILDWINDOW_WITHID( ScSpellDialogChildWindow, SID_SPELL_DIALOG ) @@ -272,6 +272,6 @@ bool ScSpellDialogChildWindow::IsSelectionChanged() return (*mxOldRangeList != aCurrentRangeList); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index cd8fd0b55c64..3d9c10eb384f 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -268,7 +268,7 @@ void ScConversionEngineBase::FillFromCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) } } -// ============================================================================ + ScSpellingEngine::ScSpellingEngine( SfxItemPool* pEnginePoolP, ScViewData& rViewData, @@ -335,7 +335,7 @@ Window* ScSpellingEngine::GetDialogParent() return mrDocShell.GetActiveDialogParent(); } -// ============================================================================ + ScConversionParam::ScConversionParam( ScConversionType eConvType ) : meConvType( eConvType ), @@ -408,6 +408,6 @@ bool ScTextConversionEngine::NeedsConversion() return HasConvertibleTextPortion( maConvParam.GetSourceLang() ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 367a80a82b3c..95c6ef66eeec 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -36,7 +36,7 @@ // STATIC DATA ----------------------------------------------------------- -//================================================================== + ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) : TabBar( pParent, diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index a7752b70f3ad..e9913923f791 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -23,7 +23,7 @@ #include <vcl/settings.hxx> -//================================================================== + ScTabSplitter::ScTabSplitter( Window* pParent, WinBits nWinStyle, ScViewData* pData ) : Splitter( pParent, nWinStyle ), diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 5bf2db8977bb..c445316ac398 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -162,7 +162,7 @@ void ScCornerButton::MouseButtonDown( const MouseEvent& rMEvt ) } } -//================================================================== + static bool lcl_HasColOutline( const ScViewData& rViewData ) { @@ -531,9 +531,9 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner ) else nBarX = nBarY = 0; - // + // Splitter auswerten - // + long nLeftSize = nSizeX; long nRightSize = 0; @@ -668,9 +668,9 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner ) Point(nSplitPosX,nPosY), Size(nRightSize,nTopSize), nTotalWidth, bLayoutRTL ); } - // + // Scrollbars updaten - // + if (!bInUpdateHeader) { @@ -1446,9 +1446,9 @@ void ScTabView::UpdateShow() if ( aViewData.GetDocShell()->IsPreview() ) bHScrollMode = bVScrollMode = bTabMode = bHeader = bOutlMode = bHOutline = bVOutline = false; - // + // Windows anlegen - // + if (bShowH && !pGridWin[SC_SPLIT_BOTTOMRIGHT]) { @@ -1483,9 +1483,9 @@ void ScTabView::UpdateShow() pRowBar[SC_SPLIT_TOP] = new ScRowBar( pFrameWin, &aViewData, SC_SPLIT_TOP, &aHdrFunc, pHdrSelEng ); - // + // Windows anzeigen - // + ShowHide( &aHScrollLeft, bHScrollMode ); ShowHide( &aHScrollRight, bShowH && bHScrollMode ); diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 8cac82a491db..3f1578bf410d 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -96,9 +96,9 @@ using namespace com::sun::star; -// + // --- Public-Funktionen -// + void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, bool bControl ) { @@ -709,16 +709,16 @@ static Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) return NULL; } - // + // Bildschirm an Cursorposition anpassen - // + void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, const ScSplitPos* pWhich ) { - // + // aktiven Teil umschalten jetzt hier - // + ScSplitPos eActive = aViewData.GetActivePart(); ScHSplitPos eActiveX = WhichH(eActive); @@ -738,9 +738,9 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, eActiveY = SC_SPLIT_BOTTOM; } - // + // eigentliches Align - // + if ( eMode != SC_FOLLOW_NONE ) { @@ -944,9 +944,9 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, if ( nNewDeltaY != nDeltaY ) ScrollY( nNewDeltaY - nDeltaY, eAlignY ); } - // + // nochmal aktiven Teil umschalten - // + if (bHFix) if (eActiveX == SC_SPLIT_RIGHT && nCurX < (SCsCOL)aViewData.GetFixPosX()) @@ -982,9 +982,9 @@ bool ScTabView::SelMouseButtonDown( const MouseEvent& rMEvt ) return bRet; } - // + // MoveCursor - mit Anpassung des Bildausschnitts - // + void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, bool bShift, bool bControl, bool bKeepOld, bool bKeepSel ) @@ -1769,9 +1769,9 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa } } -// + // Paint-Funktionen - nur fuer diese View -// + void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW nRow ) { diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index 4a18e9093076..2f2dd64268ec 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -33,11 +33,11 @@ extern sal_uInt16 nScFillModeMouseModifier; // global.cxx // STATIC DATA ----------------------------------------------------------- -//================================================================== -// + + // --- Referenz-Eingabe / Fill-Cursor -// + void ScTabView::HideTip() { @@ -462,7 +462,7 @@ void ScTabView::InvertVertical( ScHSplitPos eWhich, long nDragPos ) } } -//================================================================== + void ScTabView::InterpretVisible() { diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 04fdf7e8d389..25e771efca61 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -248,7 +248,7 @@ void ScTabView::DoAddWin( ScGridWindow* pWin ) } } -//================================================================== + void ScTabView::TabChanged( bool bSameTabButMoved ) { diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index fca644ab010d..cf0ec07d2990 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -97,10 +97,10 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) return; } - // + // Pseudo-Slots von Draw-Toolbox auswerten //! wird das ueberhaupt noch gebraucht ????? - // + if (nNewId == SID_INSERT_DRAW && pArgs) { diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 76b9e2b5dc2b..c74de5aed9b2 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -904,7 +904,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - // ---------------------------------------------------------------- + case FID_CHG_SHOW: { diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index d8357a03fdba..dbd66ceff488 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -40,7 +40,7 @@ #include "cellvalue.hxx" #include "svl/sharedstring.hxx" -//================================================================== + void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index c593bf695d73..8c1beedbfed6 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -41,7 +41,7 @@ #include <svx/srchdlg.hxx> #include "document.hxx" -//================================================================== + OUString ScTabViewShell::GetSelectionText( bool bWholeWord ) { diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index de4070b4f4d6..bf23d9a3f77b 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -1585,9 +1585,9 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, return Point( nScrPosX, nScrPosY ); } -// + // Number of cells on a screen -// + SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, sal_uInt16 nScrSizeX ) const { diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index e83551516ee1..aea072da40a8 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -71,7 +71,7 @@ using namespace com::sun::star; // STATIC DATA --------------------------------------------------------------- -//============================================================================ + // GlobalName der Writer-DocShell kommt jetzt aus comphelper/classids.hxx @@ -764,9 +764,9 @@ static bool lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL return false; } -// + // Einfuegen auf Tabelle: -// + // internes Paste @@ -1207,10 +1207,10 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, rMark.SetMarkArea( aUserRange ); MarkDataChanged(); - // + // Aus Clipboard kopieren, // wenn gerechnet werden soll, Originaldaten merken - // + ScDocument* pMixDoc = NULL; if (nFunction) @@ -1750,7 +1750,7 @@ void ScViewFunc::PostPasteFromClip(const ScRangeList& rPasteRanges, const ScMark // D R A G A N D D R O P -// + // innerhalb des Dokuments bool ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 352ed4f21352..b892b0ee5108 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -75,7 +75,7 @@ using namespace com::sun::star; bool bPasteIsDrop = false; -//================================================================== + void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, const ::com::sun::star::uno::Reference< diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index ea3595717fe4..3a4457931590 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -107,9 +107,9 @@ bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, TransferableDataHelper aDataHelper( rxTransferable ); bool bRet = false; - // + // handle individual formats - // + if ( nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE || nFormatId == SOT_FORMATSTR_ID_LINK_SOURCE || diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index e897b8e3a47f..e3f617173f95 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -77,7 +77,7 @@ #include "tokenarray.hxx" #include <rowheightcontext.hxx> -//================================================================== + static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, ScDocShell *pDocSh ) { @@ -90,7 +90,7 @@ static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, ScDo } -//================================================================== + ScViewFunc::ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : ScTabView( pParent, rDocSh, pViewShell ), @@ -633,9 +633,9 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, ScEditableTester aTester( pDoc, nTab, nCol,nRow, nCol,nRow ); if (aTester.IsEditable()) { - // + // test for attribute - // + bool bSimple = false; bool bCommon = false; ScPatternAttr* pCellAttrs = NULL; @@ -672,9 +672,9 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, // #i97726# always get text for "repeat" of undo action aString = ScEditUtil::GetSpaceDelimitedString(aEngine); - // + // undo - // + EditTextObject* pUndoData = NULL; ScUndoEnterData::ValuesType aOldValues; @@ -693,9 +693,9 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, pUndoData = rData.Clone(); } - // + // enter data - // + if (bCommon) pDoc->ApplyPattern(nCol,nRow,nTab,*pCellAttrs); //! undo @@ -884,11 +884,11 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter, } } -// + // apply attribute - undo OK // // complete set ( ATTR_STARTINDEX, ATTR_ENDINDEX ) -// + void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet, |