[Libreoffice-commits] .: sw/inc sw/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Nov 1 14:05:41 PDT 2010
sw/inc/HandleAnchorNodeChg.hxx | 1
sw/inc/anchoredobject.hxx | 109 ++++++-------------------------------
sw/inc/comcore.hrc | 9 +--
sw/inc/fesh.hxx | 27 ++-------
sw/inc/fldbas.hxx | 7 --
sw/inc/fmtcntnt.hxx | 1
sw/inc/fmtftntx.hxx | 7 --
sw/inc/frmfmt.hxx | 48 +++-------------
sw/inc/globals.hrc | 2
sw/inc/htmltbl.hxx | 15 -----
sw/inc/itabenum.hxx | 2
sw/inc/ndarr.hxx | 28 +++------
sw/inc/ndgrf.hxx | 1
sw/inc/ndindex.hxx | 4 -
sw/inc/node.hxx | 4 -
sw/inc/numrule.hxx | 4 -
sw/inc/shellres.hxx | 6 --
sw/inc/toxe.hxx | 1
sw/inc/txtfld.hxx | 2
sw/inc/undobj.hxx | 94 +++++---------------------------
sw/inc/unodraw.hxx | 36 ------------
sw/inc/unomap.hxx | 2
sw/inc/unomid.h | 2
sw/inc/unosrch.hxx | 4 -
sw/source/ui/uiview/view.cxx | 117 ++++++++++++----------------------------
sw/source/ui/utlui/attrdesc.cxx | 24 --------
26 files changed, 109 insertions(+), 448 deletions(-)
New commits:
commit 4cac8dce456352e076dccb3ed01b294dfbcfcc7f
Author: Robert Roth <robert.roth.off at gmail.com>
Date: Mon Nov 1 03:48:31 2010 +0200
Bogus comments, commented lines removed, some german comments translated.
diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx
index dddeab5..a2613cd 100644
--- a/sw/inc/HandleAnchorNodeChg.hxx
+++ b/sw/inc/HandleAnchorNodeChg.hxx
@@ -32,7 +32,6 @@ class SwFlyFrmFmt;
class SwFmtAnchor;
class SwFlyFrm;
-// OD 2006-02-28 #125892#
// helper class to track change of anchor node of at-paragraph respectively
// at-character anchored fly frames
// if such a change happens, it has to be checked, if the count of the anchor
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index b8a9757..286561b 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -35,19 +35,16 @@
class SdrObject;
class SwFrm;
class SwLayoutFrm;
-// --> OD 2004-07-14 #117380#
class SwTxtFrm;
-// <--
-// --> OD 2004-06-30 #i28701#
+
class SwPageFrm;
class SwObjPositioningInProgress;
-// <--
+
class SwFrmFmt;
class SwFmtAnchor;
/** wrapper class for the positioning of Writer fly frames and drawing objects
- OD 2004-03-22 #i26791#
Purpose of this class is to provide a unified interface for the positioning
of Writer fly frames (derived classes of <SwFlyFrm>) and of drawing objects
(derived classes of <SwDrawFrm>).
@@ -61,10 +58,9 @@ class SW_DLLPUBLIC SwAnchoredObject
SdrObject* mpDrawObj;
// frame the object is anchored at
SwFrm* mpAnchorFrm;
- // --> OD 2004-06-30 #i28701# - page frame the object is registered at
+ // #i28701 - page frame the object is registered at
// note: no page frame for as-character anchored objects
SwPageFrm* mpPageFrm;
- // <--
// current relative position (relative to anchor position of anchor frame)
Point maRelPos;
@@ -86,34 +82,32 @@ class SW_DLLPUBLIC SwAnchoredObject
// a following layout frame in the text flow.
const SwLayoutFrm* mpVertPosOrientFrm;
- // --> OD 2004-06-30 #i28701# - boolean, indicating that the object
+ // i#i28701 boolean, indicating that the object
// positioning algorithm is in progress.
bool mbPositioningInProgress;
- // <--
- // --> OD 2004-06-29 #i28701# - Booleans needed for the layout process.
+ // Booleans needed for the layout process.
// Values only of relevance for to-paragraph and to-character anchored
// floating screen object, for whose the 'straight-forward positioning
// process are applied
// Otherwise value of <mbConsiderForTextWrap> is treated as <true>,
// value of <mbPositionLocked> is treated as <false> and
// value of <mbRestartLayoutProcess> is treated as <false>.
- // --> OD 2004-10-22 #i35911# - add boolean <mbClearEnvironment>
+ // i#35911 - add boolean <mbClearEnvironment>
// Indicates that due to its position and wrapping style its layout
// environment is cleared - all content is moved forward.
// Treated as <false>, if not the 'straight-forward positioning process"
// is applied.
bool mbConsiderForTextWrap;
bool mbPositionLocked;
- // --> OD 2005-01-10 #i40147# - boolean needed to keep position of
+ // boolean needed to keep position of
// anchored object locked due to special object positioning for sections.
bool mbKeepPositionLockedForSection;
- // <--
+
bool mbRestartLayoutProcess;
bool mbClearedEnvironment;
- // <--
- // --> OD 2004-08-25 #i3317# - boolean, indicating that temporarly
+ // i#i3317 - boolean, indicating that temporarly
// the wrapping style influence of the anchored object has to be
// considered during its positioning.
// This boolean is used, if compatibility option 'Consider wrapping style
@@ -123,13 +117,10 @@ class SW_DLLPUBLIC SwAnchoredObject
// The boolean is reset to <false>, when the layout process for a
// page frame starts - see class <NotifyLayoutOfPageInProgress>.
bool mbTmpConsiderWrapInfluence;
- // <--
- // --> OD 2006-06-21 #i68520#
mutable SwRect maObjRectWithSpaces;
mutable bool mbObjRectWithSpacesValid;
mutable SwRect maLastObjRect;
- // <--
/** method to indicate, that positioning of anchored object is in progress
@@ -146,12 +137,10 @@ class SW_DLLPUBLIC SwAnchoredObject
/** check anchor character rectangle
- OD 2004-03-25 #i26791#
helper method for method <CheckCharRectAndTopOfLine()>
For to-character anchored Writer fly frames the member <maLastCharRect>
is updated. This is checked for change and depending on the applied
positioning, it's decided, if the Writer fly frame has to be invalidated.
- OD 2004-07-14 #117380#
improvement - add second parameter <_rAnchorCharFrm>
@author OD
@@ -168,13 +157,10 @@ class SW_DLLPUBLIC SwAnchoredObject
/** check top of line
- OD 2004-03-25 #i26791#
helper method for method <CheckCharRectAndTopOfLine()>
For to-character anchored Writer fly frames the member <mnLastTopOfLine>
is updated. This is checked for change and depending on the applied
positioning, it's decided, if the Writer fly frame has to be invalidated.
- OD 2004-07-14 #117380#
- improvement - add second parameter <_rAnchorCharFrm>
@author OD
@@ -188,7 +174,6 @@ class SW_DLLPUBLIC SwAnchoredObject
void _CheckTopOfLine( const SwFmtAnchor& _rAnch,
const SwTxtFrm& _rAnchorCharFrm );
- // --> OD 2005-03-30 #120729# - needed for the hotfix
// method <lcl_HideObj(..)> sets needed data structure values for the
// object positioning
friend bool lcl_HideObj( const SwTxtFrm& _rFrm,
@@ -204,8 +189,6 @@ class SW_DLLPUBLIC SwAnchoredObject
/** method to assure that anchored object is registered at the correct
page frame
- OD 2004-07-02 #i28701#
-
@author OD
*/
virtual void RegisterAtCorrectPage() = 0;
@@ -219,8 +202,6 @@ class SW_DLLPUBLIC SwAnchoredObject
/** method to determine, if other anchored objects, also attached at
to the anchor frame, have to consider its wrap influence.
- // --> OD 2005-02-22 #i43255#
-
@author OD
*/
bool ConsiderObjWrapInfluenceOfOtherObjs() const;
@@ -228,20 +209,14 @@ class SW_DLLPUBLIC SwAnchoredObject
/** method to apply temporary consideration of wrapping style influence
to the anchored objects, which are anchored at the same anchor frame
- OD 2006-07-24 #b6449874#
-
@author OD
*/
void SetTmpConsiderWrapInfluenceOfOtherObjs( const bool bTmpConsiderWrapInfluence );
- // --> OD 2006-08-10 #i68520#
virtual bool _SetObjTop( const SwTwips _nTop) = 0;
virtual bool _SetObjLeft( const SwTwips _nLeft) = 0;
- // <--
- // --> OD 2006-10-05 #i70122#
virtual const SwRect GetObjBoundRect() const = 0;
- // <--
public:
TYPEINFO();
@@ -258,7 +233,6 @@ class SW_DLLPUBLIC SwAnchoredObject
void ChgAnchorFrm( SwFrm* _pNewAnchorFrm );
/** determine anchor frame containing the anchor position
- OD 2004-10-08 #i26945#
the anchor frame, which is determined, is <mpAnchorFrm>
for an at-page, at-frame or at-paragraph anchored object
and the anchor character frame for an at-character and as-character
@@ -268,17 +242,13 @@ class SW_DLLPUBLIC SwAnchoredObject
*/
SwFrm* GetAnchorFrmContainingAnchPos();
- // --> OD 2004-06-30 #i28701# - accessors to member <mpPageFrm>
SwPageFrm* GetPageFrm();
const SwPageFrm* GetPageFrm() const;
void SetPageFrm( SwPageFrm* _pNewPageFrm );
- // <--
/** method to determine the page frame, on which the 'anchor' of
the given anchored object is.
- OD 2004-07-02 #i28701#
- OD 2004-09-23 #i33751#, #i34060#
Adjust meaning of method and thus its name: If the anchored object
or its anchor isn't correctly inserted in the layout, no page frame
can be found. Thus, the return type changed to be a pointer and can
@@ -298,8 +268,6 @@ class SW_DLLPUBLIC SwAnchoredObject
/** get frame, which contains the anchor character, if the object
is anchored at-character or as-character.
- OD 2004-10-04 #i26945#
-
@author OD
@return SwTxtFrm*
@@ -314,22 +282,18 @@ class SW_DLLPUBLIC SwAnchoredObject
{
return mpVertPosOrientFrm;
}
- // --> OD 2004-11-29 #115759# - method to clear member <mpVertPosOrientFrm>
+ // method to clear member <mpVertPosOrientFrm>
inline void ClearVertPosOrientFrm()
{
mpVertPosOrientFrm = 0L;
}
- // <--
/** check anchor character rectangle and top of line
- OD 2004-03-25 #i26791#
For to-character anchored Writer fly frames the members <maLastCharRect>
and <maLastTopOfLine> are updated. These are checked for change and
depending on the applied positioning, it's decided, if the Writer fly
frame has to be invalidated.
- OD 2004-07-15 #117380#
- add parameter <_bCheckForParaPorInf>, default value <true>
@author OD
@@ -348,13 +312,10 @@ class SW_DLLPUBLIC SwAnchoredObject
// accessor to member <nmLastTopOfLine>
SwTwips GetLastTopOfLine() const;
- // OD 2004-05-18 #i28701# - follow-up of #i22341#
void AddLastTopOfLineY( SwTwips _nDiff );
/** reset members <maLastCharRect> and <mnLastTopOfLine>
- OD 2004-06-29 #i27801#
-
@author OD
*/
void ClearCharRectAndTopOfLine();
@@ -377,8 +338,6 @@ class SW_DLLPUBLIC SwAnchoredObject
/** method to determine, if invalidation of position is allowed
- OD 2004-07-01 #i28701#
-
@author OD
*/
bool InvalidationOfPosAllowed() const;
@@ -393,16 +352,12 @@ class SW_DLLPUBLIC SwAnchoredObject
objects, for whose the wrapping style influence has to be considered
on the object positioning.
- OD 2004-06-30 #i28701#
-
@author OD
*/
void InvalidateObjPosForConsiderWrapInfluence( const bool _bNotifyBackgrd );
/** method to trigger notification of 'background'
- OD 2004-07-01 #i28701#
-
@author OD
*/
virtual void NotifyBackground( SwPageFrm* _pPageFrm,
@@ -420,19 +375,15 @@ class SW_DLLPUBLIC SwAnchoredObject
// accessors to the object area and its position
virtual const SwRect GetObjRect() const = 0;
- // --> OD 2006-08-10 #i68520#
+
void SetObjTop( const SwTwips _nTop);
void SetObjLeft( const SwTwips _nLeft);
- // <--
/** method update layout direction the layout direction, the anchored
object is assigned to
- OD 2004-07-27 #i31698#
method has typically to be called, if the anchored object gets its
anchor frame assigned and if the anchor frame changes its layout direction
- OD 2006-03-17 #i62875#
- made virtual, because it's needed to be overloaded by <SwAnchoredDrawObject>
@author OD
*/
@@ -440,24 +391,18 @@ class SW_DLLPUBLIC SwAnchoredObject
/** method to determine object area inclusive its spacing
- OD 2004-06-30 #i28701#
- OD 2006-08-10 #i68520# - return constant reference
-
@author OD
*/
const SwRect& GetObjRectWithSpaces() const;
- // --> OD 2006-08-10 #i68520#
inline void InvalidateObjRectWithSpaces() const
{
mbObjRectWithSpacesValid = false;
}
- // <--
/** method to determine, if wrapping style influence of the anchored
object has to be considered on the object positioning
- OD 2004-06-30 #i28701#
Note: result of this method also decides, if the boolean for the
layout process are of relevance.
@@ -465,7 +410,7 @@ class SW_DLLPUBLIC SwAnchoredObject
*/
bool ConsiderObjWrapInfluenceOnObjPos() const;
- // --> OD 2004-06-29 #i28701# - accessors to booleans for layout process
+ // accessors to booleans for layout process
bool ConsiderForTextWrap() const;
void SetConsiderForTextWrap( const bool _bConsiderForTextWrap );
bool PositionLocked() const;
@@ -480,19 +425,19 @@ class SW_DLLPUBLIC SwAnchoredObject
mbPositionLocked = false;
}
}
- // --> OD 2005-01-10 #i40147#
+
inline void SetKeepPosLocked( const bool _bKeepPosLocked )
{
mbKeepPositionLockedForSection = _bKeepPosLocked;
}
- // <--
+
bool RestartLayoutProcess() const;
void SetRestartLayoutProcess( const bool _bRestartLayoutProcess );
- // --> OD 2004-10-22 #i35911# - accessors for <mbClearedEnvironment>
+ // accessors for <mbClearedEnvironment>
bool ClearedEnvironment() const;
void SetClearedEnvironment( const bool _bClearedEnvironment );
- // <--
- // --> OD 2005-03-03 #i43913# - reset booleans for layout process
+
+ // reset booleans for layout process
inline void ResetLayoutProcessBools()
{
mbPositioningInProgress = false;
@@ -503,20 +448,16 @@ class SW_DLLPUBLIC SwAnchoredObject
mbClearedEnvironment = false;
mbTmpConsiderWrapInfluence = false;
}
- // <--
/** method to determine, if due to anchored object size and wrapping
style, its layout environment is cleared.
- OD 2004-10-22 #i35911#
-
@author OD
*/
bool HasClearedEnvironment() const;
/** method to update anchored object in the <SwSortedObjs> lists
- OD 2004-07-01 #i28701#
Method is not proposed to be called during a layout process is
running. It has been used on the change of the anchored object
attributes, which belongs the sort criteria of <SwSortedObjs>.
@@ -531,7 +472,6 @@ class SW_DLLPUBLIC SwAnchoredObject
/** method to determine, if a format on the anchored object is possible
- OD 2004-07-23 #i28701#
A format isn't possible, if anchored object is in an invisible layer.
Note: method is virtual to refine the conditions for the sub-classes.
@@ -539,15 +479,13 @@ class SW_DLLPUBLIC SwAnchoredObject
*/
virtual bool IsFormatPossible() const;
- // --> OD 2004-08-25 #i3317# - accessors to member <mbTmpConsiderWrapInfluence>
+ // accessors to member <mbTmpConsiderWrapInfluence>
void SetTmpConsiderWrapInfluence( const bool _bTmpConsiderWrapInfluence );
bool IsTmpConsiderWrapInfluence() const;
- // <--
/** method to determine, if the anchored object is overlapping with a
previous column
- OD 2004-08-25 #i3317#
overlapping with a previous column means, that the object overlaps
with a column, which is a previous one of the column its anchor
frame is in.
@@ -560,7 +498,6 @@ class SW_DLLPUBLIC SwAnchoredObject
/** method to determine position of anchored object relative to
anchor frame
- OD 2005-01-06 #i30669#
Usage: Needed layout information for WW8 export
@author OD
@@ -572,10 +509,8 @@ class SW_DLLPUBLIC SwAnchoredObject
/** method to determine position of anchored object relative to
page frame
- OD 2005-01-06 #i30669#
Usage: Needed layout information for WW8 export
- OD 2005-01-27 #i33818# - add parameters <_bFollowTextFlow> and
- <_obRelToTableCell>
+
If <_bFollowTextFlow> is set and object is anchored inside table,
the position relative to the table cell is determined. Output
parameter <_obRelToTableCell> reflects this situation
@@ -598,7 +533,6 @@ class SW_DLLPUBLIC SwAnchoredObject
/** method to determine position of anchored object relative to
anchor character
- OD 2005-01-06 #i30669#
Usage: Needed layout information for WW8 export
@author OD
@@ -610,7 +544,6 @@ class SW_DLLPUBLIC SwAnchoredObject
/** method to determine position of anchored object relative to
top of line
- OD 2005-01-06 #i30669#
Usage: Needed layout information for WW8 export
@author OD
@@ -621,18 +554,16 @@ class SW_DLLPUBLIC SwAnchoredObject
};
// ============================================================================
-// OD 2004-04-13 #i26791#, #i28701#
// helper class for notify that positioning of an anchored object is in progress
// ============================================================================
class SwObjPositioningInProgress
{
private:
SwAnchoredObject* mpAnchoredObj;
- // --> OD 2005-08-09 #i52904# - introduce boolean indicating old state
+ // boolean indicating old state
// of anchored object regarding positioning in progress in order to
// consider nested usage of class <SwObjPositioningInProgress>
bool mbOldObjPositioningInProgress;
- // <--
public:
SwObjPositioningInProgress( SdrObject& _rSdrObj );
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index 31ff558..1b0287d 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -52,7 +52,7 @@
#define STR_HYPH_TITLE (RC_COMCORE_BEGIN + 16)
#define MSG_DISABLE_UNDO_QUESTION (RC_COMCORE_BEGIN + 17)
#define MSG_DISABLE_READLINE_QUESTION (RC_COMCORE_BEGIN + 18)
-// -> #111827#
+
#define STR_REDLINE_INSERT (RC_COMCORE_BEGIN + 19)
#define STR_REDLINE_DELETE (RC_COMCORE_BEGIN + 20)
#define STR_REDLINE_FORMAT (RC_COMCORE_BEGIN + 21)
@@ -68,8 +68,7 @@
#define STR_REDLINE_MULTIPLE (RC_COMCORE_BEGIN + 31)
#define STR_N_REDLINES (RC_COMCORE_BEGIN + 32)
#define STR_FIELD (RC_COMCORE_BEGIN + 33)
-// <- #111827#
-// -> #115575#
+
#define STR_FRAME (RC_COMCORE_BEGIN + 34)
#define STR_OLE (RC_COMCORE_BEGIN + 35)
#define STR_MATH_FORMULA (RC_COMCORE_BEGIN + 36)
@@ -84,11 +83,9 @@
#define STR_DRAWING_OBJECTS (RC_COMCORE_BEGIN + 45)
#define STR_TABLE_NAME (RC_COMCORE_BEGIN + 46)
#define STR_PARAGRAPH_UNDO (RC_COMCORE_BEGIN + 47)
-// <- #115575#
-// -> PB #146850#
+
#define RID_GRAPHIC_REPLACEBMP_HC (RC_COMCORE_BEGIN + 48)
#define RID_GRAPHIC_ERRORBMP_HC (RC_COMCORE_BEGIN + 49)
-// <- #146850#
// defines fuer die Autoformat Redline Kommentare
#define STR_AUTOFMTREDL_DEL_EMPTY_PARA 0
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index aed33cd..c550004 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -36,7 +36,6 @@
#include <editsh.hxx>
#include <flyenum.hxx>
-// OD 25.06.2003 #108784#
#include <svx/svdtypes.hxx>
#include <svtools/embedhlp.hxx>
@@ -171,7 +170,7 @@ struct SwGetCurColNumPara
#define SW_TABCOL_VERT 2
#define SW_TABROW_HORI 3
#define SW_TABROW_VERT 4
-// --> FME 2004-07-30 #i32329# Enhanced table selection
+
#define SW_TABSEL_HORI 5
#define SW_TABSEL_HORI_RTL 6
#define SW_TABROWSEL_HORI 7
@@ -180,7 +179,6 @@ struct SwGetCurColNumPara
#define SW_TABSEL_VERT 10
#define SW_TABROWSEL_VERT 11
#define SW_TABCOLSEL_VERT 12
-// <--
class SdrDropMarkerOverlay;
@@ -197,7 +195,6 @@ class SW_DLLPUBLIC SwFEShell : public SwEditShell
SW_DLLPRIVATE void ScrollTo( const Point &rPt );
- // OD 25.06.2003 #108784# - correct type of 1st parameter
SW_DLLPRIVATE void ChangeOpaque( SdrLayerID nLayerId );
// Used for mouse operations on a table:
@@ -273,7 +270,6 @@ public:
bool IsObjSelectable( const Point& rPt );
int IsInsideSelectedObj( const Point& rPt ); //!! returns enum values
- // #107513#
// Test if there is a draw object at that position and if it should be selected.
// The 'should' is aimed at Writer text fly frames which may be in front of
// the draw object.
@@ -293,7 +289,7 @@ public:
USHORT GetFrmType( const Point *pPt, BOOL bStopAtFly ) const;
USHORT GetSelFrmType() const; //Selektion (Drawing)
- /** #108784# check whether selected frame contains a control;
+ /** check whether selected frame contains a control;
* companion method to GetSelFrmType, used for preventing
* drag&drop of controls into header */
bool IsSelContainsControl() const;
@@ -305,11 +301,10 @@ public:
SwRect GetObjRect() const;
//Zum Verschieben von Flys mit der Tastatur
SwRect GetFlyRect() const;
- // OD 18.09.2003 #i17567#, #108749#, #110354# - adjustments to allow
- // negative vertical positions for fly frames anchored
+ // i#17567 - adjustments to allow negative vertical positions for fly frames anchored
// to paragraph or to character.
- // OD 02.10.2003 #i18732# - adjustments for new option 'FollowTextFlow'
- // OD 12.11.2003 #i22341# - adjustments for new vertical alignment at top of line
+ // i#18732 - adjustments for new option 'FollowTextFlow'
+ // i#22341 - adjustments for new vertical alignment at top of line
void CalcBoundRect( SwRect& _orRect,
const RndStdIds _nAnchorId,
const sal_Int16 _eHoriRelOrient = com::sun::star::text::RelOrientation::FRAME,
@@ -356,12 +351,10 @@ public:
const Graphic *GetGrfAtPos( const Point &rDocPos,
String &rName, BOOL &rbLink ) const;
- // --> OD 2009-07-13 #i73249#
const String GetObjTitle() const;
void SetObjTitle( const String& rTitle );
const String GetObjDescription() const;
void SetObjDescription( const String& rDescription );
- // <--
//SS fuer Rahmen --------------------------------------------
@@ -654,12 +647,9 @@ public:
void SetMouseTabCols( const SwTabCols &rNew, BOOL bCurRowOnly,
const Point &rPt );
- // --> FME 2004-07-30 #i20126# Enhanced table selection
// pEnd will be used during MouseMove
bool SelTblRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
- // <--
- // #i24134# adjustment of table rows via Ruler
void GetTabRows( SwTabCols &rToFill ) const;
void SetTabRows( const SwTabCols &rNew, BOOL bCurColOnly );
void GetMouseTabRows( SwTabCols &rToFill, const Point &rPt ) const;
@@ -744,7 +734,6 @@ public:
/** SwFEShell::GetShapeBackgrd
- OD 02.09.2002 for #102450#:
method determines background color of the page the selected drawing
object is on and returns this color.
If no color is found, because no drawing object is selected or ...,
@@ -759,7 +748,6 @@ public:
/** Is default horizontal text direction for selected drawing object right-to-left
- OD 09.12.2002 #103045#
Because drawing objects only painted for each page only, the default
horizontal text direction of a drawing object is given by the corresponding
page property.
@@ -773,14 +761,11 @@ public:
void ParkCursorInTab();
- // -> #i23726#
SwTxtNode * GetNumRuleNodeAtPos(const Point &rPot);
BOOL IsNumLabel( const Point &rPt, int nMaxOffset = -1 );
- // <- #i23726#
- // --> OD 2005-02-21 #i42921#
+
bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode,
const Point& _rDocPos ) const;
- // <--
};
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 1fa85fc..d57f2e5 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -248,8 +248,6 @@ extern USHORT __FAR_DATA aTypeTab[];
String GetResult(double nVal, sal_uInt32 nNumFmt, USHORT nLang = LANGUAGE_SYSTEM);
void SetErrorStr(const String& rStr);
-//String ExpandDate(const Date& rDate, ULONG nFmt, USHORT nLang);
-//String ExpandTime(const Time& rTime, ULONG nFmt, USHORT nLang);
String FormatNumber(USHORT nNum, sal_uInt32 nFormat);
/*--------------------------------------------------------------------
@@ -307,7 +305,7 @@ inline void SwFieldType::UpdateFlds() const
class SW_DLLPUBLIC SwField
{
private:
- mutable String m_Cache; /// #i85766# cached expansion (for clipboard)
+ mutable String m_Cache; // cached expansion (for clipboard)
USHORT nLang; // Immer ueber SetLanguage aendern!
BOOL bIsAutomaticLanguage;
sal_uInt32 nFormat;
@@ -421,7 +419,6 @@ public:
class SW_DLLPUBLIC SwValueField : public SwField
{
double fValue;
-// String sExpand;
protected:
SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
@@ -432,8 +429,6 @@ public:
virtual SwFieldType* ChgTyp( SwFieldType* );
virtual void SetLanguage(USHORT nLng);
-// os: wozu war das denn da?
-// virtual void ChangeFormat(ULONG n);
inline SwDoc* GetDoc() const { return ((SwValueFieldType*)GetTyp())->GetDoc(); }
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index ae8bd5d..b081de7 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -44,7 +44,6 @@ class SW_DLLPUBLIC SwFmtCntnt: public SfxPoolItem
SwFmtCntnt &operator=( const SwFmtCntnt & ); //Kopieren verboten
public:
-// SwFmtCntnt( const SwNodeIndex *pStartNodeIdx = 0 );
SwFmtCntnt( const SwStartNode* pStartNode = 0 );
SwFmtCntnt( const SwFmtCntnt &rCpy );
~SwFmtCntnt();
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 95e7d0d..e232f99 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -69,13 +69,6 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-// will be used at time??
-// void FillVariable( SbxVariable &rVar,
-// SfxMapUnit eCoreMetric,
-// SfxMapUnit eUserMetric ) const;
-// virtual SfxArgumentError SetVariable( const SbxVariable &rVal,
-// SfxMapUnit eCoreMetric,
-// SfxMapUnit eUserMetric );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 6cf2790..2a016dd 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -28,9 +28,7 @@
#ifndef _FRMFMT_HXX
#define _FRMFMT_HXX
-// --> OD 2004-08-06 #i28749#
#include <com/sun/star/text/PositionLayoutDir.hpp>
-// <--
#include <cppuhelper/weakref.hxx>
@@ -118,7 +116,6 @@ public:
BOOL IsLowerOf( const SwFrmFmt& rFmt ) const;
- // --> OD 2004-07-27 #i31698#
enum tLayoutDir
{
HORI_L2R,
@@ -129,12 +126,9 @@ public:
virtual SwFrmFmt::tLayoutDir GetLayoutDir() const;
virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir );
- // <--
- // --> OD 2004-08-06 #i28749#
virtual sal_Int16 GetPositionLayoutDir() const;
virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir );
- // <--
virtual String GetDescription() const;
@@ -185,18 +179,16 @@ public:
virtual BOOL GetInfo( SfxPoolItem& rInfo ) const;
- // --> OD 2009-07-14 #i73249#
const String GetObjTitle() const;
void SetObjTitle( const String& rTitle,
bool bBroadcast = false );
const String GetObjDescription() const;
void SetObjDescription( const String& rDescription,
bool bBroadcast = false );
- // <--
/** SwFlyFrmFmt::IsBackgroundTransparent - for #99657#
- OD 22.08.2002 - overloading virtual method and its default implementation,
+ overloading virtual method and its default implementation,
because format of fly frame provides transparent backgrounds.
Method determines, if background of fly frame is transparent.
@@ -209,7 +201,7 @@ public:
/** SwFlyFrmFmt::IsBackgroundBrushInherited - for #103898#
- OD 08.10.2002 - method to determine, if the brush for drawing the
+ method to determine, if the brush for drawing the
background is "inherited" from its parent/grandparent.
This is the case, if no background graphic is set and the background
color is "no fill"/"auto fill"
@@ -236,46 +228,34 @@ class SW_DLLPUBLIC SwDrawFrmFmt: public SwFrmFmt
SwDrawFrmFmt( const SwDrawFrmFmt &rCpy );
SwDrawFrmFmt &operator=( const SwDrawFrmFmt &rCpy );
- // --> OD 2004-07-27 #i31698#
SwFrmFmt::tLayoutDir meLayoutDir;
- // <--
- // --> OD 2004-08-06 #i28749#
+
sal_Int16 mnPositionLayoutDir;
- // <--
- // --> OD 2005-03-11 #i44334#, #i44681#
+
bool mbPosAttrSet;
- // <--
+
protected:
SwDrawFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_DRAWFRMFMT ),
pSdrObjCached(NULL),
- // --> OD 2004-07-28 #i31698#
+
meLayoutDir( SwFrmFmt::HORI_L2R ),
- // <--
- // --> OD 2004-08-06 #i28749#
- // --> OD 2005-03-10 #i44344#, #i44681# - undo change of issue #i36010#
+
mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
- // <--
- // --> OD 2005-03-11 #i44334#, #i44681#
+
mbPosAttrSet( false )
- // <--
{}
SwDrawFrmFmt( SwAttrPool& rPool, const String &rFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_DRAWFRMFMT ),
pSdrObjCached(NULL),
- // --> OD 2004-07-28 #i31698#
meLayoutDir( SwFrmFmt::HORI_L2R ),
- // <--
- // --> OD 2004-08-06 #i28749#
- // --> OD 2005-03-10 #i44344#, #i44681# - undo change of issue #i36010#
+
mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
- // <--
- // --> OD 2005-03-11 #i44334#, #i44681#
+
mbPosAttrSet( false )
- // <--
{}
public:
@@ -292,27 +272,19 @@ public:
virtual Graphic MakeGraphic( ImageMap* pMap = NULL );
- // --> OD 2004-07-27 #i31698#
virtual SwFrmFmt::tLayoutDir GetLayoutDir() const;
virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir );
- // <--
- // --> OD 2004-08-06 #i28749#
virtual sal_Int16 GetPositionLayoutDir() const;
virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir );
- // <--
- // --> OD 2005-03-11 #i44334#, #i44681#
inline bool IsPosAttrSet() const { return mbPosAttrSet; }
inline void PosAttrSet() { mbPosAttrSet = true; }
- // <--
- // --> OD 2005-08-16 #i53320#
inline void ResetPosAttr()
{
mbPosAttrSet = false;
}
- // <--
virtual String GetDescription() const;
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 984bac6..a30ff4f 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -29,8 +29,6 @@
#define _GLOBALS_HRC
-// Versions-Definition wie in solar.h und swtypes.hxx
-//#define SW_FILEFORMAT_40 3580
#include "rcid.hrc"
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 69bcf15..3addcb1 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -92,8 +92,6 @@ public:
BOOL HasNoBreakTag() const { return bNoBreakTag; }
};
-/* */
-
class SwHTMLTableLayoutCell
{
SwHTMLTableLayoutCnts *pContents; // der Inhalt der Zelle
@@ -131,8 +129,6 @@ public:
BOOL HasNoWrapOption() const { return bNoWrapOption; }
};
-/* */
-
class SwHTMLTableLayoutColumn
{
// Zwischenwerte von AutoLayoutPass1
@@ -185,8 +181,6 @@ public:
BOOL HasLeftBorder() const { return bLeftBorder; }
};
-/* */
-
class SwHTMLTableLayout
{
Timer aResizeTimer; // Timer fuer DelayedResize
@@ -250,9 +244,6 @@ class SwHTMLTableLayout
BOOL bMustNotRecalc : 1; // Tabelle darf nicht an Inhalt angepasst
// werden
-// USHORT GetLeftBorderWidth( USHORT nCol ) const;
-// USHORT GetRightBorderWidth( USHORT nCol, USHORT nColSpan ) const;
-
void AddBorderWidth( ULONG &rMin, ULONG &rMax, ULONG& rAbsMin,
USHORT nCol, USHORT nColSpan,
BOOL bSwBorders=TRUE ) const;
@@ -378,8 +369,6 @@ public:
BOOL MayBeInFlyFrame() const { return bMayBeInFlyFrame; }
};
-/* */
-
inline void SwHTMLTableLayoutCell::SetProtected()
{
nRowSpan = 1;
@@ -388,8 +377,6 @@ inline void SwHTMLTableLayoutCell::SetProtected()
pContents = 0;
}
-/* */
-
inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( ULONG nCMin,
ULONG nCMax, ULONG nAbsMin )
{
@@ -429,8 +416,6 @@ inline void SwHTMLTableLayoutColumn::SetMinMax( ULONG nMn, ULONG nMx )
nMax = nMx;
}
-/* */
-
inline USHORT SwHTMLTableLayout::GetInhCellSpace( USHORT nCol,
USHORT nColSpan ) const
{
diff --git a/sw/inc/itabenum.hxx b/sw/inc/itabenum.hxx
index d0489dd..81a5f3d 100644
--- a/sw/inc/itabenum.hxx
+++ b/sw/inc/itabenum.hxx
@@ -34,8 +34,6 @@ namespace tabopts
{
const USHORT DEFAULT_BORDER = 0x01;
const USHORT HEADLINE = 0x02;
-// const USHORT REPEAT = 0x04;
-// const USHORT HEADLINE_REPEAT = 0x06; // Headline + Repeat
const USHORT SPLIT_LAYOUT = 0x08;
const USHORT HEADLINE_NO_BORDER = HEADLINE | SPLIT_LAYOUT;
const USHORT ALL_TBL_INS_ATTR = DEFAULT_BORDER | HEADLINE | SPLIT_LAYOUT;
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index b3847d8..026f090 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.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
@@ -39,7 +39,6 @@
#include <bparr.hxx>
#include <ndtyp.hxx>
-
class Graphic;
class GraphicObject;
class String;
@@ -73,7 +72,6 @@ class SwUndoTblToTxt;
class SwUndoTxtToTbl;
struct SwPosition;
-
// --------------------
// class SwNodes
// --------------------
@@ -91,13 +89,10 @@ class SW_DLLPUBLIC SwNodes: private BigPtrArray
SwNodeIndex* pRoot; // Liste aller Indizies auf Nodes
- // --> OD 2008-05-14 #refactorlists# - removed <bSyncNumberAndNumRule>
void InsertNode( const SwNodePtr pNode,
const SwNodeIndex& rPos );
void InsertNode( const SwNodePtr pNode,
ULONG nPos );
- // <--
-
SwDoc* pMyDoc; // in diesem Doc ist das Nodes-Array
@@ -138,12 +133,12 @@ public:
typedef ::std::vector<SwNodeRange> NodeRanges_t;
typedef ::std::vector<NodeRanges_t> TableRanges_t;
-
+
SwNodePtr operator[]( ULONG n ) const
{ return (SwNodePtr)BigPtrArray::operator[] ( n ); }
-//JP 29.09.97: impl. steht im ndindex.hxx - sollte moeglichst bald auf die
-// neue Schnittstelle angepasst werden
+ // impl. steht im ndindex.hxx - sollte moeglichst bald auf die
+ // neue Schnittstelle angepasst werden
inline SwNodePtr operator[]( const SwNodeIndex& rIdx ) const;
ULONG Count() const { return BigPtrArray::Count(); }
@@ -254,13 +249,12 @@ public:
//void UpdateOutlineNode( const SwNode&, BYTE nOldLevel, BYTE nNewLevel );//#outline level,removed by zhaojianwei
// alle Nodes Updaten - Rule/Format-Aenderung
- void UpdateOutlineNode(SwNode & rNd);
+ void UpdateOutlineNode(SwNode & rNd);
// fuege die Nodes fuer die Tabelle ein
// wenn Lines angegeben, erzeuge die Matrix aus Lines & Boxen
// ansonsten nur die Anzahl von Boxen.
- /* #109161#
-
+ /*
New parameter pAttrSet: If pAttrSet is non-null and contains an
adjust item it is propagated to the table cells. If there is an
adjust in pCntntTxtColl or pHeadlineTxtColl this adjust item
@@ -280,11 +274,11 @@ public:
SwTableBoxFmt* pBoxFmt,
SwTxtFmtColl* pTxtColl,
SwUndoTxtToTbl* pUndo = 0 );
-
+
SwNodeRange * ExpandRangeForTableBox(const SwNodeRange & rRange);
-
+
//create a table from a vector of NodeRanges - API support
- SwTableNode* TextToTable( const TableRanges_t& rTableNodes,
+ SwTableNode* TextToTable( const TableRanges_t& rTableNodes,
SwTableFmt* pTblFmt,
SwTableLineFmt* pLineFmt,
SwTableBoxFmt* pBoxFmt,
@@ -339,17 +333,13 @@ public:
SwNode* FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx,
const SwNode* pEnd = 0 ) const;
- //-> #112139#
SwNode * DocumentSectionStartNode(SwNode * pNode) const;
SwNode * DocumentSectionEndNode(SwNode * pNode) const;
- //<- #112139#
private:
// privater Constructor, weil nie kopiert werden darf !!
SwNodes( const SwNodes & rNodes );
};
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index fa72079..59a64de 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -49,7 +49,6 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
GraphicObject aGrfObj;
::sfx2::SvBaseLinkRef refLink; // falls Grafik nur als Link, dann Pointer gesetzt
Size nGrfSize;
-// String aStrmName; // SW3: Name des Storage-Streams fuer Embedded
String aNewStrmName; // SW3/XML: new stream name (either SW3 stream
// name or package url)
String aLowResGrf; // HTML: LowRes Grafik (Ersatzdarstellung bis
diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx
index e45a53d..7e773b6 100644
--- a/sw/inc/ndindex.hxx
+++ b/sw/inc/ndindex.hxx
@@ -242,8 +242,8 @@ inline SwNodeIndex& SwNodeIndex::operator=( ULONG nWert )
-//JP 29.09.97: impl. steht im ndindex.hxx - sollte moeglichst bald auf die
-// neue Schnittstelle angepasst werden
+// impl. steht im ndindex.hxx - sollte moeglichst bald auf die
+// neue Schnittstelle angepasst werden
inline SwNode* SwNodes::operator[]( const SwNodeIndex& rIdx ) const
{
return &rIdx.GetNode();
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 1e54c0e..1488464 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -44,7 +44,7 @@
#include <fmtcol.hxx>
// ---------------------
-// forward Deklarationen
+// forward declarations
// ---------------------
class SvUShorts;
@@ -82,9 +82,7 @@ class IDocumentLineNumberAccess;
class IDocumentLinksAdministration;
class IDocumentFieldsAccess;
class IDocumentContentOperations;
-// --> OD 2007-10-31 #i83479#
class IDocumentListItems;
-// <--
// --------------------
// class SwNode
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index a165028..13930ed 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -261,10 +261,6 @@ public:
void SetSvxRule(const SvxNumRule&, SwDoc* pDoc);
SvxNumRule MakeSvxNumRule() const;
- // refactoring: provide certain method for certain purpose
-// void Indent(short aAmount, int nLevel = -1,
-// int nReferenceLevel = -1, BOOL bRelative = TRUE,
-// BOOL bFirstLine = TRUE, BOOL bCheckGtZero = TRUE);
// change indent of all list levels by given difference
void ChangeIndent( const short nDiff );
// set indent of certain list level to given value
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index d40f53f..9e8f5e0 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -58,10 +58,8 @@ struct SW_DLLPUBLIC ShellResource : public Resource
// fuers GetRefFeld - oben/unten
String aGetRefFld_Up;
String aGetRefFld_Down;
- // --> OD 2007-09-13 #i81002#
// for GetRefField - referenced item not found
String aGetRefFld_RefItemNotFound;
- // <--
// fuer dynamisches Menu - String "alle"
String aStrAllPageHeadFoot;
// fuer einige Listboxen - String "keine"
@@ -84,10 +82,6 @@ struct SW_DLLPUBLIC ShellResource : public Resource
SvStringsDtor aDocInfoLst;
- // Fly-Anker Bmps
-// Bitmap aAnchorBmp;
-// Bitmap aDragAnchorBmp;
-
// die AutoFormat-Redline-Kommentare
inline const SvStringsDtor& GetAutoFmtNameLst() const;
diff --git a/sw/inc/toxe.hxx b/sw/inc/toxe.hxx
index d2c790b..25f0e92 100644
--- a/sw/inc/toxe.hxx
+++ b/sw/inc/toxe.hxx
@@ -98,7 +98,6 @@ enum ToxAuthorityField
AUTH_FIELD_HOWPUBLISHED,
AUTH_FIELD_INSTITUTION,
AUTH_FIELD_JOURNAL,
-// AUTH_FIELD_KEY, // BiBTeX - Field
AUTH_FIELD_MONTH,
AUTH_FIELD_NOTE,
AUTH_FIELD_NUMBER,
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 4852ba9..c1f5dc6 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -57,13 +57,11 @@ public:
// enable notification that field content has changed and needs reformatting
void NotifyContentChange(SwFmtFld& rFmtFld);
- // #111840#
/**
Returns position of this field.
@return position of this field. Has to be deleted explicitly.
*/
-// SwPosition * GetPosition() const;
};
inline SwTxtNode& SwTxtFld::GetTxtNode() const
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index f2eb3ea..ca9879f 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.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,7 @@
#endif
#include <svl/itemset.hxx>
-#include <svx/svdundo.hxx> // #111827#
+#include <svx/svdundo.hxx>
#include <numrule.hxx>
#include <itabenum.hxx>
@@ -56,7 +56,6 @@
#include <IMark.hxx>
#include <IDocumentContentOperations.hxx>
-
class SwUndoIter;
class SwHistory;
class SwIndex;
@@ -115,7 +114,6 @@ namespace utl {
class TransliterationWrapper;
}
-
const String UNDO_ARG1("$1", RTL_TEXTENCODING_ASCII_US);
const String UNDO_ARG2("$2", RTL_TEXTENCODING_ASCII_US);
const String UNDO_ARG3("$3", RTL_TEXTENCODING_ASCII_US);
@@ -142,7 +140,6 @@ protected:
const SwRedlineSaveDatas& rCheck,
BOOL bCurrIsEnd );
- // #111827#
/**
Returns the rewriter for this object.
@@ -159,7 +156,6 @@ public:
virtual void Redo( SwUndoIter& ) = 0;
virtual void Repeat( SwUndoIter& );
- // #111827#
/**
Returns textual comment for this undo object.
@@ -240,7 +236,6 @@ public:
~SwUndoSaveCntnt();
};
-
// sicher eine vollstaendige Section im Nodes-Array
class SwUndoSaveSection : private SwUndoSaveCntnt
{
@@ -266,7 +261,6 @@ public:
SwHistory* GetHistory() { return pHistory; }
};
-
// Diese Klasse speichert den Pam als USHORT's und kann diese wieder zu
// einem PaM zusammensetzen
class SwUndRng
@@ -283,7 +277,6 @@ public:
void SetPaM( SwUndoIter&, BOOL bCorrToCntnt = FALSE ) const;
};
-
class SwUndoStart: public SwUndo
{
// Um innerhalb von Undo zuerkennen, wann ein Start vorliegt, gibt
@@ -301,11 +294,9 @@ public:
virtual void Redo( SwUndoIter& );
virtual void Repeat( SwUndoIter& );
- // -> #111827#
virtual String GetComment() const;
void SetRewriter(const SwRewriter & rRewriter);
virtual SwRewriter GetRewriter() const;
- // <- #111827#
virtual SwUndoId GetEffectiveId() const;
SwUndoId GetUserId() const { return nUserId; }
@@ -331,11 +322,9 @@ public:
virtual void Redo( SwUndoIter& );
virtual void Repeat( SwUndoIter& );
- // -> #111827#
virtual String GetComment() const;
void SetRewriter(const SwRewriter & rRewriter);
virtual SwRewriter GetRewriter() const;
- // <- #111827#
virtual SwUndoId GetEffectiveId() const;
SwUndoId GetUserId() const { return nUserId; }
@@ -377,7 +366,6 @@ public:
virtual void Redo( SwUndoIter& );
virtual void Repeat( SwUndoIter& );
- // #111827#
/**
Returns rewriter for this undo object.
@@ -391,11 +379,9 @@ public:
*/
virtual SwRewriter GetRewriter() const;
-
DECL_FIXEDMEMPOOL_NEWDEL(SwUndoInsert)
};
-
class SwUndoDelete: public SwUndo, private SwUndRng, private SwUndoSaveCntnt
{
SwNodeIndex* pMvStt; // Position der Nodes im UndoNodes-Array
@@ -431,7 +417,6 @@ public:
virtual void Redo( SwUndoIter& );
virtual void Repeat( SwUndoIter& );
- // #111827#
/**
Returns rewriter for this undo object.
@@ -449,7 +434,7 @@ public:
void SetTblDelLastNd() { bTblDelLastNd = TRUE; }
- // fuer die PageDesc/PageBreak Attribute einer Tabelle
+ // for PageDesc/PageBreak Attribute of a table
void SetPgBrkFlags( BOOL bPageBreak, BOOL bPageDesc )
{ bResetPgDesc = bPageDesc; bResetPgBrk = bPageBreak; }
@@ -463,14 +448,13 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwUndoDelete)
};
-
class SwUndoOverwrite: public SwUndo, private SwUndoSaveCntnt
{
String aDelStr, aInsStr;
SwRedlineSaveDatas* pRedlSaveData;
ULONG nSttNode;
xub_StrLen nSttCntnt;
- BOOL bInsChar : 1; // kein Overwrite mehr; sondern Insert
+ BOOL bInsChar : 1; // no more OverWrite; use Insert
BOOL bGroup : 1; // TRUE: ist schon eine Gruppe; wird in
// CanGrouping() ausgwertet !!
public:
@@ -480,7 +464,6 @@ public:
virtual void Redo( SwUndoIter& );
virtual void Repeat( SwUndoIter& );
- // #111827#
/**
Returns the rewriter of this undo object.
@@ -497,7 +480,6 @@ public:
BOOL CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns );
};
-
class SwUndoSplitNode: public SwUndo
{
SwHistory* pHistory;
@@ -515,7 +497,6 @@ public:
void SetTblFlag() { bTblFlag = TRUE; }
};
-
class SwUndoMove : public SwUndo, private SwUndRng, private SwUndoSaveCntnt
{
// nDest.. - Bereich, in den verschoben wurde (nach dem Move!)
@@ -552,7 +533,6 @@ public:
};
-
class SwUndoAttr : public SwUndo, private SwUndRng
{
SfxItemSet m_AttrSet; // attributes for Redo
@@ -607,7 +587,6 @@ class SwUndoFmtAttr : public SwUndo
bool IsFmtInDoc( SwDoc* ); //is the attribute format still in the Doc?
void SaveFlyAnchor( bool bSaveDrawPt = false );
- // --> OD 2004-10-26 #i35443# - Add return value, type <bool>.
// Return value indicates, if anchor attribute is restored.
// Notes: - If anchor attribute is restored, all other existing attributes
// are also restored.
@@ -616,26 +595,22 @@ class SwUndoFmtAttr : public SwUndo
// aren't restored.
// This situation occurs for undo of styles.
bool RestoreFlyAnchor( SwUndoIter& rIter );
- // <--
- // --> OD 2008-02-27 #refactorlists# - removed <rAffectedItemSet>
+
void Init();
- // <--
public:
// register at the Format and save old attributes
- // --> OD 2008-02-27 #refactorlists# - removed <rNewSet>
SwUndoFmtAttr( const SfxItemSet& rOldSet,
SwFmt& rFmt,
bool bSaveDrawPt = true );
- // <--
SwUndoFmtAttr( const SfxPoolItem& rItem,
SwFmt& rFmt,
bool bSaveDrawPt = true );
virtual ~SwUndoFmtAttr();
virtual void Undo( SwUndoIter& );
- // --> OD 2004-10-26 #i35443# - <Redo(..)> calls <Undo(..)> - nothing else
+
virtual void Redo( SwUndoIter& );
- // <--
+
virtual void Repeat( SwUndoIter& );
virtual SwRewriter GetRewriter() const;
@@ -643,7 +618,6 @@ public:
SwFmt* GetFmt( SwDoc& rDoc ); // checks if it is still in the Doc!
};
-// --> OD 2008-02-12 #newlistlevelattrs#
class SwUndoFmtResetAttr : public SwUndo
{
public:
@@ -662,7 +636,6 @@ class SwUndoFmtResetAttr : public SwUndo
// old attribute which has been reset - needed for undo.
::std::auto_ptr<SfxPoolItem> m_pOldItem;
};
-// <--
class SwUndoDontExpandFmt : public SwUndo
{
@@ -692,33 +665,27 @@ public:
SwUndoFmtAttr* ReleaseUndo() { return m_pUndo.release(); }
};
-
class SwUndoFmtColl : public SwUndo, private SwUndRng
{
String aFmtName;
SwHistory* pHistory;
SwFmtColl* pFmtColl;
- // --> OD 2008-04-15 #refactorlists# - for correct <ReDo(..)> and <Repeat(..)>
// boolean, which indicates that the attributes are reseted at the nodes
// before the format has been applied.
const bool mbReset;
// boolean, which indicates that the list attributes had been reseted at
// the nodes before the format has been applied.
const bool mbResetListAttrs;
- // <--
public:
- // --> OD 2008-04-15 #refactorlists#
-// SwUndoFmtColl( const SwPaM&, SwFmtColl* );
+
SwUndoFmtColl( const SwPaM&, SwFmtColl*,
const bool bReset,
const bool bResetListAttrs );
- // <--
virtual ~SwUndoFmtColl();
virtual void Undo( SwUndoIter& );
virtual void Redo( SwUndoIter& );
virtual void Repeat( SwUndoIter& );
- // #111827#
/**
Returns the rewriter for this undo object.
@@ -738,7 +705,6 @@ public:
};
-
class SwUndoMoveLeftMargin : public SwUndo, private SwUndRng
{
const ::std::auto_ptr<SwHistory> m_pHistory;
@@ -932,7 +898,6 @@ public:
void SaveSection( SwStartNode* pSttNd );
void ReNewBoxes( const SwSelBoxes& rBoxes );
-
void SetColWidthParam( ULONG nBoxIdx, USHORT nMode, USHORT nType,
SwTwips nAbsDif, SwTwips nRelDif )
{
@@ -970,7 +935,6 @@ public:
};
-
class SwUndoTblNumFmt : public SwUndo
{
SfxItemSet *pBoxSet;
@@ -1073,7 +1037,6 @@ public:
void SaveFormula( SwHistory& rHistory );
};
-
class SwUndoBookmark : public SwUndo
{
const ::std::auto_ptr<SwHistoryBookmark> m_pHistoryBookmark;
@@ -1087,7 +1050,6 @@ protected:
public:
virtual ~SwUndoBookmark();
- // #111827#
/**
Returns the rewriter for this undo object.
@@ -1103,7 +1065,6 @@ public:
virtual SwRewriter GetRewriter() const;
};
-
class SwUndoInsBookmark : public SwUndoBookmark
{
public:
@@ -1112,7 +1073,6 @@ public:
virtual void Redo( SwUndoIter& );
};
-
/*--------------------------------------------------------------------
Beschreibung: Undo auf Sorting
--------------------------------------------------------------------*/
@@ -1170,8 +1130,6 @@ public:
};
-
-
//--------------------------------------------------------------------
class SwUndoFlyBase : public SwUndo, private SwUndoSaveSection
@@ -1231,7 +1189,6 @@ public:
};
-
class SwUndoSetFlyFmt : public SwUndo, public SwClient
{
SwFrmFmt* pFrmFmt; // das gespeicherte FlyFormat
@@ -1277,7 +1234,6 @@ public:
virtual void Undo( SwUndoIter& );
virtual void Redo( SwUndoIter& );
- // #111827#
/**
Returns the rewriter of this undo object.
@@ -1307,10 +1263,8 @@ public:
};
-
//--------------------------------------------------------------------
-
class SwUndoTblHeadline : public SwUndo
{
ULONG nTblNd;
@@ -1323,8 +1277,7 @@ public:
virtual void Repeat( SwUndoIter& );
};
-
-//------------ Undo von Insert-/Delete-Sections ----------------------
+//------------ Undo of Insert-/Delete-Sections ----------------------
class SwUndoInsSection : public SwUndo, private SwUndRng
{
@@ -1358,7 +1311,6 @@ SW_DLLPRIVATE SwUndo * MakeUndoDelSection(SwSectionFmt const&);
SW_DLLPRIVATE SwUndo * MakeUndoUpdateSection(SwSectionFmt const&, bool const);
-
//------------ Undo von verschieben/stufen von Gliederung ----------------
class SwUndoOutlineLeftRight : public SwUndo, private SwUndRng
@@ -1375,7 +1327,7 @@ public:
class SwUndoDefaultAttr : public SwUndo
{
- ::std::auto_ptr<SfxItemSet> m_pOldSet; // the old attributes
+ ::std::auto_ptr<SfxItemSet> m_pOldSet; // the old attributes
::std::auto_ptr<SvxTabStopItem> m_pTabStop;
public:
@@ -1387,7 +1339,7 @@ public:
};
//--------------------------------------------------------------------
-// ---------- Undo fuer Numerierung ----------------------------------
+// ---------- Undo for Numbering ----------------------------------
class SwUndoInsNum : public SwUndo, private SwUndRng
{
@@ -1485,7 +1437,7 @@ public:
};
//--------------------------------------------------------------------
-// ---------- Undo fuer DrawObjecte ----------------------------------
+// ---------- Undo for DrawObjecte ----------------------------------
class SwSdrUndo : public SwUndo
{
@@ -1516,7 +1468,6 @@ public:
void SetGroupFmt( SwDrawFrmFmt* );
};
-// --> OD 2006-11-01 #130889#
// Action "ungroup drawing object" is now splitted into three parts - see
// method <SwDoc::UnGroupSelection(..)>:
// - creation for <SwDrawFrmFmt> instances for the group members of the
@@ -1543,7 +1494,6 @@ public:
void AddObj( USHORT nPos, SwDrawFrmFmt* );
};
-// --> OD 2006-11-01 #130889#
class SwUndoDrawUnGroupConnectToLayout : public SwUndo
{
private:
@@ -1558,8 +1508,6 @@ class SwUndoDrawUnGroupConnectToLayout : public SwUndo
void AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt,
SdrObject* pDrawObject );
};
-// <--
-
class SwUndoDrawDelete : public SwUndo
{
@@ -1603,24 +1551,21 @@ class SwUndoInsertLabel : public SwUndo
{
union {
struct {
- // fuer NoTxtFrms
+ // for NoTxtFrms
SwUndoInsLayFmt* pUndoFly;
SwUndoFmtAttr* pUndoAttr;
} OBJECT;
struct {
- // fuer Tabelle/TextRahmen
+ // for Tables/TextBoxes
SwUndoDelete* pUndoInsNd;
ULONG nNode;
} NODE;
};
String sText;
- // --> PB 2005-01-06 #i39983# - the separator will be drawed with a character style
String sSeparator;
- // <--
String sNumberSeparator;
String sCharacterStyle;
- // OD 2004-04-15 #i26791# - re-store of drawing object position no longer needed
USHORT nFldId;
SwLabelType eType;
BYTE nLayerId; // fuer Zeichen-Objekte
@@ -1630,10 +1575,8 @@ class SwUndoInsertLabel : public SwUndo
public:
SwUndoInsertLabel( const SwLabelType eTyp, const String &rText,
- // --> PB 2005-01-06 #i39983# - the separator will be drawed with a character style
const String& rSeparator,
- // <--
- const String& rNumberSeparator, //#i61007# order of captions
+ const String& rNumberSeparator, /
const BOOL bBefore, const USHORT nId,
const String& rCharacterStyle,
const BOOL bCpyBrd );
@@ -1643,7 +1586,6 @@ public:
virtual void Redo( SwUndoIter& );
virtual void Repeat( SwUndoIter& );
- // #111827#
/**
Returns the rewriter of this undo object.
@@ -1711,7 +1653,6 @@ public:
virtual void Redo( SwUndoIter& );
};
-
//--------------------------------------------------------------------
struct _UndoTransliterate_Data;
@@ -1824,7 +1765,6 @@ public:
virtual void Redo( SwUndoIter& );
};
-
//--------------------------------------------------------------------
// Object der als Iterator durch die Undo-Liste laeuft, bis die
@@ -1866,8 +1806,6 @@ public:
void ClearSelections() { pSelFmt = 0; pMarkList = 0; }
};
-
-// -> #111827#
const int nUndoStringLength = 20;
/**
@@ -1894,9 +1832,7 @@ const int nUndoStringLength = 20;
@return the shortened string
*/
String ShortenString(const String & rStr, xub_StrLen nLength, const String & rFillStr);
-// <- #111827#
-// #16487#
/**
Denotes special characters in a string.
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 57b90c7..f28cbd5 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -32,20 +32,16 @@
#include <calbck.hxx>
#include <frmfmt.hxx>
#include <com/sun/star/text/XTextContent.hpp>
-// --> OD 2009-01-13 #i59051#
#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
-// <--
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
#include <cppuhelper/implbase3.hxx> // helper for implementations
#include <cppuhelper/implbase4.hxx> // helper for implementations
-// --> OD 2004-07-22 #i31698#
#include <cppuhelper/implbase6.hxx> // helper for implementations
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
-// <--
#include <svl/itemprop.hxx>
class SdrMarkList;
@@ -70,7 +66,6 @@ public:
const SdrMarkList& PreGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > & xShapes);
void PreUnGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > xShapeGroup);
-// void PostGroup(); ?? wird es noch gebraucht ??
SdrView* GetDrawView() {return mpView;}
SdrPageView* GetPageView();
@@ -131,9 +126,7 @@ public:
// renamed and outlined to detect where it's called
void InvalidateSwDoc(); // {pDoc = 0;}
};
-/* -----------------22.01.99 10:20-------------------
- *
- * --------------------------------------------------*/
+
class SwShapeDescriptor_Impl;
class SwXGroupShape;
typedef
@@ -144,9 +137,7 @@ cppu::WeakAggImplHelper6
::com::sun::star::text::XTextContent,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XUnoTunnel,
- // --> OD 2004-07-22 #i31698#
::com::sun::star::drawing::XShape
- // <--
>
SwXShapeBaseClass;
class SwXShape : public SwXShapeBaseClass,
@@ -158,10 +149,9 @@ class SwXShape : public SwXShapeBaseClass,
friend class SwXDrawPage;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > xShapeAgg;
- // --> OD 2004-07-23 #i31698# - reference to <XShape>, determined in the
+ // reference to <XShape>, determined in the
// constructor by <queryAggregation> at <xShapeAgg>.
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape;
- // <--
const SfxItemPropertySet* m_pPropSet;
const SfxItemPropertyMapEntry* m_pPropertyMapEntries;
@@ -177,16 +167,12 @@ class SwXShape : public SwXShapeBaseClass,
/** method to determine top group object
- OD 2004-08-03 #i31698#
-
@author OD
*/
SdrObject* _GetTopGroupObj( SvxShape* _pSvxShape = 0L );
/** method to determine position according to the positioning attributes
- OD 2004-08-03 #i31698#
-
@author OD
*/
com::sun::star::awt::Point _GetAttrPosition();
@@ -194,8 +180,6 @@ class SwXShape : public SwXShapeBaseClass,
/** method to convert the position (translation) of the drawing object to
the layout direction horizontal left-to-right.
- OD 2004-07-27 #i31698#
-
@author OD
*/
::com::sun::star::awt::Point _ConvertPositionToHoriL2R(
@@ -205,8 +189,6 @@ class SwXShape : public SwXShapeBaseClass,
/** method to convert the transformation of the drawing object to the layout
direction, the drawing object is in
- OD 2004-07-27 #i31698#
-
@author OD
*/
::com::sun::star::drawing::HomogenMatrix3 _ConvertTransformationToLayoutDir(
@@ -214,8 +196,6 @@ class SwXShape : public SwXShapeBaseClass,
/** method to adjust the positioning properties
- OD 2004-08-02 #i31698#
-
@author OD
@param _aPosition
@@ -228,8 +208,6 @@ class SwXShape : public SwXShapeBaseClass,
/** method to convert start or end position of the drawing object to the
Writer specific position, which is the attribute position in layout direction
- OD 2009-01-12 #i59051#
-
@author OD
*/
::com::sun::star::awt::Point _ConvertStartOrEndPosToLayoutDir(
@@ -238,8 +216,6 @@ class SwXShape : public SwXShapeBaseClass,
/** method to convert PolyPolygonBezier of the drawing object to the
Writer specific position, which is the attribute position in layout direction
- OD 2009-01-13 #i59051#
-
@author OD
*/
::com::sun::star::drawing::PolyPolygonBezierCoords _ConvertPolyPolygonBezierToLayoutDir(
@@ -247,8 +223,6 @@ class SwXShape : public SwXShapeBaseClass,
/** method to get property from aggregation object
- OD 2004-10-28 #i36248#
-
@author OD
*/
::com::sun::star::uno::Any _getPropAtAggrObj( const ::rtl::OUString& _rPropertyName )
@@ -301,15 +275,11 @@ public:
virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
- // --> OD 2004-07-22 #i31698# XShape
virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException);
- // <--
- // --> OD 2004-07-22 #i31698# XShapeDescriptor - superclass of XShape
virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException);
- // <--
//SwClient
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
@@ -320,9 +290,7 @@ public:
// helper
static void AddExistingShapeToFmt( SdrObject& _rObj );
};
-/* -----------------------------31.05.01 09:54--------------------------------
- ---------------------------------------------------------------------------*/
class SwXGroupShape :
public SwXShape,
public ::com::sun::star::drawing::XShapes
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index 4f6e736..a4ff76a 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -250,9 +250,7 @@
#define WID_DOC_HAS_VALID_SIGNATURES 1017
#define WID_DOC_BUILDID 1024
#define WID_DOC_ISTEMPLATEID 1025
-// --> OD 2006-03-21 #b6375613#
#define WID_APPLY_WORKAROUND_FOR_B6375613 1070
-// <--
//MailMerge
#define WID_SELECTION 1071
diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h
index 0fe5dcb..6e68bdc 100644
--- a/sw/inc/unomid.h
+++ b/sw/inc/unomid.h
@@ -152,7 +152,7 @@
#define MID_ENV_SHIFT_RIGHT 12
#define MID_ENV_SHIFT_DOWN 13
-// OD 2004-05-04 #i28701# - SwFmtWrapInfluenceOnObjPos
+// SwFmtWrapInfluenceOnObjPos
#define MID_WRAP_INFLUENCE 0
#endif
diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx
index 6a26066..2c5b5f3 100644
--- a/sw/inc/unosrch.hxx
+++ b/sw/inc/unosrch.hxx
@@ -47,9 +47,6 @@ namespace com{namespace sun{namespace star{namespace util{
}}}}
-/*-----------------19.12.97 12:58-------------------
-
---------------------------------------------------*/
class SwXTextSearch : public cppu::WeakImplHelper3
<
::com::sun::star::util::XPropertyReplace,
@@ -72,7 +69,6 @@ class SwXTextSearch : public cppu::WeakImplHelper3
sal_Bool bBack : 1;
sal_Bool bExpr : 1;
sal_Bool bCase : 1;
-// sal_Bool bInSel: 1; // wie geht Suchen in Selektionen?
sal_Bool bStyles:1;
sal_Bool bSimilarity : 1;
sal_Bool bLevRelax :1;
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index b129da7..7cabb6e 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -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
@@ -29,7 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <string> // HACK: prevent conflict between STLPORT and Workshop headers
#include <stdlib.h>
#include <hintids.hxx>
@@ -118,7 +117,6 @@
#include <svl/cjkoptions.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -126,7 +124,6 @@ using namespace ::com::sun::star::scanner;
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
-
extern sal_Bool bNoInterrupt; // in mainwn.cxx
#define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT| \
@@ -148,7 +145,6 @@ sal_Bool SwView::bExtra = sal_False;
sal_Bool SwView::bFound = sal_False;
sal_Bool SwView::bJustOpened = sal_False;
-
SvxSearchDialog* SwView::pSrchDlg = 0;
SearchAttrItemList* SwView::pSrchList = 0;
SearchAttrItemList* SwView::pReplList = 0;
@@ -256,7 +252,7 @@ void SwView::SelectShell()
}
pLastTableFormat = pCurTableFmt;
- //SEL_TBL und SEL_TBL_CELLS koennen verodert sein!
+ //SEL_TBL and SEL_TBL_CELLS can be changed!
int nNewSelectionType = (pWrtShell->GetSelectionType()
& ~nsSelectionType::SEL_TBL_CELLS);
@@ -277,7 +273,6 @@ void SwView::SelectShell()
SfxDispatcher &rDispatcher = GetDispatcher();
SwToolbarConfigItem *pBarCfg = SW_MOD()->GetToolbarConfig();
- // DELETEZ(pxSelectionObj); //Selektionsobjekt loeschen
if ( pShell )
{
rDispatcher.Flush(); // alle gecachten Shells wirklich loeschen
@@ -464,7 +459,7 @@ void SwView::SelectShell()
if ( GetDocShell()->GetDoc()->IsOLEPrtNotifyPending() )
GetDocShell()->GetDoc()->PrtOLENotify( sal_False );
- //jetzt das Tabellen-Update
+ // now the table-update
if(bUpdateTable)
pWrtShell->UpdateTable();
@@ -496,7 +491,6 @@ IMPL_LINK( SwView, AttrChangedNotify, SwWrtShell *, EMPTYARG )
GetDocShell()->IsReadOnly() )
_CheckReadonlyState();
- // JP 19.01.99: Cursor in Readonly Bereichen
if( !pWrtShell->IsPaintLocked() && !bNoInterrupt )
_CheckReadonlySelection();
@@ -524,26 +518,11 @@ IMPL_LINK( SwView, AttrChangedNotify, SwWrtShell *, EMPTYARG )
}
- //#i6193#, change ui if cursor is at a SwPostItField
+ // change ui if cursor is at a SwPostItField
if (mpPostItMgr)
{
- // --> OD 2008-06-19 #i90516#
// only perform the code that is needed to determine, if at the
// actual cursor position is a post-it field
-// SwRect aFldRect;
-// SwContentAtPos aCntntAtPos( SwContentAtPos::SW_FIELD);
-// if( pWrtShell->GetContentAtPos( pWrtShell->GetCrsrDocPos(), aCntntAtPos, FALSE, &aFldRect ) )
-// {
-// const SwField* pFld = aCntntAtPos.aFnd.pFld;
-// if (pFld->Which()== RES_POSTITFLD)
-// {
-// mpPostItMgr->SetShadowState(reinterpret_cast<const SwPostItField*>(pFld));
-// }
-// else
-// mpPostItMgr->SetShadowState(0);
-// }
-// else
-// mpPostItMgr->SetShadowState(0);
mpPostItMgr->SetShadowState( pWrtShell->GetPostItFieldAtCursor() );
}
@@ -587,8 +566,8 @@ void SwView::_CheckReadonlyState()
//Um erkennen zu koennen ob bereits disabled ist!
SfxItemState eStateRO, eStateProtAll;
const SfxPoolItem *pItem;
- // JP 29.04.97: von einem nur uns bekannten Slot den Status abfragen.
- // Ansonsten kennen andere den Slot; wie z.B. die BasidIde
+ // von einem nur uns bekannten Slot den Status abfragen.
+ // Ansonsten kennen andere den Slot; wie z.B. die BasidIde
eStateRO = rDis.QueryState( FN_INSERT_BOOKMARK, pItem );
eStateProtAll = rDis.QueryState( FN_EDIT_REGION, pItem );
sal_Bool bChgd = sal_False;
@@ -693,7 +672,7 @@ void SwView::_CheckReadonlySelection()
case SHELL_MODE_TABLE_TEXT:
case SHELL_MODE_TABLE_LIST_TEXT:
{
-//JP 22.01.99: temporaere Loesung!!! Sollte bei jeder Cursorbewegung
+// temporaere Loesung!!! Sollte bei jeder Cursorbewegung
// den Font von der akt. Einfuegeposition setzen, also ausserhalb
// dieses if's. Aber TH wertet den Font zur Zeit nicht aus und
// das besorgen erscheint mir hier zu teuer zu sein.
@@ -729,7 +708,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
aPageStr( SW_RES( STR_PAGE )),
nNewPage(USHRT_MAX),
- pNumRuleNodeFromDoc(0), // #i23726#
+ pNumRuleNodeFromDoc(0),
pEditWin( new SwEditWin( &_pFrame->GetWindow(), *this ) ),
pWrtShell(0),
pShell(0),
@@ -770,7 +749,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
bInDtor(FALSE),
bOldShellWasPagePreView(FALSE)
{
- // OD 18.12.2002 #103492# - According to discussion with MBA and further
+ // According to discussion with MBA and further
// investigations, no old SfxViewShell will be set as parameter <pOldSh>,
// if function "New Window" is performed to open an additional view beside
// an already existing one.
@@ -814,7 +793,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
sal_Bool bOldShellWasSrcView = FALSE;
- // OD 18.12.2002 #103492# - determine, if there is an existing view for
+ // determine if there is an existing view for
// document
SfxViewShell* pExistingSh = 0;
if ( pOldSh )
@@ -869,20 +848,20 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
aUsrPref.SetViewLayoutColumns( 1 );
}
pWrtShell = new SwWrtShell( rDoc, pEditWin, *this, &aUsrPref );
- //#97610# creating an SwView from a SwPagePreView needs to
+ // creating an SwView from a SwPagePreView needs to
// add the ViewShell to the ring of the other ViewShell(s)
if(bOldShellWasPagePreView)
{
ViewShell& rPreviewViewShell = *((SwPagePreView*)pExistingSh)->GetViewShell();
pWrtShell->MoveTo(&rPreviewViewShell);
- //#95521# to update the field command et.al. if necessary
+ // to update the field command et.al. if necessary
const SwViewOption* pPreViewOpt = rPreviewViewShell.GetViewOptions();
if( pPreViewOpt->IsFldName() != aUsrPref.IsFldName() ||
pPreViewOpt->IsShowHiddenField() != aUsrPref.IsShowHiddenField() ||
pPreViewOpt->IsShowHiddenPara() != aUsrPref.IsShowHiddenPara() ||
pPreViewOpt->IsShowHiddenChar() != aUsrPref.IsShowHiddenChar() )
rPreviewViewShell.ApplyViewOptions(aUsrPref);
- // OD 09.01.2003 #106334# - reset design mode at draw view for form
+ // reset design mode at draw view for form
// shell, if needed.
if ( ((SwPagePreView*)pExistingSh)->ResetFormDesignMode() &&
pWrtShell->HasDrawView() )
@@ -894,16 +873,15 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
}
RTL_LOGFILE_CONTEXT_TRACE( aLog, "after create WrtShell" );
- // --> OD 2005-02-11 #i38810# - assure that modified state of document
+ // assure that modified state of document
// isn't reset, if document is already modified.
const bool bIsDocModified = pWrtShell->GetDoc()->IsModified();
- // <--
- // JP 05.02.99: Bug 61495 - damit unter anderem das HLineal im
+ // damit unter anderem das HLineal im
// ReadonlyFall nicht angezeigt wird
aUsrPref.SetReadonly( pWrtShell->GetViewOptions()->IsReadonly() );
- //Kein Margin fuer OLE!
+ // no margin for OLE!
Size aBrwsBorder;
if( SFX_CREATE_MODE_EMBEDDED != pDocSh->GetCreateMode() )
aBrwsBorder = GetMargin();
@@ -929,7 +907,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
StartListening( *pViewFrame, TRUE );
StartListening( *pDocSh, TRUE );
- // Vom HLineal den ZOOM-Faktor einstellen
+ // Set Zoom-factor from HLineal
Fraction aZoomFract( aUsrPref.GetZoom(), 100 );
pHRuler->SetZoom( aZoomFract );
pVRuler->SetZoom( aZoomFract );
@@ -1040,14 +1018,13 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
SfxViewFrame* pFirst = SfxViewFrame::GetFirst(pDocSh);
// zur Zeit(360) wird die View erst nach dem Ctor eingetragen
// der folgende Ausdruck funktioniert auch, wenn sich das aendert
- //JP 27.07.98: wenn per Undo nicht mehr die Modifizierung aufhebar ist,
+ // wenn per Undo nicht mehr die Modifizierung aufhebar ist,
// so setze das Modified NICHT zurueck.
- // --> OD 2005-02-11 #i38810# - no reset of modified state, if document
+ // no reset of modified state, if document
// was already modified.
if ( !pWrtShell->GetDoc()->IsUndoNoResetModified() &&
( !pFirst || pFirst == pVFrame ) &&
!bIsDocModified )
- // <--
{
pWrtShell->ResetModified();
}
@@ -1062,12 +1039,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
GetDispatcher().Execute(SID_NAVIGATOR, SFX_CALLMODE_ASYNCHRON, &aNavi, 0L);
}
-
- /*uno::Reference< awt::XWindow > aTmpRef;
- _pFrame->GetFrame().GetFrameInterface()->setComponent( aTmpRef,
- pViewImpl->GetUNOObject_Impl());*/
-
- uno::Reference< frame::XFrame > xFrame = pVFrame->GetFrame().GetFrameInterface();
+ uno::Reference< frame::XFrame > xFrame = pVFrame->GetFrame().GetFrameInterface();
uno::Reference< frame::XFrame > xBeamerFrame = xFrame->findFrame(
OUString(RTL_CONSTASCII_USTRINGPARAM("_beamer")), frame::FrameSearchFlag::CHILDREN);
@@ -1103,9 +1075,7 @@ SwView::~SwView()
{
GetViewFrame()->GetWindow().RemoveChildEventListener( LINK( this, SwView, WindowChildEventListener ) );
delete mpPostItMgr;
- // --> OD 2009-03-10 #i100035#
mpPostItMgr = 0;
- // <--
bInDtor = TRUE;
pEditWin->Hide(); // damit kein Paint Aerger machen kann!
@@ -1119,7 +1089,7 @@ SwView::~SwView()
if( aTimer.IsActive() && bAttrChgNotifiedWithRegistrations )
GetViewFrame()->GetBindings().LEAVEREGISTRATIONS();
- //JP 27.11.00: Bug 80631 - the last view must end the text edit
+ // the last view must end the text edit
SdrView *pSdrView = pWrtShell ? pWrtShell->GetDrawView() : 0;
if( pSdrView && pSdrView->IsTextEdit() )
pSdrView->SdrEndTextEdit( sal_True );
@@ -1191,7 +1161,6 @@ void SwView::WriteUserData( String &rUserData, sal_Bool bBrowse )
/*--------------------------------------------------------------------
Beschreibung: CursorPos setzen
--------------------------------------------------------------------*/
-//#i43146# go to the last editing position when opening own files
bool lcl_IsOwnDocument( SwView& rView )
{
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
@@ -1213,7 +1182,6 @@ void SwView::ReadUserData( const String &rUserData, sal_Bool bBrowse )
//Forward/Backward
(!pWrtShell->IsNewLayout() || pWrtShell->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) || bBrowse) )
{
- //#i43146# go to the last editing position when opening own files
bool bIsOwnDocument = lcl_IsOwnDocument( *this );
SET_CURR_SHELL(pWrtShell);
@@ -1254,14 +1222,13 @@ void SwView::ReadUserData( const String &rUserData, sal_Bool bBrowse )
sal_Bool bSelectObj = (0 != rUserData.GetToken( nOff, ';', nPos ).ToInt32())
&& pWrtShell->IsObjSelectable( aCrsrPos );
- //#i33307# restore editing position
+ // restore editing position
pViewImpl->SetRestorePosition(aCrsrPos, bSelectObj);
- // OD 11.02.2003 #100556# - set flag value to avoid macro execution.
+ // set flag value to avoid macro execution.
bool bSavedFlagValue = pWrtShell->IsMacroExecAllowed();
pWrtShell->SetMacroExecAllowed( false );
-//!!! pb (11.08.2004): #i32536#
// os: changed: The user data has to be read if the view is switched back from page preview
-//#i43146# go to the last editing position when opening own files
+// go to the last editing position when opening own files
if(bOldShellWasPagePreView || bIsOwnDocument)
{
pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos, !bSelectObj );
@@ -1272,15 +1239,14 @@ void SwView::ReadUserData( const String &rUserData, sal_Bool bBrowse )
}
}
- // OD 11.02.2003 #100556# - reset flag value
+ // reset flag value
pWrtShell->SetMacroExecAllowed( bSavedFlagValue );
- // OD 08.04.2003 #108693# - set visible area before applying
+ // set visible area before applying
// information from print preview. Otherwise, the applied information
// is lost.
-//!!! pb (11.08.2004): #i32536#
// os: changed: The user data has to be read if the view is switched back from page preview
-//#i43146# go to the last editing position when opening own files
+// go to the last editing position when opening own files
if(bOldShellWasPagePreView || bIsOwnDocument )
{
if ( bBrowse )
@@ -1331,7 +1297,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
{
if(GetDocShell()->IsPreview())
return;
- //#i43146# go to the last editing position when opening own files
bool bIsOwnDocument = lcl_IsOwnDocument( *this );
sal_Int32 nLength = rSequence.getLength();
if (nLength && (!pWrtShell->IsNewLayout() || pWrtShell->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) || bBrowse) )
@@ -1444,13 +1409,11 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
sal_Bool bSelectObj = (sal_False != bSelectedFrame )
&& pWrtShell->IsObjSelectable( aCrsrPos );
- // OD 11.02.2003 #100556# - set flag value to avoid macro execution.
+ // set flag value to avoid macro execution.
bool bSavedFlagValue = pWrtShell->IsMacroExecAllowed();
pWrtShell->SetMacroExecAllowed( false );
-//!!! pb (11.08.2004): #i32536#
// os: changed: The user data has to be read if the view is switched back from page preview
-//#i43146# go to the last editing position when opening own files
- //#i33307# restore editing position
+// go to the last editing position when opening own files
pViewImpl->SetRestorePosition(aCrsrPos, bSelectObj);
if(bOldShellWasPagePreView|| bIsOwnDocument)
{
@@ -1462,7 +1425,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
}
}
- // OD 11.02.2003 #100556# - reset flag value
+ // reset flag value
pWrtShell->SetMacroExecAllowed( bSavedFlagValue );
}
SelectShell();
@@ -1483,7 +1446,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
bSetViewSettings &&
eZoom != SVX_ZOOM_PERCENT;
-
if ( !bZoomNeedsViewLayout )
pWrtShell->StartAction();
@@ -1496,15 +1458,14 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >
if ( bSetViewSettings )
SetZoom( eZoom, nZoomFactor, sal_True );
-//!!! pb (11.08.2004): #i32536#
// os: changed: The user data has to be read if the view is switched back from page preview
-//#i43146# go to the last editing position when opening own files
+// go to the last editing position when opening own files
if(bOldShellWasPagePreView||bIsOwnDocument)
{
if ( bBrowse && bGotVisibleLeft && bGotVisibleTop )
{
Point aTopLeft(aVis.TopLeft());
- //#i76699# make sure the document is still centered
+ // make sure the document is still centered
const SwTwips lBorder = IsDocumentBorder() ? DOCUMENTBORDER : 2 * DOCUMENTBORDER;
SwTwips nEditWidth = GetEditWin().GetOutputSize().Width();
if(nEditWidth > (aDocSz.Width() + lBorder ))
@@ -1604,7 +1565,7 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe
void SwView::ShowCursor( bool bOn )
{
- //JP 10.10.2001: Bug 90461 - don't scroll the cursor into the visible area
+ //don't scroll the cursor into the visible area
BOOL bUnlockView = !pWrtShell->IsViewLocked();
pWrtShell->LockView( TRUE ); //lock visible section
@@ -1629,9 +1590,8 @@ ErrCode SwView::DoVerb( long nVerb )
return ERRCODE_NONE;
}
-/*-----------------17.02.98 13:33-------------------
- nur sal_True fuer eine Textselektion zurueck geben
---------------------------------------------------*/
+/* only return sal_True for a text selection
+*/
sal_Bool SwView::HasSelection( sal_Bool bText ) const
{
return bText ? GetWrtShell().SwCrsrShell::HasSelection()
@@ -1671,7 +1631,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
sal_uInt32 nId = ((SfxSimpleHint&)rHint).GetId();
switch ( nId )
{
- // --> OD 2005-03-03 #i43775# - sub shells will be destroyed by the
+ // sub shells will be destroyed by the
// dispatcher, if the view frame is dying. Thus, reset member <pShell>.
case SFX_HINT_DYING:
{
@@ -1681,7 +1641,6 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
}
}
break;
- // <--
case SFX_HINT_MODECHANGED:
{
// Modalmodus-Umschaltung?
@@ -1690,7 +1649,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
pVRuler->SetActive( !bModal );
}
- /* kein break hier */
+ /* no break here */
case SFX_HINT_TITLECHANGED:
if ( GetDocShell()->IsReadOnly() != GetWrtShell().GetViewOptions()->IsReadonly() )
@@ -1707,7 +1666,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
else
KillTab();
bool bReadonly = GetDocShell()->IsReadOnly();
- //#i76332# if document is to be opened in alive-mode then this has to be regarded while switching from readonly-mode to edit-mode
+ // if document is to be opened in alive-mode then this has to be regarded while switching from readonly-mode to edit-mode
if( !bReadonly )
{
SwDrawDocument * pDrawDoc = 0;
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index 11af0bf..2915af1 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -71,7 +71,7 @@ using namespace com::sun::star;
TYPEINIT2(SwFmtCharFmt,SfxPoolItem,SwClient);
-// erfrage die Attribut-Beschreibung
+// query the attribute descriptions
void SwAttrSet::GetPresentation(
SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
@@ -911,20 +911,12 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation
switch( GetValue() )
{
case FTNEND_ATPGORDOCEND:
-// rText = SW_RESSTR( STR_LAYOUT_FTN );
break;
case FTNEND_ATTXTEND:
break;
case FTNEND_ATTXTEND_OWNNUMSEQ:
- {
-// String sPrefix;
-// String sSuffix;
-// SvxNumberType aFmt;
-// USHORT nOffset;
-// rText +=
- }
break;
}
}
@@ -1062,20 +1054,6 @@ SfxItemPresentation SwHeaderAndFooterEatSpacingItem::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
-// rText.Erase();
-// switch ( ePres )
-// {
-// case SFX_ITEM_PRESENTATION_NONE:
-// rText.Erase();
-// break;
-// case SFX_ITEM_PRESENTATION_NAMELESS:
-// case SFX_ITEM_PRESENTATION_COMPLETE:
-// {
-// if ( GetValue() )
-// rText = SW_RESSTR(STR_EDIT_IN_READONLY);
-// return ePres;
-// }
-// }
return SFX_ITEM_PRESENTATION_NONE;
}
More information about the Libreoffice-commits
mailing list