[Libreoffice-commits] .: sw/inc
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Nov 1 14:06:57 PDT 2010
sw/inc/SwUndoFmt.hxx | 1 -
sw/inc/chrdlg.hrc | 1 -
sw/inc/crsrsh.hxx | 39 +++++++++------------------------------
sw/inc/fmtclds.hxx | 4 +---
sw/inc/fmtcol.hxx | 44 +++++++++-----------------------------------
sw/inc/hintids.hxx | 11 +----------
sw/inc/list.hxx | 4 ----
sw/inc/ndnotxt.hxx | 6 ------
sw/inc/rolbck.hxx | 25 +++++--------------------
sw/inc/swtypes.hxx | 8 +-------
sw/inc/unoframe.hxx | 14 ++------------
sw/inc/unoport.hxx | 9 ---------
sw/inc/unoprnms.hxx | 6 +++---
sw/inc/unotxdoc.hxx | 14 +-------------
14 files changed, 32 insertions(+), 154 deletions(-)
New commits:
commit 2a18c44ed1faf98f99791a2a7e5322f1b25938e6
Author: Robert Roth <robert.roth.off at gmail.com>
Date: Mon Nov 1 20:15:09 2010 +0200
Commented lines, bogus comments removed.
diff --git a/sw/inc/SwUndoFmt.hxx b/sw/inc/SwUndoFmt.hxx
index b68ae48..f5db7d6 100644
--- a/sw/inc/SwUndoFmt.hxx
+++ b/sw/inc/SwUndoFmt.hxx
@@ -93,7 +93,6 @@ class SwUndoRenameFmt : public SwUndo
protected:
String sOldName, sNewName;
SwDoc * pDoc;
-// SwUndoId nId;
public:
SwUndoRenameFmt(SwUndoId nUndoId, const String & sOldName,
diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc
index 7e3175a..6affa10 100644
--- a/sw/inc/chrdlg.hrc
+++ b/sw/inc/chrdlg.hrc
@@ -45,7 +45,6 @@
#define STR_TEXTCOLL_HEADER (RC_CHRDLG_BEGIN + 2)
#define STR_PAGEFMT_HEADER (RC_CHRDLG_BEGIN + 4)
#define SW_STR_NONE (RC_CHRDLG_BEGIN + 5)
-//#define STR_NUMFMT (RC_CHRDLG_BEGIN + 6)
#define MSG_ILLEGAL_PAGENUM (RC_CHRDLG_BEGIN + 1)
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 35d27e6..0524220 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -46,7 +46,6 @@
#include <tblsel.hxx>
#include <IDocumentMarkAccess.hxx>
-
// einige Forward Deklarationen
class KeyCode;
@@ -74,10 +73,10 @@ class SwCellFrms;
class SwTOXMark;
class SwRedline;
class IBlockCursor;
-class SwCntntNode; // #i23726#
-// --> OD 2008-06-19 #i90516#
+class SwCntntNode;
+
class SwPostItField;
-// <--
+
struct SwPosition;
namespace com { namespace sun { namespace star { namespace util {
@@ -108,8 +107,8 @@ struct SwContentAtPos
SW_OUTLINE = 0x0040,
SW_TOXMARK = 0x0080,
SW_REFMARK = 0x0100,
- SW_NUMLABEL = 0x0200, // #i23726#
- SW_CONTENT_CHECK = 0x0400, // #i43742#
+ SW_NUMLABEL = 0x0200,
+ SW_CONTENT_CHECK = 0x0400,
SW_SMARTTAG = 0x0800,
SW_FORMCTRL = 0x1000
#if OSL_DEBUG_LEVEL > 1
@@ -122,11 +121,11 @@ struct SwContentAtPos
const SwField* pFld;
const SfxPoolItem* pAttr;
const SwRedline* pRedl;
- SwCntntNode * pNode; // #i23726#
+ SwCntntNode * pNode;
const sw::mark::IFieldmark* pFldmark;
} aFnd;
- int nDist; // #i23726#
+ int nDist;
String sStr;
const SwTxtAttr* pFndTxtAttr;
@@ -181,7 +180,6 @@ private:
Point aOldRBPos; // Right/Bottom von letzter VisArea
// (wird im Invalidate vom Cursor benutzt)
-
// um event. Macro was anhaengt auszufuehren.
Link aFlyMacroLnk; // Link will be called, if the Crsr is set
// into a fly. A macro can be then becalled
@@ -189,7 +187,6 @@ private:
// format changes at cursor position.
Link aGrfArrivedLnk; // Link calls to UI if a grafik is arrived
-
SwShellCrsr* pCurCrsr; // der aktuelle Cursor
SwShellCrsr* pCrsrStk; // Stack fuer den Cursor
SwVisCrsr *pVisCrsr; // der Sichtbare-Cursor
@@ -220,10 +217,8 @@ private:
USHORT nBasicActionCnt; // Actions, die vom Basic geklammert wurden
CrsrMoveState eMvState; // Status fuers Crsr-Travelling - GetCrsrOfst
- // --> OD 2008-04-02 #refactorlists#
String sMarkedListId;
int nMarkedListLevel;
- // <--
BOOL bHasFocus : 1; // Shell ist in einem Window "aktiv"
BOOL bSVCrsrVis : 1; // SV-Cursor Un-/Sichtbar
@@ -248,7 +243,6 @@ private:
BOOL bSetCrsrInReadOnly : 1;// TRUE -> Cursor darf in ReadOnly-Bereiche
BOOL bOverwriteCrsr : 1; // TRUE -> show Overwrite Crsr
- // OD 11.02.2003 #100556# - flag to allow/avoid execution of marcos (default: true)
bool mbMacroExecAllowed : 1;
SW_DLLPRIVATE void UpdateCrsr( USHORT eFlags
@@ -257,11 +251,8 @@ private:
SW_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing );
- // -> #i27615#
-
/** Mark a certain list level of a certain list
- OD 2008-04-02 #refactorlists#
levels of a certain lists are marked now
@param sListId list Id of the list whose level is marked
@@ -271,7 +262,6 @@ private:
*/
SW_DLLPRIVATE void MarkListLevel( const String& sListId,
const int nLevel );
- // <- #i27615#
// private method(s) accessed from public inline method(s) must be exported.
BOOL LeftRight( BOOL, USHORT, USHORT, BOOL );
@@ -309,13 +299,9 @@ protected:
void PaMCorrAbs(const SwNodeIndex &rOldNode, const SwPosition &rNewPos,
const xub_StrLen nOffset = 0 );
- // --> FME 2004-07-30 #i32329# Enhanced table selection
BOOL _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
- // <--
- // --> FME 2005-01-31 #i41424# Only update the marked number levels if necessary
bool SetInFrontOfLabel( BOOL bNew );
- // <--
void RefreshBlockCursor();
@@ -415,7 +401,6 @@ public:
// CRSR_POSOLD: wenn der Crsr nicht veraendert wurde
int SetCrsr( const Point &rPt, BOOL bOnlyText = FALSE, bool bBlock = true );
-
/*
* Benachrichtung, dass der sichtbare Bereich sich geaendert
* hat. aVisArea wird neu gesetzt, anschliessend wird
@@ -627,9 +612,8 @@ public:
BOOL SelTblRow() { return _SelTblRowOrCol( true ); }
BOOL SelTblCol() { return _SelTblRowOrCol( false ); }
BOOL SelTblBox();
- // --> FME 2004-07-30 #i32329# Enhanced table selection
+
BOOL SelTbl();
- // <--
// zum naechsten/vorhergehenden Punkt auf gleicher Ebene
BOOL GotoNextNum();
@@ -801,9 +785,7 @@ public:
BOOL bSetCrsr = FALSE,
SwRect* pFldRect = 0 );
- // --> OD 2008-06-19 #i90516#
const SwPostItField* GetPostItFieldAtCursor() const;
- // <--
// get smart tags at point position
void GetSmartTagTerm( const Point& rPt,
@@ -859,7 +841,6 @@ public:
// remove all invalid cursors
void ClearUpCrsrs();
- // OD 11.02.2003 #100556# - set/get flag to allow/avoid execution of macros
inline void SetMacroExecAllowed( const bool _bMacroExecAllowed )
{
mbMacroExecAllowed = _bMacroExecAllowed;
@@ -869,7 +850,6 @@ public:
return mbMacroExecAllowed;
}
- // #111827#
/**
Returns textual description of the current selection.
@@ -884,7 +864,6 @@ public:
SwRect GetRectOfCurrentChar();
};
-
// Cursor Inlines:
inline SwMoveFnCollection* SwCrsrShell::MakeFindRange(
USHORT nStt, USHORT nEnd, SwPaM* pPam ) const
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index fbc17b3..503774e 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -78,7 +78,6 @@ enum SwColLineAdj
class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem
{
-// Pen aPen; //Pen fuer die Linine zwischen den Spalten
ULONG nLineWidth; //width of the separator line
Color aLineColor; //color of the separator line
@@ -122,7 +121,7 @@ public:
const SwColumns &GetColumns() const { return aColumns; }
SwColumns &GetColumns() { return aColumns; }
USHORT GetNumCols() const { return aColumns.Count(); }
-// const Pen& GetLinePen() const { return aPen; }
+
ULONG GetLineWidth() const { return nLineWidth;}
const Color& GetLineColor() const { return aLineColor;}
@@ -136,7 +135,6 @@ public:
//Return die kleinste Breite wenn bMin True ist.
USHORT GetGutterWidth( BOOL bMin = FALSE ) const;
-// void SetLinePen( const Pen& rNew ) { aPen = rNew; }
void SetLineWidth(ULONG nLWidth) { nLineWidth = nLWidth;}
void SetLineColor(const Color& rCol ) { aLineColor = rCol;}
void SetLineHeight( BYTE nNew ) { nLineHeight = nNew; }
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index f143d39..d1bb9e1 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -50,28 +50,24 @@ protected:
: SwFmt( rPool, rFmtName, pWhichRanges, pDerFrom, nFmtWhich )
{ SetAuto( FALSE ); }
-
private:
// erstmal wird nicht kopiert und nicht zugewiesen
SwFmtColl(const SwFmtColl & );
const SwFmtColl &operator=(const SwFmtColl &);
};
-
class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl
{
friend class SwDoc;
SwTxtFmtColl(const SwTxtFmtColl & rRef);
- // --> OD 2007-01-24 #i73790#
bool mbStayAssignedToListLevelOfOutlineStyle;
- // <--
protected:
//BYTE nOutlineLevel; //<-#outline level, removed by zhaojianwei
- bool mbAssignedToOutlineStyle;//<-#outline level added by zhaojianwei
-
+ bool mbAssignedToOutlineStyle;//<-#outline level added by zhaojianwei
+
SwTxtFmtColl *pNextTxtFmtColl;
SwTxtFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName,
@@ -79,11 +75,9 @@ protected:
USHORT nFmtWh = RES_TXTFMTCOLL )
: SwFmtColl( rPool, pFmtCollName, aTxtFmtCollSetRange,
pDerFrom, nFmtWh ),
- // --> OD 2007-01-24 #i73790#
mbStayAssignedToListLevelOfOutlineStyle( false ),
- // <--
- //nOutlineLevel( NO_NUMBERING ) //<-#outline level,removed by zhaojianwei
- mbAssignedToOutlineStyle(false) //<-#outline level,added by zhaojianwei
+
+ mbAssignedToOutlineStyle(false)
{ pNextTxtFmtColl = this; }
SwTxtFmtColl( SwAttrPool& rPool, const String &rFmtCollName,
@@ -91,11 +85,10 @@ protected:
USHORT nFmtWh = RES_TXTFMTCOLL )
: SwFmtColl( rPool, rFmtCollName, aTxtFmtCollSetRange,
pDerFrom, nFmtWh ),
- // --> OD 2007-01-24 #i73790#
+
mbStayAssignedToListLevelOfOutlineStyle( false ),
- // <--
- //nOutlineLevel( NO_NUMBERING ) //<-#outline level,removed by zhaojianwei
- mbAssignedToOutlineStyle(false) //<-#outline level,added by zhaojianwei
+
+ mbAssignedToOutlineStyle(false)
{ pNextTxtFmtColl = this; }
public:
@@ -109,8 +102,6 @@ public:
BOOL IsAtDocNodeSet() const;
- // --> OD 2006-11-22 #i71574#
- //<-#outline level,zhaojianwei
void SetAttrOutlineLevel( int );
int GetAttrOutlineLevel() const;
int GetAssignedOutlineStyleLevel() const;
@@ -120,18 +111,13 @@ public:
}
void AssignToListLevelOfOutlineStyle(const int nAssignedListLevel);
void DeleteAssignmentToListLevelOfOutlineStyle();
- //<-end
- // <--
- // --> OD 2008-03-04 #refactorlists#
// override to recognize changes on the <SwNumRuleItem> and register/unregister
// the paragragh style at the corresponding <SwNumRule> instance
virtual BOOL SetFmtAttr( const SfxPoolItem& rAttr );
virtual BOOL SetFmtAttr( const SfxItemSet& rSet );
virtual BOOL ResetFmtAttr( USHORT nWhich1, USHORT nWhich2 = 0 );
- // <--
- // --> OD 2007-01-24 #i73790#
// override <ResetAllFmtAttr()> to stay assigned to list level of outline style
virtual USHORT ResetAllFmtAttr();
@@ -139,13 +125,10 @@ public:
{
return mbStayAssignedToListLevelOfOutlineStyle;
}
- // <--
- // --> OD 2008-02-13 #newlistleveattrs#
bool AreListLevelIndentsApplicable() const;
- // <--
-/*----------------- JP 09.08.94 17:36 -------------------
+/*
wird die Funktionalitaet von Zeichenvorlagen an Absatzvorlagen
ueberhaupt benoetigt ??
@@ -173,7 +156,6 @@ inline SwCharFmt* SwTxtFmtColl::GetCharFmt() const
typedef SwTxtFmtColl* SwTxtFmtCollPtr;
SV_DECL_PTRARR(SwTxtFmtColls,SwTxtFmtCollPtr,2,4)
-
class SwGrfFmtColl: public SwFmtColl
{
friend class SwDoc;
@@ -197,8 +179,6 @@ public:
typedef SwGrfFmtColl* SwGrfFmtCollPtr;
SV_DECL_PTRARR(SwGrfFmtColls,SwGrfFmtCollPtr,2,4)
-
-
//FEATURE::CONDCOLL
// --------- Bedingte Vorlagen -------------------------------
@@ -218,7 +198,6 @@ enum Master_CollConditions
USRFLD_EXPRESSION = (int)0x8000
};
-
class SW_DLLPUBLIC SwCollCondition : public SwClient
{
ULONG nCondition;
@@ -231,7 +210,6 @@ class SW_DLLPUBLIC SwCollCondition : public SwClient
public:
TYPEINFO(); //Bereits in Basisklasse Client drin.
-
SwCollCondition( SwTxtFmtColl* pColl, ULONG nMasterCond,
ULONG nSubCond = 0 );
SwCollCondition( SwTxtFmtColl* pColl, ULONG nMasterCond,
@@ -258,7 +236,6 @@ public:
SwTxtFmtColl* GetTxtFmtColl() const { return (SwTxtFmtColl*)GetRegisteredIn(); }
};
-
typedef SwCollCondition* SwCollConditionPtr;
SV_DECL_PTRARR_DEL( SwFmtCollConditions, SwCollConditionPtr, 0, 5 )
@@ -282,9 +259,6 @@ public:
virtual ~SwConditionTxtFmtColl();
- // zum "abfischen" von Aenderungen
-// virtual void Modify( SfxPoolItem*, SfxPoolItem* );
-
const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const;
const SwFmtCollConditions& GetCondColls() const { return aCondColls; }
void InsertCondition( const SwCollCondition& rCond );
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 4ed2c33..c0c24e9 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -33,7 +33,7 @@
#include "swdllapi.h"
// fuer SwTxtHints ohne Endindex wird folgendes Zeichen eingefuegt:
-//JP 24.05.00: for the new UniCode Version:
+
#define CH_TXTATR_BREAKWORD ((sal_Unicode)0x01)
#define CH_TXTATR_INWORD ((sal_Unicode)0x02)
#define CH_TXTATR_TAB ((sal_Unicode)'\t')
@@ -171,7 +171,6 @@ RES_PARATR_BEGIN = RES_TXTATR_END,
RES_PARATR_END
};
-// --> OD 2008-02-25 #refactorlists#
// list attributes for paragraphs.
// intentionally these list attributes are not contained in paragraph styles
enum RES_PARATR_LIST
@@ -184,7 +183,6 @@ RES_PARATR_LIST_BEGIN = RES_PARATR_END,
RES_PARATR_LIST_ISCOUNTED, // 79
RES_PARATR_LIST_END
};
-// <--
enum RES_FRMATR
{
@@ -224,12 +222,8 @@ RES_FRMATR_BEGIN = RES_PARATR_LIST_END,
RES_FRAMEDIR, // 112
RES_HEADER_FOOTER_EAT_SPACING, // 113
RES_ROW_SPLIT, // 114
- // OD 18.09.2003 #i18732# - insert new item and 5 dummies
RES_FOLLOW_TEXT_FLOW, // 115
-// --> collapsing borders FME 2005-05-27 #i29550#
RES_COLLAPSING_BORDERS, // 116
-// <-- collapsing
- // OD 2004-05-04 #i28701# - use dummy1 for new item
RES_WRAP_INFLUENCE_ON_OBJPOS, // 117
RES_AUTO_STYLE, // 118
RES_FRMATR_STYLE_NAME, // 119
@@ -325,9 +319,6 @@ RES_MSG_BEGIN = RES_FMT_END,
RES_HIDDENPARA_PRINT,
RES_CONDCOLL_CONDCHG,
RES_VIRTPAGENUM_INFO,
- // --> OD 2008-02-25 #refactorlists#
-// RES_GETNUMNODES,
- // <--
RES_GETLOWERNUMLEVEL,
RES_RESET_FMTWRITTEN,
RES_REMOVE_UNO_OBJECT,
diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx
index bcd9e0b..fce956a 100644
--- a/sw/inc/list.hxx
+++ b/sw/inc/list.hxx
@@ -61,10 +61,6 @@ class SwList
bool IsListLevelMarked( const int nListLevel ) const;
-// void ContinueList( SwList& rList );
-// const SwList* GetContinuedList() const;
-// void ClearContinuation();
-
private:
// no copy constructor and no assignment operator
SwList( const SwList& );
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 8d403b7..d072628 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -41,8 +41,6 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode
friend class SwNodes;
friend class SwNoTxtFrm;
-// String aAlternateText; // alternativer Text (HTML)
-
PolyPolygon *pContour; // Polygon fuer Konturumlauf
BOOL bAutomaticContour : 1; // automatic contour polygon, not manipulated
BOOL bContourMapModeValid : 1; // contour map mode is not the graphics's
@@ -80,10 +78,6 @@ public:
void SetDescription( const String& rDescription,
bool bBroadcast = false );
-// const String GetAlternateText() const;
-// void SetAlternateText( const String& rTxt,
-// sal_Bool bBroadcast=sal_False );
-
void SetContour( const PolyPolygon *pPoly,
BOOL bAutomatic = FALSE );
const PolyPolygon *HasContour() const;
diff --git a/sw/inc/rolbck.hxx b/sw/inc/rolbck.hxx
index 642fdbe..5a40d1c 100644
--- a/sw/inc/rolbck.hxx
+++ b/sw/inc/rolbck.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -70,13 +70,10 @@ class SwCharFmt;
#include <tox.hxx>
#include <SwNumberTreeTypes.hxx>
-// --> OD 2007-10-17 #i81002#
#include <IDocumentMarkAccess.hxx>
-// <--
#include <memory>
-
enum HISTORY_HINT {
HSTRY_SETFMTHNT,
HSTRY_RESETFMTHNT,
@@ -93,7 +90,7 @@ enum HISTORY_HINT {
HSTRY_RESETATTRSET,
HSTRY_CHGFLYANCHOR,
HSTRY_CHGFLYCHAIN,
- HSTRY_CHGCHARFMT, // #i27615#
+ HSTRY_CHGCHARFMT,
HSTRY_END
};
@@ -128,9 +125,7 @@ class SwHistoryResetFmt : public SwHistoryHint
const USHORT m_nWhich;
public:
- // --> OD 2008-02-27 #refactorlists# - removed <rDoc>
SwHistoryResetFmt( const SfxPoolItem* pFmtHt, ULONG nNodeIdx );
- // <--
virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
};
@@ -268,7 +263,6 @@ class SwHistoryBookmark : public SwHistoryHint
bool IsEqualBookmark(const ::sw::mark::IMark& rBkmk);
const ::rtl::OUString& GetName() const;
-
private:
const ::rtl::OUString m_aName;
::rtl::OUString m_aShortName;
@@ -297,7 +291,6 @@ public:
};
-
class SwHistoryResetAttrSet : public SwHistoryHint
{
const ULONG m_nNodeIndex;
@@ -339,7 +332,6 @@ public:
virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet );
};
-// #i27615#
class SwHistoryChangeCharFmt : public SwHistoryHint
{
const SfxItemSet m_OldSet;
@@ -351,7 +343,6 @@ public:
};
-
#endif
typedef SwHistoryHint* SwHistoryHintPtr;
@@ -377,17 +368,15 @@ public:
// call all objects between nStart and TmpEnd; store nStart as TmpEnd
bool TmpRollback( SwDoc* pDoc, USHORT nStart, bool ToFirst = true );
- // --> OD 2008-02-27 #refactorlists# - removed <rDoc>
void Add( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue,
ULONG nNodeIdx );
- // <--
void Add( SwTxtAttr* pTxtHt, ULONG nNodeIdx, bool bNewAttr = true );
void Add( SwFmtColl*, ULONG nNodeIdx, BYTE nWhichNd );
void Add( const ::sw::mark::IMark&, bool bSavePos, bool bSaveOtherPos );
void Add( SwFrmFmt& rFmt );
void Add( SwFlyFrmFmt&, USHORT& rSetPos );
void Add( const SwTxtFtn& );
- void Add( const SfxItemSet & rSet, const SwCharFmt & rCharFmt); // #i27615#
+ void Add( const SfxItemSet & rSet, const SwCharFmt & rCharFmt);
USHORT Count() const { return m_SwpHstry.Count(); }
USHORT GetTmpEnd() const { return m_SwpHstry.Count() - m_nEndDiff; }
@@ -410,9 +399,7 @@ public:
// used by Undo classes (Delete/Overwrite/Inserts)
void CopyAttr( SwpHints* pHts, ULONG nNodeIdx, xub_StrLen nStart,
xub_StrLen nEnd, bool bFields );
- // --> OD 2008-02-27 #refactorlists# - removed <rDoc>
void CopyFmtAttr( const SfxItemSet& rSet, ULONG nNodeIdx );
- // <--
};
#ifndef ROLBCK_HISTORY_ONLY
@@ -427,15 +414,14 @@ private:
void _MakeSetWhichIds();
public:
- // --> OD 2008-02-27 #refactorlists# - removed <rDoc>
+
SwRegHistory( SwHistory* pHst );
- // <--
SwRegHistory( const SwNode& rNd, SwHistory* pHst );
SwRegHistory( SwModify* pRegIn, const SwNode& rNd, SwHistory* pHst );
virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
- /// @return true iff at least 1 item was inserted
+ /// @return true if at least 1 item was inserted
bool InsertItems( const SfxItemSet& rSet,
xub_StrLen const nStart, xub_StrLen const nEnd,
SetAttrMode const nFlags );
@@ -448,7 +434,6 @@ public:
#endif
-
#endif // _ROLBCK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 849fa9f..ad98ef9 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -75,7 +75,7 @@ typedef long SwTwips;
#define TWIPS_MAX (LONG_MAX - 1)
#define MM50 283 // 1/2 cm in TWIPS
-// --> OD 2004-06-18 #i19922# - constant for minimal page header/footer height of 1mm
+
const SwTwips cMinHdFtHeight = 56;
#define MINFLY 23 //Minimalgroesse fuer FlyFrms
@@ -120,8 +120,6 @@ enum SwLabelType
const BYTE OLD_MAXLEVEL = 5;
const BYTE MAXLEVEL = 10; //Ehemals numrule.hxx
const BYTE NO_NUM = 200; //Ehemals numrule.hxx
-//const BYTE NO_NUMBERING = 201; //Ehemals numrule.hxx //#outline level,removed by zhaojianwei
-//const BYTE NO_INIT = 202; //Ehemals numrule.hxx
// fuer Absaetze mit NO_NUM aber auf unterschiedlichen Leveln
// DAMIT entfaellt das NO_NUM !!!!
@@ -145,13 +143,11 @@ extern SwPathFinder *pPathFinder;
// (fuer die weiteren Ebenen sind die Werte mit den Ebenen+1 zu
// multiplizieren; Ebenen 0..4 !!!)
-// -> #i30312#
const USHORT lBullIndent = 1440/4;
const short lBullFirstLineOffset = -lBullIndent;
const USHORT lNumIndent = 1440/4;
const short lNumFirstLineOffset = -lNumIndent;
const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm
-// <- #i30312#
// Anzahl der SystemField-Types vom SwDoc
#define INIT_FLDTYPES 32
@@ -278,7 +274,6 @@ SW_DLLPUBLIC CollatorWrapper& GetAppCaseCollator();
SW_DLLPUBLIC const ::utl::TransliterationWrapper& GetAppCmpStrIgnore();
-// --> OD 2004-06-30 #i28701# - moved from <frame.hxx>
//fuer Prepare() zur Benachrichtigung des Inhaltes durch das Layout auf
//dem kurzen Dienstweg.
//Der Inhalt sorgt dafuer, dass beim naechsten Aufruf von ::Format() das
@@ -334,7 +329,6 @@ enum PrepareHint
PREP_ERGOSUM, //wg. Bewegung in FtnFrms QuoVadis/ErgoSum pruefen
PREP_END //END
};
-// <--
#endif
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index d62ddbb..3696ea2 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -57,9 +57,6 @@ class SwFmt;
class SwFlyFrmFmt;
-/*-----------------12.02.98 11:21-------------------
-
---------------------------------------------------*/
class BaseFrameProperties_Impl;
class SwXFrame : public cppu::WeakImplHelper6
<
@@ -133,7 +130,7 @@ public:
//XShapeDescriptor
virtual rtl::OUString SAL_CALL getShapeType(void) throw( ::com::sun::star::uno::RuntimeException );
- //Basisimplementierung
+ //Base implementation
//XComponent
virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
@@ -164,9 +161,7 @@ public:
void SetSelection(SwPaM& rCopySource);
static SdrObject *GetOrCreateSdrObject( SwFlyFrmFmt *pFmt );
};
-/*-----------------20.02.98 11:28-------------------
---------------------------------------------------*/
typedef cppu::WeakImplHelper3
<
::com::sun::star::text::XTextFrame,
@@ -245,9 +240,7 @@ public:
void * SAL_CALL operator new( size_t ) throw();
void SAL_CALL operator delete( void * ) throw();
};
-/*-----------------20.02.98 11:28-------------------
---------------------------------------------------*/
typedef cppu::WeakImplHelper2
<
::com::sun::star::text::XTextContent,
@@ -291,9 +284,7 @@ public:
void * SAL_CALL operator new( size_t ) throw();
void SAL_CALL operator delete( void * ) throw();
};
-/*-----------------20.02.98 11:28-------------------
---------------------------------------------------*/
class SwOLENode;
typedef cppu::WeakImplHelper3
<
@@ -357,8 +348,7 @@ class SwXOLEListener : public cppu::WeakImplHelper1
public SwClient
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLEModel;
-// SfxObjectShell* GetObjShell( const SwFmt& rFmt,
-// SwOLENode** ppNd = 0 ) const;
+
SwFmt* GetFmt() const { return (SwFmt*)GetRegisteredIn(); }
public:
SwXOLEListener(SwFmt& rOLEFmt, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLE);
diff --git a/sw/inc/unoport.hxx b/sw/inc/unoport.hxx
index 50020b3..5ccd38c 100644
--- a/sw/inc/unoport.hxx
+++ b/sw/inc/unoport.hxx
@@ -71,7 +71,6 @@ enum SwTextPortionType
PORTION_FIELD,
PORTION_FRAME,
PORTION_FOOTNOTE,
-// obsolete! PORTION_CONTROL_CHAR,
PORTION_REFMARK_START,
PORTION_REFMARK_END,
PORTION_TOXMARK_START,
@@ -136,7 +135,6 @@ private:
protected:
- //SfxItemPropertySet& GetPropSet() { return aPropSet; }
void SAL_CALL SetPropertyValues_Impl(
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames,
@@ -146,9 +144,6 @@ protected:
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-// ::com::sun::star::uno::Any GetPropertyValue( const SfxItemPropertyMap *pEntry,
-// SwUnoCrsr *pUnoCrsr,
-// SfxItemSet *pSet );
void GetPropertyValues( const ::rtl::OUString *pPropertyNames,
::com::sun::star::uno::Any *pValues,
sal_Int32 nLength );
@@ -186,7 +181,6 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
//XMultiPropertySet
-// virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
@@ -266,9 +260,6 @@ public:
{return static_cast<SwUnoCrsr*>(const_cast<SwModify*>(GetRegisteredIn()));}
};
-/* -----------------29.05.98 14:42-------------------
- *
- * --------------------------------------------------*/
class SwXTextPortionEnumeration
: public ::cppu::WeakImplHelper3
< ::com::sun::star::container::XEnumeration
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 2cae1be..ec263aa 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -737,7 +737,7 @@ enum SwPropNameIds
/* 0690 */ UNO_NAME_BLIND_COPIES_TO,
/* 0691 */ UNO_NAME_IN_SERVER_PASSWORD,
/* 0692 */ UNO_NAME_OUT_SERVER_PASSWORD,
-// <--
+
/* 0693 */ UNO_NAME_SAVE_FILTER_OPTIONS,
/* 0694 */ UNO_NAME_SAVE_FILTER_DATA,
/* 0695 */ UNO_NAME_LOCK_UPDATES,
@@ -788,12 +788,12 @@ enum SwPropNameIds
/* 0728 */ UNO_NAME_LIST_ID,
/* 0729 */ UNO_NAME_DEFAULT_LIST_ID,
-// <--
+
/* 0730 */ UNO_NAME_STREAM_NAME,
/* 0731 */ UNO_NAME_PARA_CONTINUEING_PREVIOUS_SUB_TREE,
/* 0732 */ UNO_NAME_PARA_LIST_LABEL_STRING,
-// <--
+
/* 0733 */ UNO_NAME_CHAR_OVERLINE,
/* 0734 */ UNO_NAME_CHAR_OVERLINE_COLOR,
/* 0735 */ UNO_NAME_CHAR_OVERLINE_HAS_COLOR,
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index e182c5f..37afbb0 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -331,9 +331,6 @@ public:
// css::text::XTextEmbeddedObjectsSupplier
virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getEmbeddedObjects(void) throw( css::uno::RuntimeException );
-// // css::text::XTextShapesSupplier
-// virtual css::uno::Reference< css::container::XIndexAccess > getShapes(void) throw( css::uno::RuntimeException );
-
// css::text::XBookmarksSupplier
virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getBookmarks(void) throw( css::uno::RuntimeException );
@@ -444,9 +441,7 @@ public:
void SAL_CALL operator delete( void * ) throw();
};
-/* -----------------25.10.99 11:02-------------------
- --------------------------------------------------*/
class SwXLinkTargetSupplier : public cppu::WeakImplHelper2
<
css::container::XNameAccess,
@@ -483,9 +478,7 @@ public:
//
void Invalidate() {pxDoc = 0;}
};
-/* -----------------26.10.99 09:05-------------------
- --------------------------------------------------*/
class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper4
<
css::beans::XPropertySet,
@@ -536,9 +529,7 @@ public:
virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException );
};
-/* -----------------26.10.99 15:46-------------------
- --------------------------------------------------*/
class SwXOutlineTarget : public cppu::WeakImplHelper2
<
css::beans::XPropertySet,
@@ -589,8 +580,7 @@ public:
};
-/*-- 06.01.2004 15:08:34---------------------------------------------------
- The class SwViewOptionAdjust_Impl is used to adjust the SwViewOption of
+/* The class SwViewOptionAdjust_Impl is used to adjust the SwViewOption of
the current ViewShell so that fields are not printed as commands and
hidden characters are always invisible. Hidden text and place holders
should be printed according to the current print options.
@@ -600,8 +590,6 @@ class SwViewOptionAdjust_Impl
{
SwWrtShell & m_rShell;
SwViewOption m_aOldViewOptions;
-// SwViewOption m_aRenderViewOptions; // view options to use when rendering for PDF export or printing
-// bool m_bRestoreViewOptions;
public:
SwViewOptionAdjust_Impl( SwWrtShell& rSh, const SwViewOption &rViewOptions );
More information about the Libreoffice-commits
mailing list