diff options
214 files changed, 485 insertions, 1681 deletions
diff --git a/sw/inc/IDocumentDrawModelAccess.hxx b/sw/inc/IDocumentDrawModelAccess.hxx index 496f03b9c211..4c76292bc3cb 100644 --- a/sw/inc/IDocumentDrawModelAccess.hxx +++ b/sw/inc/IDocumentDrawModelAccess.hxx @@ -25,8 +25,6 @@ class SdrModel; class SdrPageView; -/** IDocumentDrawModelAccess - */ class IDocumentDrawModelAccess { public: diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx index 50cbdcbd46da..dac4b6549eb3 100644 --- a/sw/inc/IDocumentRedlineAccess.hxx +++ b/sw/inc/IDocumentRedlineAccess.hxx @@ -78,8 +78,6 @@ namespace nsRedlineType_t const RedlineType_t REDLINE_FORM_AUTOFMT = 0x80;// Can be a flag in RedlineType. } -/** IDocumentRedlineAccess -*/ class IDocumentRedlineAccess { // Static helper functions diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx index 86e70a05da7e..ee67ba04ec8a 100644 --- a/sw/inc/IDocumentUndoRedo.hxx +++ b/sw/inc/IDocumentUndoRedo.hxx @@ -32,8 +32,6 @@ namespace sw { class RepeatContext; } -/** IDocumentUndoRedo -*/ class IDocumentUndoRedo { public: diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index e7f63e7461d9..e2b006be4449 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -170,7 +170,6 @@ public: virtual OUString GetDescription() const SAL_OVERRIDE; }; -// --- inlines ----------------------------------------------------------- inline OUString SwAuthEntry::GetAuthorField(ToxAuthorityField ePos) const { SAL_WARN_IF(AUTH_FIELD_END <= ePos, "sw", "wrong index"); diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 8f4967585d0d..a7674e1377ed 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -60,9 +60,7 @@ #define FN_UNO_RANGE_BEGIN FN_FORMAT2 #define FN_UNO_RANGE_END (FN_PARAM2 + 199) -/*-------------------------------------------------------------------- - Region: File - --------------------------------------------------------------------*/ +// Region: File #define FN_NEW_GLOBAL_DOC (FN_FILE + 4 ) /* Create Global Document */ #define FN_OPEN_FILE (FN_FILE + 7 ) /* Open */ @@ -71,9 +69,7 @@ #define FN_NEW_HTML_DOC (FN_FILE + 40 ) /* Create HTML document */ -/*-------------------------------------------------------------------- - Region: Edit - --------------------------------------------------------------------*/ +// Region: Edit #define FN_EDIT_FIELD (FN_EDIT + 4 ) /* Edit field */ #define FN_EDIT_LINK_DLG (FN_EDIT + 9 ) /* Edit link dialog */ @@ -84,9 +80,7 @@ #define FN_EDIT_FORMULA (FN_EDIT + 28) /* Edit formula in RibbonBar */ #define FN_CALC_TABLE (FN_EDIT + 29) -/*-------------------------------------------------------------------- - Region: Bullets - --------------------------------------------------------------------*/ +// Region: Bullets #define FN_NUM_BULLET_DOWN (FN_EDIT + 30) /* Bullet down */ #define FN_NUM_BULLET_UP (FN_EDIT + 31) /* Bullet up */ #define FN_NUM_BULLET_PREV (FN_EDIT + 32) /* to previous bullet */ @@ -164,14 +158,10 @@ #define FN_REDLINE_NEXT_CHANGE (FN_EDIT2 + 41) /* Go to the next change */ #define FN_REDLINE_PREV_CHANGE (FN_EDIT2 + 42) /* Go to the previous change */ -/*-------------------------------------------------------------------- - Region: Edit - --------------------------------------------------------------------*/ - +// Region: Edit #define FN_REFRESH_VIEW (FN_VIEW + 1) /* Refresh/Redraw */ #define FN_DRAW_WRAP_DLG (FN_VIEW + 3) /* Draw Umlauf-Dlg */ - #define FN_RULER (FN_VIEW + 11) /* Horizontal ruler */ #define FN_VIEW_GRAPHIC (FN_VIEW + 13) /* View graphic */ @@ -221,10 +211,7 @@ #define FN_SCROLL_PREV (FN_VIEW + 57) /* uno:ScrollToPrevious */ #define FN_SCROLL_NEXT (FN_VIEW + 58) /* uno:ScrollToNext */ -/*-------------------------------------------------------------------- - Region: Insert - --------------------------------------------------------------------*/ - +// Region: Insert #define FN_INSERT_BOOKMARK (FN_INSERT + 2 ) /* Bookmark */ #define FN_INSERT_BREAK_DLG (FN_INSERT + 4 ) /* Break */ @@ -285,10 +272,7 @@ #define FN_INSERT_FLD_AUTHOR (FN_INSERT + 98) #define FN_INSERT_FOOTNOTE (FN_INSERT + 99) -/*-------------------------------------------------------------------- - Region: Paste (Part 2) - --------------------------------------------------------------------*/ - +// Region: Paste (Part 2) #define FN_MAILMERGE_SENDMAIL_CHILDWINDOW (FN_INSERT2 + 5) /* child window provided by mailmerge */ #define FN_SBA_BRW_UPDATE (FN_INSERT2 + 7) /* insert records into fields */ @@ -306,10 +290,7 @@ #define FN_INSERT_MULTI_TOX (FN_INSERT2 + 20) /* insert any TOX */ #define FN_INSERT_AUTH_ENTRY_DLG (FN_INSERT2 + 21) /* insert entry for table of authorities*/ -/*-------------------------------------------------------------------- - Region: Format - --------------------------------------------------------------------*/ - +// Region: Format #define FN_AUTOFORMAT_APPLY (FN_FORMAT + 1 ) /* apply autoformat options */ #define FN_AUTOFORMAT_AUTO (FN_FORMAT + 2 ) /* apply autoformat during user input */ #define FN_GROW_FONT_SIZE (FN_FORMAT + 3 ) /* size */ @@ -380,9 +361,7 @@ #define FN_CONVERT_TABLE_TO_TEXT (FN_FORMAT + 132) /* convert a table to text */ #define FN_TABLE_SORT_DIALOG (FN_FORMAT + 133) /* sorting in tables*/ -/*-------------------------------------------------------------------- - Region: Page Template - --------------------------------------------------------------------*/ +// Region: Page Template #define FN_PAGE_STYLE_SET_LR_MARGIN (FN_FORMAT + 130) /* left / right margin */ #define FN_PAGE_STYLE_SET_UL_MARGIN (FN_FORMAT + 131) /* upper / lower margin */ #define FN_PAGE_STYLE_SET_PAPER_SIZE (FN_FORMAT + 135) /* */ @@ -400,14 +379,10 @@ #define FN_TABLE_HEADLINE_COUNT (FN_FORMAT + 147) /* number of repeated headlines of tables */ -/*-------------------------------------------------------------------- - Region: Ribbon - --------------------------------------------------------------------*/ - +// Region: Ribbon #define FN_FORMULA_CALC (FN_FORMAT + 156) /* select formula */ #define FN_FORMULA_CANCEL (FN_FORMAT + 157) /* don't apply formula */ #define FN_FORMULA_APPLY (FN_FORMAT + 158) /* apply formula */ - #define FN_TABLE_UNSET_READ_ONLY (FN_FORMAT + 159) /* undo cell protection for table */ #define FN_FRAME_WRAP_IDEAL (FN_FORMAT + 163) /* frame ideal wrapping */ @@ -492,10 +467,7 @@ #define FN_REMOVE_DIRECT_CHAR_FORMATS (FN_FORMAT2 + 159) //free (160) -/*-------------------------------------------------------------------- - Region: Extras - --------------------------------------------------------------------*/ - +// Region: Extras #define FN_LINE_NUMBERING_DLG (FN_EXTRA + 2 ) /* */ #define FN_HYPHENATE_OPT_DLG (FN_EXTRA + 5 ) /* */ #define FN_ADD_UNKNOWN (FN_EXTRA + 6 ) /* learn words */ @@ -655,12 +627,8 @@ #define FN_UNO_HIDDEN (FN_EXTRA2 + 122) #define FN_UNO_STYLE_INTEROP_GRAB_BAG (FN_EXTRA2 + 123) -/*------------------------------------------------ -------------------- - Area: Help - -------------------------------------------------- ------------------*/ -/*------------------------------------------------ -------------------- - Region: Traveling & Selection - -------------------------------------------------- ------------------*/ +// Area: Help +// Region: Traveling & Selection #define FN_CHAR_LEFT (FN_SELECTION + 1 ) /* */ #define FN_CHAR_RIGHT (FN_SELECTION + 2 ) /* */ #define FN_LINE_UP (FN_SELECTION + 3 ) /* */ @@ -747,14 +715,10 @@ #define FN_SELECTION_MODE_DEFAULT (FN_SELECTION + 90) /* use default selection mode - not block mode */ #define FN_SELECTION_MODE_BLOCK (FN_SELECTION + 91) /* switch on block selection */ -/*-------------------------------------------------------------------- - QUERY-Block - --------------------------------------------------------------------*/ - +// QUERY-Block #define FN_TXTATR_INET (FN_QUERY +29) /* INet-Attribut */ #define FN_GET_PRINT_AREA (FN_QUERY +32) /* Get attribute for printable area of page */ - #define FN_DB_CONNECTION_ANY (FN_QUERY2 + 3) #define FN_DB_COLUMN_ANY (FN_QUERY2 + 4) #define FN_DB_DATA_SOURCE_ANY (FN_QUERY2 + 5) @@ -764,10 +728,7 @@ #define FN_DB_DATA_SELECTION_ANY (FN_QUERY2 + 9) #define FN_DB_DATA_CURSOR_ANY (FN_QUERY2 + 10) -/*-------------------------------------------------------------------- - Region: Envelope - --------------------------------------------------------------------*/ - +// Region: Envelope #define FN_ENVELOP (FN_ENVELP ) #define FN_DELETE_NOTE_AUTHOR (FN_NOTES+1) @@ -787,10 +748,7 @@ #define FN_PAGEBREAK_EDIT (FN_PAGEBREAK+1) #define FN_PAGEBREAK_DELETE (FN_PAGEBREAK+2) -/*-------------------------------------------------------------------- - Region: Parameter - --------------------------------------------------------------------*/ - +// Region: Parameter #define FN_PARAM_MOVE_COUNT (FN_PARAM+2) #define FN_PARAM_MOVE_SELECTION (FN_PARAM+3) @@ -856,10 +814,7 @@ #define FN_SHAPE_ENDPOSITION_IN_HORI_L2R (FN_PARAM2+26) #define FN_PARAM_PAM (FN_PARAM2+27) /* Point and Mark */ -/*-------------------------------------------------------------------- - Description: Status: not more than 19! - --------------------------------------------------------------------*/ - +// Status: not more than 19! #define FN_STAT_PAGE (FN_STAT + 1) #define FN_STAT_TEMPLATE (FN_STAT + 2) #define FN_STAT_ZOOM (FN_STAT + 3) @@ -867,10 +822,7 @@ #define FN_STAT_BOOKMARK (FN_STAT + 8) /* For Popup Bookmarks*/ #define FN_STAT_WORDCOUNT (FN_STAT + 9) -/*-------------------------------------------------------------------- - Region: Page preview - --------------------------------------------------------------------*/ - +// Region: Page preview #define FN_SHOW_TWO_PAGES (FN_PGPREVIEW + 1) #ifndef FN_SHOW_MULTIPLE_PAGES #define FN_SHOW_MULTIPLE_PAGES (FN_PGPREVIEW + 2) @@ -879,10 +831,7 @@ #define FN_CLOSE_PAGEPREVIEW (FN_PGPREVIEW + 4) #define FN_SHOW_BOOKVIEW (FN_PGPREVIEW + 5) -/*-------------------------------------------------------------------- - Region: Setting Attributes - --------------------------------------------------------------------*/ - +// Region: Setting Attributes #define FN_OPAQUE (FN_FRAME + 1) #define FN_SET_PROTECT (FN_FRAME + 2) #define FN_SURROUND (FN_FRAME + 3) diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index 53548f4cc704..8677265eda08 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -27,10 +27,7 @@ class SwDoc; class SwTxtFld; class SwFrm; -/*-------------------------------------------------------------------- - Database field. - --------------------------------------------------------------------*/ - +// Database field. class SW_DLLPUBLIC SwDBFieldType : public SwValueFieldType { SwDBData aDBData; @@ -56,11 +53,8 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Classes derived from SwFields. They overlay the expand-function. - Content is formated according to the format (if available). - --------------------------------------------------------------------*/ - +// Classes derived from SwFields. They overlay the expand-function. +// Content is formated according to the format (if available). class SW_DLLPUBLIC SwDBField : public SwValueField { OUString aContent; @@ -124,10 +118,7 @@ inline void SwDBField::SetExpansion(const OUString& rStr) inline void SwDBField::ChgBodyTxtFlag( bool bIsInBody ) { bIsInBodyTxt = bIsInBody; } -/*-------------------------------------------------------------------- - Base class for all other database fields. - --------------------------------------------------------------------*/ - +// Base class for all other database fields. class SW_DLLPUBLIC SwDBNameInfField : public SwField { SwDBData aDBData; @@ -154,10 +145,7 @@ public: virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Database field next record. - --------------------------------------------------------------------*/ - +// Database field next record. class SW_DLLPUBLIC SwDBNextSetFieldType : public SwFieldType { public: @@ -166,10 +154,7 @@ public: virtual SwFieldType* Copy() const SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Next data record with condition. - --------------------------------------------------------------------*/ - +// Next data record with condition. class SW_DLLPUBLIC SwDBNextSetField : public SwDBNameInfField { OUString aCond; @@ -199,10 +184,7 @@ inline bool SwDBNextSetField::IsCondValid() const inline void SwDBNextSetField::SetCondValid(bool bCond) { bCondValid = bCond; } -/*-------------------------------------------------------------------- - Database field next record. - --------------------------------------------------------------------*/ - +// Database field next record. class SwDBNumSetFieldType : public SwFieldType { public: @@ -211,11 +193,8 @@ public: virtual SwFieldType* Copy() const SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Data record with number xxx. - Number is in nFormat (bit of a misuse!) - --------------------------------------------------------------------*/ - +// Data record with number xxx. +// Number is in nFormat (bit of a misuse!) class SwDBNumSetField : public SwDBNameInfField { OUString aCond; @@ -251,10 +230,7 @@ inline bool SwDBNumSetField::IsCondValid() const inline void SwDBNumSetField::SetCondValid(bool bCond) { bCondValid = bCond; } -/*-------------------------------------------------------------------- - Database name. - --------------------------------------------------------------------*/ - +// Database name. class SwDBNameFieldType : public SwFieldType { SwDoc *pDoc; @@ -265,10 +241,7 @@ public: virtual SwFieldType* Copy() const SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Database field. - --------------------------------------------------------------------*/ - +// Database field. class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField { public: @@ -280,10 +253,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Number of data record. - --------------------------------------------------------------------*/ - +// Number of data record. class SW_DLLPUBLIC SwDBSetNumberFieldType : public SwFieldType { public: @@ -292,14 +262,10 @@ public: virtual SwFieldType* Copy() const SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Database field. - --------------------------------------------------------------------*/ - +// Database field. class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField { long nNumber; - public: SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0); diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index d2b2eb783c1f..c4c6ad11b0f8 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -83,9 +83,7 @@ enum DBManagerOptions DBMGR_MERGE_SINGLE_FILE ///< Save merge as single file. }; -/*-------------------------------------------------------------------- - Administration of (new) logical databases. - --------------------------------------------------------------------*/ +// Administration of (new) logical databases. #define SW_DB_SELECT_UNKNOWN 0 #define SW_DB_SELECT_TABLE 1 #define SW_DB_SELECT_QUERY 2 diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index b4f5b3d9b7a6..4417c0e069e2 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -25,10 +25,7 @@ class SwDoc; -/*-------------------------------------------------------------------- - FieldType for DDE - --------------------------------------------------------------------*/ - +// FieldType for DDE class SW_DLLPUBLIC SwDDEFieldType : public SwFieldType { OUString aName; @@ -83,10 +80,7 @@ public: void SetCRLFDelFlag( bool bFlag = true ) { bCRLFFlag = bFlag; } }; -/*-------------------------------------------------------------------- - DDE-field - --------------------------------------------------------------------*/ - +// DDE-field class SwDDEField : public SwField { private: diff --git a/sw/inc/dobjfac.hxx b/sw/inc/dobjfac.hxx index b76fb541c766..d0787959cebf 100644 --- a/sw/inc/dobjfac.hxx +++ b/sw/inc/dobjfac.hxx @@ -21,8 +21,6 @@ #include <tools/link.hxx> -// class SwObjectFactory - class SdrObjFactory; class SwObjectFactory diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 78ea8a1004e6..9760272e43ea 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -104,9 +104,9 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener /// Methods for StyleSheets - // @param nSlot - // Only used for nFamily == SFX_STYLE_FAMILY_PAGE. Identifies optional Slot by which the edit is triggered. - // Used to activate certain dialog pane + /// @param nSlot + /// Only used for nFamily == SFX_STYLE_FAMILY_PAGE. Identifies optional Slot by which the edit is triggered. + /// Used to activate certain dialog pane SAL_DLLPRIVATE sal_uInt16 Edit( const OUString &rName, const OUString& rParent, @@ -242,9 +242,9 @@ public: void _LoadStyles( SfxObjectShell& rSource, bool bPreserveCurrentDocument ); - // Show page style format dialog - // @param nSlot - // Identifies slot by which the dialog is triggered. Used to activate certain dialog pane + /// Show page style format dialog + /// @param nSlot + /// Identifies slot by which the dialog is triggered. Used to activate certain dialog pane void FormatPage( const OUString& rPage, const OString& rPageId, diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index fe2f411eb24b..c93984daedee 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -36,9 +36,7 @@ class SwTxtFmtColl; class SwFrmFmt; class SwNumRule; -/*-------------------------------------------------------------------- - Local helper class. - --------------------------------------------------------------------*/ +// Local helper class. class SwPoolFmtList : public std::vector<OUString> { public: @@ -47,9 +45,7 @@ public: void Erase(); }; -/*-------------------------------------------------------------------- - Temporary StyleSheet. - --------------------------------------------------------------------*/ +// Temporary StyleSheet. class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase { friend class SwDocStyleSheetPool; @@ -147,10 +143,7 @@ public: virtual bool IsUsed() const SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Iterator for Pool. - --------------------------------------------------------------------*/ - +// Iterator for Pool. class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener { rtl::Reference< SwDocStyleSheet > mxIterSheet; diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index ad3ea83a11a3..246971fc22fc 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -43,10 +43,7 @@ enum SwAuthorFormat AF_FIXED = 0x8000 }; -/*-------------------------------------------------------------------- - Subtype of document statistics. - --------------------------------------------------------------------*/ - +// Subtype of document statistics. enum SwDocStatSubType { DS_BEGIN, @@ -132,10 +129,6 @@ enum SwJumpEditFormat JE_FMT_OLE }; -/*-------------------------------------------------------------------- - Page number. - --------------------------------------------------------------------*/ - class SwPageNumberFieldType : public SwFieldType { sal_Int16 nNumberingType; @@ -151,10 +144,7 @@ public: virtual SwFieldType* Copy() const SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Page numbering. - --------------------------------------------------------------------*/ - +// Page numbering. class SW_DLLPUBLIC SwPageNumberField : public SwField { OUString sUserStr; @@ -187,10 +177,6 @@ public: void SetUserString( const OUString& rS ) { sUserStr = rS; } }; -/*-------------------------------------------------------------------- - Authors. - --------------------------------------------------------------------*/ - class SwAuthorFieldType : public SwFieldType { public: @@ -200,10 +186,6 @@ public: virtual SwFieldType* Copy() const SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Author field. - --------------------------------------------------------------------*/ - class SwAuthorField : public SwField { OUString aContent; @@ -221,10 +203,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Filename - --------------------------------------------------------------------*/ - class SwFileNameFieldType : public SwFieldType { SwDoc *pDoc; @@ -235,10 +213,6 @@ public: virtual SwFieldType* Copy() const SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - FileNameField - --------------------------------------------------------------------*/ - class SW_DLLPUBLIC SwFileNameField : public SwField { OUString aContent; @@ -256,10 +230,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - TemplName - --------------------------------------------------------------------*/ - class SwTemplNameFieldType : public SwFieldType { SwDoc *pDoc; @@ -270,10 +240,6 @@ public: virtual SwFieldType* Copy() const SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - TemplNameField - --------------------------------------------------------------------*/ - class SW_DLLPUBLIC SwTemplNameField : public SwField { public: @@ -285,10 +251,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Document statistics - --------------------------------------------------------------------*/ - +// Document statistics class SwDocStatFieldType : public SwFieldType { SwDoc* pDoc; @@ -302,10 +265,6 @@ public: inline void SetNumFormat( sal_Int16 eFmt ) { nNumberingType = eFmt; } }; -/*-------------------------------------------------------------------- - DocStatField - --------------------------------------------------------------------*/ - class SW_DLLPUBLIC SwDocStatField : public SwField { sal_uInt16 nSubType; @@ -325,10 +284,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Hidden text. - --------------------------------------------------------------------*/ - class SwHiddenTxtFieldType : public SwFieldType { bool bHidden; @@ -341,10 +296,6 @@ public: inline bool GetHiddenFlag() const { return bHidden; } }; -/*-------------------------------------------------------------------- - HiddenTxtField - --------------------------------------------------------------------*/ - class SwHiddenTxtField : public SwField { OUString aTRUETxt; ///< Text if condition sal_True. @@ -397,10 +348,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Field that expands to an empty line (without height). - --------------------------------------------------------------------*/ - +// Field that expands to an empty line (without height). class SwHiddenParaFieldType : public SwFieldType { public: @@ -409,10 +357,6 @@ public: virtual SwFieldType* Copy() const SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Hidded paragraph. - --------------------------------------------------------------------*/ - class SwHiddenParaField : public SwField { OUString aCond; @@ -434,10 +378,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Run Macro. - --------------------------------------------------------------------*/ - class SwMacroFieldType : public SwFieldType { SwDoc* pDoc; @@ -448,10 +388,6 @@ public: virtual SwFieldType* Copy() const SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - MacroField. - --------------------------------------------------------------------*/ - class SW_DLLPUBLIC SwMacroField : public SwField { OUString aMacro; @@ -490,10 +426,6 @@ public: static bool isScriptURL( const OUString& str ); }; -/*-------------------------------------------------------------------- - PostIts - --------------------------------------------------------------------*/ - class SwPostItFieldType : public SwFieldType { private: @@ -509,10 +441,6 @@ public: }; }; -/*-------------------------------------------------------------------- - PostItField - --------------------------------------------------------------------*/ - class SW_DLLPUBLIC SwPostItField : public SwField { OUString sTxt; @@ -561,10 +489,6 @@ public: virtual OUString GetDescription() const SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - DocumentInfo - --------------------------------------------------------------------*/ - class SwDocInfoFieldType : public SwValueFieldType { public: @@ -598,10 +522,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Extended User settings. - --------------------------------------------------------------------*/ - +// Extended User settings. class SwExtUserFieldType : public SwFieldType { OUString aData; @@ -634,10 +555,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Relative page numbers - field. - --------------------------------------------------------------------*/ - +// Relative page numbers - field. class SwRefPageSetFieldType : public SwFieldType { public: @@ -650,10 +568,7 @@ protected: virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Relative page numbering. - --------------------------------------------------------------------*/ - +// Relative page numbering. class SwRefPageSetField : public SwField { short nOffset; @@ -677,10 +592,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Relative page numbers - query field. - --------------------------------------------------------------------*/ - +// Relative page numbers - query field. class SwRefPageGetFieldType : public SwFieldType { SwDoc* pDoc; @@ -697,10 +609,7 @@ public: SwDoc* GetDoc() const { return pDoc; } }; -/*-------------------------------------------------------------------- - Query relative page numbering. - --------------------------------------------------------------------*/ - +// Query relative page numbering. class SwRefPageGetField : public SwField { OUString sTxt; @@ -717,10 +626,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Field to jump to and edit. - --------------------------------------------------------------------*/ - +// Field to jump to and edit. class SwJumpEditFieldType : public SwFieldType { SwDoc* pDoc; @@ -757,10 +663,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Script Fieldtype. - --------------------------------------------------------------------*/ - class SwScriptFieldType : public SwFieldType { SwDoc* pDoc; @@ -770,10 +672,6 @@ public: virtual SwFieldType* Copy() const SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - ScriptField. - --------------------------------------------------------------------*/ - class SwScriptField : public SwField { OUString sType; ///< Type of Code (Java/VBScript/...) @@ -804,10 +702,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Combined Character Fieldtype - --------------------------------------------------------------------*/ - +// Combined Character Fieldtype class SwCombinedCharFieldType : public SwFieldType { public: @@ -816,10 +711,7 @@ public: virtual SwFieldType* Copy() const SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - ScriptField - --------------------------------------------------------------------*/ - +// ScriptField #define MAX_COMBINED_CHARACTERS 6 class SW_DLLPUBLIC SwCombinedCharField : public SwField diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 4a09b171f851..ee1aa0e364d5 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -350,10 +350,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Description: Sorted list of input fields and DropDown fields - --------------------------------------------------------------------*/ - +// Sorted list of input fields and DropDown fields class SwInputFieldList { public: diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index 357aafe67fd5..42c0f5afcbc2 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -27,8 +27,6 @@ class SwCharFmt; class SwTxtCharFmt; class IntlWrapper; -// ATT_CHARFMT ********************************************* - class SW_DLLPUBLIC SwFmtCharFmt: public SfxPoolItem, public SwClient { friend class SwTxtCharFmt; diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index eada4b6ac8c9..a40416ec507a 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -23,8 +23,6 @@ #include <format.hxx> #include <boost/shared_ptr.hpp> -// ATT_AUTOFMT ********************************************* - class SwFmtAutoFmt: public SfxPoolItem { boost::shared_ptr<SfxItemSet> mpHandle; diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 95aa7bf81ea0..325893105c0f 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -331,8 +331,6 @@ public: virtual FillAttributesPtr getFillAttributes() const; }; -// --------------- inline Implementations ------------------------ - //UUUUinline const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, //UUUU bool bInParents ) const //UUUU{ diff --git a/sw/inc/istyleaccess.hxx b/sw/inc/istyleaccess.hxx index add8a10e3100..f961ea468f55 100644 --- a/sw/inc/istyleaccess.hxx +++ b/sw/inc/istyleaccess.hxx @@ -22,14 +22,10 @@ #include <vector> #include <svl/stylepool.hxx> -/*-------------------------------------------------------------------- - Management of (automatic) styles - --------------------------------------------------------------------*/ - +// Management of (automatic) styles class IStyleAccess { public: - enum SwAutoStyleFamily { AUTO_STYLE_CHAR, diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 294a79e38bf5..be64d454d690 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -524,8 +524,6 @@ private: SwTableNode & operator= ( const SwTableNode & rNode ); }; -// SwSectionNode - class SwSectionNode : public SwStartNode , private ::boost::noncopyable @@ -572,8 +570,6 @@ public: }; -// SwDummySectionNode - /** This class is internal. And quite frankly I don't know what ND_SECTIONDUMMY is for, the class has been merely created to replace "SwNode( ND_SECTIONDUMMY )", the only case of instantiating SwNode directly. Now SwNode can be an abstract base class. */ diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 7a9365718b96..c87563812418 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -351,8 +351,6 @@ public: }; -// -------------- inlines --------------------------------- - inline SwSection* SwSection::GetParent() const { SwSectionFmt* pFmt = GetFmt(); diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index fc1d475c7530..1acbf8dd8375 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -395,9 +395,9 @@ public: bool bFmt = false, const OString& sDefPage = OString(), const OUString* pFmtStr = 0) = 0; - // @param nSlot - // Identifies optional Slot by which the creation of the Template (Style) dialog is triggered. - // Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane + /// @param nSlot + /// Identifies optional Slot by which the creation of the Template (Style) dialog is triggered. + /// Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane virtual SfxAbstractApplyTabDialog* CreateTemplateDialog( Window* pParent, SfxStyleSheetBase& rBase, diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx index 5c0d96666d52..f66e723d312d 100644 --- a/sw/inc/swddetbl.hxx +++ b/sw/inc/swddetbl.hxx @@ -45,8 +45,6 @@ protected: virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE; }; -// ----------- Inlines ----------------------------- - inline const SwDDEFieldType* SwDDETable::GetDDEFldType() const { return ((SwDDETable*)this)->GetDDEFldType(); diff --git a/sw/inc/swerror.h b/sw/inc/swerror.h index 88238edc2291..aff48474e0ff 100644 --- a/sw/inc/swerror.h +++ b/sw/inc/swerror.h @@ -66,8 +66,6 @@ #define ERR_TBLINSCOL_ERROR (ERROR_SW_BASE|ERRCODE_CLASS_NONE| 57 ) #define ERR_TBLDDECHG_ERROR (ERROR_SW_BASE|ERRCODE_CLASS_NONE| 58 ) -// ----- Warnings --------------------------- - // Import - Warnings #define WARN_SWG_NO_DRAWINGS (WARN_SW_READ_BASE | 70 ) #define WARN_WW6_FASTSAVE_ERR (WARN_SW_READ_BASE | 71 ) diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index 23975d5990e4..8c96abafcc87 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -18,15 +18,15 @@ */ #ifndef INCLUDED_SW_INC_TBLAFMT_HXX #define INCLUDED_SW_INC_TBLAFMT_HXX -/************************************************************************* -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - - The structure of table auto formatting should not be changed. It is used - by different code of Writer and Calc. If a change is necessary, the - source code of both applications must be changed! - -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -**************************************************************************/ +/* + * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + * + * The structure of table auto formatting should not be changed. It is used + * by different code of Writer and Calc. If a change is necessary, the + * source code of both applications must be changed! + * + * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + */ #include <boost/scoped_ptr.hpp> diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 701cf8b2f811..86565aff003c 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -42,10 +42,7 @@ class SwDoc; class SwTOXMarks : public std::vector<SwTOXMark*> {}; -/*-------------------------------------------------------------------- - Description: Entry of content index, alphabetical index or user defined index - --------------------------------------------------------------------*/ - +// Entry of content index, alphabetical index or user defined index class SW_DLLPUBLIC SwTOXMark : public SfxPoolItem , public SwModify @@ -148,10 +145,7 @@ public: static void InsertTOXMarks( SwTOXMarks& aMarks, const SwTOXType& rType ); }; -/*-------------------------------------------------------------------- - Description: index types - --------------------------------------------------------------------*/ - +// index types class SwTOXType : public SwModify { public: @@ -171,10 +165,7 @@ private: SwTOXType & operator= (const SwTOXType &); }; -/*-------------------------------------------------------------------- - Description: Structure of the index lines - --------------------------------------------------------------------*/ - +// Structure of the index lines #define FORM_TITLE 0 #define FORM_ALPHA_DELIMITTER 1 #define FORM_PRIMARY_KEY 2 @@ -341,10 +332,7 @@ public: static OUString GetFormAuth(); }; -/*-------------------------------------------------------------------- - Description: Content to create indexes of - --------------------------------------------------------------------*/ - +// Content to create indexes of typedef sal_uInt16 SwTOXElement; namespace nsSwTOXElement { @@ -396,10 +384,7 @@ namespace nsSwTOOElements #define TOX_STYLE_DELIMITER ((sal_Unicode)0x01) -/*-------------------------------------------------------------------- - Description: Class for all indexes - --------------------------------------------------------------------*/ - +// Class for all indexes class SW_DLLPUBLIC SwTOXBase : public SwClient { SwForm aForm; // description of the lines @@ -545,10 +530,6 @@ public: void RegisterToTOXType( SwTOXType& rMark ); }; -/*-------------------------------------------------------------------- - Description: Inlines - --------------------------------------------------------------------*/ - //SwTOXMark inline OUString SwTOXMark::GetAlternativeText() const diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx index fe4fad242796..c849a7b70e8d 100644 --- a/sw/inc/txatbase.hxx +++ b/sw/inc/txatbase.hxx @@ -132,8 +132,6 @@ public: virtual sal_Int32* GetEnd() SAL_OVERRIDE; }; -// --------------- Inline Implementations ------------------------ - inline const sal_Int32* SwTxtAttr::End() const { return const_cast<SwTxtAttr * >(this)->GetEnd(); diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx index b727106b41f5..b8720b09ec6f 100644 --- a/sw/inc/txtatr.hxx +++ b/sw/inc/txtatr.hxx @@ -29,8 +29,6 @@ namespace sw { class MetaFieldManager; } -// ATT_CHARFMT ********************************************* - class SwTxtCharFmt : public SwTxtAttrEnd { SwTxtNode * m_pTxtNode; @@ -51,7 +49,6 @@ public: sal_uInt16 GetSortNumber() const { return m_nSortNumber; } }; -// ****************************** class SwTxtAttrNesting : public SwTxtAttrEnd { @@ -80,7 +77,6 @@ public: void ChgTxtNode(SwTxtNode * const pNode); }; -// ****************************** class SW_DLLPUBLIC SwTxtRuby : public SwTxtAttrNesting, public SwClient { diff --git a/sw/inc/txtflcnt.hxx b/sw/inc/txtflcnt.hxx index cd1f73dd8fc5..b3e2b6cfb103 100644 --- a/sw/inc/txtflcnt.hxx +++ b/sw/inc/txtflcnt.hxx @@ -26,13 +26,10 @@ class SwFrm; class SwTxtNode; class SwDoc; -// SWTXT_FLYCNT ******************************** // Attribute for line-bound frames (without end index). - class SwTxtFlyCnt : public SwTxtAttr { SwFlyInCntFrm *_GetFlyFrm( const SwFrm *pCurrFrm ); - public: SwTxtFlyCnt( SwFmtFlyCnt& rAttr, sal_Int32 nStart ); diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx index 7ce306e1b5c3..3f4d41f13de7 100644 --- a/sw/inc/txtfld.hxx +++ b/sw/inc/txtfld.hxx @@ -24,8 +24,6 @@ class SwTxtNode; -// ATT_FLD *********************************** - class SwTxtFld : public SwTxtAttr { mutable OUString m_aExpand; // only used to determine, if field content is changing in <ExpandTxtFld()> diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx index 7ad6dc498e7c..94b2712c2f0a 100644 --- a/sw/inc/txtftn.hxx +++ b/sw/inc/txtftn.hxx @@ -29,8 +29,6 @@ class SwNodes; class SwDoc; class SwFrm; -// ATT_FTN ********************************************************** - class SW_DLLPUBLIC SwTxtFtn : public SwTxtAttr { SwNodeIndex * m_pStartNode; diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx index f1159c598a75..341762d4f8b5 100644 --- a/sw/inc/txtinet.hxx +++ b/sw/inc/txtinet.hxx @@ -26,8 +26,6 @@ class SwTxtNode; class SwCharFmt; -// ATT_INETFMT ********************************************* - class SW_DLLPUBLIC SwTxtINetFmt : public SwTxtAttrNesting, public SwClient { SwTxtNode * m_pTxtNode; diff --git a/sw/inc/txtrfmrk.hxx b/sw/inc/txtrfmrk.hxx index 78fac9723424..eee21e2f9f32 100644 --- a/sw/inc/txtrfmrk.hxx +++ b/sw/inc/txtrfmrk.hxx @@ -23,9 +23,7 @@ class SwTxtNode; -// SWTXT_REFMARK ************************************* // Attribute for content-/position references in text. - class SwTxtRefMark : public SwTxtAttrEnd { SwTxtNode * m_pTxtNode; diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx index e767bd759d28..6436b859f342 100644 --- a/sw/inc/txttxmrk.hxx +++ b/sw/inc/txttxmrk.hxx @@ -24,9 +24,7 @@ class SwTxtNode; class SwDoc; -// SWTXT_TOXMARK ******************************* // Attribute for indices/tables of contents. - class SwTxtTOXMark : public SwTxtAttrEnd { SwTxtNode * m_pTxtNode; diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 1f3d632de10e..e43ea2be83aa 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -583,17 +583,15 @@ public: virtual void onChange() SAL_OVERRIDE; }; -/* The class SwViewOptionAdjust_Impl is used to adjust the SwViewOption of - the current SwViewShell so that fields are not printed as commands and - hidden characters are always invisible. Hidden text and place holders - should be printed according to the current print options. - After printing the view options are restored - -----------------------------------------------------------------------*/ +// The class SwViewOptionAdjust_Impl is used to adjust the SwViewOption of +// the current SwViewShell so that fields are not printed as commands and +// hidden characters are always invisible. Hidden text and place holders +// should be printed according to the current print options. +// After printing the view options are restored class SwViewOptionAdjust_Impl { SwViewShell * m_pShell; SwViewOption m_aOldViewOptions; - public: SwViewOptionAdjust_Impl( SwViewShell& rSh, const SwViewOption &rViewOptions ); ~SwViewOptionAdjust_Impl(); diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index f6816be6bd13..98e875e72eda 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -189,10 +189,7 @@ public: inline sal_uInt32 GetCoreOptions() const {return nCoreOptions;} inline void SetUIOptions( const SwViewOption& ); -/*--------------------------------------------------------------------------- - Options from nCoreOptions -----------------------------------------------------------------------------*/ - + // Options from nCoreOptions inline bool IsIdle() const { return bIdle; } @@ -330,9 +327,7 @@ public: inline void SetCrossHair( bool b ) { b ? (nCoreOptions |= VIEWOPT_1_CROSSHAIR ) : ( nCoreOptions &= ~VIEWOPT_1_CROSSHAIR); } -/*--------------------------------------------------------------------------- - Options from nCore2Options -----------------------------------------------------------------------------*/ + // Options from nCore2Options inline bool IsBlackFont() const {return nCore2Options & VIEWOPT_CORE2_BLACKFONT ? sal_True : sal_False;} @@ -436,10 +431,7 @@ public: inline bool operator == ( const SwViewOption &rOpt ) const; inline bool operator != ( const SwViewOption &rOpt ) const { return !(*this == rOpt); } -/*--------------------------------------------------------------------------- - Options from nUIOptions -----------------------------------------------------------------------------*/ - + // Options from nUIOptions bool IsViewVScrollBar() const { #if HAVE_FEATURE_DESKTOP diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index ff7d1a6ac6f4..8b0f1b3fa4a7 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -30,8 +30,6 @@ using ::com::sun::star::lang::IndexOutOfBoundsException; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Sequence; -// SwAccessiblePreview - SwAccessiblePreview::SwAccessiblePreview( SwAccessibleMap *pMp ) : SwAccessibleDocumentBase( pMp ) { diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx index 2cad1a6446b7..be678fe8ddea 100644 --- a/sw/source/core/attr/calbck.cxx +++ b/sw/source/core/attr/calbck.cxx @@ -27,8 +27,6 @@ static SwClientIter* pClientIters = 0; TYPEINIT0( SwClient ); -// SwClient - SwClient::SwClient( SwModify* pToRegisterIn ) : pLeft( 0 ), pRight( 0 ), pRegisteredIn( 0 ), mbIsAllowedToBeRemovedInModifyCall( false ) { @@ -82,8 +80,6 @@ bool SwClient::GetInfo( SfxPoolItem& ) const return true; } -// SwModify - SwModify::SwModify() : SwClient(0), pRoot(0) { @@ -355,8 +351,6 @@ void SwModify::ModifyBroadcast( const SfxPoolItem* pOldValue, const SfxPoolItem* } } -// SwDepend - SwDepend::SwDepend( SwClient* pTellHim, SwModify* pDepend ) : SwClient( pDepend ) { @@ -382,8 +376,6 @@ bool SwDepend::GetInfo( SfxPoolItem& rInfo ) const return pToTell ? pToTell->GetInfo( rInfo ) : true; } -// SwClientIter - SwClientIter::SwClientIter( const SwModify& rModify ) : rRoot(rModify) , pNxtIter(NULL) diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx index b8957c18795e..e9bfb33504dc 100644 --- a/sw/source/core/attr/cellatr.cxx +++ b/sw/source/core/attr/cellatr.cxx @@ -31,8 +31,6 @@ #include <switerator.hxx> #include <swtable.hxx> -// SwTblBoxNumFormat - SwTblBoxNumFormat::SwTblBoxNumFormat( sal_uInt32 nFormat, bool bFlag ) : SfxUInt32Item( RES_BOXATR_FORMAT, nFormat ), bAuto( bFlag ) { @@ -50,8 +48,6 @@ SfxPoolItem* SwTblBoxNumFormat::Clone( SfxItemPool* ) const return new SwTblBoxNumFormat( GetValue(), bAuto ); } -// SwTblBoxFormula - SwTblBoxFormula::SwTblBoxFormula( const OUString& rFormula ) : SfxPoolItem( RES_BOXATR_FORMULA ), SwTableFormula( rFormula ), @@ -192,8 +188,6 @@ void SwTblBoxFormula::Calc( SwTblCalcPara& rCalcPara, double& rValue ) } } -// SwTblBoxValue - SwTblBoxValue::SwTblBoxValue() : SfxPoolItem( RES_BOXATR_VALUE ), nValue( 0 ) { diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx index 984db36e7577..073abb76a44b 100644 --- a/sw/source/core/attr/swatrset.cxx +++ b/sw/source/core/attr/swatrset.cxx @@ -41,8 +41,6 @@ #include <svx/sxenditm.hxx> #include <svx/sdsxyitm.hxx> -// SwAttrPool - SwAttrPool::SwAttrPool( SwDoc* pD ) : SfxItemPool( OUString("SWG"), POOLATTR_BEGIN, POOLATTR_END-1, @@ -145,8 +143,6 @@ void SwAttrPool::removeAndDeleteSecondaryPools() SfxItemPool::Free(pEEgPool); } -// SwAttrSet - SwAttrSet::SwAttrSet( SwAttrPool& rPool, sal_uInt16 nWh1, sal_uInt16 nWh2 ) : SfxItemSet( rPool, nWh1, nWh2 ), pOldSet( 0 ), pNewSet( 0 ) { diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx index 81da0bb7d013..f180ce08f5bc 100644 --- a/sw/source/core/bastyp/index.cxx +++ b/sw/source/core/bastyp/index.cxx @@ -24,8 +24,6 @@ TYPEINIT0(SwIndexReg); -// SwIndex - SwIndex::SwIndex(SwIndexReg *const pReg, sal_Int32 const nIdx) : m_nIndex( nIdx ) , m_pIndexReg( pReg ) @@ -209,8 +207,6 @@ SwIndex& SwIndex::Assign( SwIndexReg* pArr, sal_Int32 nIdx ) return *this; } -// SwIndexReg - SwIndexReg::SwIndexReg() : m_pFirst( 0 ), m_pLast( 0 ) { diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 6a05a8c2c7c4..62d87e4dde2c 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -63,8 +63,7 @@ long SwSelPaintRects::nPixPtX = 0; long SwSelPaintRects::nPixPtY = 0; MapMode* SwSelPaintRects::pMapMode = 0; -// ----- Starting from here: classes / methods for the non-text-cursor ----- - +// Starting from here: classes / methods for the non-text-cursor SwVisCrsr::SwVisCrsr( const SwCrsrShell * pCShell ) : m_pCrsrShell( pCShell ) { diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 1c419fe49d8f..f7038471e55b 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -1618,14 +1618,15 @@ static bool lcl_CheckSmartTagsAgain( const SwNodePtr& rpNd, void* ) return true; } -/** Re-trigger spelling in the idle handler. +/** + * Re-trigger spelling in the idle handler. * * @param bInvalid if <true>, the WrongLists in all nodes are invalidated * and the SpellInvalid flag is set on all pages. * @param bOnlyWrong controls whether only the areas with wrong words are * checked or the whole area. * @param bSmartTags ??? - ************************************************************************/ + */ void SwDoc::SpellItAgainSam( bool bInvalid, bool bOnlyWrong, bool bSmartTags ) { std::set<SwRootFrm*> aAllLayouts = GetAllLayouts(); diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index 5aa68f10dedb..0ef7fb7a2be4 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -1303,8 +1303,6 @@ IDocumentMarkAccess* SwDoc::getIDocumentMarkAccess() const IDocumentMarkAccess* SwDoc::getIDocumentMarkAccess() const { return static_cast< IDocumentMarkAccess* >(mpMarkManager.get()); } -// SaveBookmark methods - SaveBookmark::SaveBookmark( bool bSavePos, bool bSaveOtherPos, diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 58cff5cd7375..f679b933ab42 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -965,12 +965,12 @@ SwDrawFrmFmt* SwDoc::InsertDrawObj( return pFmt; } -/* --------------------------------------------------------------------------- - paragraph frames - o.k. if the PaM includes the paragraph from the beginning - to the beginning of the next paragraph at least - frames at character - o.k. if the PaM starts at least at the same position - as the frame - ---------------------------------------------------------------------------*/ +/* + * paragraph frames - o.k. if the PaM includes the paragraph from the beginning + * to the beginning of the next paragraph at least + * frames at character - o.k. if the PaM starts at least at the same position + * as the frame + */ static bool lcl_TstFlyRange( const SwPaM* pPam, const SwPosition* pFlyPos, RndStdIds nAnchorId ) { @@ -1763,8 +1763,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( return pNewFmt; } -// IDocumentTimerAccess methods ------------------------------------------ - +// IDocumentTimerAccess methods void SwDoc::StartIdling() { mbStartIdleTimer = true; diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx index 83d2b8aa6ef3..1a4994c7896b 100644 --- a/sw/source/core/doc/docruby.cxx +++ b/sw/source/core/doc/docruby.cxx @@ -202,8 +202,8 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt rPam.DeleteMark(); } - // ----- search the start - // --- look where a ruby attribute starts + // search the start + // look where a ruby attribute starts sal_uInt16 nHtIdx = USHRT_MAX; const SwpHints* pHts = pTNd->GetpSwpHints(); const SwTxtAttr* pAttr = 0; diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index c16f576eb479..2a04550c4816 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -709,8 +709,7 @@ static const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl = return pNd ? pNd->FindOutlineNodeOfLevel( nLvl ) : 0; } -// Table of contents class ------------------------------------------ - +// Table of contents class SwTOXBaseSection::SwTOXBaseSection(SwTOXBase const& rBase, SwSectionFmt & rFmt) : SwTOXBase( rBase ) , SwSection( TOX_CONTENT_SECTION, OUString(), rFmt ) diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx index 71c7cee112ae..4ccaf42aeeed 100644 --- a/sw/source/core/doc/list.cxx +++ b/sw/source/core/doc/list.cxx @@ -219,7 +219,6 @@ void SwListImpl::NotifyItemsOnListLevel( const int nLevel ) } } -// SwList --------------------------------------------------------------------- SwList::SwList( const OUString& sListId, SwNumRule& rDefaultListStyle, const SwNodes& rNodes ) diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 71e05690b544..7584054fb8ce 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -1291,19 +1291,19 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt ) } /* - ----------------------- >> MERGE << ------------------------ - Algorithm: - If we only have one Line in the _FndBox, take this Line and test - the Box count: - - If we have more than one Box, we merge on Box level, meaning - the new Box will be as wide as the old ones. - - All Lines that are above/under the Area, are inserted into - the Box as Line + Box. - - All Lines that come before/after the Area, are inserted into - the Boxes Left/Right. - - ----------------------- >> MERGE << ------------------------ -*/ + * >> MERGE << + * Algorithm: + * If we only have one Line in the _FndBox, take this Line and test + * the Box count: + * If we have more than one Box, we merge on Box level, meaning + * the new Box will be as wide as the old ones. + * All Lines that are above/under the Area, are inserted into + * the Box as Line + Box. + * All Lines that come before/after the Area, are inserted into + * the Boxes Left/Right. + * + * >> MERGE << + */ static void lcl_CpyLines( sal_uInt16 nStt, sal_uInt16 nEnd, SwTableLines& rLines, SwTableBox* pInsBox, diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index c10acd5cb0b7..a1473d246d3d 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -2303,10 +2303,6 @@ sal_uInt16 SwDoc::MergeTbl( SwPaM& rPam ) return nRet; } -/** - * SwTableNode - * - */ SwTableNode::SwTableNode( const SwNodeIndex& rIdx ) : SwStartNode( rIdx, ND_TABLENODE ) { diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 1cda0150cfb3..a99dafdb26a4 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -896,8 +896,6 @@ SwEndNode::SwEndNode( SwNodes& rNds, sal_uLong nPos, SwStartNode& rSttNd ) pStartOfSection->pEndOfSection = this; } -// SwCntntNode - SwCntntNode::SwCntntNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType, SwFmtColl *pColl ) : SwModify( pColl ), // CrsrsShell, FrameFmt, diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 4fea5d7e84ec..50ea9f60749d 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -189,8 +189,6 @@ OUString SwSectionData::CollapseWhiteSpaces(const OUString& sName) return aBuf.makeStringAndClear(); } -// SwSection =========================================================== - SwSection::SwSection( SectionType const eType, OUString const& rName, SwSectionFmt & rFormat) : SwClient(& rFormat) @@ -624,8 +622,6 @@ const SwTOXBase* SwSection::GetTOXBase() const return pRet; } -// SwSectionFmt ======================================================== - SwSectionFmt::SwSectionFmt( SwSectionFmt* pDrvdFrm, SwDoc *pDoc ) : SwFrmFmt( pDoc->GetAttrPool(), OUString(), pDrvdFrm ) { diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 7abc1f83bfed..16b5e87382e0 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -164,8 +164,6 @@ bool IsMarqueeTextObj( const SdrObject& rObj ) || SDRTEXTANI_ALTERNATE == eTKind || SDRTEXTANI_SLIDE == eTKind ); } -// SwContact - SwContact::SwContact( SwFrmFmt *pToRegisterIn ) : SwClient( pToRegisterIn ), mbInDTOR( false ) @@ -391,8 +389,6 @@ sal_uInt32 SwContact::GetMaxOrdNum() const return nMaxOrdNum; } -// SwFlyDrawContact - SwFlyDrawContact::SwFlyDrawContact( SwFlyFrmFmt *pToRegisterIn, SdrModel * ) : SwContact( pToRegisterIn ) { @@ -2142,8 +2138,6 @@ sdr::contact::ViewContact* SwDrawVirtObj::CreateObjectSpecificViewContact() return new sdr::contact::VCOfDrawVirtObj(*this); } -// SwDrawVirtObj - SwDrawVirtObj::SwDrawVirtObj( SdrObject& _rNewObj, SwDrawContact& _rDrawContact ) : SdrVirtObj( _rNewObj ), diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 09b8acf329b7..75307c17e28d 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -89,8 +89,6 @@ static const SwFrm *lcl_FindAnchor( const SdrObject *pObj, bool bAll ) return 0; } -// SwDrawView - SwDrawView::SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice *pOutDev) : FmFormView( (FmFormModel*)pMd, pOutDev ), rImp( rI ) diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index bd5b88b9d668..c39acfccd88b 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -135,7 +135,6 @@ class SwAutoFormat bool m_bEmptyLine : 1; bool m_bMoreLines : 1; - // ------------- private methods ----------------------------- CharClass& GetCharClass( LanguageType eLang ) const { if( !m_pCharClass || eLang != m_eCharClassLang ) diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx index 4dc18169b464..d1552abffb13 100644 --- a/sw/source/core/fields/chpfld.cxx +++ b/sw/source/core/fields/chpfld.cxx @@ -51,8 +51,6 @@ OUString removeControlChars(const OUString& sIn) } -// SwChapterFieldType - SwChapterFieldType::SwChapterFieldType() : SwFieldType( RES_CHAPTERFLD ) { diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index 76d514e2800a..0a1d8a6e1be8 100644 --- a/sw/source/core/fields/dbfld.cxx +++ b/sw/source/core/fields/dbfld.cxx @@ -632,8 +632,6 @@ SwFieldType* SwDBNumSetFieldType::Copy() const return pTmp; } -// SwDBNumSetField - SwDBNumSetField::SwDBNumSetField(SwDBNumSetFieldType* pTyp, const OUString& rCond, const OUString& rDBNum, @@ -732,8 +730,6 @@ bool SwDBNumSetField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) return bRet; } -// SwDBNameFieldType - SwDBNameFieldType::SwDBNameFieldType(SwDoc* pDocument) : SwFieldType( RES_DBNAMEFLD ) { @@ -784,8 +780,6 @@ bool SwDBNameField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) return SwDBNameInfField::PutValue(rAny, nWhichId ); } -// SwDBSetNumberFieldType - SwDBSetNumberFieldType::SwDBSetNumberFieldType() : SwFieldType( RES_DBSETNUMBERFLD ) { diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 2ba6e7145252..7ae51794b71a 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -101,8 +101,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace nsSwDocInfoSubType; -// SwPageNumberFieldType - SwPageNumberFieldType::SwPageNumberFieldType() : SwFieldType( RES_PAGENUMBERFLD ), nNumberingType( SVX_NUM_ARABIC ), @@ -170,8 +168,6 @@ void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc, } } -// SwPageNumberField - SwPageNumberField::SwPageNumberField(SwPageNumberFieldType* pTyp, sal_uInt16 nSub, sal_uInt32 nFmt, short nOff, sal_uInt16 const nPageNumber, sal_uInt16 const nMaxPage) @@ -314,7 +310,6 @@ bool SwPageNumberField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) } return bRet; } -// SwAuthorFieldType SwAuthorFieldType::SwAuthorFieldType() : SwFieldType( RES_AUTHORFLD ) @@ -335,8 +330,6 @@ SwFieldType* SwAuthorFieldType::Copy() const return new SwAuthorFieldType; } -// SwAuthorField - SwAuthorField::SwAuthorField(SwAuthorFieldType* pTyp, sal_uInt32 nFmt) : SwField(pTyp, nFmt) { @@ -410,8 +403,6 @@ bool SwAuthorField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) return true; } -// SwFileNameFieldType - SwFileNameFieldType::SwFileNameFieldType(SwDoc *pDocument) : SwFieldType( RES_FILENAMEFLD ) { @@ -476,8 +467,6 @@ SwFieldType* SwFileNameFieldType::Copy() const return pTmp; } -// SwFileNameField - SwFileNameField::SwFileNameField(SwFileNameFieldType* pTyp, sal_uInt32 nFmt) : SwField(pTyp, nFmt) { @@ -589,8 +578,6 @@ bool SwFileNameField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) return true; } -// SwTemplNameFieldType - SwTemplNameFieldType::SwTemplNameFieldType(SwDoc *pDocument) : SwFieldType( RES_TEMPLNAMEFLD ) { @@ -653,7 +640,6 @@ SwFieldType* SwTemplNameFieldType::Copy() const SwFieldType *pTmp = new SwTemplNameFieldType(pDoc); return pTmp; } -// SwTemplNameField SwTemplNameField::SwTemplNameField(SwTemplNameFieldType* pTyp, sal_uInt32 nFmt) : SwField(pTyp, nFmt) @@ -735,8 +721,6 @@ bool SwTemplNameField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) return true; } -// SwDocStatFieldType - SwDocStatFieldType::SwDocStatFieldType(SwDoc* pDocument) : SwFieldType( RES_DOCSTATFLD ), nNumberingType( SVX_NUM_ARABIC ) { @@ -1281,8 +1265,6 @@ bool SwDocInfoField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) return true; } -// SwHiddenTxtFieldType - SwHiddenTxtFieldType::SwHiddenTxtFieldType( bool bSetHidden ) : SwFieldType( RES_HIDDENTXTFLD ), bHidden( bSetHidden ) { diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index c0ec660acf97..2d94ddfbe82c 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -2283,9 +2283,6 @@ static bool lcl_IsLineOfTblFrm( const SwTabFrm& rTable, const SwFrm& rChk ) return &rTable == pTblFrm; } -/* - * lcl_UpdateRepeatedHeadlines - */ static void lcl_UpdateRepeatedHeadlines( SwTabFrm& rTabFrm, bool bCalcLowers ) { OSL_ENSURE( rTabFrm.IsFollow(), "lcl_UpdateRepeatedHeadlines called for non-follow tab" ); diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx index 310aea72e5b0..771b1b109e13 100644 --- a/sw/source/core/graphic/grfatr.cxx +++ b/sw/source/core/graphic/grfatr.cxx @@ -43,8 +43,6 @@ using namespace ::com::sun::star; TYPEINIT1_AUTOFACTORY(SwCropGrf, SfxPoolItem) TYPEINIT1_AUTOFACTORY(SwGammaGrf, SfxPoolItem) -// SwMirrorGrf - SfxPoolItem* SwMirrorGrf::Clone( SfxItemPool* ) const { return new SwMirrorGrf( *this ); @@ -149,8 +147,6 @@ bool SwMirrorGrf::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -// SwCropGrf - SwCropGrf::SwCropGrf() : SvxGrfCrop( RES_GRFATR_CROPGRF ) {} @@ -164,8 +160,6 @@ SfxPoolItem* SwCropGrf::Clone( SfxItemPool* ) const return new SwCropGrf( *this ); } -// SwRotationGrf - SfxPoolItem* SwRotationGrf::Clone( SfxItemPool * ) const { return new SwRotationGrf( GetValue(), aUnrotatedSize ); diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx index 39082b1db822..fcf5c11128e2 100644 --- a/sw/source/core/inc/UndoDraw.hxx +++ b/sw/source/core/inc/UndoDraw.hxx @@ -31,7 +31,7 @@ class SdrObjGroup; class SdrUndoAction; class SwDrawFrmFmt; -// ----------- Undo for Draw Objects --------------------------------- +// Undo for Draw Objects class SwSdrUndo : public SwUndo { SdrUndoAction* pSdrUndo; diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx index b794164da41b..d6a6737c230c 100644 --- a/sw/source/core/inc/node2lay.hxx +++ b/sw/source/core/inc/node2lay.hxx @@ -21,7 +21,7 @@ #include <tools/solar.h> -/* -------------------------------------------------- +/* * Die Klasse SwNode2Layout stellt die Verbindung von Nodes zum Layout her. * Sie liefert einen intelligenten Iterator ueber die zum Node oder Nodebereich * gehoerenden Frames. Je nach Zweck der Iteration, z.B. um vor oder hinter @@ -41,7 +41,7 @@ * die Frames gehaengt werden koennen. * 2. Die Lieferung der Frames hinter/vor die die neuen Frames eines Nodes * gehaengt werden muessen, ebenfalls von MakeFrms gerufen. - * --------------------------------------------------*/ + */ class SwNode2LayImpl; class SwFrm; diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx index 59ee1716a270..32a47199341c 100644 --- a/sw/source/core/inc/pamtyp.hxx +++ b/sw/source/core/inc/pamtyp.hxx @@ -49,8 +49,7 @@ bool GoPrevious(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode ); SW_DLLPUBLIC SwCntntNode* GoNextNds( SwNodeIndex * pIdx, bool ); SwCntntNode* GoPreviousNds( SwNodeIndex * pIdx, bool ); -// --------- Funktionsdefinitionen fuer die SwCrsrShell -------------- - +// Funktionsdefinitionen fuer die SwCrsrShell bool GoPrevPara( SwPaM&, SwPosPara); bool GoCurrPara( SwPaM&, SwPosPara); bool GoNextPara( SwPaM&, SwPosPara); @@ -58,8 +57,7 @@ bool GoPrevSection( SwPaM&, SwPosSection); bool GoCurrSection( SwPaM&, SwPosSection); bool GoNextSection( SwPaM&, SwPosSection); -// ------------ Typedefiniton fuer Funktionen ---------------------- - +// Typedefiniton fuer Funktionen typedef bool (*GoNd)( SwNode*, SwIndex*, sal_uInt16 ); typedef SwCntntNode* (*GoNds)( SwNodeIndex*, bool ); typedef void (*GoDoc)( SwPosition* ); @@ -82,7 +80,7 @@ struct SwMoveFnCollection MvSection fnSection; }; -// --------- Funktionsdefinitionen fuers Suchen -------------- +// Funktionsdefinitionen fuers Suchen SwCntntNode* GetNode( SwPaM&, bool&, SwMoveFn, bool bInReadOnly = false ); #endif diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx index 7b72f992f46a..4146d8f7f7ab 100644 --- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx +++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx @@ -53,7 +53,6 @@ namespace objectpositioning // the needed type SwTxtFrm& GetAnchorTxtFrm() const; - // ********************************************************************* /** determine frame for horizontal position if the given proposed frame is a content frame, the proposed diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index 31f396c2db42..53dda8bce844 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -115,10 +115,7 @@ public: inline bool IsNumeric( const OUString& rStr ) const; }; -/*-------------------------------------------------------------------- - Beschreibung: Klassen fuer die Sortierung der Verzeichnisse - --------------------------------------------------------------------*/ - +// Beschreibung: Klassen fuer die Sortierung der Verzeichnisse struct SwTOXSortTabBase { SwTOXSources aTOXSources; @@ -175,10 +172,7 @@ inline const ::com::sun::star::lang::Locale& SwTOXSortTabBase::GetLocale() const return aLocale; } -/*-------------------------------------------------------------------- - Beschreibung: fuer Sortierung nach Text - --------------------------------------------------------------------*/ - +// Beschreibung: fuer Sortierung nach Text struct SwTOXIndex : public SwTOXSortTabBase { SwTOXIndex( const SwTxtNode&, const SwTxtTOXMark*, sal_uInt16 nOptions, sal_uInt8 nKeyLevel, @@ -215,10 +209,7 @@ private: sal_uInt16 nLev; }; -/*-------------------------------------------------------------------- - Beschreibung: fuer Sortierung nach Position - --------------------------------------------------------------------*/ - +// Beschreibung: fuer Sortierung nach Position struct SwTOXContent : public SwTOXSortTabBase { SwTOXContent( const SwTxtNode&, const SwTxtTOXMark*, diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index a6fab3f90aa2..cb422141eab7 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -186,8 +186,6 @@ bool SwObjPosOscillationControl::OscillationDetected() return bOscillationDetected; } -// class <SwAnchoredDrawObject> - TYPEINIT1(SwAnchoredDrawObject,SwAnchoredObject); SwAnchoredDrawObject::SwAnchoredDrawObject() : diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index b4a0cd8f5bef..7ab974c42721 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -62,8 +62,6 @@ SwObjPositioningInProgress::~SwObjPositioningInProgress() } } -// SwAnchoredObject - TYPEINIT0(SwAnchoredObject); SwAnchoredObject::SwAnchoredObject() : diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 583ccc793138..aa40d45c93e1 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -171,9 +171,7 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt ) } } -// class SwFmtFrmSize -// Partially implemented inline in hxx - +// Partially implemented inline in hxx SwFmtFrmSize::SwFmtFrmSize( SwFrmSize eSize, SwTwips nWidth, SwTwips nHeight ) : SfxPoolItem( RES_FRM_SIZE ), m_aSize( nWidth, nHeight ), @@ -419,13 +417,10 @@ bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -// class SwFmtFillOrder -// Partially implemented inline in hxx - +// Partially implemented inline in hxx SwFmtFillOrder::SwFmtFillOrder( SwFillOrder nFO ) : SfxEnumItem( RES_FILL_ORDER, sal_uInt16(nFO) ) {} - SfxPoolItem* SwFmtFillOrder::Clone( SfxItemPool* ) const { return new SwFmtFillOrder( GetFillOrder() ); @@ -436,9 +431,7 @@ sal_uInt16 SwFmtFillOrder::GetValueCount() const return SW_FILL_ORDER_END - SW_FILL_ORDER_BEGIN; } -// class SwFmtHeader -// Partially implemented inline in hxx - +// Partially implemented inline in hxx SwFmtHeader::SwFmtHeader( SwFrmFmt *pHeaderFmt ) : SfxPoolItem( RES_HEADER ), SwClient( pHeaderFmt ), @@ -483,9 +476,7 @@ void SwFmtHeader::RegisterToFormat( SwFmt& rFmt ) rFmt.Add(this); } -// class SwFmtFooter -// Partially implemented inline in hxx - +// Partially implemented inline in hxx SwFmtFooter::SwFmtFooter( SwFrmFmt *pFooterFmt ) : SfxPoolItem( RES_FOOTER ), SwClient( pFooterFmt ), @@ -530,9 +521,7 @@ SfxPoolItem* SwFmtFooter::Clone( SfxItemPool* ) const return new SwFmtFooter( *this ); } -// class SwFmtCntnt -// Partially implemented inline in hxx - +// Partially implemented inline in hxx SwFmtCntnt::SwFmtCntnt( const SwFmtCntnt &rCpy ) : SfxPoolItem( RES_CNTNT ) { @@ -572,9 +561,7 @@ SfxPoolItem* SwFmtCntnt::Clone( SfxItemPool* ) const return new SwFmtCntnt( *this ); } -// class SwFmtPageDesc -// Partially implemented inline in hxx - +// Partially implemented inline in hxx SwFmtPageDesc::SwFmtPageDesc( const SwFmtPageDesc &rCpy ) : SfxPoolItem( RES_PAGEDESC ), SwClient( (SwPageDesc*)rCpy.GetPageDesc() ), @@ -1105,9 +1092,7 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -// class SwFmtSurround -// Partially implemented inline in hxx - +// Partially implemented inline in hxx SwFmtSurround::SwFmtSurround( SwSurround eFly ) : SfxEnumItem( RES_SURROUND, sal_uInt16( eFly ) ) { @@ -1241,9 +1226,7 @@ SfxPoolItem* SwFmtVertOrient::Create(SvStream &rStream, sal_uInt16 /*itemVersion return new SwFmtVertOrient(yPos, orient, relation); } -// class SwFmtVertOrient -// Partially implemented inline in hxx - +// Partially implemented inline in hxx SwFmtVertOrient::SwFmtVertOrient( SwTwips nY, sal_Int16 eVert, sal_Int16 eRel ) : SfxPoolItem( RES_VERT_ORIENT ), @@ -1325,9 +1308,7 @@ bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -// class SwFmtHoriOrient -// Partially implemented inline in hxx - +// Partially implemented inline in hxx SwFmtHoriOrient::SwFmtHoriOrient( SwTwips nX, sal_Int16 eHori, sal_Int16 eRel, bool bPos ) : SfxPoolItem( RES_HORI_ORIENT ), @@ -1421,9 +1402,7 @@ bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -// class SwFmtAnchor -// Partially implemented inline in hxx - +// Partially implemented inline in hxx SwFmtAnchor::SwFmtAnchor( RndStdIds nRnd, sal_uInt16 nPage ) : SfxPoolItem( RES_ANCHOR ), nAnchorId( nRnd ), @@ -1628,9 +1607,7 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -// class SwFmtURL -// Partially implemented inline in hxx - +// Partially implemented inline in hxx SwFmtURL::SwFmtURL() : SfxPoolItem( RES_URL ), pMap( 0 ), @@ -1788,29 +1765,21 @@ bool SwFmtURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -// class SwFmtEditInReadonly - SfxPoolItem* SwFmtEditInReadonly::Clone( SfxItemPool* ) const { return new SwFmtEditInReadonly( Which(), GetValue() ); } -// class SwFmtLayoutSplit - SfxPoolItem* SwFmtLayoutSplit::Clone( SfxItemPool* ) const { return new SwFmtLayoutSplit( GetValue() ); } -// class SwFmtRowSplit - SfxPoolItem* SwFmtRowSplit::Clone( SfxItemPool* ) const { return new SwFmtRowSplit( GetValue() ); } -// class SwFmtNoBalancedColumns - SfxPoolItem* SwFmtNoBalancedColumns::Clone( SfxItemPool* ) const { return new SwFmtNoBalancedColumns( GetValue() ); @@ -2032,8 +2001,6 @@ bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const return bRet; } -//class SwFmtLineNumber - SwFmtLineNumber::SwFmtLineNumber() : SfxPoolItem( RES_LINENUMBER ) { @@ -2107,8 +2074,6 @@ bool SwFmtLineNumber::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -// class SwTextGridItem - SwTextGridItem::SwTextGridItem() : SfxPoolItem( RES_TEXTGRID ), m_aColor( COL_LIGHTGRAY ), m_nLines( 20 ) , m_nBaseHeight( 400 ), m_nRubyHeight( 200 ), m_eGridType( GRID_NONE ) @@ -2398,16 +2363,12 @@ void SwTextGridItem::Init() } } -// class SwHeaderAndFooterEatSpacingItem - SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* ) const { return new SwHeaderAndFooterEatSpacingItem( Which(), GetValue() ); } -// class SwFrmFmt -// Partially implemented inline in hxx - +// Partially implemented inline in hxx TYPEINIT1( SwFrmFmt, SwFmt ); IMPL_FIXEDMEMPOOL_NEWDEL_DLL( SwFrmFmt ) diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 348789afeafb..5400d1455dd2 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -1564,7 +1564,7 @@ void SwCntntFrm::MakeAll() bFitPromise = true; continue; } - /* -------------------------------------------------- + /* * In earlier days, we never tried to fit TextFrms in * frames and sections using bMoveOrFit by ignoring * its attributes (Widows, Keep). @@ -1572,7 +1572,7 @@ void SwCntntFrm::MakeAll() * as it must be tried anyway with linked frames and sections. * Exception: If we sit in FormatWidthCols, we must not ignore * the attributes. - * --------------------------------------------------*/ + */ else if ( !bFtn && bMoveable && ( !bFly || !FindFlyFrm()->IsColLocked() ) && ( !bSct || !FindSctFrm()->IsColLocked() ) ) diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 5c563088203b..64b70f67139b 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -25,7 +25,7 @@ * The PROTOCOL macros allow you to log events in frame methods. In places where * logging is useful either one of the PROTOCOL(...) or PROTOCOL_ENTER(...) can * be used. PROTOCOL_ENTER(...) additionally logs the leaving of a method. - + * * The PROTOCOL macros accept the following parameters: * 1. A pointer to an SwFrm (usually "this" or "rThis") * 2. The function group i.e. PROT_MAKEALL. This is used to decide (inline) @@ -82,7 +82,6 @@ * listed; default is 0 which means that none are logged. It's also * possible to remove functions using '!'. * An example INI file: - * ------------------------------------------ * #Functions: all, except PRTARE * [record] 0xFFFFFFFE !0x200 * [frmid] @@ -90,7 +89,6 @@ * 1 2 12 13 14 15 * #no layout frames, except ColumnFrms * [frmtype] !0x3FFF 0x4 - * ------------------------------------------ * * As soon as the logging is in process, one can manipulate many things in * SwImplProtocol::_Record(...) using a debugger, especially concerning @@ -100,7 +98,6 @@ #include "dbg_lay.hxx" #include <stdio.h> - #include "flyfrm.hxx" #include "txtfrm.hxx" #include <fntcache.hxx> diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx index 72896f38caad..a1c29b5e5b2d 100644 --- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx @@ -38,9 +38,6 @@ using namespace ::com::sun::star; using namespace objectpositioning; -// ************************************************************************** -// constructor, destructor, initialization -// ************************************************************************** SwAnchoredObjectPosition::SwAnchoredObjectPosition( SdrObject& _rDrawObj ) : mrDrawObj( _rDrawObj ), mbIsObjFly( false ), @@ -838,10 +835,8 @@ SwTwips SwAnchoredObjectPosition::_CalcRelPosX( return nRelPosX; } -// ************************************************************************** // method incl. helper methods for adjusting proposed horizontal position, // if object has to draw aside another object. -// ************************************************************************** /** adjust calculated horizontal position in order to draw object aside other objects with same positioning */ diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 81528f2799eb..99d77d02ee58 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -135,8 +135,6 @@ void SAL_CALL SwOLEListener_Impl::disposing( const lang::EventObject& ) throw (u pOLELRU_Cache->RemoveObj( *mpObj ); } -// SwEmbedObjectLink - // TODO/LATER: actually SwEmbedObjectLink should be used here, but because different objects are used to control // embedded object different link objects with the same functionality had to be implemented @@ -205,8 +203,6 @@ void SwEmbedObjectLink::Closed() SvBaseLink::Closed(); } -// SwOLENode - SwOLENode::SwOLENode( const SwNodeIndex &rWhere, const svt::EmbeddedObjectRef& xObj, SwGrfFmtColl *pGrfColl, diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx index 88ec5406e816..028d3e8c0c36 100644 --- a/sw/source/core/para/paratr.cxx +++ b/sw/source/core/para/paratr.cxx @@ -206,18 +206,11 @@ bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -/** - * SwRegisterItem - */ - SfxPoolItem* SwRegisterItem::Clone( SfxItemPool * ) const { return new SwRegisterItem( *this ); } -/** - * SwNumRuleItem - */ SfxPoolItem* SwNumRuleItem::Clone( SfxItemPool * ) const { return new SwNumRuleItem( *this ); diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index e3afa6c79c48..c3a7ce4ed36f 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -99,8 +99,6 @@ public: void setDummyFlag( bool bDummy ) { mbDummyFlag = bDummy; } }; -// ----------- Inlines ----------------------------- - inline const Color* SwTableBox::GetSaveUserColor() const { return pImpl ? pImpl->GetSaveUserColor() : 0; diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index ac3afd1a28eb..12e3e528d5d1 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -230,9 +230,7 @@ SwLinePortion *SwTxtFormatter::Underflow( SwTxtFormatInfo &rInf ) // } // } - /*-------------------------------------------------- - * Snapshot - * --------------------------------------------------*/ + // Snapshot if ( pPor==rInf.GetLast() ) { // We end up here, if the portion triggering the under-flow @@ -242,9 +240,7 @@ SwLinePortion *SwTxtFormatter::Underflow( SwTxtFormatInfo &rInf ) pPor->Truncate(); return pPor; // Is that enough? } - /*--------------------------------------------------- - * End the snapshot - * --------------------------------------------------*/ + // End the snapshot // X + Width == 0 with SoftHyph > Line?! if( !pPor || !(rInf.X() + pPor->Width()) ) diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 5c946a715b3e..0a068f6b69b5 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -1046,9 +1046,7 @@ void SwTxtFrm::StopAnimation( OutputDevice* pOut ) } } -// SwCombinedPortion::SwCombinedPortion(..) // initializes the script array and clears the width array - SwCombinedPortion::SwCombinedPortion( const OUString &rTxt ) : SwFldPortion( rTxt ) , nUpPos(0) diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index abcfc80747c9..b683adad3fce 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -130,10 +130,6 @@ static SwFormTokens lcl_GetAuthPattern(sal_uInt16 nTypeId) TYPEINIT2( SwTOXMark, SfxPoolItem, SwClient ); // fuers rtti -/*-------------------------------------------------------------------- - TOX dtor and ctor - --------------------------------------------------------------------*/ - /// pool default constructor SwTOXMark::SwTOXMark() : SfxPoolItem( RES_TXTATR_TOXMARK ) @@ -239,10 +235,7 @@ void SwTOXMark::InsertTOXMarks( SwTOXMarks& aMarks, const SwTOXType& rType ) } } -/*-------------------------------------------------------------------- - Manage types of TOX - --------------------------------------------------------------------*/ - +// Manage types of TOX SwTOXType::SwTOXType( TOXTypes eTyp, const OUString& rName ) : SwModify(0), aName(rName), @@ -257,10 +250,7 @@ SwTOXType::SwTOXType(const SwTOXType& rCopy) { } -/*-------------------------------------------------------------------- - Edit forms - --------------------------------------------------------------------*/ - +// Edit forms SwForm::SwForm( TOXTypes eTyp ) // #i21237# : eType( eTyp ), nFormMaxLevel( SwForm::GetFormMaxLevel( eTyp )), // nFirstTabPos( lNumIndent ), @@ -466,10 +456,6 @@ OUString SwForm::GetFormChapterMark() {return OUString("<C>");} OUString SwForm::GetFormText() {return OUString("<X>");} OUString SwForm::GetFormAuth() {return OUString("<A>");} -/*-------------------------------------------------------------------- - Ctor TOXBase - --------------------------------------------------------------------*/ - SwTOXBase::SwTOXBase(const SwTOXType* pTyp, const SwForm& rForm, sal_uInt16 nCreaType, const OUString& rTitle ) : SwClient((SwModify*)pTyp) @@ -557,10 +543,7 @@ SwTOXBase& SwTOXBase::CopyTOXBase( SwDoc* pDoc, const SwTOXBase& rSource ) return *this; } -/*-------------------------------------------------------------------- - TOX specific functions - --------------------------------------------------------------------*/ - +// TOX specific functions SwTOXBase::~SwTOXBase() { // if( GetTOXType()->GetType() == TOX_USER ) diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index a26f4bbf7070..80736682d924 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -47,10 +47,8 @@ extern bool IsFrameBehind( const SwTxtNode& rMyNd, sal_Int32 nMySttPos, using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -/*-------------------------------------------------------------------- - Initialize strings - --------------------------------------------------------------------*/ +// Initialize strings sal_uInt16 SwTOXSortTabBase::nOpt = 0; SwTOXInternational::SwTOXInternational( LanguageType nLang, sal_uInt16 nOpt, @@ -129,10 +127,7 @@ OUString SwTOXInternational::GetFollowingText( bool bMorePages ) const return pIndexWrapper->GetFollowingText( bMorePages ); } -/*-------------------------------------------------------------------- - SortElement for TOX entries - --------------------------------------------------------------------*/ - +// SortElement for TOX entries SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd, const SwTxtTOXMark* pMark, const SwTOXInternational* pInter, @@ -268,10 +263,7 @@ bool SwTOXSortTabBase::operator<( const SwTOXSortTabBase& rCmp ) return false; } -/*-------------------------------------------------------------------- - Sorted keyword entry - --------------------------------------------------------------------*/ - +// Sorted keyword entry SwTOXIndex::SwTOXIndex( const SwTxtNode& rNd, const SwTxtTOXMark* pMark, sal_uInt16 nOptions, sal_uInt8 nKyLevel, @@ -408,10 +400,7 @@ sal_uInt16 SwTOXIndex::GetLevel() const return nForm; } -/*-------------------------------------------------------------------- - Key and separator - --------------------------------------------------------------------*/ - +// Key and separator SwTOXCustom::SwTOXCustom(const TextAndReading& rKey, sal_uInt16 nLevel, const SwTOXInternational& rIntl, @@ -445,10 +434,7 @@ TextAndReading SwTOXCustom::GetText_Impl() const return m_aKey; } -/*-------------------------------------------------------------------- - Sorts the TOX entries - --------------------------------------------------------------------*/ - +// Sorts the TOX entries SwTOXContent::SwTOXContent( const SwTxtNode& rNd, const SwTxtTOXMark* pMark, const SwTOXInternational& rIntl) : SwTOXSortTabBase( TOX_SORT_CONTENT, &rNd, pMark, &rIntl ) @@ -492,12 +478,9 @@ sal_uInt16 SwTOXContent::GetLevel() const return pTxtMark->GetTOXMark().GetLevel(); } -/*-------------------------------------------------------------------- - TOX assembled from paragraphs - Watch out for OLE/graphics when sorting! - The position must not come from the document, but from the "anchor"! - --------------------------------------------------------------------*/ - +// TOX assembled from paragraphs +// Watch out for OLE/graphics when sorting! +// The position must not come from the document, but from the "anchor"! SwTOXPara::SwTOXPara( const SwCntntNode& rNd, SwTOXElement eT, sal_uInt16 nLevel, const OUString& sSeqName ) : SwTOXSortTabBase( TOX_SORT_PARA, &rNd, 0, 0 ), eType( eT ), @@ -628,10 +611,7 @@ OUString SwTOXPara::GetURL() const return aTxt; } -/*-------------------------------------------------------------------- - Table - --------------------------------------------------------------------*/ - +// Table SwTOXTable::SwTOXTable( const SwCntntNode& rNd ) : SwTOXSortTabBase( TOX_SORT_TABLE, &rNd, 0, 0 ), nLevel(FORM_ALPHA_DELIMITTER) diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx index f56b196f0c56..5379f79538ab 100644 --- a/sw/source/core/txtnode/SwGrammarContact.cxx +++ b/sw/source/core/txtnode/SwGrammarContact.cxx @@ -27,18 +27,17 @@ #include <rootfrm.hxx> #include <viewsh.hxx> -/* SwGrammarContact - This class is responsible for the delayed display of grammar checks when a paragraph is edited - It's a client of the paragraph the cursor points to. - If the cursor position changes, updateCursorPosition has to be called - If the grammar checker wants to set a grammar marker at a paragraph, he has to request - the grammar list from this class. If the requested paragraph is not edited, it returns - the normal grammar list. But if the paragraph is the active one, a proxy list will be returned and - all changes are set in this proxy list. If the cursor leaves the paragraph the proxy list - will replace the old list. If the grammar checker has completed the paragraph ('setChecked') - then a timer is setup which replaces the old list as well. -*/ - +/* + * This class is responsible for the delayed display of grammar checks when a paragraph is edited + * It's a client of the paragraph the cursor points to. + * If the cursor position changes, updateCursorPosition has to be called + * If the grammar checker wants to set a grammar marker at a paragraph, he has to request + * the grammar list from this class. If the requested paragraph is not edited, it returns + * the normal grammar list. But if the paragraph is the active one, a proxy list will be returned and + * all changes are set in this proxy list. If the cursor leaves the paragraph the proxy list + * will replace the old list. If the grammar checker has completed the paragraph ('setChecked') + * then a timer is setup which replaces the old list as well. + */ class SwGrammarContact : public IGrammarContact, public SwClient { Timer aTimer; diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index cf0e1c9d6d4c..2ae4530dbe68 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -185,8 +185,6 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere, } while( true ); } -// SwTxtNode - SwTxtNode::SwTxtNode( const SwNodeIndex &rWhere, SwTxtFmtColl *pTxtColl, const SfxItemSet* pAutoAttr ) diff --git a/sw/source/core/uibase/app/docshini.cxx b/sw/source/core/uibase/app/docshini.cxx index 9f06c234d354..39c10b8ceed2 100644 --- a/sw/source/core/uibase/app/docshini.cxx +++ b/sw/source/core/uibase/app/docshini.cxx @@ -392,7 +392,6 @@ void SwDocShell::Init_Impl() SetMapUnit( MAP_TWIP ); } -// AddLink void SwDocShell::AddLink() { if( !pDoc ) @@ -431,7 +430,6 @@ void SwDocShell::UpdateFontList() } } -// RemoveLink void SwDocShell::RemoveLink() { // disconnect Uno-Object diff --git a/sw/source/core/uibase/app/docst.cxx b/sw/source/core/uibase/app/docst.cxx index 75e38c6c1c49..36e29fc85b9e 100644 --- a/sw/source/core/uibase/app/docst.cxx +++ b/sw/source/core/uibase/app/docst.cxx @@ -829,7 +829,6 @@ sal_uInt16 SwDocShell::Edit( return nRet; } -// Delete sal_uInt16 SwDocShell::Delete(const OUString &rName, sal_uInt16 nFamily) { SfxStyleSheetBase *pStyle = mxBasePool->Find(rName, (SfxStyleFamily)nFamily); @@ -1217,13 +1216,12 @@ void SwDocShell::LoadStyles( SfxObjectShell& rSource ) { _LoadStyles(rSource, false); } -/* -------------------------------------------------- - bPreserveCurrentDocument determines whether SetFixFields() is called - This call modifies the source document. This mustn't happen when the source - is a document the user is working on. - Calls of ::LoadStyles() normally use files especially loaded for the purpose - of importing styles. - --------------------------------------------------*/ + +// bPreserveCurrentDocument determines whether SetFixFields() is called +// This call modifies the source document. This mustn't happen when the source +// is a document the user is working on. +// Calls of ::LoadStyles() normally use files especially loaded for the purpose +// of importing styles. void SwDocShell::_LoadStyles( SfxObjectShell& rSource, bool bPreserveCurrentDocument ) { /* [Description] diff --git a/sw/source/core/uibase/app/docstyle.cxx b/sw/source/core/uibase/app/docstyle.cxx index 848649cec15d..4a6d6860093c 100644 --- a/sw/source/core/uibase/app/docstyle.cxx +++ b/sw/source/core/uibase/app/docstyle.cxx @@ -403,7 +403,6 @@ SwDocStyleSheet::SwDocStyleSheet( const SwDocStyleSheet& rOrg) : { } -// Reset void SwDocStyleSheet::Reset() { aName = ""; diff --git a/sw/source/core/uibase/config/cfgitems.cxx b/sw/source/core/uibase/config/cfgitems.cxx index a834edb50a38..c9a64b18aa83 100644 --- a/sw/source/core/uibase/config/cfgitems.cxx +++ b/sw/source/core/uibase/config/cfgitems.cxx @@ -50,9 +50,7 @@ SwDocDisplayItem::SwDocDisplayItem( sal_uInt16 _nWhich ) : }; -/*------------------------------------------------------------------- - Item for the Settings dialog, page document view ---------------------------------------------------------------------*/ +// Item for the Settings dialog, page document view SwDocDisplayItem::SwDocDisplayItem( const SwDocDisplayItem& rDocDisplayItem ): SfxPoolItem(rDocDisplayItem) { @@ -225,26 +223,20 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const rVOpt.SetPostIts (bNotes ); } -/*-------------------------------------------------------------------- - Description: CopyCTOR - --------------------------------------------------------------------*/ +// CopyCTOR SwAddPrinterItem::SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem ): SfxPoolItem(rAddPrinterItem), SwPrintData( rAddPrinterItem ) { } -/*-------------------------------------------------------------------- - Description: CTOR for empty Item - --------------------------------------------------------------------*/ +// CTOR for empty Item SwAddPrinterItem::SwAddPrinterItem( sal_uInt16 _nWhich): SfxPoolItem(_nWhich) { } -/*-------------------------------------------------------------------- - Description: CTOR from SwPrintOptions - --------------------------------------------------------------------*/ +// CTOR from SwPrintOptions SwAddPrinterItem::SwAddPrinterItem( sal_uInt16 _nWhich, const SwPrintData& rPrtData ) : SfxPoolItem(_nWhich) { @@ -265,9 +257,7 @@ bool SwAddPrinterItem::operator==( const SfxPoolItem& rAttr ) const return SwPrintData::operator==(rItem); } -/*-------------------------------------------------- - Item for Settings dialog, ShadowCursorPage ---------------------------------------------------*/ +// Item for Settings dialog, ShadowCursorPage SwShadowCursorItem::SwShadowCursorItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich ), eMode( FILL_TAB ) diff --git a/sw/source/core/uibase/config/dbconfig.cxx b/sw/source/core/uibase/config/dbconfig.cxx index 19f802df42d5..cad668f4a618 100644 --- a/sw/source/core/uibase/config/dbconfig.cxx +++ b/sw/source/core/uibase/config/dbconfig.cxx @@ -28,10 +28,6 @@ using namespace utl; using namespace com::sun::star::uno; -/*-------------------------------------------------------------------- - Description: Ctor - --------------------------------------------------------------------*/ - const Sequence<OUString>& SwDBConfig::GetPropertyNames() { static Sequence<OUString> aNames; diff --git a/sw/source/core/uibase/config/prtopt.cxx b/sw/source/core/uibase/config/prtopt.cxx index eb969bd7dabb..2b2a648828c6 100644 --- a/sw/source/core/uibase/config/prtopt.cxx +++ b/sw/source/core/uibase/config/prtopt.cxx @@ -28,10 +28,7 @@ using namespace utl; using namespace com::sun::star::uno; -/*-------------------------------------------------------------------- - Description: Ctor - --------------------------------------------------------------------*/ - +// Ctor Sequence<OUString> SwPrintOptions::GetPropertyNames() { static const char* aPropNames[] = diff --git a/sw/source/core/uibase/config/uinums.cxx b/sw/source/core/uibase/config/uinums.cxx index ba78c55e17af..f6ea5cfecf44 100644 --- a/sw/source/core/uibase/config/uinums.cxx +++ b/sw/source/core/uibase/config/uinums.cxx @@ -47,14 +47,12 @@ using namespace ::com::sun::star; #define CHAPTER_FILENAME "chapter.cfg" -// SwNumRulesWithName ---------------------------------------------------- -// PUBLIC METHODES ------------------------------------------------------- -/*------------------------------------------------------------------------ +/* Description: Saving a rule Parameter: rCopy -- the rule to save nIdx -- position, where the rule is to be saved. An old rule at that position will be overwritten. -------------------------------------------------------------------------*/ +*/ SwBaseNumRules::SwBaseNumRules( const OUString& rFileName ) : @@ -105,7 +103,6 @@ void SwBaseNumRules::ApplyNumRules(const SwNumRulesWithName &rCopy, sal_uInt16 n *pNumRules[nIdx] = rCopy; } -// PROTECTED METHODS ---------------------------------------------------- bool SwBaseNumRules::Store(SvStream &rStream) { rStream.WriteUInt16( ACT_NUM_VERSION ); diff --git a/sw/source/core/uibase/dbui/dbmgr.cxx b/sw/source/core/uibase/dbui/dbmgr.cxx index 4574a91603e5..638e2dade2cf 100644 --- a/sw/source/core/uibase/dbui/dbmgr.cxx +++ b/sw/source/core/uibase/dbui/dbmgr.cxx @@ -309,9 +309,7 @@ static bool lcl_GetColumnCnt(SwDSParam* pParam, return true; }; -/*-------------------------------------------------------------------- - Description: import data - --------------------------------------------------------------------*/ +// import data bool SwDBManager::MergeNew(const SwMergeDescriptor& rMergeDesc ) { OSL_ENSURE(!bInMerge && !pImpl->pMergeData, "merge already activated!"); @@ -444,9 +442,7 @@ bool SwDBManager::MergeNew(const SwMergeDescriptor& rMergeDesc ) return bRet; } -/*-------------------------------------------------------------------- - Description: import data - --------------------------------------------------------------------*/ +// import data bool SwDBManager::Merge(SwWrtShell* pSh) { pSh->StartAllAction(); @@ -592,9 +588,7 @@ void SwDBManager::ImportDBEntry(SwWrtShell* pSh) } } -/*-------------------------------------------------------------------- - Description: fill Listbox with tablelist - --------------------------------------------------------------------*/ +// fill Listbox with tablelist bool SwDBManager::GetTableNames(ListBox* pListBox, const OUString& rDBName) { bool bRet = false; @@ -643,9 +637,7 @@ bool SwDBManager::GetTableNames(ListBox* pListBox, const OUString& rDBName) return bRet; } -/*-------------------------------------------------------------------- - Description: fill Listbox with column names of a database - --------------------------------------------------------------------*/ +// fill Listbox with column names of a database void SwDBManager::GetColumnNames(ListBox* pListBox, const OUString& rDBName, const OUString& rTableName, bool bAppend) { @@ -698,9 +690,6 @@ void SwDBManager::GetColumnNames(ListBox* pListBox, } } -/*-------------------------------------------------------------------- - Description: CTOR - --------------------------------------------------------------------*/ SwDBManager::SwDBManager() : bCancel(false) , bInitDBFields(false) @@ -735,9 +724,7 @@ SwDBManager::~SwDBManager() delete pImpl; } -/*-------------------------------------------------------------------- - Description: save bulk letters as single documents - --------------------------------------------------------------------*/ +// save bulk letters as single documents static OUString lcl_FindUniqueName(SwWrtShell* pTargetShell, const OUString& rStartingPageDesc, sal_uLong nDocNo ) { do @@ -1367,10 +1354,8 @@ IMPL_LINK_INLINE_START( SwDBManager, PrtCancelHdl, Button *, pButton ) } IMPL_LINK_INLINE_END( SwDBManager, PrtCancelHdl, Button *, pButton ) -/*-------------------------------------------------------------------- - Description: determine the column's Numberformat and transfer - to the forwarded Formatter, if applicable. - --------------------------------------------------------------------*/ +// determine the column's Numberformat and transfer to the forwarded Formatter, +// if applicable. sal_uLong SwDBManager::GetColumnFmt( const OUString& rDBName, const OUString& rTableName, const OUString& rColNm, @@ -1901,11 +1886,9 @@ bool SwDBManager::ToNextRecord(SwDSParam* pParam) return bRet; } -/* ------------------------------------------------------------------------ - synchronized labels contain a next record field at their end - to assure that the next page can be created in mail merge - the cursor position must be validated - ---------------------------------------------------------------------------*/ +// synchronized labels contain a next record field at their end +// to assure that the next page can be created in mail merge +// the cursor position must be validated bool SwDBManager::ExistsNextRecord() const { return pImpl->pMergeData && !pImpl->pMergeData->bEndOfDB; diff --git a/sw/source/core/uibase/dbui/dbtree.cxx b/sw/source/core/uibase/dbui/dbtree.cxx index 8cfef1d32d59..35cd95883a58 100644 --- a/sw/source/core/uibase/dbui/dbtree.cxx +++ b/sw/source/core/uibase/dbui/dbtree.cxx @@ -430,9 +430,7 @@ OUString SwDBTreeList::GetDBName(OUString& rTableName, OUString& rColumnName, sa return sDBName; } -/*------------------------------------------------------------------------ - Description: Format: database.table -------------------------------------------------------------------------*/ +// Format: database.table void SwDBTreeList::Select(const OUString& rDBName, const OUString& rTableName, const OUString& rColumnName) { SvTreeListEntry* pParent; diff --git a/sw/source/core/uibase/dochdl/gloshdl.cxx b/sw/source/core/uibase/dochdl/gloshdl.cxx index 9fd489b95d28..571a59e11f2c 100644 --- a/sw/source/core/uibase/dochdl/gloshdl.cxx +++ b/sw/source/core/uibase/dochdl/gloshdl.cxx @@ -62,7 +62,6 @@ using namespace ::com::sun::star; const short RET_EDIT = 100; -// PUBLIC METHODS ------------------------------------------------------- struct TextBlockInfo_Impl { OUString sTitle; diff --git a/sw/source/core/uibase/docvw/edtwin.cxx b/sw/source/core/uibase/docvw/edtwin.cxx index e76b3dc85ee5..43ab6d6a0892 100644 --- a/sw/source/core/uibase/docvw/edtwin.cxx +++ b/sw/source/core/uibase/docvw/edtwin.cxx @@ -3678,9 +3678,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) Window::MouseButtonDown(rMEvt); } -/** - * MouseMove - */ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) { MouseEvent rMEvt(_rMEvt); diff --git a/sw/source/core/uibase/fldui/fldmgr.cxx b/sw/source/core/uibase/fldui/fldmgr.cxx index f69a1c5cb068..188e6adeaf5a 100644 --- a/sw/source/core/uibase/fldui/fldmgr.cxx +++ b/sw/source/core/uibase/fldui/fldmgr.cxx @@ -89,9 +89,7 @@ using namespace com::sun::star::sdbc; using namespace ::com::sun::star; using namespace nsSwDocInfoSubType; -/*-------------------------------------------------------------------- - Description: groups of fields - --------------------------------------------------------------------*/ +// groups of fields enum { GRP_DOC_BEGIN = 0, @@ -138,9 +136,7 @@ static const sal_uInt16 VF_COUNT = 1; // { 0 } static const sal_uInt16 VF_USR_COUNT = 2; // { 0, nsSwExtendedSubType::SUB_CMD } static const sal_uInt16 VF_DB_COUNT = 1; // { nsSwExtendedSubType::SUB_OWN_FMT } -/*-------------------------------------------------------------------- - Description: field types and subtypes - --------------------------------------------------------------------*/ +// field types and subtypes struct SwFldPack { sal_uInt16 nTypeId; @@ -152,9 +148,7 @@ struct SwFldPack sal_uLong nFmtEnd; }; -/*-------------------------------------------------------------------- - Description: strings and formats - --------------------------------------------------------------------*/ +// strings and formats static const SwFldPack aSwFlds[] = { // Document @@ -208,10 +202,7 @@ static const SwFldPack aSwFlds[] = { TYP_USERFLD, 0, 0, FMT_USERVAR_BEGIN, FMT_USERVAR_END } }; -/*-------------------------------------------------------------------- - Description: access to the shell - --------------------------------------------------------------------*/ - +// access to the shell static SwWrtShell* lcl_GetShell() { SwView* pView; @@ -223,10 +214,7 @@ static SwWrtShell* lcl_GetShell() inline sal_uInt16 GetPackCount() { return sizeof(aSwFlds) / sizeof(SwFldPack); } -/*-------------------------------------------------------------------- - Description: FieldManager controls inserting and updating of fields - --------------------------------------------------------------------*/ - +// FieldManager controls inserting and updating of fields SwFldMgr::SwFldMgr(SwWrtShell* pSh ) : pModule(0), pMacroItem(0), @@ -241,10 +229,7 @@ SwFldMgr::~SwFldMgr() { } -/*-------------------------------------------------------------------- - Description: organise RefMark by names - --------------------------------------------------------------------*/ - +// organise RefMark by names bool SwFldMgr::CanInsertRefMark( const OUString& rStr ) { bool bRet = false; @@ -263,10 +248,7 @@ bool SwFldMgr::CanInsertRefMark( const OUString& rStr ) return bRet; } -/*-------------------------------------------------------------------- - Description: access over ResIds - --------------------------------------------------------------------*/ - +// access over ResIds void SwFldMgr::RemoveFldType(sal_uInt16 nResId, const OUString& rName ) { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); @@ -296,9 +278,7 @@ SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, const OUString& rName) cons return pSh ? pSh->GetFldType(nResId, rName) : 0; } -/*-------------------------------------------------------------------- - Description: determine current field - --------------------------------------------------------------------*/ +// determine current field SwField* SwFldMgr::GetCurFld() { SwWrtShell *pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); @@ -337,10 +317,7 @@ SwField* SwFldMgr::GetCurFld() return pCurFld; } -/*-------------------------------------------------------------------- - Description: provide group range - --------------------------------------------------------------------*/ - +// provide group range const SwFldGroupRgn& SwFldMgr::GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId) const { static SwFldGroupRgn const aRanges[] = @@ -368,10 +345,7 @@ static SwFldGroupRgn const aWebRanges[] = return aRanges[(sal_uInt16)nGrpId]; } -/*-------------------------------------------------------------------- - Description: determine GroupId - --------------------------------------------------------------------*/ - +// determine GroupId sal_uInt16 SwFldMgr::GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType) const { if (nTypeId == TYP_SETINPFLD) @@ -398,11 +372,8 @@ sal_uInt16 SwFldMgr::GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSu return USHRT_MAX; } -/*-------------------------------------------------------------------- - Description: determine names to TypeId - ACCESS over TYP_.... - --------------------------------------------------------------------*/ - +// determine names to TypeId +// ACCESS over TYP_.... sal_uInt16 SwFldMgr::GetTypeId(sal_uInt16 nPos) { OSL_ENSURE(nPos < ::GetPackCount(), "forbidden Pos"); @@ -430,10 +401,7 @@ OUString SwFldMgr::GetTypeStr(sal_uInt16 nPos) return SwFieldType::GetTypeStr( nFldWh ); } -/*-------------------------------------------------------------------- - Description: determine Pos in the list - --------------------------------------------------------------------*/ - +// determine Pos in the list sal_uInt16 SwFldMgr::GetPos(sal_uInt16 nTypeId) { switch( nTypeId ) @@ -451,10 +419,7 @@ sal_uInt16 SwFldMgr::GetPos(sal_uInt16 nTypeId) return USHRT_MAX; } -/*-------------------------------------------------------------------- - Description: localise subtypes of a field - --------------------------------------------------------------------*/ - +// localise subtypes of a field bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill) { bool bRet = false; @@ -559,15 +524,11 @@ bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<OUString>& rToFill) return bRet; } -/*-------------------------------------------------------------------- - Description: determine format - ACCESS over TYP_.... - --------------------------------------------------------------------*/ - +// determine format +// ACCESS over TYP_.... sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHtmlMode) const { OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId"); - { const sal_uInt16 nPos = GetPos(nTypeId); @@ -616,14 +577,10 @@ sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHtml } } -/*-------------------------------------------------------------------- - Description: determine FormatString to a type - --------------------------------------------------------------------*/ - +// determine FormatString to a type OUString SwFldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const { OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId"); - const sal_uInt16 nPos = GetPos(nTypeId); if(nPos == USHRT_MAX) @@ -678,14 +635,10 @@ OUString SwFldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const return aRet; } -/*-------------------------------------------------------------------- - Description: determine FormatId from Pseudo-ID - --------------------------------------------------------------------*/ - +// determine FormatId from Pseudo-ID sal_uInt16 SwFldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const { sal_uInt16 nId = (sal_uInt16)nFormatId; - switch( nTypeId ) { case TYP_DOCINFOFLD: @@ -758,10 +711,7 @@ sal_uInt16 SwFldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const } -/*-------------------------------------------------------------------- - Description: Traveling - --------------------------------------------------------------------*/ - +// Traveling bool SwFldMgr::GoNextPrev( bool bNext, SwFieldType* pTyp ) { SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); @@ -788,10 +738,7 @@ bool SwFldMgr::GoNextPrev( bool bNext, SwFieldType* pTyp ) : sal_False; } -/*-------------------------------------------------------------------- - Description: insert field types - --------------------------------------------------------------------*/ - +// insert field types void SwFldMgr::InsertFldType(SwFieldType& rType) { SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); @@ -800,19 +747,13 @@ void SwFldMgr::InsertFldType(SwFieldType& rType) pSh->InsertFldType(rType); } -/*-------------------------------------------------------------------- - Description: determine current TypeId - --------------------------------------------------------------------*/ - +// determine current TypeId sal_uInt16 SwFldMgr::GetCurTypeId() const { return pCurFld ? pCurFld->GetTypeId() : USHRT_MAX; } -/*-------------------------------------------------------------------- - Description: Over string insert field or update - --------------------------------------------------------------------*/ - +// Over string insert field or update bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData) { @@ -1417,10 +1358,7 @@ bool SwFldMgr::InsertFld( return true; } -/*-------------------------------------------------------------------- - Description: fields update - --------------------------------------------------------------------*/ - +// fields update void SwFldMgr::UpdateCurFld(sal_uLong nFormat, const OUString& rPar1, const OUString& rPar2, @@ -1597,9 +1535,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat, pSh->EndAllAction(); } -/*-------------------------------------------------------------------- - Description: explicitly evaluate ExpressionFields - --------------------------------------------------------------------*/ +// explicitly evaluate ExpressionFields void SwFldMgr::EvalExpFlds(SwWrtShell* pSh) { if (pSh == NULL) diff --git a/sw/source/core/uibase/fldui/fldwrap.cxx b/sw/source/core/uibase/fldui/fldwrap.cxx index 32c02b0f8365..b3e71d39aa1c 100644 --- a/sw/source/core/uibase/fldui/fldwrap.cxx +++ b/sw/source/core/uibase/fldui/fldwrap.cxx @@ -53,9 +53,7 @@ IMPL_LINK_NOARG(SwChildWinWrapper, UpdateHdl) return 0; } -/*-------------------------------------------------------------------- - Description: newly initialise dialog after Doc switch - --------------------------------------------------------------------*/ +// newly initialise dialog after Doc switch bool SwChildWinWrapper::ReInitDlg(SwDocShell *) { bool bRet = false; @@ -94,9 +92,7 @@ SwFldDlgWrapper::SwFldDlgWrapper( Window* _pParent, sal_uInt16 nId, eChildAlignment = SFX_ALIGN_NOALIGNMENT; } -/*-------------------------------------------------------------------- - Description: newly initialise dialog after Doc switch - --------------------------------------------------------------------*/ +// newly initialise dialog after Doc switch bool SwFldDlgWrapper::ReInitDlg(SwDocShell *pDocSh) { bool bRet; @@ -144,9 +140,7 @@ SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* _pParent, sal_uInt16 n eChildAlignment = SFX_ALIGN_NOALIGNMENT; } -/* -------------------------------------------------- - * re-init after doc activation - * --------------------------------------------------*/ +// re-init after doc activation bool SwFldDataOnlyDlgWrapper::ReInitDlg(SwDocShell *pDocSh) { bool bRet; diff --git a/sw/source/core/uibase/fldui/xfldui.cxx b/sw/source/core/uibase/fldui/xfldui.cxx index da107a4e240c..9e567a765d20 100644 --- a/sw/source/core/uibase/fldui/xfldui.cxx +++ b/sw/source/core/uibase/fldui/xfldui.cxx @@ -45,11 +45,8 @@ using namespace ::com::sun::star::beans; // with exceptions. So we can reduce the code of the other files, which don't // need any exception handling. -/*-------------------------------------------------------------------- - Description: Is the database field numeric? - remark: in case of error sal_True is returned - --------------------------------------------------------------------*/ - +// Is the database field numeric? +// remark: in case of error sal_True is returned bool SwFldMgr::IsDBNumeric( const OUString& rDBName, const OUString& rTblQryName, bool bIsTable, const OUString& rFldName) { diff --git a/sw/source/core/uibase/frmdlg/colex.cxx b/sw/source/core/uibase/frmdlg/colex.cxx index 7a6ea208107c..98b4bad4a852 100644 --- a/sw/source/core/uibase/frmdlg/colex.cxx +++ b/sw/source/core/uibase/frmdlg/colex.cxx @@ -37,14 +37,11 @@ #include "colex.hxx" #include "colmgr.hxx" -/*----------------------------------------------------------------------- - Description: Taking the updated values from the set - -----------------------------------------------------------------------*/ +// Taking the updated values from the set void SwPageExample::UpdateExample( const SfxItemSet& rSet ) { SfxItemPool* pPool = rSet.GetPool(); sal_uInt16 nWhich = pPool->GetWhich( SID_ATTR_PAGE ); - if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET ) { // alignment diff --git a/sw/source/core/uibase/frmdlg/colmgr.cxx b/sw/source/core/uibase/frmdlg/colmgr.cxx index be100431908c..94e04b6599f5 100644 --- a/sw/source/core/uibase/frmdlg/colmgr.cxx +++ b/sw/source/core/uibase/frmdlg/colmgr.cxx @@ -25,9 +25,8 @@ #include "colmgr.hxx" // private methods -/*------------------------------------------------------------------------ - Description: set column width to current width -------------------------------------------------------------------------*/ + +// set column width to current width void FitToActualSize(SwFmtCol& rCol, sal_uInt16 nWidth) { const sal_uInt16 nCount = rCol.GetColumns().size(); @@ -40,9 +39,8 @@ void FitToActualSize(SwFmtCol& rCol, sal_uInt16 nWidth) } // public methods -/*------------------------------------------------------------------------ - Description: set column quantity and Gutterwidth -------------------------------------------------------------------------*/ + +// set column quantity and Gutterwidth void SwColMgr::SetCount(sal_uInt16 nCount, sal_uInt16 nGutterWidth) { aFmtCol.Init(nCount, nGutterWidth, nWidth); @@ -78,23 +76,18 @@ void SwColMgr::SetGutterWidth(sal_uInt16 nGutterWidth, sal_uInt16 nPos ) } } -/*------------------------------------------------------------------------ - Description: height separation line -------------------------------------------------------------------------*/ +// height separation line short SwColMgr::GetLineHeightPercent() const { return (short)aFmtCol.GetLineHeight(); } - void SwColMgr::SetLineHeightPercent(short nPercent) { OSL_ENSURE(nPercent <= 100, "line height may be at most 100%"); aFmtCol.SetLineHeight((sal_uInt8)nPercent); } -/*------------------------------------------------------------------------ - Description: column width -------------------------------------------------------------------------*/ +// column width sal_uInt16 SwColMgr::GetColWidth(sal_uInt16 nIdx) const { OSL_ENSURE(nIdx < GetCount(), "Spaltenarray ueberindiziert."); @@ -108,18 +101,14 @@ void SwColMgr::SetColWidth(sal_uInt16 nIdx, sal_uInt16 nWd) } -/*-------------------------------------------------------------------- - Description: newly set size - --------------------------------------------------------------------*/ +// newly set size void SwColMgr::SetActualWidth(sal_uInt16 nW) { nWidth = nW; ::FitToActualSize(aFmtCol, nW); } -/*-------------------------------------------------------------------- - Description: ctor - --------------------------------------------------------------------*/ +// ctor SwColMgr::SwColMgr(const SfxItemSet& rSet, sal_uInt16 nActWidth) : aFmtCol((const SwFmtCol&)rSet.Get(RES_COL)), nWidth(nActWidth) diff --git a/sw/source/core/uibase/frmdlg/frmmgr.cxx b/sw/source/core/uibase/frmdlg/frmmgr.cxx index e06aa49fbc94..b054d13ba610 100644 --- a/sw/source/core/uibase/frmdlg/frmmgr.cxx +++ b/sw/source/core/uibase/frmdlg/frmmgr.cxx @@ -55,9 +55,7 @@ static sal_uInt16 aFrmMgrRange[] = { FN_SET_FRM_NAME, FN_SET_FRM_NAME, 0}; -/*-------------------------------------------------------------------- - Description: determine frame attributes via Shell - --------------------------------------------------------------------*/ +// determine frame attributes via Shell SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( bool bNew, SwWrtShell* pSh, sal_uInt8 nType ) : m_aSet( (SwAttrPool&)pSh->GetAttrPool(), aFrmMgrRange ), m_pOwnSh( pSh ), @@ -105,9 +103,7 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( bool bNew, SwWrtShell* pSh, const SfxItemSet & } } -/*-------------------------------------------------------------------- - Description: Initialise - --------------------------------------------------------------------*/ +// Initialise void SwFlyFrmAttrMgr::UpdateAttrMgr() { if ( !m_bNewFrm && m_pOwnSh->IsFrmSelected() ) @@ -131,9 +127,7 @@ void SwFlyFrmAttrMgr::_UpdateFlyFrm() } } -/*-------------------------------------------------------------------- - Description: change existing Fly-Frame - --------------------------------------------------------------------*/ +// change existing Fly-Frame void SwFlyFrmAttrMgr::UpdateFlyFrm() { OSL_ENSURE( m_pOwnSh->IsFrmSelected(), @@ -164,9 +158,7 @@ void SwFlyFrmAttrMgr::UpdateFlyFrm() } } -/*-------------------------------------------------------------------- - Description: insert frame - --------------------------------------------------------------------*/ +// insert frame bool SwFlyFrmAttrMgr::InsertFlyFrm() { m_pOwnSh->StartAllAction(); @@ -184,11 +176,8 @@ bool SwFlyFrmAttrMgr::InsertFlyFrm() return bRet; } -/*------------------------------------------------------------------------ - Description: Insert frames of type eAnchorType. Position and size are - being set explicitly. - Not-allowed values of the enumeration type get corrected. -------------------------------------------------------------------------*/ +// Insert frames of type eAnchorType. Position and size are being set explicitly. +// Not-allowed values of the enumeration type get corrected. void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds eAnchorType, const Point &rPos, const Size &rSize, @@ -210,9 +199,7 @@ void SwFlyFrmAttrMgr::InsertFlyFrm(RndStdIds eAnchorType, InsertFlyFrm(); } -/*-------------------------------------------------------------------- - Description: set anchor - --------------------------------------------------------------------*/ +// set anchor void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId ) { sal_uInt16 nPhyPageNum, nVirtPageNum; @@ -231,22 +218,17 @@ void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId ) } } -/*------------------------------------------------------------------------ - Description: set the attribute for columns -------------------------------------------------------------------------*/ +// set the attribute for columns void SwFlyFrmAttrMgr::SetCol( const SwFmtCol &rCol ) { m_aSet.Put( rCol ); } -/*-------------------------------------------------------------------- - Description: set absolute position - --------------------------------------------------------------------*/ +// set absolute position void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint ) { m_bAbsPos = true; m_aAbsPos = rPoint; - SwFmtVertOrient aVertOrient( GetVertOrient() ); SwFmtHoriOrient aHoriOrient( GetHoriOrient() ); aHoriOrient.SetHoriOrient( text::HoriOrientation::NONE ); @@ -255,9 +237,7 @@ void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint ) m_aSet.Put( aHoriOrient ); } -/*-------------------------------------------------------------------- - Description: check metrics for correctness - --------------------------------------------------------------------*/ +// check metrics for correctness void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal, const SwPosition* pToCharCntntPos, bool bOnlyPercentRefValue ) @@ -498,9 +478,7 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal, rVal.nHeight = rVal.nMaxHeight; } -/*-------------------------------------------------------------------- - Description: correction for border - --------------------------------------------------------------------*/ +// correction for border SwTwips SwFlyFrmAttrMgr::CalcTopSpace() { const SvxShadowItem& rShadow = GetShadow(); @@ -529,9 +507,7 @@ SwTwips SwFlyFrmAttrMgr::CalcRightSpace() return rShadow.CalcShadowSpace(SHADOW_RIGHT) + rBox.CalcLineSpace(BOX_LINE_RIGHT); } -/*-------------------------------------------------------------------- - Description: erase attribute from the set - --------------------------------------------------------------------*/ +// erase attribute from the set void SwFlyFrmAttrMgr::DelAttr( sal_uInt16 nId ) { m_aSet.ClearItem( nId ); diff --git a/sw/source/core/uibase/inc/DropDownFieldDialog.hxx b/sw/source/core/uibase/inc/DropDownFieldDialog.hxx index bd3de9370f35..a6eab562f45d 100644 --- a/sw/source/core/uibase/inc/DropDownFieldDialog.hxx +++ b/sw/source/core/uibase/inc/DropDownFieldDialog.hxx @@ -28,9 +28,7 @@ class SwDropDownField; class SwField; class SwWrtShell; -/*-------------------------------------------------------------------- - Dialog to edit drop down field selection - --------------------------------------------------------------------*/ +// Dialog to edit drop down field selection namespace sw { class DropDownFieldDialog : public SvxStandardDialog diff --git a/sw/source/core/uibase/inc/actctrl.hxx b/sw/source/core/uibase/inc/actctrl.hxx index 46c6d3b51d68..2ee6a63b0706 100644 --- a/sw/source/core/uibase/inc/actctrl.hxx +++ b/sw/source/core/uibase/inc/actctrl.hxx @@ -22,9 +22,7 @@ #include <vcl/field.hxx> #include "swdllapi.h" -/*-------------------------------------------------------------------- - Description: numerical input - --------------------------------------------------------------------*/ +// numerical input class SW_DLLPUBLIC NumEditAction: public NumericField { Link aActionLink; @@ -40,9 +38,7 @@ public: const Link& GetActionHdl() const { return aActionLink; } }; -/* -------------------------------------------------- - * Edit that doesn't accept spaces - * --------------------------------------------------*/ +// Edit that doesn't accept spaces class SW_DLLPUBLIC NoSpaceEdit : public Edit { OUString sForbiddenChars; @@ -57,9 +53,7 @@ public: const OUString& GetForbiddenChars(){return sForbiddenChars;} }; -/* -------------------------------------------------- - * No space and no full stop - * --------------------------------------------------*/ +// No space and no full stop class TableNameEdit : public NoSpaceEdit { public: @@ -70,9 +64,7 @@ public: } }; -/* -------------------------------------------------- - call a link when KEY_RETURN is pressed - --------------------------------------------------*/ +// call a link when KEY_RETURN is pressed class SW_DLLPUBLIC ReturnActionEdit : public Edit { Link aReturnActionLink; diff --git a/sw/source/core/uibase/inc/bmpwin.hxx b/sw/source/core/uibase/inc/bmpwin.hxx index 0d43eaa86b31..1fe60bb4201f 100644 --- a/sw/source/core/uibase/inc/bmpwin.hxx +++ b/sw/source/core/uibase/inc/bmpwin.hxx @@ -24,9 +24,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/window.hxx> -/*-------------------------------------------------------------------- - Description: extended page for graphics - --------------------------------------------------------------------*/ +// extended page for graphics class BmpWindow : public Window { private: diff --git a/sw/source/core/uibase/inc/bookctrl.hxx b/sw/source/core/uibase/inc/bookctrl.hxx index 42264b2691fc..fd291e3c1bde 100644 --- a/sw/source/core/uibase/inc/bookctrl.hxx +++ b/sw/source/core/uibase/inc/bookctrl.hxx @@ -22,8 +22,6 @@ #include <rtl/ustring.hxx> #include <sfx2/stbitem.hxx> -// class BookmarkToolBoxControl ------------------------------------------- - class SwBookmarkControl : public SfxStatusBarControl { virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; diff --git a/sw/source/core/uibase/inc/cfgitems.hxx b/sw/source/core/uibase/inc/cfgitems.hxx index 5839fa19a6bb..bdd78cebe0df 100644 --- a/sw/source/core/uibase/inc/cfgitems.hxx +++ b/sw/source/core/uibase/inc/cfgitems.hxx @@ -40,9 +40,8 @@ class SwShdwCrsrOptionsTabPage; SfxPrinter* GetPrt( SwViewShell* ); void SetPrt( SfxPrinter* ); -/*--------OS 12.01.95 ----------------------------------- -Item for settings dialog - document view ---------------------------------------------------------- */ +// OS 12.01.95 +// Item for settings dialog - document view class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem { friend class SwShdwCrsrOptionsTabPage; @@ -74,9 +73,8 @@ public: void FillViewOptions( SwViewOption& rVOpt) const; }; -/*--------OS 12.01.95 ----------------------------------- -Item for settings dialog, element page ---------------------------------------------------------- */ +// OS 12.01.95 +// Item for settings dialog, element page class SW_DLLPUBLIC SwElemItem : public SfxPoolItem { //view @@ -112,9 +110,8 @@ public: }; -/*--------OS 12.01.95 ----------------------------------- -Item for settings dialog - printer/add ons ---------------------------------------------------------- */ +// OS 12.01.95 +// Item for settings dialog - printer/add ons class SW_DLLPUBLIC SwAddPrinterItem : public SfxPoolItem, public SwPrintData { friend class SwAddPrinterTabPage; @@ -158,9 +155,8 @@ public: }; -/*--------OS 12.01.95 ----------------------------------- -Item for settings dialog, ShadowCursorPage ---------------------------------------------------------- */ +// OS 12.01.95 +// Item for settings dialog, ShadowCursorPage class SW_DLLPUBLIC SwShadowCursorItem : public SfxPoolItem { sal_uInt8 eMode; @@ -186,9 +182,8 @@ public: #ifdef DBG_UTIL -/*--------OS 12.01.95 ----------------------------------- -Item for settings dialog - test settings ---------------------------------------------------------- */ +// OS 12.01.95 +// Item for settings dialog - test settings class SW_DLLPUBLIC SwTestItem : public SfxPoolItem { friend class SwModule; diff --git a/sw/source/core/uibase/inc/changedb.hxx b/sw/source/core/uibase/inc/changedb.hxx index f85ec62fe270..a6e1cd520df6 100644 --- a/sw/source/core/uibase/inc/changedb.hxx +++ b/sw/source/core/uibase/inc/changedb.hxx @@ -32,9 +32,7 @@ class SwView; class SwWrtShell; struct SwDBData; -/*-------------------------------------------------------------------- - Description: exchange database at fields - --------------------------------------------------------------------*/ +// exchange database at fields class SwChangeDBDlg: public SvxStandardDialog { SvTreeListBox* m_pUsedDBTLB; diff --git a/sw/source/core/uibase/inc/colmgr.hxx b/sw/source/core/uibase/inc/colmgr.hxx index a9c98164096f..1f30dfaecada 100644 --- a/sw/source/core/uibase/inc/colmgr.hxx +++ b/sw/source/core/uibase/inc/colmgr.hxx @@ -70,7 +70,6 @@ private: sal_uInt16 nWidth; }; -// INLINE METHOD -------------------------------------------------------- inline sal_uInt16 SwColMgr::GetCount() const { return aFmtCol.GetNumCols(); diff --git a/sw/source/core/uibase/inc/column.hxx b/sw/source/core/uibase/inc/column.hxx index 4026d940eba5..c223660ec631 100644 --- a/sw/source/core/uibase/inc/column.hxx +++ b/sw/source/core/uibase/inc/column.hxx @@ -85,9 +85,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; -/*-------------------------------------------------------------------- - Description: column dialog now as TabPage - --------------------------------------------------------------------*/ +// column dialog now as TabPage class SwColumnPage : public SfxTabPage { NumericField* m_pCLNrEdt; diff --git a/sw/source/core/uibase/inc/dbinsdlg.hxx b/sw/source/core/uibase/inc/dbinsdlg.hxx index a72afc1a9ee0..e77e77ae415f 100644 --- a/sw/source/core/uibase/inc/dbinsdlg.hxx +++ b/sw/source/core/uibase/inc/dbinsdlg.hxx @@ -101,13 +101,13 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem RadioButton* m_pRbDbFmtFromUsr; NumFormatListBox* m_pLbDbFmtFromUsr; - /* ----- Page Text/Field ------- */ + // Page Text/Field PushButton* m_pIbDbcolToEdit; VclMultiLineEdit* m_pEdDbText; FixedText* m_pFtDbParaColl; ListBox* m_pLbDbParaColl; - /* ----- Page Table ------------ */ + // Page Table PushButton* m_pIbDbcolAllTo; PushButton* m_pIbDbcolOneTo; PushButton* m_pIbDbcolOneFrom; diff --git a/sw/source/core/uibase/inc/docstdlg.hxx b/sw/source/core/uibase/inc/docstdlg.hxx index 8b51f9028c5c..6609d0728fe8 100644 --- a/sw/source/core/uibase/inc/docstdlg.hxx +++ b/sw/source/core/uibase/inc/docstdlg.hxx @@ -26,9 +26,7 @@ #include "docstat.hxx" -/*-------------------------------------------------------------------- - Description: DocInfo now as page - --------------------------------------------------------------------*/ +// DocInfo now as page class SwDocStatPage: public SfxTabPage { public: diff --git a/sw/source/core/uibase/inc/drpcps.hxx b/sw/source/core/uibase/inc/drpcps.hxx index 71a42d5572fc..2758e2a1ddfe 100644 --- a/sw/source/core/uibase/inc/drpcps.hxx +++ b/sw/source/core/uibase/inc/drpcps.hxx @@ -34,8 +34,6 @@ class SwWrtShell; -// class SwDropCapsDlg ****************************************************** - class SwDropCapsDlg : public SfxSingleTabDialog { public: @@ -44,8 +42,6 @@ public: class SwDropCapsPict; -// class SwDropCapsPage ***************************************************** - class SwDropCapsPage : public SfxTabPage { friend class SwDropCapsPict; diff --git a/sw/source/core/uibase/inc/edtwin.hxx b/sw/source/core/uibase/inc/edtwin.hxx index aade966efa8c..ddd1ce3cd796 100644 --- a/sw/source/core/uibase/inc/edtwin.hxx +++ b/sw/source/core/uibase/inc/edtwin.hxx @@ -43,9 +43,7 @@ struct SwApplyTemplate; struct QuickHelpData; class SdrDropMarkerOverlay; -/*-------------------------------------------------------------------- - Description: input window - --------------------------------------------------------------------*/ +// input window /** Window class for the Writer edit area, this is the one handling mouse and keyboard events and doing the final painting of the document from diff --git a/sw/source/core/uibase/inc/envimg.hxx b/sw/source/core/uibase/inc/envimg.hxx index e6bdf30efa85..2d10be75b0cd 100644 --- a/sw/source/core/uibase/inc/envimg.hxx +++ b/sw/source/core/uibase/inc/envimg.hxx @@ -23,10 +23,8 @@ #include <unotools/configitem.hxx> #include "swdllapi.h" -// MakeSender ----------------------------------------------------------------- SW_DLLPUBLIC OUString MakeSender(); -// enum ----------------------------------------------------------------------- enum SwEnvAlign { ENV_HOR_LEFT = 0, @@ -37,7 +35,6 @@ enum SwEnvAlign ENV_VER_RGHT }; -// class SwEnvItem ------------------------------------------------------------ class SW_DLLPUBLIC SwEnvItem : public SfxPoolItem { public: @@ -70,7 +67,6 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; -// class SwEnvCfgItem ------------------------------------------------------- class SwEnvCfgItem : public utl::ConfigItem { SwEnvItem aEnvItem; diff --git a/sw/source/core/uibase/inc/envlop.hxx b/sw/source/core/uibase/inc/envlop.hxx index 0c3de3affd3b..dba8a15c07ac 100644 --- a/sw/source/core/uibase/inc/envlop.hxx +++ b/sw/source/core/uibase/inc/envlop.hxx @@ -40,7 +40,6 @@ class SwEnvFmtPage; class SwWrtShell; class Printer; -// class SwEnvPreview --------------------------------------------------------- class SwEnvPreview : public Window { void Paint(const Rectangle&) SAL_OVERRIDE; @@ -54,7 +53,6 @@ protected: virtual Size GetOptimalSize() const SAL_OVERRIDE; }; -// class SwEnvDlg ----------------------------------------------------------- class SwEnvDlg : public SfxTabDialog { friend class SwEnvPage; @@ -77,7 +75,6 @@ public: virtual ~SwEnvDlg(); }; -// class SwEnvPage ---------------------------------------------------------- class SwEnvPage : public SfxTabPage { VclMultiLineEdit* m_pAddrEdit; diff --git a/sw/source/core/uibase/inc/fldmgr.hxx b/sw/source/core/uibase/inc/fldmgr.hxx index 60a8ce2597ee..1dac07f783ce 100644 --- a/sw/source/core/uibase/inc/fldmgr.hxx +++ b/sw/source/core/uibase/inc/fldmgr.hxx @@ -43,9 +43,7 @@ class SvxMacroItem; class SvNumberFormatter; class Window; -/*-------------------------------------------------------------------- - Description: the groups of fields - --------------------------------------------------------------------*/ +// the groups of fields enum SwFldGroups { GRP_DOC, @@ -62,10 +60,8 @@ struct SwFldGroupRgn sal_uInt16 nEnd; }; -/*-------------------------------------------------------------------- - Description: the field manager handles the insertation of fields - with command strings - --------------------------------------------------------------------*/ +// the field manager handles the insertation of fields +// with command strings struct SwInsertFld_Data { sal_uInt16 nTypeId; diff --git a/sw/source/core/uibase/inc/fldwrap.hxx b/sw/source/core/uibase/inc/fldwrap.hxx index 06ea1a47aea8..3d0478d9cbd3 100644 --- a/sw/source/core/uibase/inc/fldwrap.hxx +++ b/sw/source/core/uibase/inc/fldwrap.hxx @@ -35,10 +35,7 @@ public: void ShowReferencePage(); }; -/* -------------------------------------------------- - * field dialog only showing database page to support - * mail merge - * --------------------------------------------------*/ +// field dialog only showing database page to support mail merge class SwFldDataOnlyDlgWrapper : public SwChildWinWrapper { public: diff --git a/sw/source/core/uibase/inc/formedt.hxx b/sw/source/core/uibase/inc/formedt.hxx index cf4a228d23de..0aeea6aa8b5c 100644 --- a/sw/source/core/uibase/inc/formedt.hxx +++ b/sw/source/core/uibase/inc/formedt.hxx @@ -34,9 +34,7 @@ class SwWrtShell; class SwForm; -/*-------------------------------------------------------------------- - Description: insert marker for index entry - --------------------------------------------------------------------*/ +// insert marker for index entry class SwIdxFormDlg : public SvxStandardDialog { DECL_LINK( EntryHdl, Button * ); diff --git a/sw/source/core/uibase/inc/frmdlg.hxx b/sw/source/core/uibase/inc/frmdlg.hxx index 885140abf8f0..d2af253abaa8 100644 --- a/sw/source/core/uibase/inc/frmdlg.hxx +++ b/sw/source/core/uibase/inc/frmdlg.hxx @@ -24,9 +24,7 @@ #include <sfx2/tabdlg.hxx> class SwWrtShell; -/*-------------------------------------------------------------------- - Description: frame dialog - --------------------------------------------------------------------*/ +// frame dialog class SwFrmDlg : public SfxTabDialog { bool m_bFormat; diff --git a/sw/source/core/uibase/inc/frmpage.hxx b/sw/source/core/uibase/inc/frmpage.hxx index 050c59468f9f..92fd3a0e0c7d 100644 --- a/sw/source/core/uibase/inc/frmpage.hxx +++ b/sw/source/core/uibase/inc/frmpage.hxx @@ -38,9 +38,7 @@ struct FrmMap; // OD 12.11.2003 #i22341# struct SwPosition; -/*-------------------------------------------------------------------- - Description: frame dialog - --------------------------------------------------------------------*/ +// frame dialog class SwFrmPage: public SfxTabPage { // size diff --git a/sw/source/core/uibase/inc/glosdoc.hxx b/sw/source/core/uibase/inc/glosdoc.hxx index b7ad24d188e7..49c1493b6545 100644 --- a/sw/source/core/uibase/inc/glosdoc.hxx +++ b/sw/source/core/uibase/inc/glosdoc.hxx @@ -43,7 +43,6 @@ typedef ::std::vector< AutoTextEntryRef > UnoAutoTextEntries; #define GLOS_DELIM (sal_Unicode)'*' -// CLASS ----------------------------------------------------------------- class SW_DLLPUBLIC SwGlossaries { UnoAutoTextGroups m_aGlossaryGroups; diff --git a/sw/source/core/uibase/inc/gloshdl.hxx b/sw/source/core/uibase/inc/gloshdl.hxx index ba9cfe109cd8..60708116a99c 100644 --- a/sw/source/core/uibase/inc/gloshdl.hxx +++ b/sw/source/core/uibase/inc/gloshdl.hxx @@ -28,7 +28,6 @@ class SvxMacro; class SwGlossaries; class SfxViewFrame; -// CLASS ----------------------------------------------------------------- class SW_DLLPUBLIC SwGlossaryHdl { diff --git a/sw/source/core/uibase/inc/inpdlg.hxx b/sw/source/core/uibase/inc/inpdlg.hxx index 80f204f645e4..d21209ef1b59 100644 --- a/sw/source/core/uibase/inc/inpdlg.hxx +++ b/sw/source/core/uibase/inc/inpdlg.hxx @@ -31,10 +31,7 @@ class SwUserFieldType; class SwField; class SwWrtShell; -/*-------------------------------------------------------------------- - Description: insert fields - --------------------------------------------------------------------*/ - +// insert fields class SwFldInputDlg: public SvxStandardDialog { virtual void Apply() SAL_OVERRIDE; diff --git a/sw/source/core/uibase/inc/javaedit.hxx b/sw/source/core/uibase/inc/javaedit.hxx index 7fddb57a8852..b17f0f74cc1c 100644 --- a/sw/source/core/uibase/inc/javaedit.hxx +++ b/sw/source/core/uibase/inc/javaedit.hxx @@ -30,8 +30,6 @@ class SwScriptField; namespace sfx2 { class FileDialogHelper; } -// class SwJavaEditDialog ------------------------------------------------- - class SwJavaEditDialog : public SvxStandardDialog { private: diff --git a/sw/source/core/uibase/inc/labimg.hxx b/sw/source/core/uibase/inc/labimg.hxx index bcdb5612c249..20f355d4c8ec 100644 --- a/sw/source/core/uibase/inc/labimg.hxx +++ b/sw/source/core/uibase/inc/labimg.hxx @@ -24,7 +24,6 @@ #include <unotools/configitem.hxx> #include "swdllapi.h" -// class SwLabItem ---------------------------------------------------------- class SwLabCfgItem; class SW_DLLPUBLIC SwLabItem : public SfxPoolItem @@ -104,7 +103,6 @@ public: OUString sGlossaryBlockName; }; -// class SwLabCfgItem ------------------------------------------------------- class SwLabCfgItem : public utl::ConfigItem { SwLabItem aItem; diff --git a/sw/source/core/uibase/inc/mailmergehelper.hxx b/sw/source/core/uibase/inc/mailmergehelper.hxx index df4dc4b534d2..886222c16890 100644 --- a/sw/source/core/uibase/inc/mailmergehelper.hxx +++ b/sw/source/core/uibase/inc/mailmergehelper.hxx @@ -56,10 +56,8 @@ namespace SwMailMergeHelper struct SwAddressPreview_Impl; -/*------------------------------------------------------------------------- - Preview window used to show the possible selection of address blocks - and also the resulting address filled with database data - -----------------------------------------------------------------------*/ +// Preview window used to show the possible selection of address blocks +// and also the resulting address filled with database data class SW_DLLPUBLIC SwAddressPreview : public Window { ScrollBar aVScrollBar; @@ -116,11 +114,8 @@ public: void SetSelectHdl (const Link& rLink) {m_aSelectHdl = rLink;} }; -/*------------------------------------------------------------------------- - iterate over an address block or a greeting line - the iterator returns the parts either as pure string - or as column - -----------------------------------------------------------------------*/ +// iterate over an address block or a greeting line the iterator returns the +// parts either as pure string or as column struct SwMergeAddressItem { OUString sText; diff --git a/sw/source/core/uibase/inc/multmrk.hxx b/sw/source/core/uibase/inc/multmrk.hxx index ca918c9d855c..e1209055b582 100644 --- a/sw/source/core/uibase/inc/multmrk.hxx +++ b/sw/source/core/uibase/inc/multmrk.hxx @@ -28,14 +28,10 @@ class SwTOXMgr; -/*-------------------------------------------------------------------- - Description: insert mark for index entry - --------------------------------------------------------------------*/ - +// insert mark for index entry class SwMultiTOXMarkDlg : public SvxStandardDialog { DECL_LINK( SelectHdl, ListBox * ); - FixedText* m_pTextFT; ListBox* m_pTOXLB; diff --git a/sw/source/core/uibase/inc/navipi.hxx b/sw/source/core/uibase/inc/navipi.hxx index e74c5d99d52f..c5a9f32ffba0 100644 --- a/sw/source/core/uibase/inc/navipi.hxx +++ b/sw/source/core/uibase/inc/navipi.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVIPI_HXX #define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVIPI_HXX -// INCLUDE --------------------------------------------------------------- - #include <vcl/lstbox.hxx> #include <svl/lstner.hxx> #include <svtools/transfer.hxx> @@ -49,7 +47,6 @@ class SwNavHelpToolBox : public SwHelpToolBox SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId); }; -// CLASS ----------------------------------------------------------------- class SwNavigationPI : public Window, public SfxControllerItem, public SfxListener { @@ -57,7 +54,6 @@ class SwNavigationPI : public Window, friend class SwContentTree; friend class SwGlobalTree; - // --------- members ----------------------------- SwNavHelpToolBox aContentToolBox; SwHelpToolBox aGlobalToolBox; ImageList aContentImageList; @@ -96,7 +92,6 @@ class SwNavigationPI : public Window, bool bPageCtrlsVisible : 1; bool bGlobalMode : 1; - // --------- methods ----------------------------- bool _IsZoomedIn() const {return bIsZoomedIn;} void _ZoomOut(); void _ZoomIn(); diff --git a/sw/source/core/uibase/inc/numpara.hxx b/sw/source/core/uibase/inc/numpara.hxx index 9a938e6579f8..910dfcf64bd0 100644 --- a/sw/source/core/uibase/inc/numpara.hxx +++ b/sw/source/core/uibase/inc/numpara.hxx @@ -25,16 +25,12 @@ #include <vcl/field.hxx> #include <vcl/button.hxx> -/* --- class SwParagraphNumTabPage ---------------------------------------- - with this TabPage numbering settings at the paragraph / paragraph style - are performed. - - ---------------------------------------------------------------------------*/ +// with this TabPage numbering settings at the paragraph / paragraph style +// are performed. class SwParagraphNumTabPage : public SfxTabPage { VclHBox* m_pOutlineStartBX; ListBox* m_pOutlineLvLB; - VclHBox* m_pNumberStyleBX; ListBox* m_pNumberStyleLB; diff --git a/sw/source/core/uibase/inc/optcomp.hxx b/sw/source/core/uibase/inc/optcomp.hxx index c974aa179dc1..8851617ff201 100644 --- a/sw/source/core/uibase/inc/optcomp.hxx +++ b/sw/source/core/uibase/inc/optcomp.hxx @@ -27,7 +27,6 @@ #include <svx/checklbx.hxx> #include <rtl/ustring.hxx> -// class SwCompatibilityOptPage ------------------------------------------ class SwWrtShell; struct SwCompatibilityOptPage_Impl; diff --git a/sw/source/core/uibase/inc/optpage.hxx b/sw/source/core/uibase/inc/optpage.hxx index 42bd08e77603..5ca74da8a6fe 100644 --- a/sw/source/core/uibase/inc/optpage.hxx +++ b/sw/source/core/uibase/inc/optpage.hxx @@ -37,10 +37,8 @@ class SwStdFontConfig; class SwWrtShell; class FontList; -/*-------------------------------------------------------- - Tools->Options->Writer->View - Tools->Options->Writer/Web->View ---------------------------------------------------------- */ +// Tools->Options->Writer->View +// Tools->Options->Writer/Web->View class SwContentOptPage : public SfxTabPage { CheckBox* m_pCrossCB; @@ -81,9 +79,7 @@ public: }; -/*-------------------------------------------------------- - TabPage printer settings additions ---------------------------------------------------------- */ +// TabPage printer settings additions class SwAddPrinterTabPage : public SfxTabPage { CheckBox* m_pGrfCB; @@ -248,9 +244,7 @@ public: }; -/*-------------------------------------------------- - TabPage for ShadowCrsr ---------------------------------------------------*/ +// TabPage for ShadowCrsr class SwShdwCrsrOptionsTabPage : public SfxTabPage { //nonprinting characters @@ -293,9 +287,7 @@ public: virtual void PageCreated( const SfxAllItemSet& aSet ) SAL_OVERRIDE; }; -/*----------------------------------------------------------------------- - Description: mark preview - -----------------------------------------------------------------------*/ +// mark preview class SwMarkPreview : public Window { Size m_aInitialSize; @@ -333,9 +325,7 @@ public: virtual Size GetOptimalSize() const SAL_OVERRIDE; }; -/*----------------------------------------------------------------------- - Description: redlining options - -----------------------------------------------------------------------*/ +// redlining options class SwRedlineOptionsTabPage : public SfxTabPage { ListBox* pInsertLB; @@ -374,9 +364,7 @@ public: virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; -/*------------------------------------------------------- - TabPage test settings for SW ---------------------------------------------------------- */ +// TabPage test settings for SW #ifdef DBG_UTIL diff --git a/sw/source/core/uibase/inc/pgfnote.hxx b/sw/source/core/uibase/inc/pgfnote.hxx index 4cb6365e6f35..1d3d15fda359 100644 --- a/sw/source/core/uibase/inc/pgfnote.hxx +++ b/sw/source/core/uibase/inc/pgfnote.hxx @@ -28,9 +28,7 @@ #include <vcl/group.hxx> #include <svtools/ctrlbox.hxx> -/*-------------------------------------------------------------------- - Description: footnote settings TabPage - --------------------------------------------------------------------*/ +// footnote settings TabPage class SwFootNotePage: public SfxTabPage { public: diff --git a/sw/source/core/uibase/inc/pggrid.hxx b/sw/source/core/uibase/inc/pggrid.hxx index 56529f895d7d..9c2adbd5c89c 100644 --- a/sw/source/core/uibase/inc/pggrid.hxx +++ b/sw/source/core/uibase/inc/pggrid.hxx @@ -25,9 +25,7 @@ #include <vcl/fixed.hxx> #include <svtools/ctrlbox.hxx> -/*-------------------------------------------------------------------- - Description: TabPage Format/(Styles/)Page/Text grid - --------------------------------------------------------------------*/ +// TabPage Format/(Styles/)Page/Text grid class SwTextGridPage: public SfxTabPage { RadioButton* m_pNoGridRB; diff --git a/sw/source/core/uibase/inc/pview.hxx b/sw/source/core/uibase/inc/pview.hxx index 389690fadf36..a54336876ee1 100644 --- a/sw/source/core/uibase/inc/pview.hxx +++ b/sw/source/core/uibase/inc/pview.hxx @@ -295,7 +295,6 @@ public: virtual ~SwPagePreview(); }; -// ----------------- inline methods ---------------------- inline void SwPagePreview::AdjustEditWin() { OuterResizePixel( Point(), GetFrameWindow()->GetOutputSizePixel() ); diff --git a/sw/source/core/uibase/inc/swlbox.hxx b/sw/source/core/uibase/inc/swlbox.hxx index a71df6be4ef5..1de380505d05 100644 --- a/sw/source/core/uibase/inc/swlbox.hxx +++ b/sw/source/core/uibase/inc/swlbox.hxx @@ -29,9 +29,6 @@ class Window; typedef boost::ptr_vector<SwBoxEntry> SwEntryLst; -/*-------------------------------------------------------------------- - Description: SwBoxEntry - --------------------------------------------------------------------*/ class SW_DLLPUBLIC SwBoxEntry { friend class SwComboBox; @@ -50,10 +47,7 @@ public: const OUString& GetName() const { return aName;} }; -/*-------------------------------------------------------------------- - Description: for combo boxes - --------------------------------------------------------------------*/ - +// for combo boxes class SW_DLLPUBLIC SwComboBox : public ComboBox { SwEntryLst aEntryLst; diff --git a/sw/source/core/uibase/inc/swuiidxmrk.hxx b/sw/source/core/uibase/inc/swuiidxmrk.hxx index 8bf8020a910d..199026ebe0ae 100644 --- a/sw/source/core/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/core/uibase/inc/swuiidxmrk.hxx @@ -40,9 +40,8 @@ class SwWrtShell; class SwTOXMgr; class SwTOXMark; -/*-------------------------------------------------------------------- - Description: insert mark for index entry - --------------------------------------------------------------------*/ + +// insert mark for index entry class SwIndexMarkFloatDlg; class SwIndexMarkModalDlg; diff --git a/sw/source/core/uibase/inc/tabledlg.hxx b/sw/source/core/uibase/inc/tabledlg.hxx index 14db904076a9..15f6206073d6 100644 --- a/sw/source/core/uibase/inc/tabledlg.hxx +++ b/sw/source/core/uibase/inc/tabledlg.hxx @@ -27,9 +27,7 @@ class SwWrtShell; struct TColumn; -/*------------------------------------------------------- - table dialog ---------------------------------------------------------- */ +// table dialog class SwTableTabDlg : public SfxTabDialog { SwWrtShell* pShell; diff --git a/sw/source/core/uibase/inc/tmpdlg.hxx b/sw/source/core/uibase/inc/tmpdlg.hxx index e6ef9cdcf7ab..7b0198617dec 100644 --- a/sw/source/core/uibase/inc/tmpdlg.hxx +++ b/sw/source/core/uibase/inc/tmpdlg.hxx @@ -24,9 +24,7 @@ class SfxItemSet; class SwWrtShell; -/*-------------------------------------------------------------------- - Description: the tab dialog carrier of TabPages - --------------------------------------------------------------------*/ +// the tab dialog carrier of TabPages class SwTemplateDlg: public SfxStyleDialog { @@ -71,8 +69,8 @@ class SwTemplateDlg: public SfxStyleDialog sal_uInt16 m_nNumPosId; public: - // @param sPage - // Identifies name of page to open at by default + /// @param sPage + /// Identifies name of page to open at by default SwTemplateDlg( Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, diff --git a/sw/source/core/uibase/inc/tmplctrl.hxx b/sw/source/core/uibase/inc/tmplctrl.hxx index 130fd0baa08b..14f7254293e6 100644 --- a/sw/source/core/uibase/inc/tmplctrl.hxx +++ b/sw/source/core/uibase/inc/tmplctrl.hxx @@ -21,7 +21,6 @@ #include <sfx2/stbitem.hxx> -// class BookmarkToolBoxControl ------------------------------------------- class SwTemplateControl : public SfxStatusBarControl { protected: diff --git a/sw/source/core/uibase/inc/toxmgr.hxx b/sw/source/core/uibase/inc/toxmgr.hxx index 183e38435b0f..01fe269c1428 100644 --- a/sw/source/core/uibase/inc/toxmgr.hxx +++ b/sw/source/core/uibase/inc/toxmgr.hxx @@ -27,9 +27,7 @@ class SwWrtShell; class SwForm; -/*-------------------------------------------------------------------- - Description: manager for directory functionality - --------------------------------------------------------------------*/ +// manager for directory functionality //one single method will be sufficient to insert AND upate indexes class SW_DLLPUBLIC SwTOXDescription { @@ -296,9 +294,7 @@ public: }; -/*-------------------------------------------------------------------- - Description: inlines - --------------------------------------------------------------------*/ +// inlines inline sal_uInt16 SwTOXMgr::GetTOXMarkCount() { return aCurMarks.size(); } diff --git a/sw/source/core/uibase/inc/uiitems.hxx b/sw/source/core/uibase/inc/uiitems.hxx index 2c037b6f9802..dfc495816bc6 100644 --- a/sw/source/core/uibase/inc/uiitems.hxx +++ b/sw/source/core/uibase/inc/uiitems.hxx @@ -28,9 +28,7 @@ class SwNumRule; class IntlWrapper; class SwPaM; -/*-------------------------------------------------------------------- - Description: container for FootNote - --------------------------------------------------------------------*/ +// container for FootNote class SW_DLLPUBLIC SwPageFtnInfoItem : public SfxPoolItem { SwPageFtnInfo aFtnInfo; diff --git a/sw/source/core/uibase/inc/uinums.hxx b/sw/source/core/uibase/inc/uinums.hxx index 55989fc52a48..b61ccf318ba4 100644 --- a/sw/source/core/uibase/inc/uinums.hxx +++ b/sw/source/core/uibase/inc/uinums.hxx @@ -111,7 +111,6 @@ public: sal_uInt16 nIdx) SAL_OVERRIDE; }; -// INLINE METHODE -------------------------------------------------------- inline const SwNumRulesWithName *SwBaseNumRules::GetRules(sal_uInt16 nIdx) const { OSL_ENSURE(nIdx < nMaxRules, "Array der NumRules ueberindiziert."); diff --git a/sw/source/core/uibase/inc/uivwimp.hxx b/sw/source/core/uibase/inc/uivwimp.hxx index 07a0bb3de030..5d868f94b12d 100644 --- a/sw/source/core/uibase/inc/uivwimp.hxx +++ b/sw/source/core/uibase/inc/uivwimp.hxx @@ -62,7 +62,7 @@ public: void ViewDestroyed() { pView = 0; } }; -// --------------------------- Clipboard EventListener ------------------ +// Clipboard EventListener class SwClipboardChangeListener : public ::cppu::WeakImplHelper1< ::com::sun::star::datatransfer::clipboard::XClipboardListener > { diff --git a/sw/source/core/uibase/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx index 74e18fc16394..edc0fe4b6399 100644 --- a/sw/source/core/uibase/inc/view.hxx +++ b/sw/source/core/uibase/inc/view.hxx @@ -115,9 +115,7 @@ enum ShellModes SHELL_MODE_NAVIGATION }; -/*-------------------------------------------------------------------- - Description: apply a template - --------------------------------------------------------------------*/ +// apply a template struct SwApplyTemplate { union @@ -144,9 +142,7 @@ struct SwApplyTemplate } }; -/*-------------------------------------------------------------------- - Description: view of a document - --------------------------------------------------------------------*/ +// view of a document class SW_DLLPUBLIC SwView: public SfxViewShell { friend class SwHHCWrapper; @@ -666,7 +662,6 @@ public: void SetAnnotationMode(bool bMode); }; -// ----------------- inline Methoden ---------------------- inline long SwView::GetXScroll() const { return m_aVisArea.GetWidth() * nScrollX / 100L; diff --git a/sw/source/core/uibase/inc/viewlayoutctrl.hxx b/sw/source/core/uibase/inc/viewlayoutctrl.hxx index 7e778a472879..eb8f921385cc 100644 --- a/sw/source/core/uibase/inc/viewlayoutctrl.hxx +++ b/sw/source/core/uibase/inc/viewlayoutctrl.hxx @@ -21,7 +21,6 @@ #include <sfx2/stbitem.hxx> -// class SwViewLayoutControl ---------------------------------------------- class SwViewLayoutControl : public SfxStatusBarControl { private: diff --git a/sw/source/core/uibase/inc/wrap.hxx b/sw/source/core/uibase/inc/wrap.hxx index 1059b8d67bf5..9f8d644c4551 100644 --- a/sw/source/core/uibase/inc/wrap.hxx +++ b/sw/source/core/uibase/inc/wrap.hxx @@ -39,10 +39,7 @@ public: SwWrtShell* GetWrtShell() { return pWrtShell; } }; -/*-------------------------------------------------------------------- - Description: circulation TabPage - --------------------------------------------------------------------*/ - +// circulation TabPage class SwWrapTabPage: public SfxTabPage { // WRAPPING diff --git a/sw/source/core/uibase/index/toxmgr.cxx b/sw/source/core/uibase/index/toxmgr.cxx index 1b40394854a0..4099b3bde771 100644 --- a/sw/source/core/uibase/index/toxmgr.cxx +++ b/sw/source/core/uibase/index/toxmgr.cxx @@ -28,10 +28,7 @@ #include <swundo.hxx> #include <globals.hrc> -/*-------------------------------------------------------------------- - Description: handle indexes with TOXMgr - --------------------------------------------------------------------*/ - +// handle indexes with TOXMgr SwTOXMgr::SwTOXMgr(SwWrtShell* pShell): pSh(pShell) { @@ -39,10 +36,7 @@ SwTOXMgr::SwTOXMgr(SwWrtShell* pShell): SetCurTOXMark(0); } -/*-------------------------------------------------------------------- - Description: handle current TOXMarks - --------------------------------------------------------------------*/ - +// handle current TOXMarks sal_uInt16 SwTOXMgr::GetTOXMarks() { return pSh->GetCurTOXMarks(aCurMarks); @@ -158,14 +152,11 @@ void SwTOXMgr::InsertTOXMark(const SwTOXMarkDescription& rDesc) pSh->SwEditShell::Insert(*pMark); pSh->EndAllAction(); } -/*-------------------------------------------------------------------- - Description: Update of TOXMarks - --------------------------------------------------------------------*/ +// Update of TOXMarks void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc) { OSL_ENSURE(pCurTOXMark, "no current TOXMark"); - pSh->StartAllAction(); if(pCurTOXMark->GetTOXType()->GetType() == TOX_INDEX) { @@ -235,10 +226,7 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc) } } -/*-------------------------------------------------------------------- - Description: determine UserTypeID - --------------------------------------------------------------------*/ - +// determine UserTypeID sal_uInt16 SwTOXMgr::GetUserTypeID(const OUString& rStr) { sal_uInt16 nSize = pSh->GetTOXTypeCount(TOX_USER); @@ -253,10 +241,7 @@ sal_uInt16 SwTOXMgr::GetUserTypeID(const OUString& rStr) return nSize; } -/*-------------------------------------------------------------------- - Description: traveling between TOXMarks - --------------------------------------------------------------------*/ - +// traveling between TOXMarks void SwTOXMgr::NextTOXMark(bool bSame) { OSL_ENSURE(pCurTOXMark, "no current TOXMark"); @@ -277,14 +262,11 @@ void SwTOXMgr::PrevTOXMark(bool bSame) } } -/*-------------------------------------------------------------------- - Description: insert keyword index - --------------------------------------------------------------------*/ +// insert keyword index const SwTOXBase* SwTOXMgr::GetCurTOX() { return pSh->GetCurTOX(); } - const SwTOXType* SwTOXMgr::GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const { return pSh->GetTOXType(eTyp, nId); diff --git a/sw/source/core/uibase/lingu/hyp.cxx b/sw/source/core/uibase/lingu/hyp.cxx index 10cbec315e6b..a683fdbc4c6e 100644 --- a/sw/source/core/uibase/lingu/hyp.cxx +++ b/sw/source/core/uibase/lingu/hyp.cxx @@ -41,10 +41,7 @@ using namespace ::com::sun::star; -/*-------------------------------------------------------------------- - Description: interactive separation - --------------------------------------------------------------------*/ - +// interactive separation SwHyphWrapper::SwHyphWrapper( SwView* pVw, uno::Reference< linguistic2::XHyphenator > &rxHyph, bool bStart, bool bOther, bool bSelect ) : diff --git a/sw/source/core/uibase/misc/glosdoc.cxx b/sw/source/core/uibase/misc/glosdoc.cxx index 2094257f3963..55489082adea 100644 --- a/sw/source/core/uibase/misc/glosdoc.cxx +++ b/sw/source/core/uibase/misc/glosdoc.cxx @@ -89,26 +89,20 @@ OUString lcl_CheckFileName( const OUString& rNewFilePath, } -/*------------------------------------------------------------------------ - Description: supplies the default group's name -------------------------------------------------------------------------*/ +// supplies the default group's name OUString SwGlossaries::GetDefName() { return OUString("standard"); } -/*------------------------------------------------------------------------ - Description: supplies the number of text block groups -------------------------------------------------------------------------*/ +// supplies the number of text block groups sal_uInt16 SwGlossaries::GetGroupCnt() { return static_cast<sal_uInt16>(GetNameList().size()); } -/*------------------------------------------------------------------------ - Description: supplies the group's name -------------------------------------------------------------------------*/ +// supplies the group's name bool SwGlossaries::FindGroupName(OUString& rGroup) { // if the group name doesn't contain a path, a suitable group entry @@ -164,9 +158,7 @@ OUString SwGlossaries::GetGroupTitle( const OUString& rGroupName ) return sRet; } -/*------------------------------------------------------------------------ - Description: supplies the group rName's text block document -------------------------------------------------------------------------*/ +// supplies the group rName's text block document SwTextBlocks* SwGlossaries::GetGroupDoc(const OUString &rName, bool bCreate) { @@ -187,18 +179,13 @@ SwTextBlocks* SwGlossaries::GetGroupDoc(const OUString &rName, return GetGlosDoc( rName, bCreate ); } -/*------------------------------------------------------------------------ - Description: delete a text block -------------------------------------------------------------------------*/ +// delete a text block void SwGlossaries::PutGroupDoc(SwTextBlocks *pBlock) { delete pBlock; } -/*------------------------------------------------------------------------ - Description: Creates a new document with the group name. temporarly - also created as file so that groups remain there later - (without access). -------------------------------------------------------------------------*/ +// Creates a new document with the group name. temporarly also created as file +// so that groups remain there later (without access). bool SwGlossaries::NewGroupDoc(OUString& rGroupName, const OUString& rTitle) { const OUString sNewPath(rGroupName.getToken(1, GLOS_DELIM)); @@ -272,9 +259,7 @@ bool SwGlossaries::RenameGroupDoc( return true; } -/*------------------------------------------------------------------------ - Description: Deletes a text block group -------------------------------------------------------------------------*/ +// Deletes a text block group bool SwGlossaries::DelGroupDoc(const OUString &rName) { sal_uInt16 nPath = (sal_uInt16)rName.getToken(1, GLOS_DELIM).toInt32(); @@ -297,9 +282,7 @@ SwGlossaries::~SwGlossaries() InvalidateUNOOjects(); } -/*------------------------------------------------------------------------ - Description: read a block document -------------------------------------------------------------------------*/ +// read a block document SwTextBlocks* SwGlossaries::GetGlosDoc( const OUString &rName, bool bCreate ) const { sal_uInt16 nPath = (sal_uInt16)rName.getToken(1, GLOS_DELIM).toInt32(); @@ -331,9 +314,7 @@ SwTextBlocks* SwGlossaries::GetGlosDoc( const OUString &rName, bool bCreate ) co return pTmp; } -/*------------------------------------------------------------------------ - Description: access to the list of names; read in if applicable -------------------------------------------------------------------------*/ +// access to the list of names; read in if applicable std::vector<OUString> & SwGlossaries::GetNameList() { if (m_GlosArr.empty()) @@ -367,10 +348,7 @@ SwGlossaries::SwGlossaries() UpdateGlosPath(true); } -/*------------------------------------------------------------------------ - Description: set new path and recreate internal array -------------------------------------------------------------------------*/ - +// set new path and recreate internal array rtl::OUString lcl_makePath(const std::vector<rtl::OUString>& rPaths) { std::vector<rtl::OUString>::const_iterator aIt(rPaths.begin()); diff --git a/sw/source/core/uibase/misc/redlndlg.cxx b/sw/source/core/uibase/misc/redlndlg.cxx index d3dc31f29427..53aebdcdcc6d 100644 --- a/sw/source/core/uibase/misc/redlndlg.cxx +++ b/sw/source/core/uibase/misc/redlndlg.cxx @@ -71,9 +71,7 @@ SwRedlineAcceptChild::SwRedlineAcceptChild( Window* _pParent, ((SwModelessRedlineAcceptDlg *)pWindow)->Initialize(pInfo); } -/*-------------------------------------------------------------------- - Description: newly initialise dialog after document switch - --------------------------------------------------------------------*/ +// newly initialise dialog after document switch bool SwRedlineAcceptChild::ReInitDlg(SwDocShell *pDocSh) { bool bRet; @@ -346,9 +344,7 @@ OUString SwRedlineAcceptDlg::GetActionText(const SwRangeRedline& rRedln, sal_uIn return OUString(); } -/*-------------------------------------------------------------------- - Description: newly initialise after activation - --------------------------------------------------------------------*/ +// newly initialise after activation void SwRedlineAcceptDlg::Activate() { // prevent update if flag is set (#102547#) diff --git a/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx index 25b483bda3b5..bc261e31c67f 100644 --- a/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx +++ b/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx @@ -68,7 +68,7 @@ namespace sw { namespace sidebar { //Image resource. ImageList aWrapIL; - //Controller Items================================== + // Controller Items ::sfx2::sidebar::ControllerItem maSwNoWrapControl; ::sfx2::sidebar::ControllerItem maSwWrapLeftControl; ::sfx2::sidebar::ControllerItem maSwWrapRightControl; diff --git a/sw/source/core/uibase/utlui/content.cxx b/sw/source/core/uibase/utlui/content.cxx index 85632be15373..2e2e2a139ac6 100644 --- a/sw/source/core/uibase/utlui/content.cxx +++ b/sw/source/core/uibase/utlui/content.cxx @@ -206,8 +206,6 @@ SwContentType::SwContentType(SwWrtShell* pShell, sal_uInt16 nType, sal_uInt8 nLe Init(); } -// Init - void SwContentType::Init(bool* pbInvalidateWindow) { // if the MemberCount is changing ... diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index 8e9294313f47..4959028337bf 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -41,8 +41,6 @@ using namespace ::com::sun::star; // the undo array should never grow beyond this limit: #define UNDO_ACTION_LIMIT (USHRT_MAX - 1000) -// UndoManager - namespace sw { UndoManager::UndoManager(boost::shared_ptr<SwNodes> xUndoNodes, diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index 1fb2110e78c7..46cebe996184 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -479,8 +479,6 @@ SwRewriter SwUndoInsert::GetRewriter() const return aResult; } -// SwUndoReplace - class SwUndoReplace::Impl : private SwUndoSaveCntnt { @@ -782,8 +780,6 @@ void SwUndoReplace::Impl::SetEnd(SwPaM const& rPam) m_nEndCnt = pEnd->nContent.GetIndex(); } -// SwUndoReRead - SwUndoReRead::SwUndoReRead( const SwPaM& rPam, const SwGrfNode& rGrfNd ) : SwUndo( UNDO_REREAD ), nPos( rPam.GetPoint()->nNode.GetIndex() ) { diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx index 503bcc45478e..e7d791e4dbb6 100644 --- a/sw/source/core/undo/unsort.cxx +++ b/sw/source/core/undo/unsort.cxx @@ -30,10 +30,7 @@ #include <redline.hxx> #include <node2lay.hxx> -/*-------------------------------------------------------------------- - Description: Undo for Sorting - --------------------------------------------------------------------*/ - +// Undo for Sorting SwSortUndoElement::~SwSortUndoElement() { // are there string pointers saved? diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 9bd581d6d1db..aa9af3bafb5a 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -1737,7 +1737,7 @@ void SwChartDataProvider::AddRowCols( } } -// XRangeXMLConversion --------------------------------------------------- +// XRangeXMLConversion OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const OUString& rRangeRepresentation ) throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 292f6d1612df..b3c3840ff8bc 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -295,9 +295,7 @@ GetNestedTextContent(SwTxtNode & rTextNode, sal_Int32 const nIndex, return xRet; } -/* -------------------------------------------------- - * Read the special properties of the cursor - * --------------------------------------------------*/ +// Read the special properties of the cursor bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry , SwPaM& rPam , Any *pAny @@ -911,9 +909,7 @@ void GetCurPageStyle(SwPaM& rPaM, OUString &rString) } } -/* -------------------------------------------------- - * reset special properties of the cursor - * --------------------------------------------------*/ +// reset special properties of the cursor void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam) { SwDoc* pDoc = rPam.GetDoc(); diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx index 232d4df6482e..edbd811872f8 100644 --- a/sw/source/core/unocore/unoevent.cxx +++ b/sw/source/core/unocore/unoevent.cxx @@ -101,8 +101,6 @@ const struct SvEventDescription aFrameStyleEvents[] = { 0, NULL } }; -// SwHyperlinkEventDescriptor - SwHyperlinkEventDescriptor::SwHyperlinkEventDescriptor() : SvDetachedEventDescriptor(aHyperlinkEvents), sImplName("SwHyperlinkEventDescriptor") @@ -165,8 +163,6 @@ void SwHyperlinkEventDescriptor::copyMacrosFromNameReplace( } } -// SwFrameEventDescriptor - // use double cast in superclass constructor to avoid ambigous cast SwFrameEventDescriptor::SwFrameEventDescriptor( SwXTextFrame& rFrameRef ) : @@ -215,8 +211,6 @@ OUString SwFrameEventDescriptor::getImplementationName() return sSwFrameEventDescriptor; } -// SwFrameStyleEventDescriptor - SwFrameStyleEventDescriptor::SwFrameStyleEventDescriptor( SwXFrameStyle& rStyleRef ) : SvEventDescriptor((document::XEventsSupplier&)rStyleRef, diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 3b0d8ce78e0e..72e9d796007a 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -661,7 +661,6 @@ SwUnoCursorHelper::GetCurTxtFmtColl(SwPaM & rPaM, const bool bConditional) return (bError) ? 0 : pFmt; } -// class SwXTextCursor class SwXTextCursor::Impl : public SwClient { diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 377e392067af..b1f28c8984ed 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1953,8 +1953,6 @@ void SwXTextTableCursor::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNe ClientModify(this, pOld, pNew); } -// SwXTextTable - class SwXTextTable::Impl { private: @@ -1966,8 +1964,6 @@ public: Impl() : m_Listeners(m_Mutex) { } }; -// SwTableProperties_Impl - class SwTableProperties_Impl { SwUnoCursorHelper::SwAnyMapHelper aAnyMap; diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx index 5df731f48686..eeae669bab15 100644 --- a/sw/source/core/unocore/unotextmarkup.cxx +++ b/sw/source/core/unocore/unotextmarkup.cxx @@ -40,9 +40,6 @@ using namespace ::com::sun::star; -/* - * SwXTextMarkup - */ SwXTextMarkup::SwXTextMarkup( SwTxtNode *const pTxtNode, const ModelToViewHelper& rMap) : mpTxtNode(pTxtNode) @@ -463,9 +460,6 @@ void SwXTextMarkup::Modify( const SfxPoolItem* /*pOld*/, const SfxPoolItem* /*pN mpTxtNode = 0; } -/* - * SwXStringKeyMap - */ SwXStringKeyMap::SwXStringKeyMap() { } diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index ffd0182bd35a..b2bffa629f52 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -34,8 +34,6 @@ using namespace ::com::sun::star; -// SwRenderData - SwRenderData::SwRenderData() { } @@ -156,8 +154,6 @@ void SwRenderData::MakeSwPrtOptions( rOptions.SetRenderData( this ); } -// SwPrintUIOptions - SwPrintUIOptions::SwPrintUIOptions( sal_uInt16 nCurrentPage, bool bWeb, diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 5eca85e2b888..eaebcae87a22 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -888,8 +888,6 @@ SfxPoolItem* SwFltAnchor::Clone(SfxItemPool*) const return new SwFltAnchor(*this); } -// SwFltAnchorClient - SwFltAnchorClient::SwFltAnchorClient(SwFltAnchor * pFltAnchor) : m_pFltAnchor(pFltAnchor) { @@ -1014,7 +1012,6 @@ SfxPoolItem* SwFltSection::Clone(SfxItemPool*) const // all filters. the whole trouble of inserting texts and formatting attributes, // manage positions, styles & headers/footers etc. -// SwFltShell SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const OUString& rBaseURL, bool bNew, sal_uLong nFieldFl) : pCurrentPageDesc(0), pSavedPos(0), diff --git a/sw/source/filter/ww1/w1par.hxx b/sw/source/filter/ww1/w1par.hxx index 6e0375323cee..51463a800378 100644 --- a/sw/source/filter/ww1/w1par.hxx +++ b/sw/source/filter/ww1/w1par.hxx @@ -23,7 +23,6 @@ #include <fltshell.hxx> #include <w1class.hxx> -////////////////////////////////////////////////////////////// Ww1Shell class Ww1Shell : public SwFltShell { public: diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index c1b6592a64e3..075020debce4 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -32,8 +32,6 @@ namespace ww8 { -// WW8TableNodeInfoInner - WW8TableNodeInfoInner::WW8TableNodeInfoInner(WW8TableNodeInfo * pParent) : mpParent(pParent) , mnDepth(0) @@ -632,8 +630,6 @@ const WW8TableNodeInfoInner::Pointer_t WW8TableNodeInfo::getInnerForDepth(sal_uI return pResult; } -// WW8TableInfo - WW8TableInfo::WW8TableInfo() { } diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 504ae55dab00..9b8033f63e9c 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -410,10 +410,10 @@ void WW8AttributeOutput::StartStyle( const OUString& rName, StyleType eType, sal { nBit16 = bAutoUpdate ? 1 : 0; // fAutoRedef : 1 Set_UInt16( pData, nBit16 ); - //-------- jetzt neu: + // jetzt neu: // ab Ver8 gibts zwei Felder mehr: - //sal_uInt16 fHidden : 1; /* hidden from UI? */ - //sal_uInt16 : 14; /* unused bits */ + // sal_uInt16 fHidden : 1; /* hidden from UI? + // sal_uInt16 : 14; /* unused bits } sal_uInt16 nLen = static_cast< sal_uInt16 >( ( pData - aWW8_STD ) + 1 + diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 93c06822d7f5..0e8680a55e72 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -1315,7 +1315,7 @@ void WW8AttributeOutput::CharUnderline( const SvxUnderlineItem& rUnderline ) case UNDERLINE_WAVE: b = m_rWW8Export.bWrtWW8 ? 11 : 3; break; - // ------------ new in WW2000 ------------------------------------- + // new in WW2000 case UNDERLINE_BOLDDOTTED: b = m_rWW8Export.bWrtWW8 ? 20 : 4; break; diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 471249329813..438d2dc6d138 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -254,8 +254,8 @@ void lclAppendString32(OUString& rString, SvMemoryStream& rStrm, bool b16Bit) void SwWW8ImplReader::ReadEmbeddedData( SvMemoryStream& rStrm, SwDocShell* pDocShell, struct HyperLinksTable& hlStr) { - // (0x01B8) HLINK ------------------------------------------------------------- - //const sal_uInt16 WW8_ID_HLINK = 0x01B8; + // (0x01B8) HLINK + // const sal_uInt16 WW8_ID_HLINK = 0x01B8; const sal_uInt32 WW8_HLINK_BODY = 0x00000001; /// Contains file link or URL. const sal_uInt32 WW8_HLINK_ABS = 0x00000002; /// Absolute path. const sal_uInt32 WW8_HLINK_DESCR = 0x00000014; /// Description. @@ -4093,9 +4093,6 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType) return bJoined; } -/** - * class SwWW8ImplReader - */ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage, SvStream* pSt, SwDoc& rD, const OUString& rBaseURL, bool bNewDoc) : mpDocShell(rD.GetDocShell()) diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index c0e15595c138..1247392035ae 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -5223,7 +5223,7 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset) rSt.ReadInt32( fcMin ); rSt.ReadInt32( fcMac ); -// Einschub fuer WW8 ***************************************************** +// Einschub fuer WW8 if (IsEightPlus(eVer)) { rSt.ReadUInt16( csw ); @@ -5251,7 +5251,7 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset) rSt.ReadUInt16( clw ); } -// Ende des Einschubs fuer WW8 ******************************************* +// Ende des Einschubs fuer WW8 // Marke: "rglw" Beginning of the array of longs rSt.ReadInt32( cbMac ); @@ -5277,7 +5277,7 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset) rSt.SeekRel( 1 * sizeof( sal_Int32) ); else { -// Einschub fuer WW8 ***************************************************** +// Einschub fuer WW8 rSt.ReadInt32( pnFbpChpFirst ); rSt.ReadInt32( pnChpFirst ); rSt.ReadInt32( cpnBteChp ); @@ -5292,7 +5292,7 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset) rSt.ReadUInt16( cfclcb ); } -// Ende des Einschubs fuer WW8 ******************************************* +// Ende des Einschubs fuer WW8 // Marke: "rgfclcb" Beginning of array of FC/LCB pairs. rSt.ReadInt32( fcStshfOrig ); @@ -5647,7 +5647,7 @@ bool WW8Fib::WriteHeader(SvStream& rStrm) Set_UInt32( pData, fcMin ); Set_UInt32( pData, fcMac ); -// Einschub fuer WW8 ***************************************************** +// Einschub fuer WW8 // Marke: "rgsw" Beginning of the array of shorts if( bVer8 ) @@ -5662,7 +5662,7 @@ bool WW8Fib::WriteHeader(SvStream& rStrm) Set_UInt16( pData, clw ); } -// Ende des Einschubs fuer WW8 ******************************************* +// Ende des Einschubs fuer WW8 // Marke: "rglw" Beginning of the array of longs Set_UInt32( pData, cbMac ); @@ -5708,7 +5708,7 @@ bool WW8Fib::Write(SvStream& rStrm) if( !bVer8 ) pData += 1 * sizeof( sal_Int32); -// Einschub fuer WW8 ***************************************************** +// Einschub fuer WW8 if( bVer8 ) { Set_UInt32( pData, pnFbpChpFirst ); @@ -5724,7 +5724,7 @@ bool WW8Fib::Write(SvStream& rStrm) Set_UInt32( pData, fcIslandLim ); Set_UInt16( pData, cfclcb ); } -// Ende des Einschubs fuer WW8 ******************************************* +// Ende des Einschubs fuer WW8 // Marke: "rgfclcb" Beginning of array of FC/LCB pairs. Set_UInt32( pData, fcStshfOrig ); @@ -6517,8 +6517,6 @@ void WW8PLCF_HdFt::UpdateIndex( sal_uInt8 grpfIhdt ) nIdxOffset++; } -// WW8Dop - WW8Dop::WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize) : bUseThaiLineBreakingRules(false) { memset( &nDataStart, 0, (&nDataEnd - &nDataStart) ); diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 1e6a43a66aa4..1daae04b7f04 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -1110,7 +1110,7 @@ public: WW8_FC fcMin; // 0x18 file offset of first character of text WW8_FC fcMac; // 0x1c file offset of last character of text + 1 - // Einschub fuer WW8 ***************************************************** + // Einschub fuer WW8 sal_uInt16 csw; // Count of fields in the array of "shorts" // Marke: "rgsw" Beginning of the array of shorts @@ -1125,7 +1125,7 @@ public: // of Word (i.e. FIB.fFarEast is on) sal_uInt16 clw; // Number of fields in the array of longs - // Ende des Einschubs fuer WW8 ******************************************* + // Ende des Einschubs fuer WW8 // Marke: "rglw" Beginning of the array of longs WW8_FC cbMac; // 0x20 file offset of last byte written to file + 1. @@ -1140,7 +1140,7 @@ public: WW8_CP ccpTxbx; // 0x4c length of textbox subdocument text stream WW8_CP ccpHdrTxbx; // 0x50 length of header textbox subdocument text stream - // Einschub fuer WW8 ***************************************************** + // Einschub fuer WW8 sal_Int32 pnFbpChpFirst; // when there was insufficient memory for Word to expand // the PLCFbte at save time, the PLCFbte is written // to the file in a linked list of 512-byte pieces @@ -1163,7 +1163,7 @@ public: sal_Int32 fcIslandLim; // ? sal_uInt16 cfclcb; // Number of fields in the array of FC/LCB pairs. - // Ende des Einschubs fuer WW8 ******************************************* + // Ende des Einschubs fuer WW8 // Marke: "rgfclcb" Beginning of array of FC/LCB pairs. WW8_FC fcStshfOrig; // file offset of original allocation for STSH in table @@ -1292,7 +1292,7 @@ public: WW8_FC fcSttbfAtnbkmk; // 0x180 file offset of the sttbf that records names of bookmarks in the annotation subdocument sal_Int32 lcbSttbfAtnbkmk; // 0x184 length in bytes of the sttbf that records names of bookmarks in the annotation subdocument - // Ende des Einschubs fuer WW67 ****************************************** + // Ende des Einschubs fuer WW67 WW8_FC fcPlcfdoaMom; // 0x192 file offset of the FDOA (drawn object) PLCF for main document. // ==0 if document has no drawn objects. The length of the FDOA is 6 bytes. diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index 12c7236cd7cf..e1c8dfa6a979 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -176,7 +176,7 @@ struct WW8_STD sal_uInt16 cupx : 4; // # of UPXs (and UPEs) sal_uInt16 istdNext : 12; // next style sal_uInt16 bchUpe; // offset to end of upx's, start of upe's - //-------- jetzt neu: + // jetzt neu: // ab Ver8 gibts zwei Felder mehr: sal_uInt16 fAutoRedef : 1; /* auto redefine style when appropriate */ sal_uInt16 fHidden : 1; /* hidden from UI? */ diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index d4a3ad1cd7a4..1043be94a2ce 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -240,7 +240,6 @@ RedlineInfo::~RedlineInfo() delete pNextRedline; } -// XMLRedlineImportHelper XMLRedlineImportHelper::XMLRedlineImportHelper( bool bNoRedlinesPlease, const Reference<XPropertySet> & rModel, diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 1c8258ceee40..cb9b0f55094b 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -65,10 +65,7 @@ IMPL_LINK_NOARG_INLINE_START(SwBreakDlg, ClickHdl) } IMPL_LINK_NOARG_INLINE_END(SwBreakDlg, ClickHdl) -/*------------------------------------------------------------------------ - Description: Handler for Change Page Number -------------------------------------------------------------------------*/ - +// Handler for Change Page Number IMPL_LINK_INLINE_START( SwBreakDlg, PageNumHdl, CheckBox *, pBox ) { if(pBox->IsChecked()) @@ -79,10 +76,7 @@ IMPL_LINK_INLINE_START( SwBreakDlg, PageNumHdl, CheckBox *, pBox ) } IMPL_LINK_INLINE_END( SwBreakDlg, PageNumHdl, CheckBox *, pBox ) -/*------------------------------------------------------------------------ - Description: By changing the Page number the checkbox is checked. -------------------------------------------------------------------------*/ - +// By changing the Page number the checkbox is checked. IMPL_LINK_NOARG_INLINE_START(SwBreakDlg, PageNumModifyHdl) { m_pPageNumBox->Check(); @@ -90,13 +84,11 @@ IMPL_LINK_NOARG_INLINE_START(SwBreakDlg, PageNumModifyHdl) } IMPL_LINK_NOARG_INLINE_END(SwBreakDlg, PageNumModifyHdl) -/*------------------------------------------------------------------------ - Description: Ok-Handler; - checks whether pagenumber nPage is a legal pagenumber - (left pages with even numbers etc. for a page template - with alternating pages) -------------------------------------------------------------------------*/ - +/* + * Ok-Handler; + * checks whether pagenumber nPage is a legal pagenumber (left pages with even + * numbers etc. for a page template with alternating pages) + */ IMPL_LINK_NOARG(SwBreakDlg, OkHdl) { if(m_pPageNumBox->IsChecked()) { diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index ee145956bac5..33bd0fbb4441 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -97,10 +97,7 @@ SwCharDlg::~SwCharDlg() { } -/*-------------------------------------------------------------------- - Description: set FontList - --------------------------------------------------------------------*/ - +// set FontList void SwCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index c549fb379542..240d5d704146 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -33,8 +33,6 @@ #include <app.hrc> -// Globals ****************************************************************** - static const sal_uInt16 aPageRg[] = { FN_NUMBER_NEWSTART, FN_NUMBER_NEWSTART_AT, 0 diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 42a261c65b60..5a5fb9cc0b9a 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -40,8 +40,6 @@ using namespace ::com::sun::star::document; using namespace ::com::sun::star::uno; using namespace ::std; -// struct CompatibilityItem ---------------------------------------------- - struct CompatibilityItem { OUString m_sName; @@ -93,8 +91,6 @@ struct SwCompatibilityOptPage_Impl SwCompatibilityItemList m_aList; }; -// class SwCompatibilityOptPage ------------------------------------------ - SwCompatibilityOptPage::SwCompatibilityOptPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptCompatPage", "modules/swriter/ui/optcompatpage.ui", rSet) diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 097e31aa53b1..5436f899f4f3 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -68,10 +68,8 @@ using namespace ::com::sun::star; -/*-------------------------------------------------------- - Tools->Options->Writer->View - Tools->Options->Writer/Web->View ---------------------------------------------------------- */ +// Tools->Options->Writer->View +// Tools->Options->Writer/Web->View SwContentOptPage::SwContentOptPage( Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage(pParent, "ViewOptionsPage", @@ -283,9 +281,8 @@ IMPL_LINK( SwContentOptPage, AnyRulerHdl, CheckBox*, pBox) VertRulerHdl(m_pVRulerCBox); return 0; } -/*------------------------------------------------------ - TabPage Printer additional settings --------------------------------------------------------*/ + +// TabPage Printer additional settings SwAddPrinterTabPage::SwAddPrinterTabPage(Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "PrintOptionsPage", @@ -507,9 +504,7 @@ void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet) } } -/*-------------------------------------------------- - Tabpage Standardfonts ---------------------------------------------------*/ +// Tabpage Standardfonts SwStdFontTabPage::SwStdFontTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "OptFontTabPage" , "modules/swriter/ui/optfonttabpage.ui" , rSet), @@ -1446,9 +1441,7 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& rSet ) } } -/*-------------------------------------------------- - TabPage for Redlining ---------------------------------------------------*/ +// TabPage for Redlining struct CharAttr { sal_uInt16 nItemId; @@ -1482,9 +1475,7 @@ static sal_uInt16 aDeletedAttrMap[] = { 0, 1, 2, 5, 6, 7, 8, 9, 10 }; // not used static sal_uInt16 aChangedAttrMap[] = { 0, 1, 2, 3, 4, 6, 7, 8, 9, 10 }; -/*----------------------------------------------------------------------- - Description: Preview of selection - -----------------------------------------------------------------------*/ +// Preview of selection SwMarkPreview::SwMarkPreview( Window *pParent, WinBits nWinBits ) : Window(pParent, nWinBits), diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index a0f915e6f287..59fdfad0f6d5 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -198,10 +198,8 @@ OUString SwMailMergeWizard::getStateDisplayName( WizardState _nState ) const } return OUString(); } -/*---------------------------------------------------------------------- - enables/disables pages in the roadmap depending on the current - page and state - -----------------------------------------------------------------------*/ + +// enables/disables pages in the roadmap depending on the current page and state void SwMailMergeWizard::UpdateRoadmap() { /* @@ -271,10 +269,8 @@ void SwMailMergeWizard::UpdateRoadmap() enableState( nPage, bEnable ); } } -/*-- -------------------------------------------------------------------- - enables/disables pages in the roadmap depending on the current - page and state - -----------------------------------------------------------------------*/ + +// enables/disables pages in the roadmap depending on the current page and state void SwMailMergeWizard::CreateTargetDocument() { GetSwView()->GetWrtShell().GetDBManager()-> diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 1e9da5fa3a70..e03f303bf054 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -879,9 +879,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendAsHdl_Impl, PushButton*, pButton) return 0; } -/*------------------------------------------------------------------------- - Send documents as e-mail - -----------------------------------------------------------------------*/ +// Send documents as e-mail IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index ec0407b189f0..272ae0f6cb8e 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -136,9 +136,7 @@ void SwMailMergePrepareMergePage::ActivatePage() MoveHdl_Impl(m_pRecordED); } -/*------------------------------------------------------------------------- - merge the data into a new file - -----------------------------------------------------------------------*/ +// merge the data into a new file bool SwMailMergePrepareMergePage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 9f5385fd1734..ba690d6e391e 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -126,10 +126,7 @@ static void lcl_FillSubRegionList( SwWrtShell& rSh, ComboBox& rSubRegions, Combo } } -/*---------------------------------------------------------------------------- - Description: user data class for region information -----------------------------------------------------------------------------*/ - +// user data class for region information class SectRepr { private: @@ -305,9 +302,7 @@ OUString SectRepr::GetSubRegion() const return sLinkFile; } -/*---------------------------------------------------------------------------- - Description: dialog edit regions -----------------------------------------------------------------------------*/ +// dialog edit regions SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ) : SfxModalDialog(pParent, "EditSectionDialog", "modules/swriter/ui/editsectiondialog.ui") @@ -439,14 +434,11 @@ bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) return bRet; } -/*--------------------------------------------------------------------- - Description: recursively look for child-sections ----------------------------------------------------------------------*/ +// recursively look for child-sections void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pEntry ) { SwSection* pSect = 0; SvTreeListEntry* pSelEntry = 0; - if (!pFmt) { const sal_uInt16 nCount=rSh.GetSectionFmtCount(); @@ -551,11 +543,8 @@ void SwEditRegionDlg::SelectSection(const OUString& rSectionName) } } -/*--------------------------------------------------------------------- - Description: selected entry in TreeListBox is showed in - Edit window - in case of multiselection some controls are disabled ----------------------------------------------------------------------*/ +// selected entry in TreeListBox is showed in Edit window in case of +// multiselection some controls are disabled IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) { bDontCheckPasswd = true; @@ -740,10 +729,7 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox ) return 0; } -/*--------------------------------------------------------------------- - Description: in OkHdl the modified settings are being applied - and reversed regions are deleted ----------------------------------------------------------------------*/ +// in OkHdl the modified settings are being applied and reversed regions are deleted IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl) { // temp. Array because during changing of a region the position @@ -821,9 +807,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl) return 0; } -/*--------------------------------------------------------------------- - Description: Toggle protect ----------------------------------------------------------------------*/ +// Toggle protect IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox ) { if(!CheckPasswd(pBox)) @@ -847,9 +831,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox ) return 0; } -/*--------------------------------------------------------------------- - Description: Toggle hide ----------------------------------------------------------------------*/ +// Toggle hide IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox ) { if(!CheckPasswd(pBox)) @@ -876,9 +858,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox ) return 0; } -/*--------------------------------------------------------------------- - Description: Toggle edit in readonly ----------------------------------------------------------------------*/ +// Toggle edit in readonly IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox ) { if(!CheckPasswd(pBox)) @@ -897,9 +877,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox ) return 0; } -/*--------------------------------------------------------------------- - Description: clear selected region ----------------------------------------------------------------------*/ +// clear selected region IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) { if(!CheckPasswd()) @@ -964,9 +942,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) return 0; } -/*--------------------------------------------------------------------- - Description: link CheckBox to file? ----------------------------------------------------------------------*/ +// link CheckBox to file? IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) { if(!CheckPasswd(pBox)) @@ -1023,14 +999,11 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) return 0; } -/*--------------------------------------------------------------------- - Description: call dialog paste file ----------------------------------------------------------------------*/ +// call dialog paste file IMPL_LINK_NOARG(SwEditRegionDlg, FileSearchHdl) { if(!CheckPasswd(0)) return 0; - m_pOldDefDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); delete m_pDocInserter; @@ -1140,10 +1113,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl) return 0; } -/*--------------------------------------------------------------------- - Description: Applying of the filename or the - linked region ----------------------------------------------------------------------*/ +// Applying of the filename or the linked region IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit ) { Selection aSelect = pEdit->GetSelection(); @@ -1295,11 +1265,8 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) return 0; } -/*--------------------------------------------------------------------- - Description: the current region name is being added to the - TreeListBox immediately during editing, with empty - string no Ok() ----------------------------------------------------------------------*/ +// the current region name is being added to the TreeListBox immediately during +// editing, with empty string no Ok() IMPL_LINK_NOARG(SwEditRegionDlg, NameEditHdl) { if(!CheckPasswd(0)) @@ -1402,9 +1369,7 @@ Image SwEditRegionDlg::BuildBitmap( bool bProtect, bool bHidden ) return rImgLst.GetImage((int(!bHidden)+((bProtect ? 1 : 0)<<1)) + 1); } -/*-------------------------------------------------------------------- - Description: helper function - read region names from medium - --------------------------------------------------------------------*/ +// helper function - read region names from medium static void lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox ) { rBox.Clear(); diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 8a62fff1eaf3..760c9c278d59 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -326,14 +326,10 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton ) return 0; } -/*------------------------------------------------------------------------ - Description: A temporary Itemset that gets discarded at abort -------------------------------------------------------------------------*/ - +// A temporary Itemset that gets discarded at abort SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, bool bSender) { SfxItemSet *&pAddrSet = bSender ? GetParentSwEnvDlg()->pSenderSet : GetParentSwEnvDlg()->pAddresseeSet; - if (!pAddrSet) { // determine range (merge both Itemsets' ranges) diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index bacc89652263..777cdf25d00b 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -28,8 +28,6 @@ class SwTxtFmtColl; -// class SwEnvFmtPage --------------------------------------------------------- - class SwEnvFmtPage : public SfxTabPage { MetricField* m_pAddrLeftField; diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 8b0f3eaee87e..73eb2ddc5e45 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -32,8 +32,6 @@ class SwEnvDlg; -// class SwEnvPrtPage --------------------------------------------------------- - class SwEnvPrtPage : public SfxTabPage { ToolBox* m_pAlignBox; diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 0570ae151ac1..2582e5baf2ac 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -227,12 +227,10 @@ void SwLabPreview::Paint(const Rectangle &) } } -// Arror or interval character -------------------------------------------- - +// Arrow or interval character void SwLabPreview::DrawArrow(const Point &rP1, const Point &rP2, bool bArrow) { DrawLine(rP1, rP2); - if (bArrow) { Point aArr[3]; @@ -377,7 +375,7 @@ IMPL_LINK_NOARG_INLINE_START(SwLabFmtPage, PreviewHdl) } IMPL_LINK_NOARG_INLINE_END(SwLabFmtPage, PreviewHdl) -// LoseFocus-Handler: Update on change -------------------------- +// LoseFocus-Handler: Update on change IMPL_LINK_INLINE_START( SwLabFmtPage, LoseFocusHdl, Control *, pControl ) { if (((Edit*) pControl)->IsModified()) diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index da9727cb7f05..27d93db4e9bb 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -24,8 +24,6 @@ #include <vcl/msgbox.hxx> class SwLabFmtPage; -// class SwLabPreview ------------------------------------------------------- - class SwLabPreview : public Window { Color aGrayColor; @@ -68,8 +66,6 @@ public: void UpdateItem(const SwLabItem& rItem); }; -// class SwLabFmtPage ------------------------------------------------------- - class SwLabFmtPage : public SfxTabPage { FixedText* m_pMakeFI; diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 5b8a24b99c23..4cd62fbc3176 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -29,8 +29,6 @@ class SwLabDlg; class SwLabItem; -// class SwLabPrtPage ------------------------------------------------------- - class SwLabPrtPage : public SfxTabPage { Printer* pPrinter; // for the shaft setting - unfortunately diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index e06bdbd7a0de..2b2bc537026c 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -84,9 +84,6 @@ struct SwMailMergeDlg_Impl uno::Reference<XSelectionSupplier> xSelSupp; }; -/* -------------------------------------------------------------------------- - helper classes -----------------------------------------------------------------------------*/ class SwXSelChgLstnr_Impl : public cppu::WeakImplHelper1 < view::XSelectionChangeListener diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 3d32f7391de7..08cdc8817235 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -29,9 +29,7 @@ using namespace ::com::sun::star; -/*-------------------------------------------------------------------- - Description: edit insert-field - --------------------------------------------------------------------*/ +// edit insert-field sw::DropDownFieldDialog::DropDownFieldDialog(Window *pParent, SwWrtShell &rS, SwField* pField, bool bNextButton) : SvxStandardDialog(pParent, "DropdownFieldDialog", diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 8ef135a83572..8f073beaca27 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -49,9 +49,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::uno; -/*-------------------------------------------------------------------- - Description: edit insert-field - --------------------------------------------------------------------*/ +// edit insert-field SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) : SvxStandardDialog(&rVw.GetViewFrame()->GetWindow(), "ExchangeDatabasesDialog", "modules/swriter/ui/exchangedatabases.ui") @@ -85,14 +83,11 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) TreeSelectHdl(); } -/*-------------------------------------------------------------------- - Description: initialise database listboxes - --------------------------------------------------------------------*/ +// initialise database listboxes void SwChangeDBDlg::FillDBPopup() { Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference<XDatabaseContext> xDBContext = DatabaseContext::create(xContext); - const SwDBData& rDBData = pSh->GetDBData(); m_pAvailDBTLB->Select(rDBData.sDataSource, rDBData.sCommand, aEmptyOUStr); @@ -165,22 +160,16 @@ SvTreeListEntry* SwChangeDBDlg::Insert(const OUString& rDBName) return pRet; } -/*-------------------------------------------------------------------- - Description: destroy dialog - --------------------------------------------------------------------*/ +// destroy dialog SwChangeDBDlg::~SwChangeDBDlg() { delete pMgr; } - -/*-------------------------------------------------------------------- - Description: close - --------------------------------------------------------------------*/ +// close void SwChangeDBDlg::Apply() { UpdateFlds(); } - void SwChangeDBDlg::UpdateFlds() { std::vector<OUString> aDBNames; @@ -243,9 +232,7 @@ IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl) return 0; } -/*-------------------------------------------------------------------- - Description: convert database name for display - --------------------------------------------------------------------*/ +// convert database name for display void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData) { if (rDBData.sDataSource.isEmpty() && rDBData.sCommand.isEmpty()) diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 966ab35e6481..935403bbc76d 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -76,9 +76,7 @@ SwFldDBPage::~SwFldDBPage() { } -/*-------------------------------------------------------------------- - Description: initialise TabPage - --------------------------------------------------------------------*/ +// initialise TabPage void SwFldDBPage::Reset(const SfxItemSet&) { Init(); // Allgemeine initialisierung @@ -469,9 +467,7 @@ IMPL_LINK_NOARG(SwFldDBPage, AddDBHdl) return 0; } -/*-------------------------------------------------------------------- - Description: Modify - --------------------------------------------------------------------*/ +// Modify IMPL_LINK_NOARG(SwFldDBPage, ModifyHdl) { CheckInsert(); diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 8fc8170ed32f..45bf150b9f0f 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -101,9 +101,7 @@ SwFldEditDlg::SwFldEditDlg(SwView& rVw) Init(); } -/*-------------------------------------------------------------------- - Description: initialise controls - --------------------------------------------------------------------*/ +// initialise controls void SwFldEditDlg::Init() { SwFldPage* pTabPage = (SwFldPage*)GetTabPage(); @@ -212,9 +210,7 @@ void SwFldEditDlg::InsertHdl() GetOKButton()->Click(); } -/*-------------------------------------------------------------------- - Description: kick off changing of the field - --------------------------------------------------------------------*/ +// kick off changing of the field IMPL_LINK_NOARG(SwFldEditDlg, OKHdl) { if (GetOKButton()->IsEnabled()) @@ -237,9 +233,7 @@ short SwFldEditDlg::Execute() return GetTabPage() ? Dialog::Execute() : static_cast<short>(RET_CANCEL); } -/*-------------------------------------------------------------------- - Description: Traveling between fields of the same type - --------------------------------------------------------------------*/ +// Traveling between fields of the same type IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton ) { bool bNext = pButton == m_pNextBT; diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index f4c476262bbf..00a37dac4419 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -453,9 +453,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, ListEnableHdl) return 0; } -/*-------------------------------------------------------------------- - Description: renew types in SelectionBox - --------------------------------------------------------------------*/ +// renew types in SelectionBox void SwFldFuncPage::UpdateSubType() { const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); @@ -498,14 +496,11 @@ void SwFldFuncPage::UpdateSubType() m_pSelectionLB->SetUpdateMode(true); } -/*-------------------------------------------------------------------- - Description: call MacroBrowser, fill Listbox with Macros - --------------------------------------------------------------------*/ +// call MacroBrowser, fill Listbox with Macros IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn ) { Window* pDefModalDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( pBtn ); - const OUString sMacro(TurnMacroString(m_pNameED->GetText()).replaceAll(".", ";")); if (GetFldMgr().ChooseMacro(sMacro)) UpdateSubType(); diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index f3a4c4220285..d9575534024b 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -60,10 +60,7 @@ SwFldPage::~SwFldPage() { } -/*-------------------------------------------------------------------- - Description: initialise TabPage - --------------------------------------------------------------------*/ - +// initialise TabPage void SwFldPage::Init() { SwDocShell* pDocSh = (SwDocShell*)SfxObjectShell::Current(); @@ -98,19 +95,13 @@ void SwFldPage::Init() } } -/*-------------------------------------------------------------------- - Description: newly initialise page - --------------------------------------------------------------------*/ - +// newly initialise page void SwFldPage::ActivatePage() { EnableInsert(m_bInsert); } -/*-------------------------------------------------------------------- - Description: complete reset; edit new field - --------------------------------------------------------------------*/ - +// complete reset; edit new field void SwFldPage::EditNewField( bool bOnlyActivate ) { if( !bOnlyActivate ) @@ -123,10 +114,7 @@ void SwFldPage::EditNewField( bool bOnlyActivate ) m_bRefresh = false; } -/*-------------------------------------------------------------------- - Description: insert field - --------------------------------------------------------------------*/ - +// insert field bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUString& rPar1, const OUString& rPar2, sal_uLong nFormatId, sal_Unicode cSeparator, bool bIsAutomaticLanguage) @@ -318,14 +306,10 @@ void SwFldPage::RestorePos(ListBox* pLst1, ListBox* pLst2, ListBox* pLst3) (*ppLB)->SelectEntryPos( nPos ); } -/*-------------------------------------------------------------------- - Description: Insert new fields - --------------------------------------------------------------------*/ - +// Insert new fields IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn ) { SwFldDlg *pDlg = (SwFldDlg*)GetTabDialog(); - if (pDlg) { pDlg->InsertHdl(); @@ -342,14 +326,10 @@ IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn ) return 0; } -/*-------------------------------------------------------------------- - Description: enable/disable "Insert"-Button - --------------------------------------------------------------------*/ - +// enable/disable "Insert"-Button void SwFldPage::EnableInsert(bool bEnable) { SwFldDlg *pDlg = (SwFldDlg*)GetTabDialog(); - if (pDlg) { if (pDlg->GetCurTabPage() == this) diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index af5582a306ff..65aa5df431b5 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -441,10 +441,7 @@ IMPL_LINK_NOARG(SwFldRefPage, SubTypeHdl) return 0; } -/*-------------------------------------------------------------------- - Description: renew types in SelectionLB - --------------------------------------------------------------------*/ - +// renew types in SelectionLB void SwFldRefPage::UpdateSubType() { SwWrtShell *pSh = GetWrtShell(); @@ -738,10 +735,7 @@ sal_Int32 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId) return nSize; } -/*-------------------------------------------------------------------- - Description: Modify - --------------------------------------------------------------------*/ - +// Modify IMPL_LINK_NOARG(SwFldRefPage, ModifyHdl) { OUString aName(m_pNameED->GetText()); diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index bc39b2392b8f..fe6829a999d5 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -46,10 +46,7 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> -/*-------------------------------------------------------------------- - Description: carrier of the dialog - --------------------------------------------------------------------*/ - +// carrier of the dialog SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) : SfxTabDialog(pParent, "FieldDialog", "modules/swriter/ui/fielddialog.ui") , m_pChildWin(pCW) @@ -182,10 +179,7 @@ SfxItemSet* SwFldDlg::CreateInputItemSet( sal_uInt16 nID ) return 0; } -/*-------------------------------------------------------------------- - Description: kick off inserting of new fields - --------------------------------------------------------------------*/ - +// kick off inserting of new fields IMPL_LINK_NOARG(SwFldDlg, OKHdl) { if (GetOKButton().IsEnabled()) @@ -205,10 +199,7 @@ IMPL_LINK_NOARG(SwFldDlg, CancelHdl) return 0; } -/*-------------------------------------------------------------------- - Description: newly initialise dialog after Doc-Switch - --------------------------------------------------------------------*/ - +// newly initialise dialog after Doc-Switch void SwFldDlg::ReInitDlg() { SwDocShell* pDocSh = (SwDocShell*)SfxObjectShell::Current(); @@ -242,22 +233,15 @@ void SwFldDlg::ReInitDlg() m_pChildWin->SetOldDocShell(pDocSh); } -/*-------------------------------------------------------------------- - Description: newly initialise TabPage after Doc-Switch - --------------------------------------------------------------------*/ - +// newly initialise TabPage after Doc-Switch void SwFldDlg::ReInitTabPage( sal_uInt16 nPageId, bool bOnlyActivate ) { SwFldPage* pPage = (SwFldPage* )GetTabPage(nPageId); - if ( pPage ) pPage->EditNewField( bOnlyActivate ); // newly initialise TabPage } -/*-------------------------------------------------------------------- - Description: newly initialise after activation of a few TabPages - --------------------------------------------------------------------*/ - +// newly initialise after activation of a few TabPages void SwFldDlg::Activate() { SwView* pView = ::GetActiveView(); diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 24b0b8fab082..1079a22bb483 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -566,14 +566,11 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) return 0; } -/*-------------------------------------------------------------------- - Description: renew types in SelectionBox - --------------------------------------------------------------------*/ +// renew types in SelectionBox void SwFldVarPage::UpdateSubType() { OUString sOldSel; const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); - SetSelectionSel(m_pSelectionLB->GetSelectEntryPos()); if(GetSelectionSel() != LISTBOX_ENTRY_NOTFOUND) sOldSel = m_pSelectionLB->GetEntry(GetSelectionSel()); @@ -800,9 +797,7 @@ sal_Int32 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId) return nSize; } -/*-------------------------------------------------------------------- - Description: Modify - --------------------------------------------------------------------*/ +// Modify IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl) { OUString sValue(m_pValueED->GetText()); diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index 2a1d5ea5cca8..958748a9051f 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -30,10 +30,7 @@ #include <fldui.hrc> -/*-------------------------------------------------------------------- - Description: edit field-insert - --------------------------------------------------------------------*/ - +// edit field-insert SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, SwField* pField, bool bNextButton ) : SvxStandardDialog( pParent, "InputFieldDialog", @@ -116,14 +113,10 @@ void SwFldInputDlg::StateChanged( StateChangedType nType ) SvxStandardDialog::StateChanged( nType ); } -/*-------------------------------------------------------------------- - Description: Close - --------------------------------------------------------------------*/ - +// Close void SwFldInputDlg::Apply() { OUString aTmp(comphelper::string::remove(m_pEditED->GetText(), '\r')); - rSh.StartAllAction(); bool bModified = false; if(pInpFld) diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 68412714a77b..c9f5bc90a174 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -38,10 +38,6 @@ using namespace ::com::sun::star; -// static ---------------------------------------------------------------- - -// class SwJavaEditDialog ------------------------------------------------ - SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) : SvxStandardDialog(pParent, "InsertScriptDialog", "modules/swriter/ui/insertscript.ui"), diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index a6bed3525b99..0d346b289765 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -68,10 +68,7 @@ extern SW_DLLPUBLIC SwWrtShell* GetActiveWrtShell(); -/*-------------------------------------------------------------------- - Description: the dialog's carrier - --------------------------------------------------------------------*/ - +// the dialog's carrier SwTemplateDlg::SwTemplateDlg(Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index d32551aef89a..ab22c2824587 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -72,10 +72,7 @@ using namespace ::com::sun::star; #define FRAME_FORMAT_WIDTH 1000 -/*-------------------------------------------------------------------- - Description: static data - --------------------------------------------------------------------*/ - +// static data static const sal_uInt16 nVisCols = 3; inline bool IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect ) @@ -395,9 +392,7 @@ void SwColumnPage::ResetColWidth() } -/*-------------------------------------------------------------------- - Description: Now as TabPage - --------------------------------------------------------------------*/ +// Now as TabPage SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "ColumnPage", "modules/swriter/ui/columnpage.ui", rSet) , pColMgr(0) @@ -626,17 +621,12 @@ void SwColumnPage::Reset(const SfxItemSet &rSet) ActivatePage( rSet ); } -/*-------------------------------------------------------------------- - Description: create TabPage - --------------------------------------------------------------------*/ +// create TabPage SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet) { return new SwColumnPage(pParent, rSet); } - -/*-------------------------------------------------------------------- - Description: stuff attributes into the Set when OK - --------------------------------------------------------------------*/ +// stuff attributes into the Set when OK bool SwColumnPage::FillItemSet(SfxItemSet &rSet) { if(m_pCLNrEdt->HasChildPathFocus()) @@ -666,9 +656,7 @@ bool SwColumnPage::FillItemSet(SfxItemSet &rSet) return true; } -/*-------------------------------------------------------------------- - Description: update ColumnManager - --------------------------------------------------------------------*/ +// update ColumnManager IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ ) { long nGutterWidth = pColMgr->GetGutterWidth(); @@ -773,9 +761,6 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ ) return 0; } -/*------------------------------------------------------------------------ - Description: Initialisation -------------------------------------------------------------------------*/ void SwColumnPage::Init() { m_pCLNrEdt->SetValue(nCols); @@ -845,15 +830,13 @@ bool SwColumnPage::isLineNotNone() const return nPos != LISTBOX_ENTRY_NOTFOUND && nPos != 0; } -/*------------------------------------------------------------------------ - Description: The number of columns has changed -- here the controls for - editing of the columns are en- or disabled according to the - column number. - In case there are more than nVisCols (=3) all Edit are being - enabled and the buttons for scrolling too. - Otherwise Edits are being enabled according to the column - numbers; one column can not be edited. -------------------------------------------------------------------------*/ +/* + * The number of columns has changed -- here the controls for editing of the + * columns are en- or disabled according to the column number. In case there are + * more than nVisCols (=3) all Edit are being enabled and the buttons for + * scrolling too. Otherwise Edits are being enabled according to the column + * numbers; one column can not be edited. + */ void SwColumnPage::UpdateCols() { bool bEnableBtns= false; @@ -938,11 +921,11 @@ void SwColumnPage::SetLabels( sal_uInt16 nVis ) sDist.replaceFirst("%1", sLbl2).replaceFirst("%2", sLbl3)); } -/*------------------------------------------------------------------------ - Description: Handler that is called at alteration of the column number. - An alteration of the column number overwrites potential - user's width settings; all columns are equally wide. -------------------------------------------------------------------------*/ +/* + * Handler that is called at alteration of the column number. An alteration of + * the column number overwrites potential user's width settings; all columns + * are equally wide. + */ IMPL_LINK( SwColumnPage, ColModify, NumericField *, pNF ) { nCols = (sal_uInt16)m_pCLNrEdt->GetValue(); @@ -969,14 +952,12 @@ IMPL_LINK( SwColumnPage, ColModify, NumericField *, pNF ) return 0; } -/*------------------------------------------------------------------------ - Description: Modify handler for an alteration of the column width or - the column gap. - These changes take effect time-displaced. With an - alteration of the column width the automatic calculation - of the column width is overruled; only an alteration - of the column number leads back to that default. -------------------------------------------------------------------------*/ +/* + * Modify handler for an alteration of the column width or the column gap. + * These changes take effect time-displaced. With an alteration of the column + * width the automatic calculation of the column width is overruled; only an + * alteration of the column number leads back to that default. + */ IMPL_LINK( SwColumnPage, GapModify, MetricField*, pMetricFld ) { if (nCols < 2) @@ -1053,11 +1034,8 @@ IMPL_LINK( SwColumnPage, EdModify, MetricField *, pMetricFld ) return 0; } -/*------------------------------------------------------------------------ - Description: Handler behind the Checkbox for automatic width. - When the box is checked no expicit values for the column - width can be entered. -------------------------------------------------------------------------*/ +// Handler behind the Checkbox for automatic width. When the box is checked +// no expicit values for the column width can be entered. IMPL_LINK( SwColumnPage, AutoWidthHdl, CheckBox *, pBox ) { long nDist = static_cast< long >(aDistEd1.DenormalizePercent(aDistEd1.GetValue(FUNIT_TWIP))); @@ -1075,9 +1053,7 @@ IMPL_LINK( SwColumnPage, AutoWidthHdl, CheckBox *, pBox ) return 0; } -/*------------------------------------------------------------------------ - Description: scroll up the contents of the edits -------------------------------------------------------------------------*/ +// scroll up the contents of the edits IMPL_LINK_NOARG(SwColumnPage, Up) { if( nFirstVis ) @@ -1089,9 +1065,7 @@ IMPL_LINK_NOARG(SwColumnPage, Up) return 0; } -/*------------------------------------------------------------------------ - Description: scroll down the contents of the edits. -------------------------------------------------------------------------*/ +// scroll down the contents of the edits. IMPL_LINK_NOARG(SwColumnPage, Down) { if( nFirstVis + nVisCols < nCols ) @@ -1103,11 +1077,8 @@ IMPL_LINK_NOARG(SwColumnPage, Down) return 0; } -/*------------------------------------------------------------------------ - Description: relict from ancient times - now directly without time - handler; triggered by an alteration of the column width - or the column gap. -------------------------------------------------------------------------*/ +// relict from ancient times - now directly without time handler; triggered by +// an alteration of the column width or the column gap. void SwColumnPage::Timeout() { if(pModifiedField) @@ -1149,9 +1120,7 @@ void SwColumnPage::Timeout() Update(); } -/*------------------------------------------------------------------------ - Description: Update the view -------------------------------------------------------------------------*/ +// Update the view void SwColumnPage::Update() { m_pBalanceColsCB->Enable(nCols > 1); @@ -1182,9 +1151,7 @@ void SwColumnPage::Update() UpdateColMgr(0); } -/*-------------------------------------------------------------------- - Description: Update Bsp - --------------------------------------------------------------------*/ +// Update Bsp void SwColumnPage::ActivatePage(const SfxItemSet& rSet) { if(!bFrm) diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 30a373ef8fd8..1526eb10bafb 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -526,9 +526,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCategoryBox(Window* pParent return pCategoryBox; } -/*------------------------------------------------------------------------- - //#i61007# order of captions - -----------------------------------------------------------------------*/ +// #i61007# order of captions void SwCaptionDialog::ApplyCaptionOrder() { m_pNumberingSeparatorFT->Enable(bOrderNumberingFirst); diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index c6ee60133c98..5968d8214fc8 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -43,9 +43,7 @@ #include <svx/xfillit0.hxx> #include <svx/xflgrit.hxx> -/*-------------------------------------------------------------------- - Description: the dialog's carrier - --------------------------------------------------------------------*/ +// the dialog's carrier SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, Window* pParent, const SfxItemSet& rCoreSet, diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index cdf91ac4b1e8..a1b72dbcf44d 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -268,14 +268,11 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet) ActivatePage( rSet ); } -/*-------------------------------------------------------------------- - Description: stuff attributes into the set when OK - --------------------------------------------------------------------*/ +// stuff attributes into the set when OK bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) { bool bModified = false; const SfxPoolItem* pOldItem; - const SwFmtSurround& rOldSur = (const SwFmtSurround&)GetItemSet().Get(RES_SURROUND); SwFmtSurround aSur( rOldSur ); @@ -373,9 +370,7 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) return bModified; } -/*-------------------------------------------------------------------- - Description: example update - --------------------------------------------------------------------*/ +// example update void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) { // anchor @@ -569,14 +564,11 @@ int SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet) return sal_True; } -/*-------------------------------------------------------------------- - Description: range check - --------------------------------------------------------------------*/ +// range check IMPL_LINK( SwWrapTabPage, RangeModifyHdl, MetricField *, pEdit ) { sal_Int64 nValue = pEdit->GetValue(); MetricField *pOpposite = 0; - if (pEdit == m_pLeftMarginED) pOpposite = m_pRightMarginED; else if (pEdit == m_pRightMarginED) diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index a3b147289712..e125eeeb25c8 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -61,10 +61,6 @@ void SwMultiTOXMarkDlg::Apply() rMgr.SetCurTOXMark(nPos); } -/*-------------------------------------------------- - overload dtor ---------------------------------------------------*/ - SwMultiTOXMarkDlg::~SwMultiTOXMarkDlg() {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 1a837d001822..94b0c0ac1730 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -76,9 +76,7 @@ using namespace com::sun::star::util; using namespace ::comphelper; using namespace ::com::sun::star; -/*-------------------------------------------------------------------- - Description: dialog to insert a directory selection - --------------------------------------------------------------------*/ +// dialog to insert a directory selection SwIndexMarkPane::SwIndexMarkPane(Dialog &rDialog, bool bNewDlg, SwWrtShell& rWrtShell) : m_rDialog(rDialog) @@ -171,9 +169,7 @@ SwIndexMarkPane::SwIndexMarkPane(Dialog &rDialog, bool bNewDlg, m_pEntryED->GrabFocus(); } -/*-------------------------------------------------------------------- - Description: Newly initialise controls with the new selection - --------------------------------------------------------------------*/ +// Newly initialise controls with the new selection void SwIndexMarkPane::InitControls() { OSL_ENSURE(pSh && pTOXMgr, "no shell?"); @@ -345,9 +341,7 @@ OUString SwIndexMarkPane::GetDefaultPhoneticReading( const OUString& rText ) return xExtendedIndexEntrySupplier->getPhoneticCandidate(rText, LanguageTag::convertToLocale( nLangForPhoneticReading )); } -/* -------------------------------------------------- - Change the content of m_pEntryED if text is selected - --------------------------------------------------*/ +// Change the content of m_pEntryED if text is selected void SwIndexMarkPane::Activate() { // display current selection (first element) ???? @@ -373,9 +367,7 @@ void SwIndexMarkPane::Activate() } } -/*-------------------------------------------------------------------- - Description: evaluate Ok-Button - --------------------------------------------------------------------*/ +// evaluate Ok-Button void SwIndexMarkPane::Apply() { InsertUpdate(); @@ -383,14 +375,11 @@ void SwIndexMarkPane::Apply() pSh->ResetSelect(0, false); } -/*-------------------------------------------------------------------- - Description: apply changes - --------------------------------------------------------------------*/ +// apply changes void SwIndexMarkPane::InsertUpdate() { pSh->StartUndo(bDel ? UNDO_INDEX_ENTRY_DELETE : UNDO_INDEX_ENTRY_INSERT); pSh->StartAllAction(); - SwRewriter aRewriter; if( bNewMark ) @@ -422,9 +411,7 @@ void SwIndexMarkPane::InsertUpdate() nKey2Pos = m_pKey2DCB->GetEntryPos(m_pKey2DCB->GetText()); } -/*-------------------------------------------------------------------- - Description: insert mark - --------------------------------------------------------------------*/ +// insert mark static void lcl_SelectSameStrings(SwWrtShell& rSh, bool bWordOnly, bool bCaseSensitive) { rSh.Push(); @@ -498,9 +485,7 @@ void SwIndexMarkPane::InsertMark() pSh->EndAllAction(); } -/*-------------------------------------------------------------------- - Description: update mark - --------------------------------------------------------------------*/ +// update mark void SwIndexMarkPane::UpdateMark() { OUString aAltText(m_pEntryED->GetText()); @@ -540,14 +525,11 @@ void SwIndexMarkPane::UpdateMark() pTOXMgr->UpdateTOXMark(aDesc); } -/*-------------------------------------------------------------------- - Description: insert new keys - --------------------------------------------------------------------*/ +// insert new keys void SwIndexMarkPane::UpdateKeyBoxes() { OUString aKey(m_pKey1DCB->GetText()); sal_Int32 nPos = m_pKey1DCB->GetEntryPos(aKey); - if(nPos == COMBOBOX_ENTRY_NOTFOUND && !aKey.isEmpty()) { // create new key m_pKey1DCB->InsertEntry(aKey); @@ -642,9 +624,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, CloseHdl) return 0; } -/*-------------------------------------------------------------------- - Description: select index type only when inserting - --------------------------------------------------------------------*/ +// select index type only when inserting IMPL_LINK( SwIndexMarkPane, ModifyHdl, ListBox *, pBox ) { if (m_pTypeDCB == pBox) @@ -773,9 +753,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, DelHdl) return 0; } -/*-------------------------------------------------------------------- - Description: renew dialog view - --------------------------------------------------------------------*/ +// renew dialog view void SwIndexMarkPane::UpdateDialog() { OSL_ENSURE(pSh && pTOXMgr, "no shell?"); @@ -877,9 +855,7 @@ void SwIndexMarkPane::UpdateDialog() pSh->EndCrsrMove(); } -/*-------------------------------------------------------------------- - Remind whether the edit boxes for Phonetic reading are changed manually - --------------------------------------------------------------------*/ +// Remind whether the edit boxes for Phonetic reading are changed manually IMPL_LINK( SwIndexMarkPane, PhoneticEDModifyHdl, Edit *, pEdit ) { if (m_pPhoneticED0 == pEdit) @@ -897,9 +873,7 @@ IMPL_LINK( SwIndexMarkPane, PhoneticEDModifyHdl, Edit *, pEdit ) return 0; } -/*-------------------------------------------------------------------- - Description: Enable Disable of the 2nd key - --------------------------------------------------------------------*/ +// Enable Disable of the 2nd key IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox ) { if (m_pKey1DCB == pBox) @@ -955,9 +929,6 @@ IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox ) return 0; } -/*-------------------------------------------------- - overload dtor ---------------------------------------------------*/ SwIndexMarkPane::~SwIndexMarkPane() { delete pTOXMgr; diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 8405492215f5..86507168f199 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -63,9 +63,7 @@ IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox ) return 0; } -/*------------------------------------------------------------------------ - Description: callback to delete a text mark - -----------------------------------------------------------------------*/ +// callback to delete a text mark IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl) { // remove text marks from the ComboBox @@ -80,10 +78,8 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl) return 0; } -/*------------------------------------------------------------------------ - Description: callback for OKButton. Inserts a new text mark to the - current position. Deleted text marks are also deleted in the model. - -----------------------------------------------------------------------*/ +// callback for OKButton. Inserts a new text mark to the current position. +// Deleted text marks are also deleted in the model. void SwInsertBookmarkDlg::Apply() { //at first remove deleted bookmarks to prevent multiple bookmarks with the same @@ -198,14 +194,11 @@ sal_Int32 BookmarkCombo::GetSelectEntryCount() const return nCnt; } -/*------------------------------------------------------------------------ - Description: position inside of the listbox (the ComboBox) - -----------------------------------------------------------------------*/ +// position inside of the listbox (the ComboBox) sal_Int32 BookmarkCombo::GetSelectEntryPos( sal_Int32 nSelIndex ) const { sal_Int32 nCnt = 0; sal_Int32 nPos = GetFirstSelEntryPos(); - while (nPos != COMBOBOX_ENTRY_NOTFOUND) { if (nSelIndex == nCnt) diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 04d223afa9c2..1f5c0f9d2174 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -228,11 +228,8 @@ SfxTabPage *SwEndNoteOptionPage::Create( Window *pParent, const SfxItemSet &rSet return new SwEndNoteOptionPage( pParent, true, rSet ); } -/*------------------------------------------------------------------------ - Description: Different kinds of numbering; because the Listbox has - varying numbers of entries, here are functions to - set and query the intended kind of numbering. -------------------------------------------------------------------------*/ +// Different kinds of numbering; because the Listbox has varying numbers of +// entries, here are functions to set and query the intended kind of numbering. void SwEndNoteOptionPage::SelectNumbering(int eNum) { OUString sSelect; @@ -275,11 +272,8 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell ) pSh->GetView().GetDocShell()); } -/*------------------------------------------------------------------------ - Description: Handler behind the button to collect the footnote at the - page. In this case all kinds of numbering can be used. -------------------------------------------------------------------------*/ - +// Handler behind the button to collect the footnote at the page. In this case +// all kinds of numbering can be used. IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl) { const SwFtnNum eNum = (const SwFtnNum)GetNumbering(); @@ -309,12 +303,8 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl) return 0; } -/*------------------------------------------------------------------------ - Description: Handler behind the button to collect the footnote at the - chapter or end of the document. In this case no pagewise - numbering can be used. -------------------------------------------------------------------------*/ - +// Handler behind the button to collect the footnote at the chapter or end of +// the document. In this case no pagewise numbering can be used. IMPL_LINK_NOARG_INLINE_START(SwEndNoteOptionPage, PosChapterHdl) { if ( !bPosDoc ) diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index f794f537897f..e989d124cd9f 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -112,9 +112,7 @@ struct GroupUserData bReadonly(false) {} }; -/*------------------------------------------------------------------------ - Description: dialog for new block name -------------------------------------------------------------------------*/ +// dialog for new block name class SwNewGlosNameDlg : public ModalDialog { Edit* m_pNewName; @@ -156,9 +154,7 @@ SwNewGlosNameDlg::SwNewGlosNameDlg(Window* pParent, m_pNewName->GrabFocus(); } -/*------------------------------------------------------------------------ - Description: query / set currently set group -------------------------------------------------------------------------*/ +// query / set currently set group OUString SwGlossaryDlg::GetCurrGroup() { if( !::GetCurrGlosGroup().isEmpty() ) @@ -237,9 +233,7 @@ SwGlossaryDlg::~SwGlossaryDlg() delete pExampleFrame; } -/*------------------------------------------------------------------------ - Description: select new group -------------------------------------------------------------------------*/ +// select new group IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox ) { SvTreeListEntry* pEntry = pBox->FirstSelected(); @@ -312,9 +306,7 @@ void SwGlossaryDlg::EnableShortName(bool bOn) m_pShortNameEdit->Enable(bOn); } -/* -------------------------------------------------- - * does the title exist in the selected group? - * --------------------------------------------------*/ +// does the title exist in the selected group? SvTreeListEntry* SwGlossaryDlg::DoesBlockExist(const OUString& rBlock, const OUString& rShort) { @@ -586,9 +578,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) return 1; } -/*-------------------------------------------------------------------- - Description: dialog manage regions - --------------------------------------------------------------------*/ +// dialog manage regions IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl) { SwGlossaries* pGloss = ::GetGlossaries(); @@ -664,9 +654,7 @@ IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl) return 0; } -/*------------------------------------------------------------------------ - Description: initialisation; from Ctor and after editing regions -------------------------------------------------------------------------*/ +// initialisation; from Ctor and after editing regions void SwGlossaryDlg::Init() { m_pCategoryBox->SetUpdateMode( false ); @@ -775,14 +763,11 @@ IMPL_LINK_NOARG_INLINE_START(SwGlossaryDlg, EditHdl) } IMPL_LINK_NOARG_INLINE_END(SwGlossaryDlg, EditHdl) -/*------------------------------------------------------------------------ - Description: KeyInput for ShortName - Edits without Spaces -------------------------------------------------------------------------*/ +// KeyInput for ShortName - Edits without Spaces IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox ) { OUString aName(m_pNewName->GetText()); SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParent(); - if (pBox == m_pNewName) m_pNewShort->SetText( lcl_GetValidShortCut( aName ) ); @@ -821,9 +806,7 @@ IMPL_LINK( SwGlossaryDlg, CheckBoxHdl, CheckBox *, pBox ) return 0; } -/* -------------------------------------------------- - * TreeListBox for groups and blocks - * --------------------------------------------------*/ +// TreeListBox for groups and blocks SwGlTreeListBox::SwGlTreeListBox(Window* pParent, WinBits nBits) : SvTreeListBox(pParent, nBits) , sReadonly(SW_RESSTR(SW_STR_READONLY)), diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index cacc4eb4ff84..93ac3107d689 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -42,14 +42,10 @@ static bool bFootnote = true; -/*------------------------------------------------------------------------ - Description: inserting a footnote with OK -------------------------------------------------------------------------*/ - +// inserting a footnote with OK void SwInsFootNoteDlg::Apply() { OUString aStr; - if ( m_pNumberCharBtn->IsChecked() ) aStr = m_pNumberCharEdit->GetText(); diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index d37c1d66ebbd..3fdff721ad21 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -186,9 +186,7 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl) return 0; } -/*-------------------------------------------------------------------- - Description: modify - --------------------------------------------------------------------*/ +// modify IMPL_LINK_NOARG(SwLineNumberingDlg, ModifyHdl) { bool bEnable = m_pNumberingOnCB->IsChecked() && !m_pDivisorED->GetText().isEmpty(); @@ -200,9 +198,7 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, ModifyHdl) return 0; } -/*-------------------------------------------------------------------- - Description: On/Off - --------------------------------------------------------------------*/ +// On/Off IMPL_LINK_NOARG(SwLineNumberingDlg, LineOnOffHdl) { bool bEnable = m_pNumberingOnCB->IsChecked(); diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index bea294d65fa4..5b710792451d 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -48,10 +48,8 @@ static const sal_uInt16 aPageRg[] = { 0 }; -/*------------------------------------------------------------------------ - Description: handler to switch between the different possibilities - how the footnote region's height can be set. -------------------------------------------------------------------------*/ +// handler to switch between the different possibilities how the footnote +// region's height can be set. IMPL_LINK_NOARG_INLINE_START(SwFootNotePage, HeightPage) { m_pMaxHeightEdit->Enable(false); @@ -67,9 +65,7 @@ IMPL_LINK_NOARG_INLINE_START(SwFootNotePage, HeightMetric) } IMPL_LINK_NOARG_INLINE_END(SwFootNotePage, HeightMetric) -/*------------------------------------------------------------------------ - Description: handler limit values -------------------------------------------------------------------------*/ +// handler limit values IMPL_LINK_NOARG(SwFootNotePage, HeightModify) { m_pMaxHeightEdit->SetMax(m_pMaxHeightEdit->Normalize(lMaxHeight - @@ -257,9 +253,7 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet) delete pDefFtnInfo; } -/*-------------------------------------------------------------------- - Description: stuff attributes into the set, when OK - --------------------------------------------------------------------*/ +// stuff attributes into the set, when OK bool SwFootNotePage::FillItemSet(SfxItemSet &rSet) { SwPageFtnInfoItem aItem((const SwPageFtnInfoItem&)GetItemSet().Get(FN_PARAM_FTN_INFO)); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index a4e78417e704..53dcebb77344 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -76,9 +76,7 @@ static void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox ) rLstBox.Clear(); } -/*-------------------------------------------------------------------- - Description: determine lines and columns for table selection - --------------------------------------------------------------------*/ +// determine lines and columns for table selection static bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY ) { const SwTableNode* pTblNd = rSh.IsCrsrInTbl(); @@ -103,9 +101,7 @@ static bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY ) return true; } -/*-------------------------------------------------------------------- - Description: init list - --------------------------------------------------------------------*/ +// init list SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) : SvxStandardDialog(pParent, "SortDialog", "modules/swriter/ui/sortdialog.ui") , aColTxt(SW_RES(STR_COL)) @@ -270,9 +266,7 @@ sal_Unicode SwSortDlg::GetDelimChar() const return cRet; } -/*-------------------------------------------------------------------- - Description: pass on to the Core - --------------------------------------------------------------------*/ +// pass on to the Core void SwSortDlg::Apply() { // save all settings diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 0efd198edcdb..f3c11884f6df 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -487,8 +487,6 @@ IMPL_LINK_NOARG_INLINE_START(SwAutoFormatDlg, OkHdl) } IMPL_LINK_NOARG_INLINE_END(SwAutoFormatDlg, OkHdl) -// AutoFmtPreview - AutoFmtPreview::AutoFmtPreview(Window* pParent) : Window ( pParent ), aCurData ( OUString() ), diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx index 6db5ee674e3f..5df2d9b18230 100644 --- a/sw/source/ui/vba/vbaautotextentry.hxx +++ b/sw/source/ui/vba/vbaautotextentry.hxx @@ -46,7 +46,6 @@ public: virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; -/* class SwVbaAutoTextEntries */ typedef CollTestImplHelper< ooo::vba::word::XAutoTextEntries > SwVbaAutoTextEntries_BASE; class SwVbaAutoTextEntries : public SwVbaAutoTextEntries_BASE diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 83b3ad164187..e40779d282fc 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -67,7 +67,6 @@ SwVbaField::getServiceNames() return aServiceNames; } -// SwVbaReadFieldParams // FIXME? copy and paste code // the codes are copied from ww8par5.cxx class SwVbaReadFieldParams diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx index 922ca8959ac5..f20893fdc71b 100644 --- a/sw/source/ui/vba/vbafield.hxx +++ b/sw/source/ui/vba/vbafield.hxx @@ -40,8 +40,6 @@ public: virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; -// *** SwVbaFields *********************************************** - typedef CollTestImplHelper< ov::word::XFields > SwVbaFields_BASE; class SwVbaFields : public SwVbaFields_BASE diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index a996dd795d62..bb2859f7d259 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -30,8 +30,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::ooo::vba; -// SwVbaGlobals - SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, "WordDocumentContext" ) { OSL_TRACE("SwVbaGlobals::SwVbaGlobals()"); diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index d98d55c34e45..f8c4fdb29329 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -31,8 +31,6 @@ #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbaglobalbase.hxx> -// class SwVbaGlobals - typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::word::XGlobals > SwVbaGlobals_BASE; class SwVbaGlobals : public SwVbaGlobals_BASE diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx index b03491059f1c..f136343a1640 100644 --- a/sw/source/ui/vba/vbaparagraph.hxx +++ b/sw/source/ui/vba/vbaparagraph.hxx @@ -49,7 +49,6 @@ public: virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; -/* class SwVbaParagraphs */ typedef CollTestImplHelper< ooo::vba::word::XParagraphs > SwVbaParagraphs_BASE; class SwVbaParagraphs : public SwVbaParagraphs_BASE |