[Libreoffice-commits] core.git: sw/inc sw/sdi sw/source
Chris Laplante
mostthingsweb at gmail.com
Wed Apr 23 21:40:19 PDT 2014
sw/inc/EnhancedPDFExportHelper.hxx | 14 -
sw/inc/IDocumentRedlineAccess.hxx | 8
sw/inc/SwSmartTagMgr.hxx | 7
sw/inc/breakit.hxx | 4
sw/inc/calc.hxx | 17 -
sw/inc/checkit.hxx | 7
sw/inc/grfatr.hxx | 18 -
sw/inc/paratr.hxx | 10
sw/inc/shellio.hxx | 3
sw/inc/splargs.hxx | 18 -
sw/inc/swscanner.hxx | 8
sw/inc/viewsh.hxx | 3
sw/sdi/_frmsh.sdi | 7
sw/sdi/_viewsh.sdi | 7
sw/source/core/access/acccell.cxx | 2
sw/source/core/access/acccell.hxx | 6
sw/source/core/access/accdoc.hxx | 2
sw/source/core/access/accembedded.cxx | 2
sw/source/core/access/accfield.hxx | 6
sw/source/core/access/accheaderfooter.hxx | 2
sw/source/core/access/accnotextframe.cxx | 2
sw/source/core/access/accnotextframe.hxx | 2
sw/source/core/access/accpreview.hxx | 4
sw/source/core/access/accselectionhelper.hxx | 2
sw/source/core/access/acctable.cxx | 2
sw/source/core/access/acctable.hxx | 26 -
sw/source/core/access/acctextframe.cxx | 4
sw/source/core/access/acctextframe.hxx | 10
sw/source/core/doc/docftn.cxx | 6
sw/source/core/frmedt/fecopy.cxx | 17 -
sw/source/core/frmedt/fedesc.cxx | 24 -
sw/source/core/frmedt/fefly1.cxx | 128 ---------
sw/source/core/frmedt/feshview.cxx | 266 +-------------------
sw/source/core/frmedt/fetab.cxx | 126 ---------
sw/source/core/frmedt/fews.cxx | 65 ----
sw/source/core/inc/UndoNumbering.hxx | 1
sw/source/core/inc/UndoSection.hxx | 1
sw/source/core/inc/UndoSort.hxx | 1
sw/source/core/inc/laycache.hxx | 7
sw/source/core/inc/scriptinfo.hxx | 7
sw/source/core/inc/swfntcch.hxx | 12
sw/source/core/inc/swfont.hxx | 11
sw/source/core/inc/txtfrm.hxx | 8
sw/source/core/inc/unoflatpara.hxx | 8
sw/source/core/layout/findfrm.cxx | 34 +-
sw/source/core/layout/frmtool.cxx | 2
sw/source/core/layout/layhelp.hxx | 30 --
sw/source/core/layout/paintfrm.cxx | 6
sw/source/core/layout/tabfrm.cxx | 19 -
sw/source/core/table/swnewtable.cxx | 24 -
sw/source/core/table/swtable.cxx | 57 ----
sw/source/core/text/atrstck.cxx | 30 --
sw/source/core/text/frmform.cxx | 43 ---
sw/source/core/txtnode/atrfld.cxx | 6
sw/source/core/txtnode/atrflyin.cxx | 34 --
sw/source/core/txtnode/atrftn.cxx | 10
sw/source/core/txtnode/atrref.cxx | 10
sw/source/core/txtnode/fmtatr2.cxx | 38 --
sw/source/core/txtnode/fntcache.cxx | 84 ------
sw/source/core/txtnode/fntcap.cxx | 86 ------
sw/source/core/txtnode/ndhints.cxx | 20 -
sw/source/core/txtnode/ndtxt.cxx | 61 ----
sw/source/core/txtnode/swfntcch.cxx | 12
sw/source/core/txtnode/swfont.cxx | 22 -
sw/source/core/txtnode/thints.cxx | 44 ---
sw/source/core/txtnode/txtatr2.cxx | 20 -
sw/source/core/txtnode/txtedt.cxx | 16 -
sw/source/core/uibase/app/swmodule.cxx | 7
sw/source/core/uibase/chrdlg/ccoll.cxx | 9
sw/source/core/uibase/dialog/regionsw.src | 4
sw/source/core/uibase/docvw/PostItMgr.cxx | 1
sw/source/core/uibase/inc/conarc.hxx | 7
sw/source/core/uibase/inc/concustomshape.hxx | 7
sw/source/core/uibase/inc/conpoly.hxx | 9
sw/source/core/uibase/inc/conrect.hxx | 7
sw/source/core/uibase/inc/drawbase.hxx | 7
sw/source/core/uibase/inc/dselect.hxx | 7
sw/source/core/uibase/inc/regionsw.hxx | 8
sw/source/core/uibase/sidebar/PagePropertyPanel.hrc | 2
sw/source/core/undo/docundo.cxx | 6
sw/source/core/unocore/unobkm.cxx | 8
sw/source/core/unocore/unocoll.cxx | 21 -
sw/source/core/unocore/unodraw.cxx | 9
sw/source/core/unocore/unofield.cxx | 23 -
sw/source/core/unocore/unoflatpara.cxx | 8
sw/source/core/unocore/unoframe.cxx | 12
sw/source/core/unocore/unoftn.cxx | 3
sw/source/core/unocore/unoidx.cxx | 15 -
sw/source/core/unocore/unomap.cxx | 4
sw/source/core/unocore/unoobj2.cxx | 28 --
sw/source/core/unocore/unoparagraph.cxx | 6
sw/source/core/unocore/unoport.cxx | 4
sw/source/core/unocore/unorefmk.cxx | 12
sw/source/core/unocore/unosett.cxx | 15 -
sw/source/core/unocore/unostyle.cxx | 9
sw/source/core/unocore/unotext.cxx | 25 -
sw/source/filter/ww8/ww8par3.cxx | 5
sw/source/filter/ww8/ww8par6.cxx | 49 ---
sw/source/ui/chrdlg/drpcps.cxx | 39 --
sw/source/ui/chrdlg/swuiccoll.cxx | 16 -
sw/source/ui/dialog/swdlgfact.cxx | 2
sw/source/ui/frmdlg/frmpage.cxx | 56 +---
102 files changed, 269 insertions(+), 1780 deletions(-)
New commits:
commit ba39f1bf9b29f58b7593f01d552a4f1a42a637cb
Author: Chris Laplante <mostthingsweb at gmail.com>
Date: Mon Apr 21 19:28:47 2014 -0400
Finish cleaning up ASCII art in the sw module
Change-Id: If4f11093b791902514dee8e216c92f66b075211d
Reviewed-on: https://gerrit.libreoffice.org/9117
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index 3802810..d8c4ef4 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 2700a31..50cbdcb 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 c3e1640..e11f1f3 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 89ea5d1..588943e 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 2d00ab5..ead65e6 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 b26c51e..66ee370 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 de916b3..5c43030 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 8bd41a0..bb81ce8 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 0f2ff19..cf7449e 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 47bc1fb..438a2f5 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 49ce2e2..aafd070 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 22a4ff8..3f37080 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 87a57af..7325486 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 d49b732..40ec958 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 29933cd..f1ab71f 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 a2b80b8..80b9e90 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 a3e1669..65fe9fa 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 71f1c6c..f7c607c 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 6aea8b6..a44dbd8 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 b0a53e6..3c3597f 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 c3ab7ef..84a6fd0 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 d4c961a..eace193 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 f3fd970..62ea32b 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 5e51987..05f2b3f 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 1ae3f73..e9a5a36 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 6700033..4fbb425 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 5699092..5aa437c 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 20e621f..04d061b 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 1aee6b56..be8be9a 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 dcad11e..d1ca9d1 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 c85f739..d374699 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 e7cda7a..1b41d1e 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 c7fabef..60bfeb0 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 bd4fcdd..7abc152 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 01cc00c..5f2cc60 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 53614c4..f8647d9 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 478161c..7252412 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 b750741..f1be773 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 b9a0a40..2ea98d4 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 49842c9..001bc3d 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 5829749..5bb84ba 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 c11a29a..1c77cf9 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 a35a81a..9aaccd4 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 9d8b2a5..d776ed2 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 40e74bd..21fa711 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 a0e3800..3b49a6e 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 810e30a..59b1ef2 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 3da4f87..7806a76 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 14ec809..ce092c3 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 cbbda80..2342ac9 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 77bd9e6..2b4354d 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
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list