diff options
| author | Chris Laplante <mostthingsweb@gmail.com> | 2014-04-21 19:28:47 -0400 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-04-24 04:39:51 +0000 |
| commit | ba39f1bf9b29f58b7593f01d552a4f1a42a637cb (patch) | |
| tree | ab251de2ca0dbb92ab843bfa73c674adebb0ebf5 | |
| parent | bff954c0c4e5f9acf18bfd9ae796bc5a937b7ff6 (diff) | |
Finish cleaning up ASCII art in the sw module
Change-Id: If4f11093b791902514dee8e216c92f66b075211d
Reviewed-on: https://gerrit.libreoffice.org/9117
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
102 files changed, 269 insertions, 1780 deletions
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx index 38028102ed3a..d8c4ef45b4be 100644 --- a/sw/inc/EnhancedPDFExportHelper.hxx +++ b/sw/inc/EnhancedPDFExportHelper.hxx @@ -122,12 +122,8 @@ struct lt_TableColumn } }; -/************************************************************************* - * class SwTaggedPDFHelper - * Analyses a given frame during painting and generates the appropriate - * structure elements. - *************************************************************************/ - +// Analyses a given frame during painting and generates the appropriate +// structure elements. class SwTaggedPDFHelper { private: @@ -172,8 +168,7 @@ class SwTaggedPDFHelper static bool IsExportTaggedPDF( const OutputDevice& rOut ); }; -/************************************************************************* - * class SwEnhancedPDFExportHelper +/* * Analyses the document structure and export Notes, Hyperlinks, References, * and Outline. Link ids created during pdf export are stored in * aReferenceIdMap and aHyperlinkIdMap, in order to use them during @@ -183,8 +178,7 @@ class SwTaggedPDFHelper * Therefore SwEnhancedPDFExportHelper also has to be used after the * painting process, the parameter bEditEngineOnly indicated that only * the bookmarks from the EditEngine have to be processed. - *************************************************************************/ - + */ typedef std::set< long, lt_TableColumn > TableColumnsMapEntry; typedef std::pair< SwRect, sal_Int32 > IdMapEntry; typedef std::vector< IdMapEntry > LinkIdMap; diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx index 2700a3116ef9..50cbdcbd46da 100644 --- a/sw/inc/IDocumentRedlineAccess.hxx +++ b/sw/inc/IDocumentRedlineAccess.hxx @@ -98,10 +98,6 @@ public: public: - /************************************************* - Query - *************************************************/ - /** Query the currently set redline mode @returns @@ -139,10 +135,6 @@ public: virtual bool IsInRedlines(const SwNode& rNode) const = 0; - /*************************************************** - Manipulation - ***************************************************/ - /** Append a new redline @param pPtr diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx index c3e1640ed89a..e11f1f303f5d 100644 --- a/sw/inc/SwSmartTagMgr.hxx +++ b/sw/inc/SwSmartTagMgr.hxx @@ -22,12 +22,7 @@ #include <svx/SmartTagMgr.hxx> -/************************************************************************* - * class SwSmartTagMgr - * - * Wrapper for the svx SmartTagMgr - *************************************************************************/ - +// Wrapper for the svx SmartTagMgr class SwSmartTagMgr : public SmartTagMgr { private: diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx index 89ea5d12f093..588943efdb12 100644 --- a/sw/inc/breakit.hxx +++ b/sw/inc/breakit.hxx @@ -29,10 +29,6 @@ #include <i18nlangtag/languagetag.hxx> #include <swdllapi.h> -/************************************************************************* - * class SwBreakIt - *************************************************************************/ - class SW_DLLPUBLIC SwBreakIt : private ::boost::noncopyable { com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 2d00ab550020..ead65e624129 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -35,9 +35,6 @@ class SwUserFieldType; const sal_Unicode cListDelim = '|'; -/****************************************************************************** - * Calculate Operations - ******************************************************************************/ enum SwCalcOper { CALC_NAME, CALC_NUMBER, CALC_ENDCALC, @@ -58,8 +55,7 @@ enum SwCalcOper CALC_DAY=284 }; -//-- Calculate Operations Strings ----------------------------------------- - +// Calculate Operations Strings extern const sal_Char sCalc_Add[]; extern const sal_Char sCalc_Sub[]; extern const sal_Char sCalc_Mul[]; @@ -91,9 +87,7 @@ extern const sal_Char sCalc_Tdif[]; extern const sal_Char sCalc_Round[]; extern const sal_Char sCalc_Date[]; -/****************************************************************************** - * Calculate ErrorCodes - ******************************************************************************/ +// Calculate ErrorCodes enum SwCalcError { CALC_NOERR=0, @@ -128,9 +122,7 @@ public: void SetVoidValue(bool bSet) {bVoid = bSet;} }; -/****************************************************************************** - * Calculate HashTables for VarTable und Operations - ******************************************************************************/ +// Calculate HashTables for VarTable und Operations struct SwHash { SwHash( const OUString& rStr ); @@ -157,9 +149,6 @@ void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTblSize ); struct _CalcOp; _CalcOp* FindOperator( const OUString& rSearch ); -/****************************************************************************** - * class SwCalc - ******************************************************************************/ class SwCalc { SwHash* VarTable[ TBLSZ ]; diff --git a/sw/inc/checkit.hxx b/sw/inc/checkit.hxx index b26c51e02cb7..66ee3709826e 100644 --- a/sw/inc/checkit.hxx +++ b/sw/inc/checkit.hxx @@ -24,12 +24,7 @@ #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp> -/************************************************************************* - * class SwCheckIt - * - * Wrapper for the XInputSequenceChecker - *************************************************************************/ - +// Wrapper for the XInputSequenceChecker class SwCheckIt { public: diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index de916b330c3b..5c43030d039d 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -28,10 +28,6 @@ #include <swatrset.hxx> #include <format.hxx> -/****************************************************************************** - * class SwMirrorGrf - ******************************************************************************/ - enum MirrorGraph { RES_MIRROR_GRAPH_BEGIN, @@ -83,10 +79,6 @@ public: inline void SetGrfToggle( sal_Bool bNew ) { bGrfToggle = bNew; } }; -/****************************************************************************** - * class SwAttrCropGrf - ******************************************************************************/ - class SW_DLLPUBLIC SwCropGrf : public SvxGrfCrop { public: @@ -296,10 +288,7 @@ public: sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; -/****************************************************************************** - * Implementation of graphics attributes methods of SwAttr - ******************************************************************************/ - +// Implementation of graphics attributes methods of SwAttr inline const SwMirrorGrf &SwAttrSet::GetMirrorGrf(sal_Bool bInP) const { return (const SwMirrorGrf&)Get( RES_GRFATR_MIRRORGRF,bInP); } inline const SwCropGrf &SwAttrSet::GetCropGrf(sal_Bool bInP) const @@ -325,10 +314,7 @@ inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(sal_Bool bInP) con inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(sal_Bool bInP) const { return (const SwDrawModeGrf&)Get( RES_GRFATR_DRAWMODE,bInP); } -/****************************************************************************** - * Implementation of graphics attributes methods of SwFmt - ******************************************************************************/ - +// Implementation of graphics attributes methods of SwFmt inline const SwMirrorGrf &SwFmt::GetMirrorGrf(sal_Bool bInP) const { return aSet.GetMirrorGrf(bInP); } inline const SwCropGrf &SwFmt::GetCropGrf(sal_Bool bInP) const diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 8bd41a07c8ec..bb81ce815bbc 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -188,10 +188,7 @@ inline SwParaConnectBorderItem& SwParaConnectBorderItem::operator=( return *this; } -/****************************************************************************** - * Implementation of paragraph-attributes methods of SwAttrSet - ******************************************************************************/ - +// Implementation of paragraph-attributes methods of SwAttrSet inline const SvxLineSpacingItem &SwAttrSet::GetLineSpacing(sal_Bool bInP) const { return (const SvxLineSpacingItem&)Get( RES_PARATR_LINESPACING,bInP); } inline const SvxAdjustItem &SwAttrSet::GetAdjust(sal_Bool bInP) const @@ -225,10 +222,7 @@ inline const SvxParaGridItem &SwAttrSet::GetParaGrid(sal_Bool bInP) const inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(sal_Bool bInP) const { return (const SwParaConnectBorderItem&)Get( RES_PARATR_CONNECT_BORDER, bInP ); } -/****************************************************************************** - * Implementation of paragraph-attributes methods of SwFmt - ******************************************************************************/ - +// Implementation of paragraph-attributes methods of SwFmt inline const SvxLineSpacingItem &SwFmt::GetLineSpacing(sal_Bool bInP) const { return aSet.GetLineSpacing(bInP); } inline const SvxAdjustItem &SwFmt::GetAdjust(sal_Bool bInP) const diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 0f2ff1988704..cf7449ed429a 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -94,7 +94,6 @@ public: SwAsciiOptions() { Reset(); } }; -/**************** SwReader/Reader ************************/ // Base class of possible options for a special reader. class Reader; // Calls reader with its options, document, cursor etc. @@ -184,8 +183,6 @@ protected: void SetBaseURL( const OUString& rURL ) { sBaseURL = rURL; } }; -/**************** Special Readers ************************/ - // Special Readers can be both!! (Excel, W4W, .. ). #define SW_STREAM_READER 1 #define SW_STORAGE_READER 2 diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx index 47bc1fbc3fc1..438a2f55ffe9 100644 --- a/sw/inc/splargs.hxx +++ b/sw/inc/splargs.hxx @@ -31,10 +31,6 @@ class Font; #include <com/sun/star/linguistic2/XSpellChecker1.hpp> #include <com/sun/star/linguistic2/XHyphenatedWord.hpp> -/************************************************************************* - * struct SwArgsBase - *************************************************************************/ - struct SwArgsBase // used for text conversion (Hangul/Hanja, ...) { SwTxtNode *pStartNode; @@ -60,11 +56,7 @@ struct SwArgsBase // used for text conversion (Hangul/Hanja, ...) } }; -/************************************************************************* - * struct SwConversionArgs - * used for text conversion (Hangul/Hanja, Simplified/Traditional Chinese, ...) - *************************************************************************/ - +// used for text conversion (Hangul/Hanja, Simplified/Traditional Chinese, ...) struct SwConversionArgs : SwArgsBase { OUString aConvText; // convertible text found @@ -89,10 +81,6 @@ struct SwConversionArgs : SwArgsBase {} }; -/************************************************************************* - * struct SwSpellArgs - *************************************************************************/ - struct SwSpellArgs : SwArgsBase { ::com::sun::star::uno::Reference< @@ -114,10 +102,6 @@ struct SwSpellArgs : SwArgsBase {} }; -/************************************************************************* - * class SwInterHyphInfo - *************************************************************************/ - // Parameter-class for Hyphenate. // docedt.cxx: SwDoc::Hyphenate() // txtedt.cxx: SwTxtNode::Hyphenate() diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx index 49ce2e2d3053..aafd070da238 100644 --- a/sw/inc/swscanner.hxx +++ b/sw/inc/swscanner.hxx @@ -25,12 +25,8 @@ class SwTxtNode; -/************************************************************************* - * class SwScanner - * Helper class that provides consecutively the words of a selected area - * during spell check - *************************************************************************/ - +// Helper class that provides consecutively the words of a selected area +// during spell check class SwScanner { OUString aWord; diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 22a4ff8528f3..3f3708028651 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -573,8 +573,7 @@ public: bool IsSelectAll() { return mbSelectAll; } }; -//---- class CurrShell manages global ShellPointer ------------------- - +// manages global ShellPointer class CurrShell { public: diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi index 87a57af6c61a..7325486e56b4 100644 --- a/sw/sdi/_frmsh.sdi +++ b/sw/sdi/_frmsh.sdi @@ -355,12 +355,7 @@ interface BaseTextFrame DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] - /***************************************************** - - Abfragefunktionen fuer ImageMaps - - ****************************************************/ - +// Abfragefunktionen fuer ImageMaps // Slots ohne Export FN_INSERT_FRAME diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi index d49b732be8a6..40ec958f82ee 100644 --- a/sw/sdi/_viewsh.sdi +++ b/sw/sdi/_viewsh.sdi @@ -398,11 +398,8 @@ interface BaseTextEditView ExecMethod = Execute ; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] - /****************************************************/ - /* */ - /* Properties Page Format */ - /* */ - /****************************************************/ + + // Properties Page Format SID_ATTR_PAGE // status() [ ExecMethod = Execute ; diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 29933cd307fd..f1ab71ff6b15 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -456,7 +456,7 @@ sal_Int32 SAL_CALL SwAccessibleCell::getBackground() return crBack; } -//===== XAccessibleSelection ============================================ +// XAccessibleSelection void SwAccessibleCell::selectAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index a2b80b8090e6..80b9e908a8c1 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -109,7 +109,7 @@ public: // XAccessibleValue - //===== XAccessibleExtendedAttributes ================================================ + // XAccessibleExtendedAttributes ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; private: @@ -128,11 +128,11 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleComponent ============================================ + // XAccessibleComponent sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleSelection ============================================ + // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index a3e1669526e3..65fe9fae933b 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -125,7 +125,7 @@ public: SwAccessibleDocument( SwAccessibleMap* pInitMap ); DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); - //===== XEventListener==================================================== + // XEventListener virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Event ) diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index 71f1c6c33d7a..f7c607c01222 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -48,7 +48,7 @@ SwAccessibleEmbeddedObject::~SwAccessibleEmbeddedObject() { } -//===== XInterface ========================================================== +// XInterface com::sun::star::uno::Any SAL_CALL SwAccessibleEmbeddedObject::queryInterface (const com::sun::star::uno::Type & rType) throw (::com::sun::star::uno::RuntimeException, std::exception) diff --git a/sw/source/core/access/accfield.hxx b/sw/source/core/access/accfield.hxx index 6aea8b646a7e..a44dbd87c503 100644 --- a/sw/source/core/access/accfield.hxx +++ b/sw/source/core/access/accfield.hxx @@ -71,13 +71,13 @@ public: virtual void SAL_CALL release( ) throw () SAL_OVERRIDE ; public: - //===== XAccessible ===================================================== + // XAccessible /// Return the XAccessibleContext. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleContext ============================================== + // XAccessibleContext /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) @@ -133,7 +133,7 @@ public: getLocale (void) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleComponent ============================================ + // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx index b0a53e6eea15..3c3597fdf5b6 100644 --- a/sw/source/core/access/accheaderfooter.hxx +++ b/sw/source/core/access/accheaderfooter.hxx @@ -63,7 +63,7 @@ public: // XTypeProvider virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleComponent ============================================ + // XAccessibleComponent sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index c3ab7efedb3e..84a6fd0f0f66 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -256,7 +256,7 @@ sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getAccessibleImageWidth( ) return getSize().Width; } -//===== XAccesibleText ================================================== +// XAccesibleText sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} sal_Bool SAL_CALL SwAccessibleNoTextFrame::setCaretPosition( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return 0;} sal_Unicode SAL_CALL SwAccessibleNoTextFrame::getCharacter( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return 0;} diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx index d4c961a8c10c..eace1934dc5f 100644 --- a/sw/source/core/access/accnotextframe.hxx +++ b/sw/source/core/access/accnotextframe.hxx @@ -119,7 +119,7 @@ public: virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleHypertext ============================================ + // XAccessibleHypertext virtual sal_Int32 SAL_CALL getHyperLinkCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx index f3fd970d7e13..62ea32baa3ac 100644 --- a/sw/source/core/access/accpreview.hxx +++ b/sw/source/core/access/accpreview.hxx @@ -37,7 +37,7 @@ class SwAccessiblePreview : public SwAccessibleDocumentBase public: SwAccessiblePreview( SwAccessibleMap *pMap ); - //===== XServiceInfo ==================================================== + // XServiceInfo /** Returns an identifier for the implementation of this object. */ @@ -58,7 +58,7 @@ public: getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //====== XTypeProvider ==================================================== + // XTypeProvider virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/source/core/access/accselectionhelper.hxx b/sw/source/core/access/accselectionhelper.hxx index 5e51987df66a..05f2b3f7335e 100644 --- a/sw/source/core/access/accselectionhelper.hxx +++ b/sw/source/core/access/accselectionhelper.hxx @@ -40,7 +40,7 @@ public: SwAccessibleSelectionHelper( SwAccessibleContext& rContext ); ~SwAccessibleSelectionHelper(); - //===== XAccessibleSelection ============================================ + // XAccessibleSelection void selectAccessibleChild( sal_Int32 nChildIndex ) diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 1ae3f73a3ef7..e9a5a363c760 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -1772,7 +1772,7 @@ void SwAccessibleTable::AddSelectionCell(const SwAccessibleContext* pAccCell ,sa } } -//===== XAccessibleTableSelection ============================================ +// XAccessibleTableSelection sal_Bool SAL_CALL SwAccessibleTable::selectRow( sal_Int32 row ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index 6700033d19e8..4fbb425a309d 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -88,7 +88,7 @@ protected: public: SwAccessibleTable( SwAccessibleMap* pInitMap, const SwTabFrm* pTableFrm ); - //===== XInterface ====================================================== + // XInterface // (XInterface methods need to be implemented to disambigouate // between those inherited through SwAcessibleContext and @@ -104,18 +104,18 @@ public: virtual void SAL_CALL release( ) throw () SAL_OVERRIDE { SwAccessibleContext::release(); }; - //====== XTypeProvider ==================================================== + // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleContext ============================================== + // XAccessibleContext /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleTable ================================================ + // XAccessibleTable virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -184,7 +184,7 @@ public: virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleTableSelection ============================================ + // XAccessibleTableSelection virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) @@ -197,7 +197,7 @@ public: throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XServiceInfo ==================================================== + // XServiceInfo /** Returns an identifier for the implementation of this object. */ @@ -218,7 +218,7 @@ public: getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== C++ interface ====================================================== + // C++ interface // The object has been moved by the layout virtual void InvalidatePosOrSize( const SwRect& rOldBox ) SAL_OVERRIDE; @@ -231,7 +231,7 @@ public: virtual void InvalidateChildPosOrSize( const sw::access::SwAccessibleChild& rFrmOrObj, const SwRect& rFrm ) SAL_OVERRIDE; - //===== XAccessibleSelection ============================================ + // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) @@ -263,7 +263,7 @@ public: throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - //===== XAccessibleComponent ============================================ + // XAccessibleComponent sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; typedef std::vector<const SwAccessibleContext*> VEC_CELL; @@ -293,7 +293,7 @@ protected: public: SwAccessibleTableColHeaders( SwAccessibleMap *pMap, const SwTabFrm *pTabFrm ); - //===== XInterface ====================================================== + // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) @@ -305,7 +305,7 @@ public: virtual void SAL_CALL release( ) throw () SAL_OVERRIDE { SwAccessibleContext::release(); }; - //===== XAccessibleContext ============================================== + // XAccessibleContext /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) @@ -317,7 +317,7 @@ public: throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; - //===== XAccessibleTable ================================================ + // XAccessibleTable virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > @@ -328,7 +328,7 @@ public: SAL_CALL getAccessibleColumnHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XServiceInfo ==================================================== + // XServiceInfo /** Returns an identifier for the implementation of this object. */ diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index 5699092008b7..5aa437cab09c 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -136,7 +136,7 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * } } -//===== XInterface ========================================================== +// XInterface com::sun::star::uno::Any SAL_CALL SwAccessibleTextFrame::queryInterface (const com::sun::star::uno::Type & rType) @@ -164,7 +164,7 @@ void SAL_CALL SwAccessibleContext::release (); } -//===== XAccessibleSelection ============================================ +// XAccessibleSelection void SAL_CALL SwAccessibleTextFrame::selectAccessibleChild( sal_Int32 ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx index 20e621fece53..04d061bc5f7f 100644 --- a/sw/source/core/access/acctextframe.hxx +++ b/sw/source/core/access/acctextframe.hxx @@ -50,7 +50,7 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL release() throw () SAL_OVERRIDE; - //===== XAccessibleSelection ============================================ + // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, @@ -80,7 +80,7 @@ public: throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - //===== XAccessibleContext ============================================== + // XAccessibleContext // #i73249# - Return the object's current name. virtual OUString SAL_CALL @@ -91,7 +91,7 @@ public: getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XServiceInfo ==================================================== + // XServiceInfo /** Returns an identifier for the implementation of this object. */ @@ -112,10 +112,10 @@ public: getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //====== XTypeProvider ==================================================== + // XTypeProvider virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - //===== XAccessibleContext::getAccessibleRelationSet ==================== + // XAccessibleContext::getAccessibleRelationSet // text frame may have accessible relations to their // predocesor/successor frames diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx index 1aee6b563cb2..be8be9a23921 100644 --- a/sw/source/core/doc/docftn.cxx +++ b/sw/source/core/doc/docftn.cxx @@ -33,8 +33,6 @@ #include <poolfmt.hxx> #include <ftninfo.hxx> -/*********************** SwEndNoteInfo ***************************/ - SwEndNoteInfo& SwEndNoteInfo::operator=(const SwEndNoteInfo& rInfo) { if( rInfo.GetFtnTxtColl() ) @@ -209,8 +207,6 @@ void SwEndNoteInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) CheckRegistration( pOld, pNew ); } -/*********************** SwFtnInfo ***************************/ - SwFtnInfo& SwFtnInfo::operator=(const SwFtnInfo& rInfo) { SwEndNoteInfo::operator=(rInfo); @@ -249,8 +245,6 @@ SwFtnInfo::SwFtnInfo(SwTxtFmtColl *pFmt) : m_bEndNote = false; } -/*********************** SwDoc ***************************/ - void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo) { SwRootFrm* pTmpRoot = GetCurrentLayout(); diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index dcad11e08724..d1ca9d1b2ddb 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -76,13 +76,7 @@ using namespace ::com::sun::star; -/************************************************************************* -|* -|* SwFEShell::Copy() copy for the internal clipboard. -|* Copies all selections to the clipboard. -|* -|*************************************************************************/ - +// Copy for the internal clipboard. Copies all selections to the clipboard. sal_Bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt ) { OSL_ENSURE( pClpDoc, "kein Clipboard-Dokument" ); @@ -665,13 +659,8 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt, return bRet; } -/************************************************************************* -|* -|* SwFEShell::Paste() Paste for the interal clipboard. -|* Copy the content of the clipboard in the document -|* -|*************************************************************************/ - +// Paste for the interal clipboard. Copy the content of the clipboard +// in the document namespace { typedef boost::shared_ptr<SwPaM> PaMPtr; typedef boost::shared_ptr<SwPosition> PositionPtr; diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx index c85f739934b9..d374699e5c08 100644 --- a/sw/source/core/frmedt/fedesc.cxx +++ b/sw/source/core/frmedt/fedesc.cxx @@ -31,23 +31,11 @@ #include <edimp.hxx> #include <SwStyleNameMapper.hxx> -/************************************************************************* -|* -|* SwFEShell::GetPageDescCnt() -|* -|*************************************************************************/ - sal_uInt16 SwFEShell::GetPageDescCnt() const { return GetDoc()->GetPageDescCnt(); } -/************************************************************************* -|* -|* SwFEShell::ChgCurPageDesc() -|* -|*************************************************************************/ - void SwFEShell::ChgCurPageDesc( const SwPageDesc& rDesc ) { #if OSL_DEBUG_LEVEL > 0 @@ -112,12 +100,6 @@ void SwFEShell::ChgCurPageDesc( const SwPageDesc& rDesc ) EndAllActionAndCall(); } -/************************************************************************* -|* -|* SwFEShell::ChgPageDesc() -|* -|*************************************************************************/ - void SwFEShell::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged ) { StartAllAction(); @@ -133,12 +115,6 @@ void SwFEShell::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged ) EndAllActionAndCall(); } -/************************************************************************* -|* -|* SwFEShell::GetPageDesc(), GetCurPageDesc() -|* -|*************************************************************************/ - const SwPageDesc& SwFEShell::GetPageDesc( sal_uInt16 i ) const { return GetDoc()->GetPageDesc( i ); diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index e7cda7aedf9a..1b41d1ebbccb 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -70,13 +70,8 @@ using namespace ::com::sun::star; -/*********************************************************************** -#* Class : SwDoc -#* Methode : UseSpzLayoutFmt -#* Description : based on the request, changes to the specific layouts -#* will be made, to fit to the format -#***********************************************************************/ - +// Based on the request, changes to the specific layouts will be made, to +// fit to the format static bool lcl_SetNewFlyPos( const SwNode& rNode, SwFmtAnchor& rAnchor, const Point& rPt ) { @@ -258,14 +253,7 @@ void SwFEShell::SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool bNew ) } } -/************************************************************************* -|* -|* SwFEShell::FindFlyFrm() -|* -|* Description returns a Fly if one is selected -|* -*************************************************************************/ - +// returns a Fly if one is selected SwFlyFrm *SwFEShell::FindFlyFrm() const { if ( Imp()->HasDrawView() ) @@ -281,15 +269,7 @@ SwFlyFrm *SwFEShell::FindFlyFrm() const return 0; } -/************************************************************************* -|* -|* SwFEShell::IsFlyInFly() -|* -|* Description Returns sal_True, if the current Fly could be anchored -|* to another one (so it is inside) -|* -*************************************************************************/ - +// Returns sal_True, if the current Fly could be anchored to another one (so it is inside) const SwFrmFmt* SwFEShell::IsFlyInFly() { SET_CURR_SHELL( this ); @@ -345,12 +325,6 @@ const SwFrmFmt* SwFEShell::IsFlyInFly() return NULL; } -/************************************************************************* -|* -|* SwFEShell::SetFlyPos -|* -*************************************************************************/ - void SwFEShell::SetFlyPos( const Point& rAbsPos ) { SET_CURR_SHELL( this ); @@ -385,12 +359,6 @@ void SwFEShell::SetFlyPos( const Point& rAbsPos ) CallChgLnk(); // call the AttrChangeNotify on the UI-side. } -/************************************************************************* -|* -|* SwFEShell::FindAnchorPos -|* -*************************************************************************/ - Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt ) { Point aRet; @@ -595,12 +563,6 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt ) return aRet; } -/*********************************************************************** -#* Class : SwFEShell -#* Methode : NewFlyFrm -#* Description : -#***********************************************************************/ - const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchValid, SwFrmFmt *pParent ) { @@ -774,11 +736,6 @@ const SwFrmFmt *SwFEShell::NewFlyFrm( const SfxItemSet& rSet, sal_Bool bAnchVali return pRet; } -/*********************************************************************** -#* Class : SwFEShell -#* Methode : Insert -#***********************************************************************/ - void SwFEShell::Insert( const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, const SfxItemSet* pFlyAttrSet, @@ -938,11 +895,6 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj, } } -/*********************************************************************** -#* Class : SwFEShell -#* Methode : GetPageObjs -#***********************************************************************/ - void SwFEShell::GetPageObjs( std::vector<SwFrmFmt*>& rFillArr ) { rFillArr.clear(); @@ -957,11 +909,6 @@ void SwFEShell::GetPageObjs( std::vector<SwFrmFmt*>& rFillArr ) } } -/*********************************************************************** -#* Class : SwFEShell -#* Methode : SetPageFlysNewPage -#***********************************************************************/ - void SwFEShell::SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffset ) { if( rFillArr.empty() || !nOffset ) @@ -1012,16 +959,9 @@ void SwFEShell::SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffse EndAllAction(); } -/*********************************************************************** -#* Class : SwFEShell -#* Methode : GetFlyFrmAttr -#* Description : all attributes in the "baskets" will be filled -#* with the attributes of the current FlyFrms. -#* Attributes which cannot be filled due to being at the wrong place -#* or which are ambiguous (multiple selections) will be removed. -#* -#***********************************************************************/ - +// All attributes in the "baskets" will be filled with the attributes of the +// current FlyFrms. Attributes which cannot be filled due to being at the +// wrong place or which are ambiguous (multiple selections) will be removed. sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const { SwFlyFrm *pFly = FindFlyFrm(); @@ -1073,12 +1013,8 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const rSet.ClearItem( RES_CHAIN ); return sal_True; } -/*********************************************************************** -#* Class : SwFEShell -#* Methode : SetFlyFrmAttr -#* Description : Attributes of the current fly will change. -#***********************************************************************/ +// Attributes of the current fly will change. bool SwFEShell::SetFlyFrmAttr( SfxItemSet& rSet ) { SET_CURR_SHELL( this ); @@ -1157,13 +1093,7 @@ sal_Bool SwFEShell::SetDrawingAttr( SfxItemSet& rSet ) return bRet; } -/*********************************************************************** -#* Class : SwFEShell -#* Methode : ResetFlyFrmAttr -#* Description : Reset requested attributes or the ones contained in -#* the set. -#***********************************************************************/ - +// Reset requested attributes or the ones contained in the set. sal_Bool SwFEShell::ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet ) { sal_Bool bRet = sal_False; @@ -1208,12 +1138,7 @@ sal_Bool SwFEShell::ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet ) return bRet; } -/*********************************************************************** -#* Class : SwFEShell -#* Methode : GetCurFrmFmt -#* Description : Returns frame-format if frame, otherwise 0 -#***********************************************************************/ - +// Returns frame-format if frame, otherwise 0 SwFrmFmt* SwFEShell::GetCurFrmFmt() const { SwFrmFmt* pRet = 0; @@ -1224,11 +1149,6 @@ SwFrmFmt* SwFEShell::GetCurFrmFmt() const return pRet; } -/****************************************************************************** - * Methode : void SwFEShell::SetFrmFmt(SwFrmFmt *pNewFmt) - * Description : - ******************************************************************************/ - void SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, bool bKeepOrient, Point* pDocPos ) { SwFlyFrm *pFly = 0; @@ -1274,12 +1194,6 @@ void SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, bool bKeepOrient, Point* pDocPos ) } } -/************************************************************************* -|* -|* SwFEShell::GetFlyFrmFmt() -|* -*************************************************************************/ - const SwFrmFmt* SwFEShell::GetFlyFrmFmt() const { const SwFlyFrm* pFly = FindFlyFrm(); @@ -1306,12 +1220,6 @@ SwFrmFmt* SwFEShell::GetFlyFrmFmt() return 0; } -/************************************************************************* -|* -|* SwFEShell::GetFlyRect() -|* -*************************************************************************/ - SwRect SwFEShell::GetFlyRect() const { SwCntntFrm *pCntnt = GetCurrFrm( sal_False ); @@ -1325,12 +1233,6 @@ SwRect SwFEShell::GetFlyRect() const return pFly->Frm(); } -/************************************************************************* -|* -|* SwFEShell::GetObjRect() -|* -*************************************************************************/ - SwRect SwFEShell::GetObjRect() const { if( Imp()->HasDrawView() ) @@ -1351,11 +1253,6 @@ void SwFEShell::SetObjRect( const SwRect& rRect ) } } -/*********************************************************************** -#* Class : SwFEShell -#* Methode : RequestObjectResize() -#***********************************************************************/ - Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference < embed::XEmbeddedObject >& xObj ) { Size aResult; @@ -1481,11 +1378,6 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference < return aResult; } -/*********************************************************************** -#* Class : SwFEShell -#* Methode : WizzardFindCurFrmFmt -#***********************************************************************/ - SwFrmFmt* SwFEShell::WizzardGetFly() { // do not search the Fly via the layout. Now we can delete a frame diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index c7fabefc8991..60bfeb07630c 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -127,11 +127,6 @@ extern bool bNoInterrupt; // in swapp.cxx } } -/************************************************************************* -|* -|* SwFEShell::SelectObj() -*************************************************************************/ - sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pObj ) { SwDrawView *pDView = Imp()->GetDrawView(); @@ -247,24 +242,20 @@ sal_Bool SwFEShell::SelectObj( const Point& rPt, sal_uInt8 nFlag, SdrObject *pOb return bRet; } -/************************************************************************* -|* -|* sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir ) -|* -|* Description: MoveAnchor( nDir ) looked for an another Anchor for -|* the selected drawing object (or fly frame) in the given direction. -|* An object "as character" doesn't moves anyway. -|* A page bounded object could move to the previous/next page with up/down, -|* an object bounded "at paragraph" moves to the previous/next paragraph, too. -|* An object bounded "at character" moves to the previous/next paragraph -|* with up/down and to the previous/next character with left/right. -|* If the anchor for at paragraph/character bounded objects has vertical or -|* right_to_left text direction, the directions for up/down/left/right will -|* interpreted accordingly. -|* An object bounded "at fly" takes the center of the actual anchor and looks -|* for the nearest fly frame in the given direction. -|* -*************************************************************************/ +/* + * Description: MoveAnchor( nDir ) looked for an another Anchor for + * the selected drawing object (or fly frame) in the given direction. + * An object "as character" doesn't moves anyway. + * A page bounded object could move to the previous/next page with up/down, + * an object bounded "at paragraph" moves to the previous/next paragraph, too. + * An object bounded "at character" moves to the previous/next paragraph + * with up/down and to the previous/next character with left/right. + * If the anchor for at paragraph/character bounded objects has vertical or + * right_to_left text direction, the directions for up/down/left/right will + * interpreted accordingly. + * An object bounded "at fly" takes the center of the actual anchor and looks + * for the nearest fly frame in the given direction. + */ #define LESS_X( aPt1, aPt2, bOld ) ( aPt1.getX() < aPt2.getX() || \ ( aPt1.getX() == aPt2.getX() && ( aPt1.getY() < aPt2.getY() || \ @@ -514,12 +505,6 @@ sal_Bool SwFEShell::MoveAnchor( sal_uInt16 nDir ) return bRet; } -/************************************************************************* -|* -|* SwFEShell::GetSelFrmType() -|* -*************************************************************************/ - const SdrMarkList* SwFEShell::_GetMarkList() const { const SdrMarkList* pMarkList = NULL; @@ -578,12 +563,6 @@ bool SwFEShell::IsSelContainsControl() const return bRet; } -/************************************************************************* -|* -|* SwFEShell::Scroll() -|* -*************************************************************************/ - void SwFEShell::ScrollTo( const Point &rPt ) { const SwRect aRect( rPt, rPt ); @@ -595,24 +574,12 @@ void SwFEShell::ScrollTo( const Point &rPt ) } } -/************************************************************************* -|* -|* SwFEShell::SetDragMode() -|* -*************************************************************************/ - void SwFEShell::SetDragMode( sal_uInt16 eDragMode ) { if ( Imp()->HasDrawView() ) Imp()->GetDrawView()->SetDragMode( (SdrDragMode)eDragMode ); } -/************************************************************************* -|* -|* SwFEShell::BeginDrag() -|* -*************************************************************************/ - long SwFEShell::BeginDrag( const Point* pPt, sal_Bool ) { SdrView *pView = Imp()->GetDrawView(); @@ -626,11 +593,6 @@ long SwFEShell::BeginDrag( const Point* pPt, sal_Bool ) } return 0; } -/************************************************************************* -|* -|* SwFEShell::Drag() -|* -*************************************************************************/ long SwFEShell::Drag( const Point *pPt, sal_Bool ) { @@ -646,12 +608,6 @@ long SwFEShell::Drag( const Point *pPt, sal_Bool ) return 0; } -/************************************************************************* -|* -|* SwFEShell::EndDrag() -|* -*************************************************************************/ - long SwFEShell::EndDrag( const Point *, sal_Bool ) { OSL_ENSURE( Imp()->HasDrawView(), "EndDrag without DrawView?" ); @@ -696,12 +652,6 @@ long SwFEShell::EndDrag( const Point *, sal_Bool ) return 0; } -/************************************************************************* -|* -|* SwFEShell::BreakDrag() -|* -*************************************************************************/ - void SwFEShell::BreakDrag() { OSL_ENSURE( Imp()->HasDrawView(), "BreakDrag without DrawView?" ); @@ -710,14 +660,7 @@ void SwFEShell::BreakDrag() SetChainMarker(); } -/************************************************************************* -|* -|* SwFEShell::SelFlyGrabCrsr() -|* -|* Description If a fly is selected, pulls the crsr in -|* the first CntntFrm -*************************************************************************/ - +// If a fly is selected, pulls the crsr in the first CntntFrm const SwFrmFmt* SwFEShell::SelFlyGrabCrsr() { if ( Imp()->HasDrawView() ) @@ -750,14 +693,7 @@ const SwFrmFmt* SwFEShell::SelFlyGrabCrsr() return 0; } -/************************************************************************* -|* -|* SwFEShell::SelectionToTop(), SelectionToBottom() -|* -|* Description Selection to above/below (Z-Order) -|* -*************************************************************************/ - +// Selection to above/below (Z-Order) static void lcl_NotifyNeighbours( const SdrMarkList *pLst ) { // Rules for evasion have changed. @@ -876,14 +812,8 @@ void SwFEShell::SelectionToBottom( sal_Bool bBottom ) EndAllAction(); } -/************************************************************************* -|* -|* SwFEShell::GetLayerId() -|* -|* Description Object above/below the document? -|* 2 Controls, 1 Heaven, 0 Hell, -1 Ambiguous -*************************************************************************/ - +// Object above/below the document? 2 Controls, 1 Heaven, 0 Hell, +// -1 Ambiguous short SwFEShell::GetLayerId() const { short nRet = SHRT_MAX; @@ -909,13 +839,7 @@ short SwFEShell::GetLayerId() const return nRet; } -/************************************************************************* -|* -|* SwFEShell::SelectionToHeaven(), SelectionToHell() -|* -|* Description Object above/below the document -|* -*************************************************************************/ +// Object above/below the document // Note: only visible objects can be marked. Thus, objects with invisible // layer IDs have not to be considered. // If <SwFEShell> exists, layout exists!! @@ -966,12 +890,6 @@ void SwFEShell::SelectionToHell() ChangeOpaque( getIDocumentDrawModelAccess()->GetHellId() ); } -/************************************************************************* -|* -|* SwFEShell::IsObjSelected(), IsFrmSelected() -|* -*************************************************************************/ - sal_uInt16 SwFEShell::IsObjSelected() const { if ( IsFrmSelected() || !Imp()->HasDrawView() ) @@ -1018,12 +936,6 @@ sal_Bool SwFEShell::IsObjSameLevelWithMarked(const SdrObject* pObj) const return sal_False; } -/************************************************************************* -|* -|* SwFEShell::EndTextEdit() -|* -*************************************************************************/ - void SwFEShell::EndTextEdit() { // Terminate the TextEditMode. If required (default if the object @@ -1076,12 +988,6 @@ void SwFEShell::EndTextEdit() EndAllAction(); } -/************************************************************************* -|* -|* SwFEShell::IsInsideSelectedObj() -|* -*************************************************************************/ - int SwFEShell::IsInsideSelectedObj( const Point &rPt ) { if( Imp()->HasDrawView() ) @@ -1097,12 +1003,6 @@ int SwFEShell::IsInsideSelectedObj( const Point &rPt ) return SDRHIT_NONE; } -/************************************************************************* -|* -|* SwFEShell::IsObjSelectable() -|* -*************************************************************************/ - bool SwFEShell::IsObjSelectable( const Point& rPt ) { SET_CURR_SHELL(this); @@ -1248,18 +1148,12 @@ sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt) return bRet; } -/************************************************************************* -|* -|* SwFEShell::GotoObj() -|* -|* Description If an object was selected, we assume its upper-left corner -|* otherwise the middle of the current CharRects. -|* -*************************************************************************/ -/* -------------------------------------------------- +/* + * If an object was selected, we assume its upper-left corner + * otherwise the middle of the current CharRects. * Does the object include a control or groups, * which comprise only controls - * --------------------------------------------------*/ + */ static bool lcl_IsControlGroup( const SdrObject *pObj ) { bool bRet = false; @@ -1498,12 +1392,6 @@ sal_Bool SwFEShell::GotoObj( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType ) return sal_True; } -/************************************************************************* -|* -|* SwFEShell::BeginCreate() -|* -*************************************************************************/ - sal_Bool SwFEShell::BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Point &rPos ) { sal_Bool bRet = sal_False; @@ -1546,12 +1434,6 @@ sal_Bool SwFEShell::BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, sa return bRet; } -/************************************************************************* -|* -|* SwFEShell::MoveCreate() -|* -*************************************************************************/ - void SwFEShell::MoveCreate( const Point &rPos ) { OSL_ENSURE( Imp()->HasDrawView(), "MoveCreate without DrawView?" ); @@ -1563,12 +1445,6 @@ void SwFEShell::MoveCreate( const Point &rPos ) } } -/************************************************************************* -|* -|* SwFEShell::EndCreate(), ImpEndCreate() -|* -*************************************************************************/ - sal_Bool SwFEShell::EndCreate( sal_uInt16 eSdrCreateCmd ) { // To assure undo-object from the DrawEngine is not stored, @@ -1931,12 +1807,6 @@ sal_Bool SwFEShell::ImpEndCreate() return sal_True; } -/************************************************************************* -|* -|* SwFEShell::BreakCreate() -|* -*************************************************************************/ - void SwFEShell::BreakCreate() { OSL_ENSURE( Imp()->HasDrawView(), "BreakCreate without DrawView?" ); @@ -1944,23 +1814,11 @@ void SwFEShell::BreakCreate() ::FrameNotify( this, FLY_DRAG_END ); } -/************************************************************************* -|* -|* SwFEShell::IsDrawCreate() -|* -*************************************************************************/ - bool SwFEShell::IsDrawCreate() const { return Imp()->HasDrawView() ? Imp()->GetDrawView()->IsCreateObj() : false; } -/************************************************************************* -|* -|* SwFEShell::BeginMark() -|* -*************************************************************************/ - sal_Bool SwFEShell::BeginMark( const Point &rPos ) { if ( !Imp()->HasDrawView() ) @@ -1979,12 +1837,6 @@ sal_Bool SwFEShell::BeginMark( const Point &rPos ) return sal_False; } -/************************************************************************* -|* -|* SwFEShell::MoveMark() -|* -*************************************************************************/ - void SwFEShell::MoveMark( const Point &rPos ) { OSL_ENSURE( Imp()->HasDrawView(), "MoveMark without DrawView?" ); @@ -2003,12 +1855,6 @@ void SwFEShell::MoveMark( const Point &rPos ) } } -/************************************************************************* -|* -|* SwFEShell::EndMark() -|* -*************************************************************************/ - sal_Bool SwFEShell::EndMark() { sal_Bool bRet = sal_False; @@ -2066,24 +1912,12 @@ sal_Bool SwFEShell::EndMark() return bRet; } -/************************************************************************* -|* -|* SwFEShell::BreakSelect() -|* -*************************************************************************/ - void SwFEShell::BreakMark() { OSL_ENSURE( Imp()->HasDrawView(), "BreakMark without DrawView?" ); Imp()->GetDrawView()->BrkMarkObj(); } -/************************************************************************* -|* -|* SwFEShell::GetAnchorId() -|* -*************************************************************************/ - short SwFEShell::GetAnchorId() const { short nRet = SHRT_MAX; @@ -2114,12 +1948,6 @@ short SwFEShell::GetAnchorId() const return nRet; } -/************************************************************************* -|* -|* SwFEShell::ChgAnchor() -|* -*************************************************************************/ - void SwFEShell::ChgAnchor( int eAnchorId, bool bSameOnly, bool bPosCorr ) { OSL_ENSURE( Imp()->HasDrawView(), "ChgAnchor without DrawView?" ); @@ -2138,12 +1966,6 @@ void SwFEShell::ChgAnchor( int eAnchorId, bool bSameOnly, bool bPosCorr ) } } -/************************************************************************* -|* -|* SwFEShell::DelSelectedObj() -|* -*************************************************************************/ - void SwFEShell::DelSelectedObj() { OSL_ENSURE( Imp()->HasDrawView(), "DelSelectedObj(), no DrawView available" ); @@ -2156,15 +1978,7 @@ void SwFEShell::DelSelectedObj() } } -/************************************************************************* -|* -|* SwFEShell::GetObjSize(), GetAnchorObjDiff() -|* -|* Description For the statusline to request the current -|* conditions -|* -*************************************************************************/ - +// For the statusline to request the current conditions Size SwFEShell::GetObjSize() const { Rectangle aRect; @@ -2213,12 +2027,6 @@ Point SwFEShell::GetObjAbsPos() const return Imp()->GetDrawView()->GetDragStat().GetActionRect().TopLeft(); } -/************************************************************************* -|* -|* SwFEShell::IsGroupSelected() -|* -*************************************************************************/ - sal_Bool SwFEShell::IsGroupSelected() { if ( IsObjSelected() ) @@ -2319,15 +2127,7 @@ bool SwFEShell::IsGroupAllowed() const return bIsGroupAllowed; } -/************************************************************************* -|* -|* SwFEShell::GroupSelection() -|* -|* Description The group gets the anchor and the contactobject -|* of the first in the selection -|* -*************************************************************************/ - +// The group gets the anchor and the contactobject of the first in the selection void SwFEShell::GroupSelection() { if ( IsGroupAllowed() ) @@ -2342,15 +2142,7 @@ void SwFEShell::GroupSelection() } } -/************************************************************************* -|* -|* SwFEShell::UnGroupSelection() -|* -|* Description The individual objects get a copy of the anchor and -|* the contactobject of the group -|* -*************************************************************************/ - +// The individual objects get a copy of the anchor and the contactobject of the group void SwFEShell::UnGroupSelection() { if ( IsGroupSelected() ) @@ -2365,12 +2157,6 @@ void SwFEShell::UnGroupSelection() } } -/************************************************************************* -|* -|* SwFEShell::MirrorSelection() -|* -*************************************************************************/ - void SwFEShell::MirrorSelection( bool bHorizontal ) { SdrView *pView = Imp()->GetDrawView(); diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index bd4fcddd9262..7abc15200ad0 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -180,10 +180,6 @@ void SwFEShell::ParkCursorInTab() } } -/*********************************************************************** -#* Class : SwFEShell -#* Methods : InsertRow(), InsertCol -#***********************************************************************/ bool SwFEShell::InsertRow( sal_uInt16 nCnt, bool bBehind ) { // check if Point/Mark of current cursor are in a table @@ -263,14 +259,7 @@ bool SwFEShell::InsertCol( sal_uInt16 nCnt, bool bBehind ) return bRet; } -/*********************************************************************** -#* Class : SwFEShell -#* Methoden : DeleteRow(), DeleteCol() -#***********************************************************************/ - -/** - Determines if the current cursor is in the last row of the table. -*/ +// Determines if the current cursor is in the last row of the table. sal_Bool SwFEShell::IsLastCellInRow() const { SwTabCols aTabCols; @@ -456,11 +445,6 @@ sal_Bool SwFEShell::DeleteRow(bool bCompleteTable) return bRet; } -/*********************************************************************** -#* Class : SwFEShell -#* Methods : MergeTab(), SplitTab() -#***********************************************************************/ - sal_uInt16 SwFEShell::MergeTab() { // check if Point/Mark of current cursor are in a table @@ -536,10 +520,6 @@ sal_Bool SwFEShell::SplitTab( sal_Bool bVert, sal_uInt16 nCnt, sal_Bool bSameHei return bRet; } -/*********************************************************************** -#* Class : SwFEShell -#* Methods : _GetTabCols -#***********************************************************************/ void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const { const SwTabFrm *pTab = pBox->FindTabFrm(); @@ -613,10 +593,6 @@ void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const #endif } -/*********************************************************************** -#* Class : SwFEShell -#* Methods : _GetTabRows -#***********************************************************************/ void SwFEShell::_GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const { const SwTabFrm *pTab = pBox->FindTabFrm(); @@ -664,10 +640,6 @@ void SwFEShell::_GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const } } -/*********************************************************************** -#* Class : SwFEShell -#* Methods : SetTabCols(), GetTabCols() -#***********************************************************************/ void SwFEShell::SetTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly ) { SwFrm *pBox = GetCurrFrm(); @@ -745,11 +717,6 @@ void SwFEShell::SetMouseTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly, co } } -/*********************************************************************** - * Class : SwFEShell - * Methods : SetRowSplit(), GetRowSplit() - ***********************************************************************/ - void SwFEShell::SetRowSplit( const SwFmtRowSplit& rNew ) { SET_CURR_SHELL( this ); @@ -763,10 +730,6 @@ void SwFEShell::GetRowSplit( SwFmtRowSplit*& rpSz ) const GetDoc()->GetRowSplit( *getShellCrsr( false ), rpSz ); } -/*********************************************************************** - * Class : SwFEShell - * Methods : SetRowHeight(), GetRowHeight() - ***********************************************************************/ void SwFEShell::SetRowHeight( const SwFmtFrmSize &rNew ) { SET_CURR_SHELL( this ); @@ -775,9 +738,6 @@ void SwFEShell::SetRowHeight( const SwFmtFrmSize &rNew ) EndAllActionAndCall(); } -/****************************************************************************** - * SwTwips SwFEShell::GetRowHeight() const - ******************************************************************************/ void SwFEShell::GetRowHeight( SwFmtFrmSize *& rpSz ) const { GetDoc()->GetRowHeight( *getShellCrsr( false ), rpSz ); @@ -794,9 +754,6 @@ sal_Bool SwFEShell::BalanceRowHeight( sal_Bool bTstOnly ) return bRet; } -/****************************************************************************** - * void SwFEShell::SetRowBackground() - ******************************************************************************/ void SwFEShell::SetRowBackground( const SvxBrushItem &rNew ) { SET_CURR_SHELL( this ); @@ -805,19 +762,11 @@ void SwFEShell::SetRowBackground( const SvxBrushItem &rNew ) EndAllActionAndCall(); } -/****************************************************************************** - * SwTwips SwFEShell::GetRowBackground() const - ******************************************************************************/ sal_Bool SwFEShell::GetRowBackground( SvxBrushItem &rToFill ) const { return GetDoc()->GetRowBackground( *getShellCrsr( false ), rToFill ); } -/*********************************************************************** -#* Class : SwFEShell -#* Methods : SetTabBorders(), GetTabBorders() -#***********************************************************************/ - void SwFEShell::SetTabBorders( const SfxItemSet& rSet ) { SET_CURR_SHELL( this ); @@ -841,10 +790,6 @@ void SwFEShell::GetTabBorders( SfxItemSet& rSet ) const GetDoc()->GetTabBorders( *getShellCrsr( false ), rSet ); } -/*********************************************************************** -#* Class : SwFEShell -#* Methods : SetBoxBackground(), GetBoxBackground() -#***********************************************************************/ void SwFEShell::SetBoxBackground( const SvxBrushItem &rNew ) { SET_CURR_SHELL( this ); @@ -858,10 +803,6 @@ sal_Bool SwFEShell::GetBoxBackground( SvxBrushItem &rToFill ) const return GetDoc()->GetBoxAttr( *getShellCrsr( false ), rToFill ); } -/*********************************************************************** -#* Class : SwFEShell -#* Methods : SetBoxDirection(), GetBoxDirection() -#***********************************************************************/ void SwFEShell::SetBoxDirection( const SvxFrameDirectionItem& rNew ) { SET_CURR_SHELL( this ); @@ -875,10 +816,6 @@ sal_Bool SwFEShell::GetBoxDirection( SvxFrameDirectionItem& rToFill ) const return GetDoc()->GetBoxAttr( *getShellCrsr( false ), rToFill ); } -/*********************************************************************** -#* Class : SwFEShell -#* Methods : SetBoxAlign, SetBoxAlign -#***********************************************************************/ void SwFEShell::SetBoxAlign( sal_uInt16 nAlign ) { SET_CURR_SHELL( this ); @@ -892,10 +829,6 @@ sal_uInt16 SwFEShell::GetBoxAlign() const return GetDoc()->GetBoxAlign( *getShellCrsr( false ) ); } -/*********************************************************************** -#* Class : SwFEShell -#* Methods : SetTabBackground(), GetTabBackground() -#***********************************************************************/ void SwFEShell::SetTabBackground( const SvxBrushItem &rNew ) { SwFrm *pFrm = GetCurrFrm(); @@ -916,10 +849,6 @@ void SwFEShell::GetTabBackground( SvxBrushItem &rToFill ) const rToFill = pFrm->ImplFindTabFrm()->GetFmt()->GetBackground(); } -/*********************************************************************** -#* Class : SwFEShell -#* Methods : HasWholeTabSelection() -#***********************************************************************/ sal_Bool SwFEShell::HasWholeTabSelection() const { // whole table selected? @@ -979,10 +908,6 @@ sal_Bool SwFEShell::HasBoxSelection() const return sal_False; } -/*********************************************************************** -#* Class : SwFEShell -#* Methods : ProtectCells(), UnProtectCells() -#***********************************************************************/ void SwFEShell::ProtectCells() { SvxProtectItem aProt( RES_PROTECT ); @@ -1072,10 +997,6 @@ sal_Bool SwFEShell::CanUnProtectCells() const return bUnProtectAvailable; } -/*********************************************************************** -#* Class : SwFEShell -#* Methods : GetRowsToRepeat(), SetRowsToRepeat() -#***********************************************************************/ sal_uInt16 SwFEShell::GetRowsToRepeat() const { const SwFrm *pFrm = GetCurrFrm(); @@ -1099,9 +1020,7 @@ void SwFEShell::SetRowsToRepeat( sal_uInt16 nSet ) } } -/*------------------------------------------------------------------------- - returns the number of rows consecutively selected from top - -----------------------------------------------------------------------*/ +// returns the number of rows consecutively selected from top static sal_uInt16 lcl_GetRowNumber( const SwPosition& rPos ) { sal_uInt16 nRet = USHRT_MAX; @@ -1137,6 +1056,7 @@ static sal_uInt16 lcl_GetRowNumber( const SwPosition& rPos ) return nRet; } + sal_uInt16 SwFEShell::GetRowSelectionFromTop() const { sal_uInt16 nRet = 0; @@ -1193,11 +1113,6 @@ sal_Bool SwFEShell::CheckHeadline( bool bRepeat ) const return bRet; } -/*********************************************************************** -#* Class : SwFEShell -#* Methoden : AdjustCellWidth() -#***********************************************************************/ - void SwFEShell::AdjustCellWidth( sal_Bool bBalance ) { SET_CURR_SHELL( this ); @@ -1324,10 +1239,6 @@ sal_Bool SwFEShell::GetTableAutoFmt( SwTableAutoFmt& rGet ) return GetDoc()->GetTableAutoFmt( aBoxes, rGet ); } -/*********************************************************************** -#* Class : SwFEShell -#* Methoden : DeleteTblSel() -#***********************************************************************/ sal_Bool SwFEShell::DeleteTblSel() { // check if SPoint/Mark of current cursor are in a table @@ -1371,11 +1282,6 @@ sal_Bool SwFEShell::DeleteTblSel() return bRet; } -/************************************************************************* -|* -|* SwFEShell::GetCurTabColNum() -|* -|*************************************************************************/ size_t SwFEShell::GetCurTabColNum() const { //!!!GetCurMouseTabColNum() mitpflegen!!!! @@ -1437,12 +1343,6 @@ size_t SwFEShell::GetCurTabColNum() const return nRet; } -/************************************************************************* -|* -|* SwFEShell::GetBox() -|* -|*************************************************************************/ - static const SwFrm *lcl_FindFrmInTab( const SwLayoutFrm *pLay, const Point &rPt, SwTwips nFuzzy ) { const SwFrm *pFrm = pLay->Lower(); @@ -1949,11 +1849,6 @@ bool SwFEShell::SelTblRowCol( const Point& rPt, const Point* pEnd, bool bRowDrag return bRet; } -/************************************************************************* -|* -|* SwFEShell::WhichMouseTabCol() -|* -|*************************************************************************/ sal_uInt8 SwFEShell::WhichMouseTabCol( const Point &rPt ) const { sal_uInt8 nRet = SW_TABCOL_NONE; @@ -2092,11 +1987,6 @@ bool SwFEShell::IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode, return bRet; } -/************************************************************************* -|* -|* SwFEShell::GetMouseTabCols() -|* -|*************************************************************************/ void SwFEShell::GetMouseTabCols( SwTabCols &rToFill, const Point &rPt ) const { const SwFrm *pBox = GetBox( rPt ); @@ -2117,11 +2007,6 @@ void SwFEShell::SetMouseTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly, } } -/************************************************************************* -|* -|* SwFEShell::GetMouseColNum(), GetMouseTabColNum() -|* -|*************************************************************************/ sal_uInt16 SwFEShell::GetCurMouseColNum( const Point &rPt, SwGetCurColNumPara* pPara ) const { @@ -2164,11 +2049,6 @@ void ClearFEShellTabCols() DELETEZ( pLastRows ); } -/************************************************************************* -|* -|* SwFEShell::GetTblAttr(), SetTblAttr() -|* -|*************************************************************************/ void SwFEShell::GetTblAttr( SfxItemSet &rSet ) const { SwFrm *pFrm = GetCurrFrm(); diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index 01cc00cd2be5..5f2cc60af410 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -53,11 +53,6 @@ using namespace com::sun::star; TYPEINIT1(SwFEShell,SwEditShell) -/*********************************************************************** -#* Class : SwFEShell -#* Method : EndAllActionAndCall() -#***********************************************************************/ - void SwFEShell::EndAllActionAndCall() { SwViewShell *pTmp = this; @@ -72,12 +67,7 @@ void SwFEShell::EndAllActionAndCall() } while( this != ( pTmp = (SwViewShell*)pTmp->GetNext() )); } -/*********************************************************************** -#* Class : SwFEShell -#* Method : GetCntntPos -#* Description : Determine the Cntnt's nearest to the point -#***********************************************************************/ - +// Determine the Cntnt's nearest to the point Point SwFEShell::GetCntntPos( const Point& rPoint, sal_Bool bNext ) const { SET_CURR_SHELL( (SwViewShell*)this ); @@ -212,26 +202,12 @@ sal_Bool SwFEShell::GetPageNumber( long nYPos, sal_Bool bAtCrsrPos, sal_uInt16& return 0 != pPage; } -/************************************************************************* -|* -|* SwFEShell::IsDirectlyInSection() -|* -|* Hack for OS: -|* -*************************************************************************/ - bool SwFEShell::IsDirectlyInSection() const { SwFrm* pFrm = GetCurrFrm( sal_False ); return pFrm && pFrm->GetUpper() && pFrm->GetUpper()->IsSctFrm(); } -/************************************************************************* -|* -|* SwFEShell::GetFrmType() -|* -*************************************************************************/ - sal_uInt16 SwFEShell::GetFrmType( const Point *pPt, sal_Bool bStopAtFly ) const { sal_uInt16 nReturn = FRMTYPE_NONE; @@ -299,12 +275,6 @@ sal_uInt16 SwFEShell::GetFrmType( const Point *pPt, sal_Bool bStopAtFly ) const return nReturn; } -/************************************************************************* -|* -|* SwFEShell::ShLooseFcs(), ShGetFcs() -|* -*************************************************************************/ - void SwFEShell::ShGetFcs( sal_Bool bUpdate ) { ::SetShell( this ); @@ -329,13 +299,6 @@ void SwFEShell::ShLooseFcs() } } -/************************************************************************* -|* -|* SwFEShell::GetPhyPageNum() -|* SwFEShell::GetVirtPageNum() -|* -*************************************************************************/ - sal_uInt16 SwFEShell::GetPhyPageNum() { SwFrm *pFrm = GetCurrFrm(); @@ -352,15 +315,6 @@ sal_uInt16 SwFEShell::GetVirtPageNum( const sal_Bool bCalcFrm ) return 0; } -/************************************************************************* -|* -|* void lcl_SetAPageOffset() -|* void SwFEShell::SetNewPageOffset() -|* void SwFEShell::SetPageOffset() -|* sal_uInt16 SwFEShell::GetPageOffset() const -|* -*************************************************************************/ - static void lcl_SetAPageOffset( sal_uInt16 nOffset, SwPageFrm* pPage, SwFEShell* pThis ) { pThis->StartAllAction(); @@ -430,12 +384,6 @@ sal_uInt16 SwFEShell::GetPageOffset() const return 0; } -/************************************************************************* -|* -|* SwFEShell::InsertLabel() -|* -*************************************************************************/ - void SwFEShell::InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator, const OUString& rNumberSeparator, const sal_Bool bBefore, const sal_uInt16 nId, @@ -524,11 +472,6 @@ void SwFEShell::InsertLabel( const SwLabelType eType, const OUString &rTxt, cons } } -/*********************************************************************** -#* Class : SwFEShell -#* Method : Sort -#***********************************************************************/ - sal_Bool SwFEShell::Sort(const SwSortOptions& rOpt) { if( !HasSelection() ) @@ -599,12 +542,6 @@ sal_Bool SwFEShell::Sort(const SwSortOptions& rOpt) return bRet; } -/************************************************************************* -|* -|* SwFEShell::GetCurColNum(), _GetColNum() -|* -|*************************************************************************/ - sal_uInt16 SwFEShell::_GetCurColNum( const SwFrm *pFrm, SwGetCurColNumPara* pPara ) const { diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx index 53614c4f9fe2..f8647d9fc194 100644 --- a/sw/source/core/inc/UndoNumbering.hxx +++ b/sw/source/core/inc/UndoNumbering.hxx @@ -26,7 +26,6 @@ #include <rtl/ustring.hxx> #include <numrule.hxx> -//----------- Undo for Numbering ------------------------------------- class SwUndoInsNum : public SwUndo, private SwUndRng { SwNumRule aNumRule; diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx index 478161cb78f8..72524128aed5 100644 --- a/sw/source/core/inc/UndoSection.hxx +++ b/sw/source/core/inc/UndoSection.hxx @@ -30,7 +30,6 @@ class SwSectionData; class SwSectionFmt; class SwTOXBase; -//------------ Undo of Insert-/Delete-Section ---------------------- class SwUndoInsSection : public SwUndo, private SwUndRng { private: diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx index b750741bb710..f1be7738bbe6 100644 --- a/sw/source/core/inc/UndoSort.hxx +++ b/sw/source/core/inc/UndoSort.hxx @@ -28,7 +28,6 @@ struct SwSortOptions; class SwTableNode; class SwUndoAttrTbl; -//-------------------- Undo for Sorting ------------------------------ struct SwSortUndoElement { union { diff --git a/sw/source/core/inc/laycache.hxx b/sw/source/core/inc/laycache.hxx index b9a0a40ca557..2ea98d4709d2 100644 --- a/sw/source/core/inc/laycache.hxx +++ b/sw/source/core/inc/laycache.hxx @@ -26,9 +26,7 @@ class SwDoc; class SwLayCacheImpl; class SvStream; -/************************************************************************* - * class SwLayoutCache - * +/* * This class allows to save layout information in the file and it contains * this information after loading of a file. * Call Write(..) with a stream and the document to save and the page break @@ -38,8 +36,7 @@ class SvStream; * There's a simple locking mechanism at these classes, * if somebody reads the information, he increments the lock count by 1, * during the Read(..) function the lock count will set to $8000. - * - **************************************************************************/ + */ class SwLayoutCache { SwLayCacheImpl *pImpl; diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx index 49842c9da413..001bc3d48c03 100644 --- a/sw/source/core/inc/scriptinfo.hxx +++ b/sw/source/core/inc/scriptinfo.hxx @@ -32,12 +32,7 @@ typedef std::list< sal_Int32 > PositionList; #define SPACING_PRECISION_FACTOR 100 -/************************************************************************* - * class SwScriptInfo - * - * encapsultes information about script changes - *************************************************************************/ - +// encapsultes information about script changes class SwScriptInfo { private: diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx index 58297497fc15..5bb84ba74904 100644 --- a/sw/source/core/inc/swfntcch.hxx +++ b/sw/source/core/inc/swfntcch.hxx @@ -29,10 +29,6 @@ class SwViewShell; class SfxPoolItem; -/************************************************************************* - * class SwFontCache - *************************************************************************/ - class SwFontCache : public SwCache { public: @@ -48,10 +44,6 @@ public: // AttributSet/Font-Cache, globale Variable, in FontCache.Cxx angelegt extern SwFontCache *pSwFontCache; -/************************************************************************* - * class SwFontObj - *************************************************************************/ - class SwFontObj : public SwCacheObj { friend class SwFontAccess; @@ -72,10 +64,6 @@ public: inline const SfxPoolItem** GetDefault() { return pDefaultArray; } }; -/************************************************************************* - * class SwFontAccess - *************************************************************************/ - class SwFontAccess : public SwCacheAccess { SwViewShell *pShell; diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index c11a29a86909..1c77cf92a8ba 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -1016,12 +1016,7 @@ inline void SwFont::SetHighlightColor( const Color& aNewColor ) aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0; } -/************************************************************************* - * class SwUnderlineFont - * - * Used for the "continuous underline" feature. - *************************************************************************/ - +// Used for the "continuous underline" feature. class SwUnderlineFont { Point aPos; @@ -1043,10 +1038,6 @@ public: void SetPos( const Point& rPoint ) { aPos = rPoint; } }; -/************************************************************************* - * class SvStatistics - *************************************************************************/ - #ifdef DBG_UTIL class SvStatistics diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index a35a81aff0fd..9aaccd4940ad 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -584,10 +584,6 @@ public: virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) SAL_OVERRIDE; }; -/************************************************************************* - * class SwTxtFrmLocker - *************************************************************************/ - class SwTxtFrmLocker { private: @@ -599,10 +595,6 @@ public: inline ~SwTxtFrmLocker() { if( pFrm ) pFrm->Unlock(); } }; -/************************************************************************* - * Inline-Implementierung - *************************************************************************/ - inline const SwParaPortion *SwTxtFrm::GetPara() const { return ((SwTxtFrm*)this)->GetPara(); diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx index 9d8b2a59e137..d776ed2154e8 100644 --- a/sw/source/core/inc/unoflatpara.hxx +++ b/sw/source/core/inc/unoflatpara.hxx @@ -44,10 +44,6 @@ namespace com { namespace sun { namespace star { namespace text { class SwTxtNode; class SwDoc; -/****************************************************************************** - * SwXFlatParagraph - ******************************************************************************/ - typedef ::cppu::ImplInheritanceHelper3 < SwXTextMarkup , css::beans::XPropertySet @@ -144,10 +140,6 @@ private: OUString maExpandText; }; -/****************************************************************************** - * SwXFlatParagraphIterator - ******************************************************************************/ - class SwXFlatParagraphIterator: public ::cppu::WeakImplHelper1 < diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 40e74bd34cdc..21fa7112c165 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -557,24 +557,22 @@ const SwAttrSet* SwFrm::GetAttrSet() const return &((const SwLayoutFrm*)this)->GetFmt()->GetAttrSet(); } -/************************************************************************* -|* -|* SwFrm::_FindNext(), _FindPrev(), InvalidateNextPos() -|* _FindNextCnt() visits tables and sections and only returns SwCntntFrms. -|* -|* Description Invalidates the position of the next frame. -|* This is the direct successor or in case of CntntFrms the next -|* CntntFrm which sits in the same flow as I do: -|* - body, -|* - footnote, -|* - in headers/footers the notification only needs to be forwarded -|* inside the section -|* - same for Flys -|* - Cntnts in tabs remain only inside their cell -|* - in principle tables behave exactly like the Cntnts -|* - sections also -|*************************************************************************/ - +/* + * SwFrm::_FindNext(), _FindPrev(), InvalidateNextPos() + * _FindNextCnt() visits tables and sections and only returns SwCntntFrms. + * + * Description Invalidates the position of the next frame. + * This is the direct successor or in case of CntntFrms the next + * CntntFrm which sits in the same flow as I do: + * - body, + * - footnote, + * - in headers/footers the notification only needs to be forwarded + * inside the section + * - same for Flys + * - Cntnts in tabs remain only inside their cell + * - in principle tables behave exactly like the Cntnts + * - sections also + */ // This helper function is an equivalent to the ImplGetNextCntntFrm() method, // besides ContentFrames this function also returns TabFrms and SectionFrms. static SwFrm* lcl_NextFrm( SwFrm* pFrm ) diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index a0e3800e12de..3b49a6e1c437 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -2130,8 +2130,6 @@ void SwBorderAttrs::_GetBottomLine( const SwFrm& _rFrm ) nGetBottomLine = nRet; } -/*************************************************************************/ - SwBorderAttrAccess::SwBorderAttrAccess( SwCache &rCach, const SwFrm *pFrm ) : SwCacheAccess( rCach, (pFrm->IsCntntFrm() ? (void*)((SwCntntFrm*)pFrm)->GetNode() : diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx index 810e30a1d586..59b1ef229f70 100644 --- a/sw/source/core/layout/layhelp.hxx +++ b/sw/source/core/layout/layhelp.hxx @@ -33,9 +33,8 @@ class SwSectionFrm; class SwSectionNode; class SvStream; -/************************************************************************* - * class SwLayCacheImpl - * contains the page break information and the text frame positions +/* + * Contains the page break information and the text frame positions * of the document (after loading) * and is used inside the constructor of the layout rootframe to * insert content and text frames at the right pages. @@ -45,7 +44,7 @@ class SvStream; * and if it's not the first part of the table/paragraph, * the row/character-offset inside the table/paragraph. * The text frame positions are stored in the SwPageFlyCache array. - *************************************************************************/ + */ class SwFlyCache; typedef boost::ptr_vector<SwFlyCache> SwPageFlyCache; @@ -72,12 +71,8 @@ public: bool IsUseFlyCache() const { return bUseFlyCache; } }; -/************************************************************************* - * class SwActualSection - * helps to create the sectionframes during the _InsertCnt-function - * by controlling nested sections. - *************************************************************************/ - +// Helps to create the sectionframes during the _InsertCnt-function +// by controlling nested sections. class SwActualSection { SwActualSection *pUpper; @@ -94,12 +89,8 @@ public: SwActualSection *GetUpper() { return pUpper; } }; -/************************************************************************* - * class SwLayHelper - * helps during the _InsertCnt-function to create new pages. - * If there's a layoutcache available, this information is used. - *************************************************************************/ - +// Helps during the _InsertCnt-function to create new pages. +// If there's a layoutcache available, this information is used. class SwLayHelper { SwFrm* &rpFrm; @@ -137,12 +128,7 @@ public: static bool CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly ); }; -/************************************************************************* - * class SwLayCacheIoImpl - * contains the data structures that are required to read and write a - * layout cache. - *************************************************************************/ - +// Contains the data structures that are required to read and write a layout cache. #define SW_LAYCACHE_IO_REC_PAGES 'p' #define SW_LAYCACHE_IO_REC_PARA 'P' #define SW_LAYCACHE_IO_REC_TABLE 'T' diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 3da4f8795074..7806a7660b90 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -226,8 +226,6 @@ public: } }; -//----------------- End of classes for border lines ---------------------- - static SwViewShell *pGlobalShell = 0; //Only repaint the Fly content as well as the background of the Fly content if @@ -444,8 +442,6 @@ SwSavePaintStatics::~SwSavePaintStatics() aScaleY = aSScaleY; } -//----------------- Implementation for the table borders -------------- - /** * Check whether the two primitve can be merged * @@ -1671,8 +1667,6 @@ static void lcl_ExtendLeftAndRight( SwRect& _rRect, // pRetoucheFly = 0; //} -//---------------- Output for BrushItem ---------------- - static void lcl_implDrawGraphicBackgrd( const SvxBrushItem& _rBackgrdBrush, OutputDevice* _pOut, const SwRect& _rAlignedPaintRect, diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 14ec809705d3..ce092c361789 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -191,9 +191,6 @@ void SwTabFrm::RegistFlys() } } -/************************************************************************* -|* Some prototypes -|*************************************************************************/ void SwInvalidateAll( SwFrm *pFrm, long nBottom ); static void lcl_RecalcRow( SwRowFrm& rRow, long nBottom ); static bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, bool bInva ); @@ -210,10 +207,6 @@ static SwTwips lcl_CalcMinRowHeight( const SwRowFrm *pRow, const sal_Bool _bConsiderObjs ); static SwTwips lcl_CalcTopAndBottomMargin( const SwLayoutFrm&, const SwBorderAttrs& ); -/************************************************************************* -|* START: local helper functions for repeated headlines -|*************************************************************************/ - static SwTwips lcl_GetHeightOfRows( const SwFrm* pStart, long nCount ) { if ( !nCount || !pStart) @@ -231,14 +224,6 @@ static SwTwips lcl_GetHeightOfRows( const SwFrm* pStart, long nCount ) return nRet; } -/************************************************************************* -|* END: local helper functions for repeated headlines -|*************************************************************************/ - -/************************************************************************* -|* START: local helper functions for splitting row frames -|*************************************************************************/ - // Local helper function to insert a new follow flow line static SwRowFrm* lcl_InsertNewFollowFlowLine( SwTabFrm& rTab, const SwFrm& rTmpRow, bool bRowSpanLine ) { @@ -805,10 +790,6 @@ static long lcl_GetMaximumLayoutRowSpan( const SwRowFrm& rRow ) return nRet; } -/************************************************************************* -|* END: local helper functions for splitting row frames -|*************************************************************************/ - // Function to remove the FollowFlowLine of rTab. // The content of the FollowFlowLine is moved to the associated line in the // master table. diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index cbbda808e332..2342ac9fd293 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -1186,19 +1186,17 @@ void SwTable::InsertSpannedRow( SwDoc* pDoc, sal_uInt16 nRowIdx, sal_uInt16 nCnt typedef std::pair< sal_uInt16, sal_uInt16 > SwLineOffset; typedef std::list< SwLineOffset > SwLineOffsetArray; -/****************************************************************************** -When a couple of table boxes has to be split, -lcl_SophisticatedFillLineIndices delivers the information where and how many -rows have to be inserted. -Input - rTable: the table to manipulate - rBoxes: an array of boxes to split - nCnt: how many parts are wanted -Output - rArr: a list of pairs ( line index, number of lines to insert ) - -******************************************************************************/ - +/* +* When a couple of table boxes has to be split, +* lcl_SophisticatedFillLineIndices delivers the information where and how many +* rows have to be inserted. +* Input +* rTable: the table to manipulate +* rBoxes: an array of boxes to split +* nCnt: how many parts are wanted +* Output +* rArr: a list of pairs ( line index, number of lines to insert ) +*/ static void lcl_SophisticatedFillLineIndices( SwLineOffsetArray &rArr, const SwTable& rTable, const SwSelBoxes& rBoxes, sal_uInt16 nCnt ) { diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 77bd9e6bfe81..2b4354dc368e 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -242,11 +242,6 @@ void _InsTblBox( SwDoc* pDoc, SwTableNode* pTblNd, } } -/************************************************************************* -|* -|* SwTable::SwTable() -|* -|*************************************************************************/ SwTable::SwTable( SwTableFmt* pFmt ) : SwClient( pFmt ), pHTMLLayout( 0 ), @@ -307,11 +302,6 @@ SwTable::~SwTable() delete pHTMLLayout; } -/************************************************************************* -|* -|* SwTable::Modify() -|* -|*************************************************************************/ static void FmtInArr( std::vector<SwFmt*>& rFmtArr, SwFmt* pBoxFmt ) { std::vector<SwFmt*>::const_iterator it = std::find( rFmtArr.begin(), rFmtArr.end(), pBoxFmt ); @@ -420,11 +410,6 @@ void SwTable::AdjustWidths( const long nOld, const long nNew ) ::lcl_ModifyLines( aLines, nOld, nNew, aFmtArr, true ); } -/************************************************************************* -|* -|* SwTable::GetTabCols() -|* -|*************************************************************************/ static void lcl_RefreshHidden( SwTabCols &rToFill, size_t nPos ) { for ( size_t i = 0; i < rToFill.Count(); ++i ) @@ -660,11 +645,6 @@ void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart, } } -/************************************************************************* -|* -|* SwTable::SetTabCols() -|* -|*************************************************************************/ // Structure for parameter passing struct Parm { @@ -1331,13 +1311,7 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew, CHECK_TABLE( *this ) } -/************************************************************************* -|* -|* const SwTableBox* SwTable::GetTblBox( const Strn?ng& rName ) const -|* return the pointer of the box specified. -|* -|*************************************************************************/ - +// return the pointer of the box specified. static bool lcl_IsValidRowName( const OUString& rStr ) { bool bIsValid = true; @@ -1523,11 +1497,6 @@ bool SwTable::IsTblComplex() const return false; } -/************************************************************************* -|* -|* SwTableLine::SwTableLine() -|* -|*************************************************************************/ SwTableLine::SwTableLine( SwTableLineFmt *pFmt, sal_uInt16 nBoxes, SwTableBox *pUp ) : SwClient( pFmt ), @@ -1550,11 +1519,6 @@ SwTableLine::~SwTableLine() delete pMod; // and delete } -/************************************************************************* -|* -|* SwTableLine::ClaimFrmFmt(), ChgFrmFmt() -|* -|*************************************************************************/ SwFrmFmt* SwTableLine::ClaimFrmFmt() { // This method makes sure that this object is an exclusive SwTableLine client @@ -1671,11 +1635,6 @@ SwTwips SwTableLine::GetTableLineHeight( bool& bLayoutAvailable ) const return nRet; } -/************************************************************************* -|* -|* SwTableBox::SwTableBox() -|* -|*************************************************************************/ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, sal_uInt16 nLines, SwTableLine *pUp ) : SwClient( 0 ), aLines(), @@ -1780,11 +1739,6 @@ SwTableBoxFmt* SwTableBox::CheckBoxFmt( SwTableBoxFmt* pFmt ) return pFmt; } -/************************************************************************* -|* -|* SwTableBox::ClaimFrmFmt(), ChgFrmFmt() -|* -|*************************************************************************/ SwFrmFmt* SwTableBox::ClaimFrmFmt() { // This method makes sure that this object is an exclusive SwTableBox client @@ -1859,13 +1813,8 @@ void SwTableBox::ChgFrmFmt( SwTableBoxFmt* pNewFmt ) delete pOld; } -/************************************************************************* -|* -|* String SwTableBox::GetName() const -|* Return the name of this box. This is determined dynamically -|* resulting from the position in the lines/boxes/tables. -|* -|*************************************************************************/ +// Return the name of this box. This is determined dynamically +// resulting from the position in the lines/boxes/tables. void sw_GetTblBoxColStr( sal_uInt16 nCol, OUString& rNm ) { const sal_uInt16 coDiff = 52; // 'A'-'Z' 'a' - 'z' diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index 0de34cd2cebb..d0d3f02eb2e1 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -56,7 +56,7 @@ #define STACK_INCREMENT 4 -/************************************************************************* +/* * Attribute to Stack Mapping * * Attributes applied to a text are pushed on different stacks. For each @@ -67,8 +67,7 @@ * are stored in the defaultitem-cache, if you add one, you have to increase * NUM_DEFAULT_VALUES. * Also adjust NUM_ATTRIBUTE_STACKS in atrhndl.hxx. - *************************************************************************/ - + */ const sal_uInt8 StackPos[ static_cast<sal_uInt16>(RES_TXTATR_WITHEND_END) - static_cast<sal_uInt16>(RES_CHRATR_BEGIN) + 1 ] = { @@ -190,15 +189,11 @@ bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr ) } } -/************************************************************************* - * lcl_ChgHyperLinkColor - * The color of hyperlinks is taken from the associated character attribute, - * depending on its 'visited' state. There are actually two cases, which - * should override the colors from the character attribute: - * 1. We never take the 'visited' color during printing/pdf export/preview - * 2. The user has chosen to override these colors in the view options - *************************************************************************/ - +// The color of hyperlinks is taken from the associated character attribute, +// depending on its 'visited' state. There are actually two cases, which +// should override the colors from the character attribute: +// 1. We never take the 'visited' color during printing/pdf export/preview +// 2. The user has chosen to override these colors in the view options static bool lcl_ChgHyperLinkColor( const SwTxtAttr& rAttr, const SfxPoolItem& rItem, const SwViewShell* pShell, @@ -631,14 +626,9 @@ void SwAttrHandler::ActivateTop( SwFont& rFnt, const sal_uInt16 nAttr ) rFnt.GetInputField()--; } -/************************************************************************* - * Font Changing Function - * - * When popping an attribute from the stack, the top mose remaining - * attribute in the stack becomes valid. The following function change - * a font depending on the stack id. - *************************************************************************/ - +// When popping an attribute from the stack, the top mose remaining +// attribute in the stack becomes valid. The following function change +// a font depending on the stack id. void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush ) { switch ( rItem.Which() ) diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 1d45c7af4776..1d688d88718b 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -942,11 +942,7 @@ bool SwTxtFrm::CalcPreps() return bRet; } -/************************************************************************* - * SwTxtFrm::FormatAdjust() - * We rewire the footnotes and the character bound objects - *************************************************************************/ - +// We rewire the footnotes and the character bound objects #define CHG_OFFSET( pFrm, nNew )\ {\ if( pFrm->GetOfst() < nNew )\ @@ -1109,12 +1105,8 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine, UNDO_SWAP( this ) } -/************************************************************************* - * SwTxtFrm::FormatLine() - * bPrev is set whether Reformat.Start() was called because of Prev(). - * Else, wo don't know whether we can limit the repaint or not. -*************************************************************************/ - +// bPrev is set whether Reformat.Start() was called because of Prev(). +// Else, wo don't know whether we can limit the repaint or not. bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const bool bPrev ) { OSL_ENSURE( ! IsVertical() || IsSwapped(), @@ -1694,12 +1686,8 @@ void SwTxtFrm::_Format( SwParaPortion *pPara ) } } -/************************************************************************* - * SwTxtFrm::Format() - * We calculate the text frame's size and send a notification. - * Shrink() or Grow() to adjust the frame's size to the changed required space. - *************************************************************************/ - +// We calculate the text frame's size and send a notification. +// Shrink() or Grow() to adjust the frame's size to the changed required space. void SwTxtFrm::Format( const SwBorderAttrs * ) { SWRECTFN( this ) @@ -1863,19 +1851,14 @@ void SwTxtFrm::Format( const SwBorderAttrs * ) _CalcHeightOfLastLine(); // #i11860# } -/************************************************************************* - * SwTxtFrm::FormatQuick() - * - * bForceQuickFormat is set if GetFormatted() has been called during the - * painting process. Actually I cannot imagine a situation which requires - * a full formatting of the paragraph during painting, on the other hand - * a full formatting can cause the invalidation of other layout frames, - * e.g., if there are footnotes in this paragraph, and invalid layout - * frames will not calculated during the painting. So I actually want to - * avoid a formatting during painting, but since I'm a coward, I'll only - * force the quick formatting in the situation of issue i29062. - *************************************************************************/ - +// bForceQuickFormat is set if GetFormatted() has been called during the +// painting process. Actually I cannot imagine a situation which requires +// a full formatting of the paragraph during painting, on the other hand +// a full formatting can cause the invalidation of other layout frames, +// e.g., if there are footnotes in this paragraph, and invalid layout +// frames will not calculated during the painting. So I actually want to +// avoid a formatting during painting, but since I'm a coward, I'll only +// force the quick formatting in the situation of issue i29062. bool SwTxtFrm::FormatQuick( bool bForceQuickFormat ) { OSL_ENSURE( ! IsVertical() || ! IsSwapped(), diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 6b1ea52bd253..d72c4d3c3851 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -40,12 +40,6 @@ TYPEINIT3( SwFmtFld, SfxPoolItem, SwClient,SfxBroadcaster) TYPEINIT1(SwFmtFldHint, SfxHint); -/**************************************************************************** - * - * class SwFmtFld - * - ****************************************************************************/ - // constructor for default item in attribute-pool SwFmtFld::SwFmtFld( sal_uInt16 nWhich ) : SfxPoolItem( nWhich ) diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx index add6e4f6cc32..a8cf81c84c37 100644 --- a/sw/source/core/txtnode/atrflyin.cxx +++ b/sw/source/core/txtnode/atrflyin.cxx @@ -61,9 +61,7 @@ SwTxtFlyCnt::SwTxtFlyCnt( SwFmtFlyCnt& rAttr, sal_Int32 nStartPos ) SetHasDummyChar(true); } -/************************************************************************* - * SwTxtFlyCnt::MakeTxtHint() - * +/* * An dieser Stelle soll einmal der Gesamtzusammenhang bei der Erzeugung * eines neuen SwTxtFlyCnt erlaeutert werden. * Das MakeTxtHint() wird z.B. im SwTxtNode::Copy() gerufen. @@ -92,7 +90,7 @@ SwTxtFlyCnt::SwTxtFlyCnt( SwFmtFlyCnt& rAttr, sal_Int32 nStartPos ) * Attraktiv ist der Umstand, dass niemand ueber die vom Node abhaengigen * CntntFrms iterieren braucht, um die FlyInCntFrm anzulegen. Dies geschieht * bei der Arbeit. - *************************************************************************/ + */ void SwTxtFlyCnt::CopyFlyFmt( SwDoc* pDoc ) { @@ -133,16 +131,11 @@ void SwTxtFlyCnt::CopyFlyFmt( SwDoc* pDoc ) ((SwFmtFlyCnt&)GetFlyCnt()).SetFlyFmt( pNew ); } -/************************************************************************* - * SwTxtFlyCnt::SetAnchor() - * - * SetAnchor() wird von SwTxtNode::Insert() gerufen und sorgt fuer das - * setzen des Ankers (die SwPosition des Dummy-Zeichens wird dem FlyFrmFmt - * per SetAttr bekannt gegeben). Dies kann nicht im MakeTxtHint erledigt - * werden, da der Zielnode unbestimmt ist. - * (siehe Kommentar in SwTxtFlyCnt::MakeTxtHint) - *************************************************************************/ - +// SetAnchor() wird von SwTxtNode::Insert() gerufen und sorgt fuer das +// setzen des Ankers (die SwPosition des Dummy-Zeichens wird dem FlyFrmFmt +// per SetAttr bekannt gegeben). Dies kann nicht im MakeTxtHint erledigt +// werden, da der Zielnode unbestimmt ist. +// (siehe Kommentar in SwTxtFlyCnt::MakeTxtHint) void SwTxtFlyCnt::SetAnchor( const SwTxtNode *pNode ) { // fuers Undo muss der neue Anker schon bekannt sein ! @@ -200,15 +193,10 @@ void SwTxtFlyCnt::SetAnchor( const SwTxtNode *pNode ) // Fuer jeden CntFrm wird ein SwFlyInCntFrm angelegt. } -/************************************************************************* - * SwTxtFlyCnt::_GetFlyFrm() - * - * _GetFlyFrm() wird im Formatierungsprozess vom LineIter gerufen - * und sucht den FlyFrm zum Dummyzeichen des aktuellen CntntFrm. Wird keiner - * gefunden, so wird ein neuer FlyFrm angelegt. - * (siehe Kommentar ind SwTxtFlyCnt::MakeTxtHint) - *************************************************************************/ - +// _GetFlyFrm() wird im Formatierungsprozess vom LineIter gerufen +// und sucht den FlyFrm zum Dummyzeichen des aktuellen CntntFrm. Wird keiner +// gefunden, so wird ein neuer FlyFrm angelegt. +// (siehe Kommentar ind SwTxtFlyCnt::MakeTxtHint) SwFlyInCntFrm *SwTxtFlyCnt::_GetFlyFrm( const SwFrm *pCurrFrm ) { SwFrmFmt* pFrmFmt = GetFlyCnt().GetFrmFmt(); diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx index 65acb83b60dc..173314fac52a 100644 --- a/sw/source/core/txtnode/atrftn.cxx +++ b/sw/source/core/txtnode/atrftn.cxx @@ -112,12 +112,6 @@ namespace { } -/************************************************************************* -|* -|* class SwFmtFtn -|* -*************************************************************************/ - SwFmtFtn::SwFmtFtn( bool bEndNote ) : SfxPoolItem( RES_TXTATR_FTN ), m_pTxtAttr( 0 ), @@ -230,10 +224,6 @@ OUString SwFmtFtn::GetViewNumStr( const SwDoc& rDoc, sal_Bool bInclStrings ) con return sRet; } -/************************************************************************* - * class SwTxt/FmtFnt - *************************************************************************/ - SwTxtFtn::SwTxtFtn( SwFmtFtn& rAttr, sal_Int32 nStartPos ) : SwTxtAttr( rAttr, nStartPos ) , m_pStartNode( 0 ) diff --git a/sw/source/core/txtnode/atrref.cxx b/sw/source/core/txtnode/atrref.cxx index 94646a4cb278..8628b1b283d4 100644 --- a/sw/source/core/txtnode/atrref.cxx +++ b/sw/source/core/txtnode/atrref.cxx @@ -22,12 +22,6 @@ #include <fmtrfmrk.hxx> #include <swfont.hxx> -/**************************************************************************** - * - * class SwFmtRefMark - * - ****************************************************************************/ - SwFmtRefMark::~SwFmtRefMark( ) { } @@ -57,10 +51,6 @@ SfxPoolItem* SwFmtRefMark::Clone( SfxItemPool* ) const return new SwFmtRefMark( *this ); } -/************************************************************************* - * class SwTxtRefMark - *************************************************************************/ - // Attribut fuer Inhalts-/Positions-Referenzen im Text SwTxtRefMark::SwTxtRefMark( SwFmtRefMark& rAttr, diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index e612d4d0b155..f1d35c2743b0 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -55,12 +55,6 @@ using namespace ::com::sun::star; TYPEINIT1_AUTOFACTORY(SwFmtINetFmt, SfxPoolItem); TYPEINIT1_AUTOFACTORY(SwFmtAutoFmt, SfxPoolItem); -/************************************************************************* -|* -|* class SwFmtCharFmt -|* -*************************************************************************/ - SwFmtCharFmt::SwFmtCharFmt( SwCharFmt *pFmt ) : SfxPoolItem( RES_TXTATR_CHARFMT ), SwClient(pFmt), @@ -114,12 +108,6 @@ bool SwFmtCharFmt::PutValue( const uno::Any& , sal_uInt8 ) return false; } -/************************************************************************* -|* -|* class SwFmtAutoFmt -|* -*************************************************************************/ - SwFmtAutoFmt::SwFmtAutoFmt( sal_uInt16 nInitWhich ) : SfxPoolItem( nInitWhich ) { @@ -158,12 +146,6 @@ bool SwFmtAutoFmt::PutValue( const uno::Any& , sal_uInt8 ) return false; } -/************************************************************************* -|* -|* class SwFmtINetFmt -|* -*************************************************************************/ - SwFmtINetFmt::SwFmtINetFmt() : SfxPoolItem( RES_TXTATR_INETFMT ) , msURL() @@ -401,10 +383,6 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -/************************************************************************* -|* class SwFmtRuby -*************************************************************************/ - SwFmtRuby::SwFmtRuby( const OUString& rRubyTxt ) : SfxPoolItem( RES_TXTATR_CJK_RUBY ), sRubyTxt( rRubyTxt ), @@ -531,10 +509,6 @@ bool SwFmtRuby::PutValue( const uno::Any& rVal, return bRet; } -/************************************************************************* - class SwFmtMeta - ************************************************************************/ - SwFmtMeta * SwFmtMeta::CreatePoolDefault(const sal_uInt16 i_nWhich) { return new SwFmtMeta(i_nWhich); @@ -647,10 +621,6 @@ void SwFmtMeta::DoCopy(::sw::MetaFieldManager & i_rTargetDocManager, namespace sw { -/************************************************************************* - class sw::Meta - ************************************************************************/ - Meta::Meta(SwFmtMeta * const i_pFmt) : ::sfx2::Metadatable() , SwModify() @@ -746,10 +716,6 @@ Meta::MakeUnoObject() return SwXMeta::CreateXMeta(*this); } -/************************************************************************* - class sw::MetaField - ************************************************************************/ - MetaField::MetaField(SwFmtMeta * const i_pFmt, const sal_uInt32 nNumberFormat, const bool bIsFixedLanguage) : Meta(i_pFmt) @@ -804,10 +770,6 @@ void MetaField::SetNumberFormat(sal_uInt32 nNumberFormat) m_nNumberFormat = nNumberFormat; } -/************************************************************************* - class sw::MetaFieldManager - ************************************************************************/ - MetaFieldManager::MetaFieldManager() { } diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index a9de9ebf481f..d935ec72f7a5 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -83,12 +83,6 @@ sal_uInt16 GetDefaultFontHeight( SwDrawTextInfo &rInf ) return (sal_uInt16)aDefaultFontItem.GetHeight(); } -/************************************************************************* -|* -|* SwFntCache::Flush() -|* -|*************************************************************************/ - void SwFntCache::Flush( ) { if ( pLastFont ) @@ -99,12 +93,6 @@ void SwFntCache::Flush( ) SwCache::Flush( ); } -/************************************************************************* -|* -|* SwFntObj::SwFntObj(), ~SwFntObj() -|* -|*************************************************************************/ - SwFntObj::SwFntObj(const SwSubFont &rFont, const void *pOwn, SwViewShell *pSh) : SwCacheObj((void*)pOwn) , aFont(rFont) @@ -159,10 +147,7 @@ void SwFntObj::CreatePrtFont( const OutputDevice& rPrt ) } } -/************************************************************************* - * - * bool lcl_IsFontAdjustNecessary( rOutDev, rRefDev ) - * +/* * returns whether we have to adjust the output font to resemble * the formatting font * @@ -171,9 +156,7 @@ void SwFntObj::CreatePrtFont( const OutputDevice& rPrt ) * 1. RefDef == OutDev (text formatting, online layout...) * 2. PDF export from online layout * 3. Prospect/PagePreview pringing - * - *************************************************************************/ - + */ static bool lcl_IsFontAdjustNecessary( const OutputDevice& rOutDev, const OutputDevice& rRefDev ) { @@ -209,12 +192,8 @@ struct CalcLinePosData } }; -/** Function: lcl_calcLinePos - - Computes the start and end position of an underline. This function is called - from the DrawText-method (for underlining misspelled words or smarttag terms). -*/ - +// Computes the start and end position of an underline. This function is called +// from the DrawText-method (for underlining misspelled words or smarttag terms). static void lcl_calcLinePos( const CalcLinePosData &rData, Point &rStart, Point &rEnd, sal_Int32 nStart, sal_Int32 nWrLen ) { @@ -275,14 +254,8 @@ static void lcl_calcLinePos( const CalcLinePosData &rData, } } -/************************************************************************* - * - * sal_uInt16 SwFntObj::GetFontAscent( const OutputDevice& rOut ) - * - * Returns the Ascent of the Font on the given output device; - * it may be necessary to create the screen font first. - *************************************************************************/ - +// Returns the Ascent of the Font on the given output device; +// it may be necessary to create the screen font first. sal_uInt16 SwFntObj::GetFontAscent( const SwViewShell *pSh, const OutputDevice& rOut ) { sal_uInt16 nRet = 0; @@ -318,14 +291,8 @@ sal_uInt16 SwFntObj::GetFontAscent( const SwViewShell *pSh, const OutputDevice& return nRet; } -/************************************************************************* - * - * sal_uInt16 SwFntObj::GetFontHeight( const OutputDevice* pOut ) - * - * Returns the height of the Font on the given output device; - * it may be necessary to create the screen font first. - *************************************************************************/ - +// Returns the height of the Font on the given output device; +// it may be necessary to create the screen font first. sal_uInt16 SwFntObj::GetFontHeight( const SwViewShell* pSh, const OutputDevice& rOut ) { sal_uInt16 nRet = 0; @@ -417,14 +384,7 @@ sal_uInt16 SwFntObj::GetFontLeading( const SwViewShell *pSh, const OutputDevice& return nRet; } -/************************************************************************* - * - * SwFntObj::CreateScrFont( const SwViewShell& rSh, const OutputDevice& rOut ) - * - * pOut is the output device, not the reference device - * - *************************************************************************/ - +// pOut is the output device, not the reference device void SwFntObj::CreateScrFont( const SwViewShell& rSh, const OutputDevice& rOut ) { if ( pScrFont ) @@ -594,15 +554,8 @@ void SwFntObj::GuessLeading( const SwViewShell& nGuessedLeading = 0; } -/************************************************************************* - * - * void SwFntObj::SetDeviceFont( const OutputDevice *pOut ), - * - * Set the font at the given output device; for screens it may be - * necessary to do some adjustment first. - * - *************************************************************************/ - +// Set the font at the given output device; for screens it may be +// necessary to do some adjustment first. void SwFntObj::SetDevFont( const SwViewShell *pSh, OutputDevice& rOut ) { const OutputDevice& rRefDev = pSh ? pSh->GetRefDev() : rOut; @@ -629,17 +582,12 @@ void SwFntObj::SetDevFont( const SwViewShell *pSh, OutputDevice& rOut ) #define WRONG_SHOW_MIN 5 -/************************************************************************* - * - * void SwFntObj::DrawText( ... ) - * +/* * Output text: * on screen => DrawTextArray * on printer, !Kerning => DrawText * on printer + Kerning => DrawStretchText - * - *************************************************************************/ - + */ static sal_uInt8 lcl_WhichPunctuation( sal_Unicode cChar ) { if ( ( cChar < 0x3001 || cChar > 0x3002 ) && @@ -2221,12 +2169,6 @@ sal_Int32 SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf ) return nCnt; } -/************************************************************************* -|* -|* SwFntAccess::SwFntAccess() -|* -|*************************************************************************/ - SwFntAccess::SwFntAccess( const void* &rMagic, sal_uInt16 &rIndex, const void *pOwn, SwViewShell *pSh, sal_Bool bCheck ) : diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 9ec2924ec4ce..e4b0d23b38fd 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -34,15 +34,10 @@ using namespace ::com::sun::star::i18n; -/************************************************************************* - * class SwCapitalInfo - * - * The information encapsulated in SwCapitalInfo is required - * by the ::Do functions. They contain the information about - * the original string, whereas rDo.GetInf() contains information - * about the display string. - *************************************************************************/ - +// The information encapsulated in SwCapitalInfo is required +// by the ::Do functions. They contain the information about +// the original string, whereas rDo.GetInf() contains information +// about the display string. class SwCapitalInfo { public: @@ -53,17 +48,12 @@ public: sal_Int32 nLen; }; -/************************************************************************* - * sal_Int32 sw_CalcCaseMap() - * - * rFnt: required for CalcCaseMap - * rOrigString: The original string - * nOfst: Position of the substring in rOrigString - * nLen: Length if the substring in rOrigString - * nIdx: Referes to a position in the display string and should be mapped - * to a position in rOrigString - *************************************************************************/ - +// rFnt: required for CalcCaseMap +// rOrigString: The original string +// nOfst: Position of the substring in rOrigString +// nLen: Length if the substring in rOrigString +// nIdx: Referes to a position in the display string and should be mapped +// to a position in rOrigString sal_Int32 sw_CalcCaseMap( const SwFont& rFnt, const OUString& rOrigString, sal_Int32 nOfst, @@ -97,10 +87,6 @@ sal_Int32 sw_CalcCaseMap( const SwFont& rFnt, return nOfst + nLen; } -/************************************************************************* - * class SwDoCapitals - *************************************************************************/ - class SwDoCapitals { protected: @@ -118,10 +104,6 @@ public: inline void SetCapInf( SwCapitalInfo& rNew ) { pCapInf = &rNew; } }; -/************************************************************************* - * class SwDoGetCapitalSize - *************************************************************************/ - class SwDoGetCapitalSize : public SwDoCapitals { protected: @@ -147,10 +129,6 @@ void SwDoGetCapitalSize::Do() aTxtSize.Height() = rInf.GetSize().Height(); } -/************************************************************************* - * SwSubFont::GetCapitalSize() - *************************************************************************/ - Size SwSubFont::GetCapitalSize( SwDrawTextInfo& rInf ) { // Start: @@ -174,10 +152,6 @@ Size SwSubFont::GetCapitalSize( SwDrawTextInfo& rInf ) return aTxtSize; } -/************************************************************************* - * class SwDoGetCapitalBreak - *************************************************************************/ - class SwDoGetCapitalBreak : public SwDoCapitals { protected: @@ -232,10 +206,6 @@ void SwDoGetCapitalBreak::Do() } } -/************************************************************************* - * SwFont::GetCapitalBreak() - *************************************************************************/ - sal_Int32 SwFont::GetCapitalBreak( SwViewShell* pSh, const OutputDevice* pOut, const SwScriptInfo* pScript, const OUString& rTxt, long const nTextWidth, const sal_Int32 nIdx, const sal_Int32 nLen ) @@ -259,10 +229,6 @@ sal_Int32 SwFont::GetCapitalBreak( SwViewShell* pSh, const OutputDevice* pOut, return aDo.getBreak(); } -/************************************************************************* - * class SwDoDrawCapital - *************************************************************************/ - class SwDoDrawCapital : public SwDoCapitals { protected: @@ -304,10 +270,6 @@ void SwDoDrawCapital::Do() rInf.SetWidth( nOrgWidth ); } -/************************************************************************* - * SwDoDrawCapital::DrawSpace() - *************************************************************************/ - void SwDoDrawCapital::DrawSpace( Point &rPos ) { long nDiff = rInf.GetPos().X() - rPos.X(); @@ -338,10 +300,6 @@ void SwDoDrawCapital::DrawSpace( Point &rPos ) rPos.X() = rInf.GetPos().X() + rInf.GetWidth(); } -/************************************************************************* - * SwSubFont::DrawCapital() - *************************************************************************/ - void SwSubFont::DrawCapital( SwDrawTextInfo &rInf ) { // Es wird vorausgesetzt, dass rPos bereits kalkuliert ist! @@ -353,10 +311,6 @@ void SwSubFont::DrawCapital( SwDrawTextInfo &rInf ) DoOnCapitals( aDo ); } -/************************************************************************* - * class SwDoDrawCapital - *************************************************************************/ - class SwDoCapitalCrsrOfst : public SwDoCapitals { protected: @@ -418,10 +372,6 @@ void SwDoCapitalCrsrOfst::Do() } } -/************************************************************************* - * SwSubFont::GetCapitalCrsrOfst() - *************************************************************************/ - sal_Int32 SwSubFont::GetCapitalCrsrOfst( SwDrawTextInfo& rInf ) { const long nOldKern = rInf.GetKern(); @@ -435,10 +385,6 @@ sal_Int32 SwSubFont::GetCapitalCrsrOfst( SwDrawTextInfo& rInf ) return aDo.GetCrsr(); } -/************************************************************************* - * class SwDoDrawStretchCapital - *************************************************************************/ - class SwDoDrawStretchCapital : public SwDoDrawCapital { const sal_Int32 nStrLen; @@ -457,10 +403,6 @@ public: virtual ~SwDoDrawStretchCapital() {} }; -/************************************************************************* - * SwDoDrawStretchCapital - *************************************************************************/ - void SwDoDrawStretchCapital::Do() { SV_STAT( nDrawStretchText ); @@ -502,10 +444,6 @@ void SwDoDrawStretchCapital::Do() ((Point&)rInf.GetPos()).X() += nPartWidth; } -/************************************************************************* - * SwSubFont::DrawStretchCapital() - *************************************************************************/ - void SwSubFont::DrawStretchCapital( SwDrawTextInfo &rInf ) { // Es wird vorausgesetzt, dass rPos bereits kalkuliert ist! @@ -525,10 +463,6 @@ void SwSubFont::DrawStretchCapital( SwDrawTextInfo &rInf ) DoOnCapitals( aDo ); } -/************************************************************************* - * SwSubFont::DoOnCapitals() const - *************************************************************************/ - void SwSubFont::DoOnCapitals( SwDoCapitals &rDo ) { OSL_ENSURE( pLastFont, "SwFont::DoOnCapitals: No LastFont?!" ); diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx index ecd8cf16532f..b2ec93036de3 100644 --- a/sw/source/core/txtnode/ndhints.cxx +++ b/sw/source/core/txtnode/ndhints.cxx @@ -29,10 +29,6 @@ inline void DumpHints(const SwpHtStart &, const SwpHtEnd &) { } -/************************************************************************* - * IsLessStart() - *************************************************************************/ - // Sortierreihenfolge: Start, Ende (umgekehrt!), Which-Wert (umgekehrt!), // als letztes die Adresse selbst @@ -66,10 +62,6 @@ static bool lcl_IsLessStart( const SwTxtAttr &rHt1, const SwTxtAttr &rHt2 ) return ( *rHt1.GetStart() < *rHt2.GetStart() ); } -/************************************************************************* - * inline IsLessEnd() - *************************************************************************/ - // Zuerst nach Ende danach nach Ptr static bool lcl_IsLessEnd( const SwTxtAttr &rHt1, const SwTxtAttr &rHt2 ) { @@ -112,10 +104,6 @@ bool CompareSwpHtEnd::operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) con return lcl_IsLessEnd( *lhs, *rhs ); } -/************************************************************************* - * class SwpHintsArr - *************************************************************************/ - void SwpHintsArray::Insert( const SwTxtAttr *pHt ) { Resort(); @@ -157,10 +145,6 @@ sal_uInt16 SwpHintsArray::GetPos( const SwTxtAttr *pHt ) const #ifdef DBG_UTIL -/************************************************************************* - * SwpHintsArray::Check() - *************************************************************************/ - #define CHECK_ERR(cond, text) \ if(!(cond)) \ { \ @@ -390,10 +374,6 @@ bool SwpHintsArray::Check(bool bPortionsMerged) const #endif /* DBG_UTIL */ -/************************************************************************* - * SwpHintsArray::Resort() - *************************************************************************/ - // Resort() is called before every Insert and Delete. // Various SwTxtNode methods modify hints in a way that violates the // sort order of the m_HintStarts, m_HintEnds arrays, so this method is needed diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 1f1045666b36..0de9a3cbec9d 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -272,12 +272,7 @@ sal_Int32 SwTxtNode::Len() const return m_Text.getLength(); } -/*--------------------------------------------------------------------------- - * lcl_ChangeFtnRef - * After a split node, it's necessary to actualize the ref-pointer of the - * ftnfrms. - * --------------------------------------------------------------------------*/ - +// After a split node, it's necessary to actualize the ref-pointer of the ftnfrms. static void lcl_ChangeFtnRef( SwTxtNode &rNode ) { SwpHints *pSwpHints = rNode.GetpSwpHints(); @@ -1310,10 +1305,6 @@ SwTxtFld* SwTxtNode::GetFldTxtAttrAt( return pTxtFld; } -/************************************************************************* - * CopyHint() - *************************************************************************/ - static SwCharFmt* lcl_FindCharFmt( const SwCharFmts* pCharFmts, const OUString& rName ) { if( !rName.isEmpty() ) @@ -1456,15 +1447,11 @@ void lcl_CopyHint( } } -/************************************************************************* -|* SwTxtNode::CopyAttr() -|* Beschreibung kopiert Attribute an der Position nStart in pDest. -|* BP 7.6.93: Es werden mit Absicht nur die Attribute _mit_ EndIdx -|* kopiert! CopyAttr wird vornehmlich dann gerufen, -|* wenn Attribute fuer einen Node mit leerem String -|* gesetzt werden sollen. -*************************************************************************/ - +// Beschreibung kopiert Attribute an der Position nStart in pDest. +// BP 7.6.93: Es werden mit Absicht nur die Attribute _mit_ EndIdx +// kopiert! CopyAttr wird vornehmlich dann gerufen, +// wenn Attribute fuer einen Node mit leerem String +// gesetzt werden sollen. void SwTxtNode::CopyAttr( SwTxtNode *pDest, const sal_Int32 nTxtStartIdx, const sal_Int32 nOldPos ) { @@ -1519,12 +1506,7 @@ void SwTxtNode::CopyAttr( SwTxtNode *pDest, const sal_Int32 nTxtStartIdx, } } -/************************************************************************* -|* SwTxtNode::Copy() -|* Beschreibung kopiert Zeichen und Attibute in pDest, -|* wird angehaengt -*************************************************************************/ - +// kopiert Zeichen und Attibute in pDest, wird angehaengt // introduction of new optional parameter to control, if all attributes have to be copied. void SwTxtNode::CopyText( SwTxtNode *const pDest, const SwIndex &rStart, @@ -1919,14 +1901,6 @@ OUString SwTxtNode::InsertText( const OUString & rStr, const SwIndex & rIdx, return sInserted; } -/************************************************************************* -|* -|* SwTxtNode::Cut() -|* -|* Beschreibung text.doc -|* -*************************************************************************/ - void SwTxtNode::CutText( SwTxtNode * const pDest, const SwIndex & rStart, const sal_Int32 nLen ) { @@ -2394,14 +2368,6 @@ void SwTxtNode::EraseText(const SwIndex &rIdx, const sal_Int32 nCount, CHECK_SWPHINTS(this); } -/*********************************************************************** -#* Class : SwTxtNode -#* Methode : GCAttr -#* -#* Beschreibung -#* text.doc -#***********************************************************************/ - void SwTxtNode::GCAttr() { if ( !HasHints() ) @@ -2694,10 +2660,6 @@ SwCntntNode* SwTxtNode::AppendNode( const SwPosition & rPos ) return pNew; } -/************************************************************************* - * SwTxtNode::GetTxtAttr - *************************************************************************/ - SwTxtAttr * SwTxtNode::GetTxtAttrForCharAt( const sal_Int32 nIndex, const RES_TXTATR nWhich ) const @@ -3096,10 +3058,7 @@ static void Replace0xFF( } } -/************************************************************************* - * SwTxtNode::GetExpandTxt - * Expand fields - *************************************************************************/ +// Expand fields // #i83479# - handling of new parameters OUString SwTxtNode::GetExpandTxt( const sal_Int32 nIdx, const sal_Int32 nLen, @@ -3401,10 +3360,6 @@ OUString SwTxtNode::GetRedlineTxt( sal_Int32 nIdx, sal_Int32 nLen, return aTxt.makeStringAndClear(); } -/************************************************************************* - * SwTxtNode::ReplaceText - *************************************************************************/ - void SwTxtNode::ReplaceText( const SwIndex& rStart, const sal_Int32 nDelLen, const OUString & rStr) { diff --git a/sw/source/core/txtnode/swfntcch.cxx b/sw/source/core/txtnode/swfntcch.cxx index 43702d967adb..1d0e6fef5fb5 100644 --- a/sw/source/core/txtnode/swfntcch.cxx +++ b/sw/source/core/txtnode/swfntcch.cxx @@ -29,12 +29,6 @@ extern const sal_uInt8 StackPos[]; // Der FontCache wird in TxtInit.Cxx _TXTINIT erzeugt und in _TXTEXIT geloescht SwFontCache *pSwFontCache = NULL; -/************************************************************************* -|* -|* SwFontObj::SwFontObj(), ~SwFontObj() -|* -|*************************************************************************/ - SwFontObj::SwFontObj( const void *pOwn, SwViewShell *pSh ) : SwCacheObj( (void*)pOwn ), aSwFont( &((SwTxtFmtColl *)pOwn)->GetAttrSet(), pSh ? pSh->getIDocumentSettingAccess() : 0 ) @@ -49,12 +43,6 @@ SwFontObj::~SwFontObj() { } -/************************************************************************* -|* -|* SwFontAccess::SwFontAccess() -|* -|*************************************************************************/ - SwFontAccess::SwFontAccess( const void *pOwn, SwViewShell *pSh ) : SwCacheAccess( *pSwFontCache, pOwn, ((SwTxtFmtColl*)pOwn)->IsInSwFntCache() ), diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index d10a394327f6..dfbec390f10f 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -66,9 +66,7 @@ SvStatistics g_SvStat; using namespace ::com::sun::star; -/************************************************************************ - * Hintergrundbrush setzen, z.B. bei Zeichenvorlagen - ***********************************************************************/ +// Hintergrundbrush setzen, z.B. bei Zeichenvorlagen void SwFont::SetBackColor( Color* pNewColor ) { delete pBackColor; @@ -439,7 +437,7 @@ void SwFont::SetVertical( sal_uInt16 nDir, const sal_Bool bVertFormat ) } } -/************************************************************************* +/* Escapement: frEsc: Fraction, Grad des Escapements Esc = resultierendes Escapement @@ -464,8 +462,7 @@ void SwFont::SetVertical( sal_uInt16 nDir, const sal_Bool bVertFormat ) Ax = A1; Hx = A1 + Esc + (H2 - A2); Bx = A1 + Esc; - -*************************************************************************/ +*/ // nEsc ist der Prozentwert sal_uInt16 SwSubFont::CalcEscAscent( const sal_uInt16 nOldAscent ) const @@ -706,8 +703,6 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet, OSL_ENSURE( aSub[SW_LATIN].IsTransparent(), "SwFont: Transparent revolution" ); } -// SwFont - SwFont::SwFont( const SwFont &rFont ) { aSub[SW_LATIN] = rFont.aSub[SW_LATIN]; @@ -1018,13 +1013,10 @@ void SwFont::ChgPhysFnt( SwViewShell *pSh, OutputDevice& rOut ) rOut.SetOverlineColor( aOverColor ); } -/************************************************************************* - * SwFont::CalcEscHeight() - * Height = MaxAscent + MaxDescent - * MaxAscent = Max (T1_ascent, T2_ascent + (Esc * T1_height) ); - * MaxDescent = Max (T1_height-T1_ascent, - * T2_height-T2_ascent - (Esc * T1_height) - *************************************************************************/ +// Height = MaxAscent + MaxDescent +// MaxAscent = Max (T1_ascent, T2_ascent + (Esc * T1_height) ); +// MaxDescent = Max (T1_height-T1_ascent, +// T2_height-T2_ascent - (Esc * T1_height) sal_uInt16 SwSubFont::CalcEscHeight( const sal_uInt16 nOldHeight, const sal_uInt16 nOldAscent ) const { diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 0e4c6f649299..1d398b9aab04 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -941,10 +941,6 @@ void SwpHints::BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint, rNode.DestroyAttr( &rNewHint ); } -/************************************************************************* - * SwTxtNode::MakeTxtAttr() - *************************************************************************/ - SwTxtAttr* MakeRedlineTxtAttr( SwDoc & rDoc, SfxPoolItem & rAttr ) { // this is intended _only_ for special-purpose redline attributes! @@ -1208,10 +1204,6 @@ void SwTxtNode::DestroyAttr( SwTxtAttr* pAttr ) } } -/************************************************************************* - * SwTxtNode::Insert() - *************************************************************************/ - SwTxtAttr* SwTxtNode::InsertItem( SfxPoolItem& rAttr, const sal_Int32 nStart, @@ -1644,10 +1636,6 @@ bool SwTxtNode::InsertHint( SwTxtAttr * const pAttr, const SetAttrMode nMode ) return bRet; } -/************************************************************************* - * SwTxtNode::DeleteAttribute() - *************************************************************************/ - void SwTxtNode::DeleteAttribute( SwTxtAttr * const pAttr ) { if ( !HasHints() ) @@ -1682,10 +1670,6 @@ void SwTxtNode::DeleteAttribute( SwTxtAttr * const pAttr ) } } -/************************************************************************* - * SwTxtNode::DeleteAttributes() - *************************************************************************/ - //FIXME: this does NOT respect SORT NUMBER (for CHARFMT)! void SwTxtNode::DeleteAttributes( const sal_uInt16 nWhich, @@ -1760,10 +1744,6 @@ void SwTxtNode::DeleteAttributes( TryDeleteSwpHints(); } -/************************************************************************* - * SwTxtNode::DelSoftHyph() - *************************************************************************/ - void SwTxtNode::DelSoftHyph( const sal_Int32 nStt, const sal_Int32 nEnd ) { sal_Int32 nFndPos = nStt; @@ -2577,10 +2557,6 @@ void SwTxtNode::FmtToTxtAttr( SwTxtNode* pNd ) pNd->TryDeleteSwpHints(); } -/************************************************************************* - * SwpHints::CalcFlags() - *************************************************************************/ - void SwpHints::CalcFlags() { m_bDDEFields = m_bFootnote = false; @@ -2610,10 +2586,6 @@ void SwpHints::CalcFlags() } } -/************************************************************************* - * SwpHints::CalcVisibleFlag() - *************************************************************************/ - bool SwpHints::CalcHiddenParaField() { m_bCalcHiddenParaField = false; @@ -2648,19 +2620,11 @@ bool SwpHints::CalcHiddenParaField() return bOldHasHiddenParaField != bNewHasHiddenParaField; } -/************************************************************************* - * SwpHints::NoteInHistory() - *************************************************************************/ - void SwpHints::NoteInHistory( SwTxtAttr *pAttr, const bool bNew ) { if ( m_pHistory ) { m_pHistory->AddHint( pAttr, bNew ); } } -/************************************************************************* - * SwpHints::MergePortions( ) - *************************************************************************/ - bool SwpHints::MergePortions( SwTxtNode& rNode ) { if ( !Count() ) @@ -2965,10 +2929,6 @@ static void lcl_CheckSortNumber( const SwpHints& rHints, SwTxtCharFmt& rNewCharF rNewCharFmt.SetSortNumber( nSortNumber ); } -/************************************************************************* - * SwpHints::Insert() - *************************************************************************/ - /* * Try to insert the new hint. * Depending on the type of the hint, this either always succeeds, or may fail. @@ -3289,10 +3249,6 @@ bool SwpHints::TryInsertHint( return true; } -/************************************************************************* - * SwpHints::DeleteAtPos() - *************************************************************************/ - void SwpHints::DeleteAtPos( const sal_uInt16 nPos ) { SwTxtAttr *pHint = GetTextHint(nPos); diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx index 8b26eb26b793..c0714c4e21b2 100644 --- a/sw/source/core/txtnode/txtatr2.cxx +++ b/sw/source/core/txtnode/txtatr2.cxx @@ -36,10 +36,6 @@ TYPEINIT1(SwTxtINetFmt,SwClient); TYPEINIT1(SwTxtRuby,SwClient); -/************************************************************************* - * class SwTxtCharFmt - *************************************************************************/ - SwTxtCharFmt::SwTxtCharFmt( SwFmtCharFmt& rAttr, sal_Int32 nStt, sal_Int32 nEnde ) : SwTxtAttrEnd( rAttr, nStt, nEnde ) @@ -80,10 +76,6 @@ bool SwTxtCharFmt::GetInfo( SfxPoolItem& rInfo ) const return false; } -/************************************************************************* - * class SwTxtAttrNesting - *************************************************************************/ - SwTxtAttrNesting::SwTxtAttrNesting( SfxPoolItem & i_rAttr, const sal_Int32 i_nStart, const sal_Int32 i_nEnd ) : SwTxtAttrEnd( i_rAttr, i_nStart, i_nEnd ) @@ -100,10 +92,6 @@ SwTxtAttrNesting::~SwTxtAttrNesting() { } -/************************************************************************* - * class SwTxtINetFmt - *************************************************************************/ - SwTxtINetFmt::SwTxtINetFmt( SwFmtINetFmt& rAttr, sal_Int32 nStart, sal_Int32 nEnd ) : SwTxtAttrNesting( rAttr, nStart, nEnd ) @@ -202,10 +190,6 @@ sal_Bool SwTxtINetFmt::IsProtect( ) const return m_pTxtNode && m_pTxtNode->IsProtect(); } -/************************************************************************* - * class SwTxtRuby - *************************************************************************/ - SwTxtRuby::SwTxtRuby( SwFmtRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd ) : SwTxtAttrNesting( rAttr, nStart, nEnd ) @@ -287,10 +271,6 @@ SwCharFmt* SwTxtRuby::GetCharFmt() return pRet; } -/************************************************************************* - * class SwTxtMeta - *************************************************************************/ - SwTxtMeta * SwTxtMeta::CreateTxtMeta( ::sw::MetaFieldManager & i_rTargetDocManager, diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 5292369e02c2..3373a75e9e22 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -647,16 +647,12 @@ sal_Int32 clipIndexBounds(const OUString &rStr, sal_Int32 nPos) return nPos; } -/************************************************************************* - * SwTxtNode::GetCurWord() - * - * Aktuelles Wort zurueckliefern: - * Wir suchen immer von links nach rechts, es wird also das Wort - * vor nPos gesucht. Es sei denn, wir befinden uns am Anfang des - * Absatzes, dann wird das erste Wort zurueckgeliefert. - * Wenn dieses erste Wort nur aus Whitespaces besteht, returnen wir - * einen leeren String. - *************************************************************************/ +// Aktuelles Wort zurueckliefern: +// Wir suchen immer von links nach rechts, es wird also das Wort +// vor nPos gesucht. Es sei denn, wir befinden uns am Anfang des +// Absatzes, dann wird das erste Wort zurueckgeliefert. +// Wenn dieses erste Wort nur aus Whitespaces besteht, returnen wir +// einen leeren String. OUString SwTxtNode::GetCurWord( sal_Int32 nPos ) const { assert(nPos <= m_Text.getLength()); // invalid index diff --git a/sw/source/core/uibase/app/swmodule.cxx b/sw/source/core/uibase/app/swmodule.cxx index b075a473d130..db2ac605dcab 100644 --- a/sw/source/core/uibase/app/swmodule.cxx +++ b/sw/source/core/uibase/app/swmodule.cxx @@ -405,12 +405,7 @@ void SwDLL::RegisterControls() ::sfx2::TaskPaneWrapper::RegisterChildWindow(false, pMod); } -/************************************************************************* -|* -|* Load Module (only dummy for linking of the DLL) -|* -\************************************************************************/ - +// Load Module (only dummy for linking of the DLL) void SwModule::InitAttrPool() { OSL_ENSURE(!pAttrPool, "Pool already exists!"); diff --git a/sw/source/core/uibase/chrdlg/ccoll.cxx b/sw/source/core/uibase/chrdlg/ccoll.cxx index 726c66974f13..15863f53a5a5 100644 --- a/sw/source/core/uibase/chrdlg/ccoll.cxx +++ b/sw/source/core/uibase/chrdlg/ccoll.cxx @@ -39,8 +39,6 @@ #include <unomid.h> -// ****************************************************************** - //!! order of entries has to be the same as in //!! CommandStruct SwCondCollItem::aCmds[] @@ -97,7 +95,7 @@ OUString GetCommandContextByIndex( sal_Int16 nIndex ) return aRes; } -// Globals ****************************************************************** +// Globals const CommandStruct SwCondCollItem::aCmds[] = { @@ -133,10 +131,7 @@ const CommandStruct SwCondCollItem::aCmds[] = TYPEINIT1_AUTOFACTORY(SwCondCollItem, SfxPoolItem) -/**************************************************************************** - Item for the transport of the condition table -****************************************************************************/ - +// Item for the transport of the condition table SwCondCollItem::SwCondCollItem(sal_uInt16 _nWhich ) : SfxPoolItem(_nWhich) { diff --git a/sw/source/core/uibase/dialog/regionsw.src b/sw/source/core/uibase/dialog/regionsw.src index 2d9755c37c88..f23fe2b4d250 100644 --- a/sw/source/core/uibase/dialog/regionsw.src +++ b/sw/source/core/uibase/dialog/regionsw.src @@ -21,11 +21,7 @@ #include "cmdid.h" #include "globals.hrc" #include "helpid.h" -/************************************************************************* - Dialog "paste region" - -*************************************************************************/ #define DLG_IMAGE_IDLIST \ IdList = \ { \ diff --git a/sw/source/core/uibase/docvw/PostItMgr.cxx b/sw/source/core/uibase/docvw/PostItMgr.cxx index 2bf148407c34..a755d8ee662e 100644 --- a/sw/source/core/uibase/docvw/PostItMgr.cxx +++ b/sw/source/core/uibase/docvw/PostItMgr.cxx @@ -979,7 +979,6 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons // otherwise the next one down // - first all notes are resized // - then the real layout starts - /*************************************************************/ //rBorder is the page rect const Rectangle rBorder = mpEditWin->LogicToPixel( aBorder); diff --git a/sw/source/core/uibase/inc/conarc.hxx b/sw/source/core/uibase/inc/conarc.hxx index 675ec799040e..e5c2784e15c7 100644 --- a/sw/source/core/uibase/inc/conarc.hxx +++ b/sw/source/core/uibase/inc/conarc.hxx @@ -21,12 +21,7 @@ #include "drawbase.hxx" -/************************************************************************* -|* -|* draw rectangle -|* -\************************************************************************/ - +// draw rectangle class ConstArc : public SwDrawBase { Point aStartPnt; diff --git a/sw/source/core/uibase/inc/concustomshape.hxx b/sw/source/core/uibase/inc/concustomshape.hxx index c3aca8af5732..73cf559296df 100644 --- a/sw/source/core/uibase/inc/concustomshape.hxx +++ b/sw/source/core/uibase/inc/concustomshape.hxx @@ -26,12 +26,7 @@ class SdrObject; class SfxRequest; -/************************************************************************* -|* -|* draw rectangle -|* -\************************************************************************/ - +// draw rectangle class ConstCustomShape : public SwDrawBase { diff --git a/sw/source/core/uibase/inc/conpoly.hxx b/sw/source/core/uibase/inc/conpoly.hxx index 2feae238d148..98810894abbc 100644 --- a/sw/source/core/uibase/inc/conpoly.hxx +++ b/sw/source/core/uibase/inc/conpoly.hxx @@ -21,12 +21,7 @@ #include "drawbase.hxx" -/************************************************************************* -|* -|* base class for all functions -|* -\************************************************************************/ - +// base class for all functions class ConstPolygon : public SwDrawBase { Point aLastPos; @@ -34,7 +29,7 @@ class ConstPolygon : public SwDrawBase public: ConstPolygon(SwWrtShell* pSh, SwEditWin* pWin, SwView* pView); - // Mouse- & Key-Events + // Mouse- & Key-Events virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; diff --git a/sw/source/core/uibase/inc/conrect.hxx b/sw/source/core/uibase/inc/conrect.hxx index 02436fe1af37..4e4ff22cd6f2 100644 --- a/sw/source/core/uibase/inc/conrect.hxx +++ b/sw/source/core/uibase/inc/conrect.hxx @@ -22,12 +22,7 @@ #include "drawbase.hxx" -/************************************************************************* -|* -|* draw rectangle -|* -\************************************************************************/ - +// draw rectangle class ConstRectangle : public SwDrawBase { bool bMarquee; diff --git a/sw/source/core/uibase/inc/drawbase.hxx b/sw/source/core/uibase/inc/drawbase.hxx index d71d234b55f1..198b8ec79d5c 100644 --- a/sw/source/core/uibase/inc/drawbase.hxx +++ b/sw/source/core/uibase/inc/drawbase.hxx @@ -27,12 +27,7 @@ class SwEditWin; class KeyEvent; class MouseEvent; -/************************************************************************* -|* -|* base class for all functions -|* -\************************************************************************/ - +// base class for all functions class SwDrawBase { protected: diff --git a/sw/source/core/uibase/inc/dselect.hxx b/sw/source/core/uibase/inc/dselect.hxx index 15da1a1b4bbd..c5a2a0f12a48 100644 --- a/sw/source/core/uibase/inc/dselect.hxx +++ b/sw/source/core/uibase/inc/dselect.hxx @@ -21,12 +21,7 @@ #include "drawbase.hxx" -/************************************************************************* -|* -|* draw rectangle -|* -\************************************************************************/ - +// draw rectangle class DrawSelection : public SwDrawBase { public: diff --git a/sw/source/core/uibase/inc/regionsw.hxx b/sw/source/core/uibase/inc/regionsw.hxx index 3f7e3cb72931..920040c4d0a1 100644 --- a/sw/source/core/uibase/inc/regionsw.hxx +++ b/sw/source/core/uibase/inc/regionsw.hxx @@ -54,9 +54,7 @@ namespace sfx2 class FileDialogHelper; } -/************************************************************************* - dialog "edit regions" -*************************************************************************/ +// dialog "edit regions" class SectRepr; typedef SectRepr* SectReprPtr; typedef boost::ptr_set<SectRepr> SectReprArr; @@ -138,9 +136,7 @@ public: }; -/************************************************************************* - dialog "insert region" -*************************************************************************/ +// dialog "insert region" class SwInsertSectionTabPage : public SfxTabPage { ComboBox* m_pCurName; diff --git a/sw/source/core/uibase/sidebar/PagePropertyPanel.hrc b/sw/source/core/uibase/sidebar/PagePropertyPanel.hrc index 5de37cc9c8b5..fe850caa259f 100644 --- a/sw/source/core/uibase/sidebar/PagePropertyPanel.hrc +++ b/sw/source/core/uibase/sidebar/PagePropertyPanel.hrc @@ -136,7 +136,7 @@ #define ITEM_HEIGHT 17 #define ITEM_HEIGHT2 15 -//========================================Position============================================== +// Position #define FT_CUSTOM_X POPUP_MARGIN + OFFSET_X #define FT_CUSTOM_Y POPUPPANEL_MARGIN_SMALL * 2 + ITEM_HEIGHT * 5 diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index fabbd7c00019..3831247ec220 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -186,8 +186,6 @@ void UndoManager::DelAllUndoObj() m_UndoSaveMark = MARK_INVALID; } -/**************** UNDO ******************/ - SwUndoId UndoManager::StartUndo(SwUndoId const i_eUndoId, SwRewriter const*const pRewriter) @@ -321,8 +319,6 @@ SwUndoComments_t UndoManager::GetUndoComments() const return ret; } -/**************** REDO ******************/ - bool UndoManager::GetFirstRedoInfo(OUString *const o_pStr, SwUndoId *const o_pId) const { @@ -367,8 +363,6 @@ SwUndoComments_t UndoManager::GetRedoComments() const return ret; } -/**************** REPEAT ******************/ - SwUndoId UndoManager::GetRepeatInfo(OUString *const o_pStr) const { SwUndoId nRepeatId(UNDO_EMPTY); diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index d144bc32f704..ef14881b5a9c 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -52,10 +52,6 @@ namespace } } -/****************************************************************** - * SwXBookmark - ******************************************************************/ - class SwXBookmark::Impl : public SwClient { @@ -494,10 +490,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, OSL_FAIL("SwXBookmark::removeVetoableChangeListener(): not implemented"); } -/****************************************************************** - * SwXFieldmark - ******************************************************************/ - SwXFieldmark::SwXFieldmark(bool _isReplacementObject, ::sw::mark::IMark* pBkm, SwDoc* pDc) : SwXFieldmark_Base(pBkm, pDc) , isReplacementObject(_isReplacementObject) diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 9d208bebf9a4..12b561459ced 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -473,9 +473,6 @@ const SvEventDescription* sw_GetSupportedMacroItems() return aMacroDescriptionsImpl; } -/****************************************************************** - * SwXServiceProvider - ******************************************************************/ OUString SwXServiceProvider::GetProviderName(sal_uInt16 nObjectType) { SolarMutexGuard aGuard; @@ -841,9 +838,6 @@ uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16 return xRet; } -/****************************************************************** - * SwXTextTables - ******************************************************************/ //SMART_UNO_IMPLEMENTATION( SwXTextTables, UsrObject ); SwXTextTables::SwXTextTables(SwDoc* pDc) : SwUnoCollection(pDc) @@ -1001,9 +995,6 @@ XTextTable* SwXTextTables::GetObject( SwFrmFmt& rFmt ) return pTbl ; } -/****************************************************************** - * SwXFrameEnumeration - ******************************************************************/ namespace { template<FlyCntType T> struct UnoFrameWrap_traits {}; @@ -1148,9 +1139,6 @@ Sequence< OUString > SwXFrameEnumeration<T>::getSupportedServiceNames(void) thro return ::comphelper::makeSequence(OUString("com.sun.star.container.XEnumeration")); } -/****************************************************************** - * SwXFrames - ******************************************************************/ OUString SwXFrames::getImplementationName(void) throw( RuntimeException, std::exception ) { return OUString("SwXFrames"); @@ -1315,9 +1303,6 @@ SwXFrame* SwXFrames::GetObject(SwFrmFmt& rFmt, FlyCntType eType) } } -/****************************************************************** - * SwXTextFrames - ******************************************************************/ OUString SwXTextFrames::getImplementationName(void) throw( RuntimeException, std::exception ) { return OUString("SwXTextFrames"); @@ -1345,9 +1330,6 @@ SwXTextFrames::~SwXTextFrames() { } -/****************************************************************** - * SwXTextGraphicObjects - ******************************************************************/ OUString SwXTextGraphicObjects::getImplementationName(void) throw( RuntimeException, std::exception ) { return OUString("SwXTextGraphicObjects"); @@ -1375,9 +1357,6 @@ SwXTextGraphicObjects::~SwXTextGraphicObjects() { } -/****************************************************************** - * SwXTextEmbeddedObjects - ******************************************************************/ OUString SwXTextEmbeddedObjects::getImplementationName(void) throw( RuntimeException, std::exception ) { return OUString("SwXTextEmbeddedObjects"); diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 04a27f3a6574..02a671a4310a 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -235,9 +235,6 @@ public: } }; -/**************************************************************************** - class SwFmDrawPage -****************************************************************************/ SwFmDrawPage::SwFmDrawPage( SdrPage* pPage ) : SvxFmDrawPage( pPage ), pPageView(0) { @@ -361,9 +358,6 @@ uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj ) return xRet; } -/**************************************************************************** - class SwXShapesEnumeration -****************************************************************************/ namespace { class SwXShapesEnumeration @@ -432,9 +426,6 @@ uno::Sequence< OUString > SwXShapesEnumeration::getSupportedServiceNames(void) t return ::comphelper::makeSequence(OUString("com.sun.star.container.XEnumeration")); } -/**************************************************************************** - class SwXDrawPage -****************************************************************************/ uno::Reference< container::XEnumeration > SwXDrawPage::createEnumeration(void) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index c777729d955c..8b4a0dc1cfd3 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -384,10 +384,6 @@ static sal_uInt16 lcl_GetPropertyMapOfService( sal_uInt16 nServiceId ) return nRet; } -/****************************************************************** - * SwXFieldMaster - ******************************************************************/ - class SwXFieldMaster::Impl : public SwClient { @@ -1068,10 +1064,6 @@ OUString SwXFieldMaster::LocalizeFormula( return rFormula; } -/****************************************************************** - * SwXTextField - ******************************************************************/ - uno::Reference<text::XTextField> SwXTextField::CreateXTextField(SwDoc & rDoc, SwFmtFld const& rFmt) { @@ -2631,9 +2623,6 @@ const SwField* SwXTextField::Impl::GetField() const return 0; } -/****************************************************************** - * SwXTextFieldMasters - ******************************************************************/ OUString SwXTextFieldMasters::getImplementationName(void) throw( uno::RuntimeException, std::exception ) { return OUString("SwXTextFieldMasters"); @@ -2662,7 +2651,7 @@ SwXTextFieldMasters::~SwXTextFieldMasters() } -/*----------------------------------------------------------------------- +/* Iteration ueber nicht-Standard Feldtypen USER/SETEXP/DDE/DATABASE Der Name ist demnach: @@ -2673,7 +2662,7 @@ SwXTextFieldMasters::~SwXTextFieldMasters() Falls wir grosszuegig werden wollen, dann koennte man com.sun.star.text auch optional weglassen - -----------------------------------------------------------------------*/ + */ static sal_uInt16 lcl_GetIdByName( OUString& rName, OUString& rTypeName ) { if (rName.startsWithIgnoreAsciiCase(COM_TEXT_FLDMASTER_CC)) @@ -2835,10 +2824,6 @@ sal_Bool SwXTextFieldMasters::hasElements(void) throw( uno::RuntimeException, st return sal_True; } -/****************************************************************** - * SwXFieldTypes - ******************************************************************/ - class SwXTextFieldTypes::Impl { private: @@ -2939,10 +2924,6 @@ throw (uno::RuntimeException, std::exception) m_pImpl->m_RefreshListeners.removeInterface(xListener); } -/****************************************************************** - * SwXFieldEnumeration - ******************************************************************/ - class SwXFieldEnumeration::Impl : public SwClient { diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx index c5c1267e6b76..c23ce7a7a43b 100644 --- a/sw/source/core/unocore/unoflatpara.cxx +++ b/sw/source/core/unocore/unoflatpara.cxx @@ -60,10 +60,6 @@ CreateFlatParagraphIterator(SwDoc & rDoc, sal_Int32 const nTextMarkupType, } -/****************************************************************************** - * SwXFlatParagraph - ******************************************************************************/ - SwXFlatParagraph::SwXFlatParagraph( SwTxtNode& rTxtNode, const OUString& aExpandText, const ModelToViewHelper& rMap ) : SwXFlatParagraph_Base(& rTxtNode, rMap) , maExpandText(aExpandText) @@ -343,10 +339,6 @@ SwXFlatParagraph::getSomething( return sw::UnoTunnelImpl(rId, this); } -/****************************************************************************** - * SwXFlatParagraphIterator - ******************************************************************************/ - SwXFlatParagraphIterator::SwXFlatParagraphIterator( SwDoc& rDoc, sal_Int32 nType, sal_Bool bAutomatic ) : mpDoc( &rDoc ), mnType( nType ), diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index f0f251f5c630..3bf159a8b8f1 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -151,9 +151,6 @@ const sal_Char sGraphicObjectProtocol[] = "vnd.sun.star.GraphicObject:"; //UUUU #define OWN_ATTR_FILLBMP_MODE (OWN_ATTR_VALUE_START+45) -/**************************************************************************** - Rahmenbeschreibung -****************************************************************************/ class BaseFrameProperties_Impl { SwUnoCursorHelper::SwAnyMapHelper aAnyMap; @@ -975,9 +972,6 @@ bool SwFrameProperties_Impl::AnyToItemSet(SwDoc *pDoc, SfxItemSet& rSet, SfxItem return bRet; } -/**************************************************************************** - Grafik-Descriptor -****************************************************************************/ class SwGraphicProperties_Impl : public BaseFrameProperties_Impl { public: @@ -3071,9 +3065,6 @@ OUString SwXFrame::getShapeType(void) throw( uno::RuntimeException, std::excepti return OUString("FrameShape"); } -/****************************************************************** - * SwXTextFrame - ******************************************************************/ SwXTextFrame::SwXTextFrame( SwDoc *_pDoc ) : SwXText(0, CURSOR_FRAME), SwXFrame(FLYCNTTYPE_FRM, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_FRAME), _pDoc ) @@ -3364,9 +3355,6 @@ sal_Int64 SAL_CALL SwXTextFrame::getSomething( const uno::Sequence< sal_Int8 >& return aRet; } -/****************************************************************** - * SwXTextGraphicObject - ******************************************************************/ SwXTextGraphicObject::SwXTextGraphicObject( SwDoc *pDoc ) : SwXFrame(FLYCNTTYPE_GRF, aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_GRAPHIC), pDoc) { diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index e5ab1bf28806..0687eae3b518 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -41,9 +41,6 @@ using namespace ::com::sun::star; -/****************************************************************** - * SwXFootnote - ******************************************************************/ class SwXFootnote::Impl : public SwClient { diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 26a42ef7c741..8ae85cef1259 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -269,9 +269,6 @@ public: }; -/****************************************************************** - * SwXDocumentIndex - ******************************************************************/ class SwDocIndexDescriptorProperties_Impl { private: @@ -1519,9 +1516,6 @@ uno::Reference<frame::XModel> SwXDocumentIndex::GetModel() return 0; } -/****************************************************************** - * SwXDocumentIndexMark - ******************************************************************/ static sal_uInt16 lcl_TypeToPropertyMap_Mark(const TOXTypes eType) { @@ -2430,9 +2424,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, OSL_FAIL("SwXDocumentIndexMark::removeVetoableChangeListener(): not implemented"); } -/****************************************************************** - * SwXDocumentIndexes - ******************************************************************/ SwXDocumentIndexes::SwXDocumentIndexes(SwDoc *const _pDoc) : SwUnoCollection(_pDoc) { @@ -2626,9 +2617,6 @@ SwXDocumentIndexes::hasElements() throw (uno::RuntimeException, std::exception) return 0 != getCount(); } -/****************************************************************** - * SwXDocumentIndex::StyleAccess_Impl - ******************************************************************/ SwXDocumentIndex::StyleAccess_Impl::StyleAccess_Impl( SwXDocumentIndex& rParentIdx) : m_xParent(&rParentIdx) @@ -2757,9 +2745,6 @@ SwXDocumentIndex::StyleAccess_Impl::hasElements() throw (uno::RuntimeException, return sal_True; } -/****************************************************************** - * SwXDocumentIndex::TokenAccess_Impl - ******************************************************************/ SwXDocumentIndex::TokenAccess_Impl::TokenAccess_Impl( SwXDocumentIndex& rParentIdx) : m_xParent(&rParentIdx) diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index 08d237144e38..3bd9cd89bad2 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -97,10 +97,6 @@ using namespace ::com::sun::star::beans; #define MID_TXT_LMARGIN 11 #endif -/****************************************************************************** - UI-Maps -******************************************************************************/ - SwUnoPropertyMapProvider aSwMapProvider; SwUnoPropertyMapProvider::SwUnoPropertyMapProvider() diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 504bb56904f4..ebd46a2851fe 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -229,9 +229,6 @@ void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx, } } -/**************************************************************************** - ActionContext -****************************************************************************/ UnoActionContext::UnoActionContext(SwDoc *const pDoc) : m_pDoc(pDoc) { @@ -255,9 +252,6 @@ UnoActionContext::~UnoActionContext() } } -/**************************************************************************** - ActionRemoveContext -****************************************************************************/ UnoActionRemoveContext::UnoActionRemoveContext(SwDoc *const pDoc) : m_pDoc(pDoc) { @@ -407,9 +401,6 @@ void SwUnoCursorHelper::GetCrsrAttr(SwPaM & rPam, } while ( pCurrent != &rPam ); } -/****************************************************************** - * SwXParagraphEnumeration - ******************************************************************/ class SwXParagraphEnumeration::Impl : public SwClient { @@ -704,9 +695,6 @@ throw (container::NoSuchElementException, lang::WrappedTargetException, return aRet; } -/****************************************************************** - * SwXTextRange - ******************************************************************/ class SwXTextRange::Impl : public SwClient { @@ -1512,9 +1500,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) SwUnoCursorHelper::makeRedline( aPaM, rRedlineType, rRedlineProperties ); } -/****************************************************************** - * SwXTextRanges - ******************************************************************/ class SwXTextRanges::Impl : public SwClient { @@ -1607,11 +1592,11 @@ throw (uno::RuntimeException, std::exception) return ::sw::UnoTunnelImpl<SwXTextRanges>(rId, this); } -/**************************************************************************** +/* * Text positions * Up to the first access to a text position, only a SwCursor is stored. * Afterwards, an array with uno::Reference<XTextPosition> will be created. -****************************************************************************/ + */ OUString SAL_CALL SwXTextRanges::getImplementationName() throw (uno::RuntimeException, std::exception) { @@ -1697,9 +1682,6 @@ void SwUnoCursorHelper::SetString(SwCursor & rCursor, const OUString& rString) pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_INSERT, NULL); } -/****************************************************************** - * SwXParaFrameEnumeration - ******************************************************************/ class SwXParaFrameEnumeration::Impl : public SwClient { @@ -1797,10 +1779,8 @@ lcl_CreateNextObject(SwUnoCrsr& i_rUnoCrsr, return o_rNextObject.is(); } -/* --------------------------------------------------------------------------- - Description: Search for a FLYCNT text attribute at the cursor point - and fill the frame into the array - ---------------------------------------------------------------------------*/ +// Search for a FLYCNT text attribute at the cursor point and fill the frame +// into the array static void lcl_FillFrame(SwClient & rEnum, SwUnoCrsr& rUnoCrsr, FrameDependList_t & rFrames) diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 3bd5a5b4ec39..748bce80a0fe 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -86,9 +86,6 @@ SwParaSelection::~SwParaSelection() } } -/****************************************************************** - * forward declarations - ******************************************************************/ static beans::PropertyState lcl_SwXParagraph_getPropertyState( const SwTxtNode& rTxtNode, const SwAttrSet** ppSet, @@ -96,9 +93,6 @@ static beans::PropertyState lcl_SwXParagraph_getPropertyState( sal_Bool &rAttrSetFetched ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception); -/****************************************************************** - * SwXParagraph - ******************************************************************/ class SwXParagraph::Impl : public SwClient { diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index c492eb02c309..f6e7d57a6ba2 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -48,10 +48,6 @@ using namespace ::com::sun::star; -/****************************************************************** - * SwXTextPortion - ******************************************************************/ - class SwXTextPortion::Impl { private: diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 263414f9770c..2b747742ae03 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -38,9 +38,6 @@ using namespace ::com::sun::star; -/****************************************************************** - * SwXReferenceMark - ******************************************************************/ class SwXReferenceMark::Impl : public SwClient { @@ -527,9 +524,6 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, #include <fmtmeta.hxx> #include <docsh.hxx> -/****************************************************************** - * SwXMetaText - ******************************************************************/ class SwXMetaText : public SwXText { @@ -647,9 +641,6 @@ SwXMetaText::createTextCursorByRange( return xCursor; } -/****************************************************************** - * SwXMeta - ******************************************************************/ // the Meta has a cached list of text portions for its contents // this list is created by SwXTextPortionEnumeration // the Meta listens at the SwTxtNode and throws away the cache when it changes @@ -1299,9 +1290,6 @@ uno::Reference<frame::XModel> SwXMeta::GetModel() return 0; } -/****************************************************************** - * SwXMetaField - ******************************************************************/ inline const ::sw::MetaField * SwXMeta::Impl::GetMetaField() const { return static_cast< const ::sw::MetaField * >(GetRegisteredIn()); diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 96538ebcab18..d1b85147f42e 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -280,9 +280,6 @@ const unsigned short aUnoToSvxAdjust[] = USHRT_MAX }; -/****************************************************************** - * SwXFootnoteProperties - ******************************************************************/ OUString SwXFootnoteProperties::getImplementationName(void) throw( RuntimeException, std::exception ) { return OUString("SwXFootnoteProperties"); @@ -590,9 +587,6 @@ void SwXFootnoteProperties::removeVetoableChangeListener( OSL_FAIL("not implemented"); } -/****************************************************************** - * SwXEndnoteProperties - ******************************************************************/ OUString SwXEndnoteProperties::getImplementationName(void) throw( RuntimeException, std::exception ) { return OUString("SwXEndnoteProperties"); @@ -819,9 +813,6 @@ void SwXEndnoteProperties::removeVetoableChangeListener(const OUString& /*Proper OSL_FAIL("not implemented"); } -/****************************************************************** - * SwXLineNumberingProperties - ******************************************************************/ OUString SwXLineNumberingProperties::getImplementationName(void) throw( RuntimeException, std::exception ) { return OUString("SwXLineNumberingProperties"); @@ -1101,9 +1092,6 @@ void SwXLineNumberingProperties::removeVetoableChangeListener(const OUString& /* OSL_FAIL("not implemented"); } -/****************************************************************** - * SwXNumberingRules - ******************************************************************/ const char aInvalidStyle[] = "__XXX___invalid"; bool SwXNumberingRules::isInvalidStyle(const OUString &rName) @@ -2342,9 +2330,6 @@ SwXChapterNumbering::~SwXChapterNumbering() { } -/****************************************************************** - * SwXTextColumns - ******************************************************************/ OUString SwXTextColumns::getImplementationName(void) throw( RuntimeException, std::exception ) { return OUString("SwXTextColumns"); diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index e36810852a1c..283692a8d9ee 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -192,9 +192,6 @@ public: SwDoc* getDoc() const { return pDoc; } }; -/****************************************************************** - * SwXStyleFamilies - ******************************************************************/ OUString SwXStyleFamilies::getImplementationName(void) throw( uno::RuntimeException, std::exception ) { return OUString("SwXStyleFamilies"); @@ -442,9 +439,6 @@ uno::Sequence< beans::PropertyValue > SwXStyleFamilies::getStyleLoaderOptions(vo return aSeq; } -/****************************************************************** - * SwXStyleFamily - ******************************************************************/ OUString SwXStyleFamily::getImplementationName(void) throw( uno::RuntimeException, std::exception ) { return OUString("SwXStyleFamily"); @@ -3185,9 +3179,6 @@ void SwXStyle::Invalidate() mxStyleFamily.clear(); } -/****************************************************************** - * SwXPageStyle - ******************************************************************/ SwXPageStyle::SwXPageStyle(SfxStyleSheetBasePool& rPool, SwDocShell* pDocSh, SfxStyleFamily eFam, const OUString& rStyleName): diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 8b75251e49ba..7b7b9af2cc96 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -71,9 +71,6 @@ using namespace ::com::sun::star; const sal_Char cInvalidObject[] = "this object is invalid"; -/****************************************************************** - * SwXText - ******************************************************************/ class SwXText::Impl { @@ -1441,10 +1438,8 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) return xRet; } -/*------------------------------------------------------------------------- - Append text portions at the end of the last paragraph of the text - interface. Support of import filters. - -----------------------------------------------------------------------*/ +// Append text portions at the end of the last paragraph of the text interface. +// Support of import filters. uno::Reference< text::XTextRange > SAL_CALL SwXText::appendTextPortion( const OUString& rText, @@ -1458,10 +1453,8 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) return insertTextPortion(rText, rCharacterAndParagraphProperties, xInsertPosition); } -/*------------------------------------------------------------------------- - enable inserting/appending text contents like graphic objects, shapes and so on - to support import filters - -----------------------------------------------------------------------*/ +// enable inserting/appending text contents like graphic objects, shapes and so on to +// support import filters uno::Reference< text::XTextRange > SAL_CALL SwXText::insertTextContentWithProperties( const uno::Reference< text::XTextContent >& xTextContent, @@ -1789,9 +1782,7 @@ SwXText::convertToTextFrame( return xRet; } -/*------------------------------------------------------------------------- - Move previously imported paragraphs into a new text table. - -----------------------------------------------------------------------*/ +// Move previously imported paragraphs into a new text table. struct VerticallyMergedCell { std::vector<uno::Reference< beans::XPropertySet > > aCells; @@ -2355,9 +2346,6 @@ throw (uno::RuntimeException, std::exception) m_pImpl->m_pDoc->CopyRange( *pCursor->GetPaM(), rPos, false ); } -/****************************************************************** - * SwXBodyText - ******************************************************************/ SwXBodyText::SwXBodyText(SwDoc *const pDoc) : SwXText(pDoc, CURSOR_BODY) { @@ -2582,9 +2570,6 @@ SwXBodyText::hasElements() throw (uno::RuntimeException, std::exception) return sal_True; } -/****************************************************************** - * SwXHeadFootText - ******************************************************************/ class SwXHeadFootText::Impl : public SwClient { diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 522e2bb6a52d..50d23948ab8f 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -314,9 +314,6 @@ void SwWW8ImplReader::DeleteFormImpl() delete pFormImpl, pFormImpl = 0; } -// WW8ListManager oeffentliche Methoden stehen ganz am Ende -//------------------------- ============ --------------- ============ -------- - // Hilfs-Deklarationen // Style Id's for each level @@ -2070,7 +2067,7 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData, } } -// ------------------------- Reading Controls ------------------------ +// Reading Controls bool SwWW8ImplReader::ImportFormulaControl(WW8FormulaControl &aFormula, WW8_CP nStart, SwWw8ControlType nWhich ) diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 7d23aa54d42c..3293e75181e8 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -130,12 +130,9 @@ inline sal_uInt32 MSRoundTweak(sal_uInt32 x) return x; } -/*************************************************************************** -# Seiten - Attribute, die nicht ueber die Attribut-Verwaltung, sondern -# ueber ...->HasSprm abgearbeitet werden -# ( ausser OLST, dass weiterhin ein normales Attribut ist ) -#**************************************************************************/ - +// Seiten - Attribute, die nicht ueber die Attribut-Verwaltung, sondern +// ueber ...->HasSprm abgearbeitet werden +// ( ausser OLST, dass weiterhin ein normales Attribut ist ) static short ReadSprm( const WW8PLCFx_SEPX* pSep, sal_uInt16 nId, short nDefaultVal ) { const sal_uInt8* pS = pSep->HasSprm( nId ); // sprm da ? @@ -2549,10 +2546,6 @@ bool SwWW8ImplReader::TestSameApo(const ApoTestResults &rApo, return aF == *pWFlyPara; } -/*************************************************************************** -# Attribut - Verwaltung -#**************************************************************************/ - void SwWW8ImplReader::NewAttr( const SfxPoolItem& rAttr, const bool bFirstLineOfStSet, const bool bLeftIndentSet ) @@ -2629,17 +2622,8 @@ const SfxPoolItem* SwWW8ImplReader::GetFmtAttr( sal_uInt16 nWhich ) return pRet; } -/*************************************************************************** -# eigentliche Attribute -# -# Die Methoden erhalten die Token-Id und die Laenge der noch folgenden -# Parameter gemaess Tabelle in WWScan.cxx als Parameter -#**************************************************************************/ - -/*************************************************************************** -# Spezial WW - Attribute -#**************************************************************************/ - +// Die Methoden erhalten die Token-Id und die Laenge der noch folgenden +// Parameter gemaess Tabelle in WWScan.cxx als Parameter void SwWW8ImplReader::Read_Special(sal_uInt16, const sal_uInt8* pData, short nLen) { if( nLen < 0 ) @@ -2750,10 +2734,6 @@ SwWW8StyInf *SwWW8ImplReader::GetStyle(sal_uInt16 nColl) const return const_cast<SwWW8StyInf *>(nColl < vColl.size() ? &vColl[nColl] : 0); } -/*************************************************************************** -# Zeichen - Attribute -#**************************************************************************/ - // Read_BoldUsw fuer Italic, Bold, Kapitaelchen, Versalien, durchgestrichen, // Contour und Shadow void SwWW8ImplReader::Read_BoldUsw( sal_uInt16 nId, const sal_uInt8* pData, short nLen ) @@ -3832,10 +3812,6 @@ void SwWW8ImplReader::Read_CharHighlight(sal_uInt16, const sal_uInt8* pData, sho } } -/*************************************************************************** -# Absatz - Attribute -#**************************************************************************/ - void SwWW8ImplReader::Read_NoLineNumb(sal_uInt16 , const sal_uInt8* pData, short nLen) { if( nLen < 0 ) // Ende des Attributes @@ -4944,16 +4920,11 @@ bool SwWW8ImplReader::ParseTabPos(WW8_TablePos *pTabPos, WW8PLCFx_Cp_FKP* pPap) return bRet; } -/*************************************************************************** -# Seiten - Attribute werden nicht mehr als Attribute gehandhabt -# ( ausser OLST ) -#**************************************************************************/ - +// Seiten - Attribute werden nicht mehr als Attribute gehandhabt +// ( ausser OLST ) long SwWW8ImplReader::ImportExtSprm(WW8PLCFManResult* pRes) { - /************************************************************************* - # Arrays zum Lesen der erweiterten ( selbstdefinierten ) SPRMs - #*************************************************************************/ + // Arrays zum Lesen der erweiterten ( selbstdefinierten ) SPRMs typedef long (SwWW8ImplReader:: *FNReadRecordExt)(WW8PLCFManResult*); static const FNReadRecordExt aWwSprmTab[] = @@ -4997,9 +4968,7 @@ void SwWW8ImplReader::EndExtSprm(sal_uInt16 nSprmId) (this->*aWwSprmTab[nIdx])(); } -/*************************************************************************** -# Arrays zum Lesen der SPRMs -#**************************************************************************/ +// Arrays zum Lesen der SPRMs // Funktion zum Einlesen von Sprms. Par1: SprmId typedef void (SwWW8ImplReader:: *FNReadRecord)( sal_uInt16, const sal_uInt8*, short ); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 513b8d905ee9..8a3cc7c90e39 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -54,8 +54,6 @@ using namespace css; using namespace css::uno; using namespace css::lang; -// Globals ****************************************************************** - static sal_uInt16 aPageRg[] = { RES_PARATR_DROP, RES_PARATR_DROP, 0 @@ -181,10 +179,7 @@ void SwDropCapsPict::InitPrinter( void ) _InitPrinter(); } -/**************************************************************************** - Create Default-String from character-count (A, AB, ABC, ...) -****************************************************************************/ - +// Create Default-String from character-count (A, AB, ABC, ...) OUString GetDefaultString(sal_uInt16 nChars) { OUString aStr; @@ -341,10 +336,6 @@ void SwDropCapsPict::UpdatePaintSettings( void ) Invalidate(); } -/**************************************************************************** -Pict: Paint-Overload -****************************************************************************/ - void SwDropCapsPict::Paint(const Rectangle &/*rRect*/) { if (!IsVisible()) @@ -588,20 +579,12 @@ int SwDropCapsPage::DeactivatePage(SfxItemSet * _pSet) return LEAVE_PAGE; } -/**************************************************************************** -Page: Factory -****************************************************************************/ - SfxTabPage* SwDropCapsPage::Create(Window *pParent, const SfxItemSet &rSet) { return new SwDropCapsPage(pParent, rSet); } -/**************************************************************************** -Page: FillItemSet-Overload -****************************************************************************/ - bool SwDropCapsPage::FillItemSet(SfxItemSet &rSet) { if(bModified) @@ -609,10 +592,6 @@ bool SwDropCapsPage::FillItemSet(SfxItemSet &rSet) return bModified; } -/**************************************************************************** -Page: Reset-Overload -****************************************************************************/ - void SwDropCapsPage::Reset(const SfxItemSet &rSet) { // Characters, lines, gap and text @@ -661,10 +640,6 @@ void SwDropCapsPage::Reset(const SfxItemSet &rSet) bModified = sal_False; } -/**************************************************************************** -Page: CheckBox's Click-Handler -****************************************************************************/ - IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl) { sal_Bool bChecked = m_pDropCapsBox->IsChecked(); @@ -695,10 +670,6 @@ IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl) return 0; } -/**************************************************************************** -Page: CheckBox's Click-Handler -****************************************************************************/ - IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl) { m_pDropCapsField->Enable( !m_pWholeWordCB->IsChecked() ); @@ -711,10 +682,6 @@ IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl) return 0; } -/**************************************************************************** -Page: SpinFields' Modify-Handler -****************************************************************************/ - IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit ) { OUString sPreview; @@ -770,10 +737,6 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit ) return 0; } -/**************************************************************************** -Page: Template-Box' Select-Handler. -*****************************************************************************/ - IMPL_LINK_NOARG_INLINE_START(SwDropCapsPage, SelectHdl) { m_pPict->UpdatePaintSettings(); diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 6a85aa051dc4..cc09b4069bc1 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -122,10 +122,6 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) } -/**************************************************************************** -Page: Dtor -****************************************************************************/ - SwCondCollPage::~SwCondCollPage() { for(sal_uInt16 i = 0; i < m_pFilterLB->GetEntryCount(); ++i) @@ -141,19 +137,11 @@ int SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) return LEAVE_PAGE; } -/**************************************************************************** -Page: Factory -****************************************************************************/ - SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet &rSet) { return new SwCondCollPage(pParent, rSet); } -/**************************************************************************** -Page: FillItemSet-Overload -****************************************************************************/ - bool SwCondCollPage::FillItemSet(SfxItemSet &rSet) { sal_Bool bModified = sal_True; @@ -167,10 +155,6 @@ bool SwCondCollPage::FillItemSet(SfxItemSet &rSet) return bModified; } -/**************************************************************************** -Page: Reset-Overload -****************************************************************************/ - void SwCondCollPage::Reset(const SfxItemSet &/*rSet*/) { if(bNewTemplate) diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 7b63f5c640bb..35468ddc63e7 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -1152,7 +1152,7 @@ GlossarySetActGroup SwAbstractDialogFactory_Impl::SetGlossaryActGroupFunc() return SwGlossaryDlg::SetActGroup; } -//------------------ Factories for TabPages +// Factories for TabPages CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId ) { CreateTabPage pRet = 0; diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 3908229c0444..361668a309d9 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -158,9 +158,7 @@ static RelationMap aAsCharRelationMap[] = {SwFPos::REL_ROW, SwFPos::REL_ROW, LB_REL_ROW, text::RelOrientation::FRAME} }; -/*-------------------------------------------------------------------- - Description: site anchored - --------------------------------------------------------------------*/ +// site anchored #define HORI_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_PG_LEFT| \ LB_REL_PG_RIGHT) @@ -192,9 +190,7 @@ static FrmMap aVPageHtmlMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, LB_REL_PG_FRAME} }; -/*-------------------------------------------------------------------- - Description: frame anchored - --------------------------------------------------------------------*/ +// frame anchored #define HORI_FRAME_REL (LB_FLY_REL_PG_FRAME|LB_FLY_REL_PG_PRTAREA| \ LB_FLY_REL_PG_LEFT|LB_FLY_REL_PG_RIGHT) @@ -229,9 +225,7 @@ static FrmMap aVFlyHtmlMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, LB_FLY_VERT_FRAME} }; -/*-------------------------------------------------------------------- - Description: paragraph anchored - --------------------------------------------------------------------*/ +// paragraph anchored #define HORI_PARA_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \ LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \ LB_REL_FRM_RIGHT) @@ -275,9 +269,7 @@ static FrmMap aVParaHtmlMap[] = {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB_VERT_PRTAREA} }; -/*-------------------------------------------------------------------- - Description: anchored relative to the character - --------------------------------------------------------------------*/ +// anchored relative to the character #define HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_PG_LEFT|LB_REL_PG_RIGHT| \ LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \ LB_REL_FRM_RIGHT|LB_REL_CHAR) @@ -339,9 +331,7 @@ static FrmMap aVCharHtmlAbsMap[] = {SwFPos::BELOW, SwFPos::BELOW, text::VertOrientation::CHAR_BOTTOM, LB_REL_CHAR} }; -/*-------------------------------------------------------------------- - Description: anchored as character - --------------------------------------------------------------------*/ +// anchored as character static FrmMap aVAsCharMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB_REL_BASE}, @@ -593,9 +583,7 @@ static sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, return nLBRelations; } -/*-------------------------------------------------------------------- - Description: standard frame TabPage - --------------------------------------------------------------------*/ +// standard frame TabPage namespace { void HandleAutoCB( sal_Bool _bChecked, FixedText& _rFT_man, FixedText& _rFT_auto, MetricField& _rPF_Edit) @@ -1034,9 +1022,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) fWidthHeightRatio = nHeight ? double(nWidth) / double(nHeight) : 1.0; } -/*-------------------------------------------------------------------- - Description: stuff attributes into the set when OK - --------------------------------------------------------------------*/ +// stuff attributes into the set when OK bool SwFrmPage::FillItemSet(SfxItemSet &rSet) { bool bRet = false; @@ -1233,9 +1219,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) return bRet; } -/*-------------------------------------------------------------------- - Description: initialise horizonal and vertical Pos - --------------------------------------------------------------------*/ +// initialise horizonal and vertical Pos void SwFrmPage::InitPos(RndStdIds eId, sal_Int16 nH, sal_Int16 nHRel, @@ -1707,9 +1691,7 @@ RndStdIds SwFrmPage::GetAnchor() return nRet; } -/*-------------------------------------------------------------------- - Description: Bsp - Update - --------------------------------------------------------------------*/ +// Bsp - Update void SwFrmPage::ActivatePage(const SfxItemSet& rSet) { bNoModifyHdl = sal_True; @@ -1742,9 +1724,7 @@ int SwFrmPage::DeactivatePage(SfxItemSet * _pSet) return sal_True; } -/*-------------------------------------------------------------------- - Description: swap left/right with inside/outside - --------------------------------------------------------------------*/ +// swap left/right with inside/outside IMPL_LINK_NOARG(SwFrmPage, MirrorHdl) { RndStdIds eId = GetAnchor(); @@ -1780,9 +1760,7 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn ) return 0; } -/*-------------------------------------------------------------------- - Description: range check - --------------------------------------------------------------------*/ +// range check IMPL_LINK_NOARG(SwFrmPage, RangeModifyHdl) { if (bNoModifyHdl) @@ -2035,9 +2013,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB ) return 0; } -/*-------------------------------------------------------------------- - Description: horizontal Pos - --------------------------------------------------------------------*/ +// horizontal Pos IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB ) { bool bHori = pLB == m_pHoriRelationLB; @@ -2621,9 +2597,7 @@ IMPL_LINK_NOARG(SwGrfExtPage, MirrorHdl) return 0; } -/*-------------------------------------------------------------------- - Description: example window - --------------------------------------------------------------------*/ +// example window BmpWindow::BmpWindow(Window* pPar, WinBits nStyle) : Window(pPar, nStyle) , bHorz(false) @@ -2718,9 +2692,7 @@ void BmpWindow::SetBitmapEx(const BitmapEx& rBmp) Invalidate(); } -/*************************************************************************** - Description: set URL and ImageMap at frames -***************************************************************************/ +// set URL and ImageMap at frames SwFrmURLPage::SwFrmURLPage( Window *pParent, const SfxItemSet &rSet ) : SfxTabPage(pParent, "FrmURLPage" , "modules/swriter/ui/frmurlpage.ui", rSet) { |