Some more comments and commented code removed, code co- licensed under
LGPLv3+, GPLv3+ and MPL.
Feedback is welcome.
Robert
From 30d67debbc928297b333481d2c6fdc1653e1da21 Mon Sep 17 00:00:00 2001
From: Robert Roth <robert.roth.off@gmail.com>
Date: Thu, 4 Nov 2010 01:06:10 +0200
Subject: [PATCH 5/6] Commented code fragments, meaningless and bogus comments removed.
---
sw/inc/SwNumberTree.hxx | 63 +++---------------
sw/inc/ccoll.hxx | 1 -
sw/inc/chpfld.hxx | 6 +--
sw/inc/dbfld.hxx | 10 +--
sw/inc/dbgoutsw.hxx | 1 -
sw/inc/doc.hxx | 74 +++++++++-----------
sw/inc/docsh.hxx | 15 ++---
sw/inc/editsh.hxx | 11 +---
sw/inc/expfld.hxx | 8 --
sw/inc/flypos.hxx | 1 -
sw/inc/format.hxx | 18 +----
sw/inc/hhcwrp.hxx | 1 -
sw/inc/shellio.hxx | 59 +----------------
sw/inc/swrect.hxx | 24 +++----
sw/inc/tox.hxx | 6 --
sw/inc/unocrsr.hxx | 6 --
sw/inc/unostyle.hxx | 51 ++++----------
sw/inc/viewopt.hxx | 15 ----
sw/source/ui/docvw/edtdd.cxx | 8 +--
sw/source/ui/docvw/edtwin2.cxx | 49 ++------------
sw/source/ui/docvw/edtwin3.cxx | 7 +-
sw/source/ui/docvw/srcedtw.cxx | 61 +----------------
sw/source/ui/ribbar/drawbase.cxx | 18 +----
sw/source/ui/ribbar/inputwin.cxx | 35 ++--------
sw/source/ui/ribbar/tbxanchr.cxx | 2 -
sw/source/ui/ribbar/workctrl.cxx | 141 +++-----------------------------------
sw/source/ui/utlui/navipi.cxx | 54 +-------------
27 files changed, 114 insertions(+), 631 deletions(-)
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index cf6f790..8451f22 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.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
@@ -144,8 +144,6 @@ public:
/**
Remove a child.
- OD 2008-02-19 #refactorlists# - no longer virtual
-
@param pChild child to be removed
*/
void RemoveChild( SwNumberTreeNode* pChild );
@@ -174,9 +172,7 @@ public:
*/
SwNumberTree::tSwNumTreeNumber GetNumber( bool bValidate = true ) const;
- // --> OD 2008-11-26 #158694#
bool IsContinueingPreviousSubTree() const;
- // <--
/**
Returns level numbers of this node.
@@ -241,7 +237,6 @@ public:
/** set level of this node
- OD 2008-03-13 #refactorlists#
precondition: node is already member of a list tree
@author OD
@@ -277,13 +272,13 @@ public:
All iterators holding the last valid node in the according list
of childs are set to the end of this list, thereby stating all
children in the list are invalid.
- OD 2007-10-26 #i83479# - made public
+ #i83479# - made public
*/
void InvalidateTree() const;
/**
Notifies all invalid children of this node.
- OD 2007-10-26 #i83479# - made public
+ #i83479# - made public
*/
void NotifyInvalidChildren();
@@ -313,15 +308,14 @@ public:
*/
void NotifyInvalidSiblings();
- /** notification of all nodes in the list tree on certain list level
-
- OD 2008-04-17 #refactorlists#
+ /**
+ notification of all nodes in the list tree on certain list level
*/
void NotifyNodesOnListLevel( const int nListLevel );
/** Invalidation and notification of complete numbering tree
- OD 2006-04-26 #i64010#
+ #i64010#
Usage: on <IsCounted()> state change its needed to invalidate the
complete numbering tree due to wide influence of this change.
*/
@@ -344,7 +338,7 @@ public:
/** determines the node, which is preceding the node
- OD 2007-09-06 #i81002#
+ #i81002#
The search for the preceding node is performed for the tree below the
<this> node. To search the complete tree, the method has been called for
the root of the tree.
@@ -353,29 +347,6 @@ public:
*/
const SwNumberTreeNode* GetPrecedingNodeOf( const SwNumberTreeNode& rNode ) const;
-// /**
-// Returns a string representation of this node.
-
-// @return the string representation of this node
-// */
-// virtual String ToString() const = 0;
-
-// /**
-// Print this subtree.
-
-// @param o output stream to direct output to
-// @param rIndent additional indent for the children of this node
-// @param rMyIndent indent to use for this node
-// @param nDepth number of levels to print (-1 means all levels)
-
-// @return output stream after output of this subtree
-// */
-// String print(const String & rIndent = String(" ",
-// RTL_TEXTENCODING_ASCII_US),
-// const String & rMyIndent = String(" ",
-// RTL_TEXTENCODING_ASCII_US),
-// int nDepth = -1) const;
-
#ifdef DBG_UTIL
static unsigned long GetInstances();
unsigned long GetSerial();
@@ -423,20 +394,16 @@ protected:
*/
tSwNumberTreeChildren::size_type GetChildCount() const;
- // --> OD 2006-04-26 #i64010# - made pure virtual
+ // #i64010# - made pure virtual
virtual bool HasCountedChildren() const = 0;
- // <--
- // --> OD 2006-04-26 #i64010#
+ // #i64010#
virtual bool IsCountedForNumbering() const = 0;
- // <--
- // --> OD 2008-02-19 #refactorlists#
// method called before this tree node has been added to the list tree
virtual void PreAdd() = 0;
// method called after this tree node has been removed from the list tree
virtual void PostRemove() = 0;
- // <--
#ifdef __SW_NUMBER_TREE_SANITY_CHECK
/**
@@ -461,7 +428,6 @@ protected:
*/
mutable SwNumberTree::tSwNumTreeNumber mnNumber;
- // --> OD 2008-11-26 #158694#
// boolean indicating, that a node of a not counted parent node is continueing
// the numbering of parent's previous node sub tree.
// Example:
@@ -470,7 +436,6 @@ protected:
// sdfjlksaf <-- not counted parent node
// 1.2. lfjlaskf <-- <mbContinueingPreviousSubTree = true>
mutable bool mbContinueingPreviousSubTree;
- // <--
/**
true this node is a phantom
@@ -522,7 +487,6 @@ protected:
/** Invalidation of all children
- OD 2005-10-19 #126009#
Usage: on <IsCounted()> state change the children have to be invalidated
*/
inline void InvalidateChildren()
@@ -532,7 +496,6 @@ protected:
/** Invalidation of parent node, if its not counted.
- OD 2005-10-19 #126009#
Usage: on <IsCounted()> state change the parent have to be invalidated
*/
inline void InvalidateNotCountedParent()
@@ -587,7 +550,6 @@ protected:
/** Notification of parent node siblings, if its not counted.
- OD 2005-10-19 #126009#
Usage: on <IsCounted()> state change the parent node and its siblings
have to be notified.
*/
@@ -601,8 +563,6 @@ protected:
/** notification of children nodes on certain depth
- OD 2008-04-17 #refactorlists#
-
@author OD
*/
void NotifyChildrenOnDepth( const int nDepth );
@@ -680,8 +640,6 @@ protected:
/**
Return if phantoms are counted.
- OD 2008-02-19 #refactorlists# - pure virtual now
-
@retval true phantoms are counted
@retval false else
*/
@@ -695,9 +653,7 @@ protected:
*/
bool HasOnlyPhantoms() const;
- // --> OD 2005-10-27 #126009#
bool HasPhantomCountedParent() const;
- // <--
/**
HB, OD : return node, if it isn't a phantom, otherwise return first
@@ -728,7 +684,6 @@ protected:
/** Moves all children of this node that are greater than a given node
to the destination node.
- OD 2005-10-14 #125991#
distinguish between node for comparing, whose children are greater,
and the destination node.
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index b6bd5eb..ea3e4fb 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -47,7 +47,6 @@
//***********************************************************
struct CollName {
-// const char* pStr;
ULONG nCnd;
ULONG nSubCond;
};
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index 560cffc..ad753be 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -73,14 +73,10 @@ class SW_DLLPUBLIC SwChapterField : public SwField
public:
SwChapterField(SwChapterFieldType*, sal_uInt32 nFmt = 0);
- // --> OD 2008-02-14 #i53420#
-// void ChangeExpansion( const SwFrm*,
-// const SwTxtNode*,
-// BOOL bSrchNum = FALSE);
+ // #i53420#
void ChangeExpansion( const SwFrm*,
const SwCntntNode*,
BOOL bSrchNum = FALSE);
- // <--
void ChangeExpansion(const SwTxtNode &rNd, BOOL bSrchNum);
virtual String Expand() const;
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 760952a..ef1f79d 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.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
@@ -132,7 +132,7 @@ public:
inline void SwDBField::SetExpansion(const String& rStr)
{ aContent = rStr; }
-// wird von UpdateExpFlds gesetzt (dort ist die Node-Position bekannt)
+// set from UpdateExpFlds (the Node-Position is known there)
inline void SwDBField::ChgBodyTxtFlag( BOOL bIsInBody )
{ bIsInBodyTxt = bIsInBody; }
@@ -156,7 +156,7 @@ public:
inline const SwDBData& GetRealDBData() { return aDBData; }
SwDBData GetDBData(SwDoc* pDoc);
- void SetDBData(const SwDBData& rDBData); // #111840#
+ void SetDBData(const SwDBData& rDBData);
// Name oder Inhalt
virtual String GetCntnt(BOOL bName = FALSE) const;
@@ -166,7 +166,6 @@ public:
virtual void SetSubType(USHORT nType);
};
-
/*--------------------------------------------------------------------
Beschreibung: Datenbankfeld Naechster Satz
--------------------------------------------------------------------*/
@@ -179,7 +178,6 @@ public:
virtual SwFieldType* Copy() const;
};
-
/*--------------------------------------------------------------------
Beschreibung: Naechsten Datensatz mit Bedingung
--------------------------------------------------------------------*/
@@ -225,7 +223,6 @@ public:
virtual SwFieldType* Copy() const;
};
-
/*--------------------------------------------------------------------
Beschreibung: Datensatz mit Nummer xxx
Die Nummer steht in nFormat
@@ -335,7 +332,6 @@ inline long SwDBSetNumberField::GetSetNumber() const
inline void SwDBSetNumberField::SetSetNumber(long nNum)
{ nNumber = nNum; }
-
#endif // _DBFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index 299b7c0..2dec2d9 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -82,7 +82,6 @@ SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem & rItem);
SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem * pItem);
SW_DLLPUBLIC const char * dbg_out(const SfxItemSet & rSet);
SW_DLLPUBLIC const char * dbg_out(SwNodes & rNodes);
-// const char * dbg_out(SwOutlineNodes & rNodes);
SW_DLLPUBLIC const char * dbg_out(const SwPosition & rPos);
SW_DLLPUBLIC const char * dbg_out(const SwPaM & rPam);
SW_DLLPUBLIC const char * dbg_out(const SwNodeNum & rNum);
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 8642dbc..1f0bfdc 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -249,7 +249,7 @@ namespace sfx2 {
typedef SwPageDesc* SwPageDescPtr;
SV_DECL_PTRARR_DEL( SwPageDescs, SwPageDescPtr, 4, 4 )
-// forward declartion
+// forward declaration
void SetAllScriptItem( SfxItemSet& rSet, const SfxPoolItem& rItem );
// global function to start grammar checking in the document
@@ -285,10 +285,10 @@ class SW_DLLPUBLIC SwDoc :
// -------------------------------------------------------------------
// die Objecte
- SwNodes aNodes; // Inhalt des Dokumentes
- SwNodes aUndoNodes; // Inhalt fuer das Undo
- SwAttrPool* mpAttrPool; // der Attribut Pool
- SwPageDescs aPageDescs; // PageDescriptoren
+ SwNodes aNodes; // document content
+ SwNodes aUndoNodes; // content for undo
+ SwAttrPool* mpAttrPool; // attribute pool
+ SwPageDescs aPageDescs; // PageDescriptors
Link aOle2Link; // OLE 2.0-Benachrichtigung
/* @@@MAINTAINABILITY-HORROR@@@
Timer should not be members of the model
@@ -310,13 +310,13 @@ class SW_DLLPUBLIC SwDoc :
// die Pointer
//Defaultformate
SwFrmFmt *pDfltFrmFmt;
- SwFrmFmt *pEmptyPageFmt; // Format fuer die Default-Leerseite.
+ SwFrmFmt *pEmptyPageFmt; // Formatfor the default empty page
SwFrmFmt *pColumnContFmt; // Format fuer Spaltencontainer
SwCharFmt *pDfltCharFmt;
SwTxtFmtColl *pDfltTxtFmtColl; // Defaultformatcollections
SwGrfFmtColl *pDfltGrfFmtColl;
- SwFrmFmts *pFrmFmtTbl; // Formattabellen
+ SwFrmFmts *pFrmFmtTbl; // Format table
SwCharFmts *pCharFmtTbl;
SwSpzFrmFmts *pSpzFrmFmtTbl;
SwSectionFmts *pSectionFmtTbl;
@@ -416,7 +416,7 @@ private:
::std::auto_ptr< ::sfx2::IXmlIdRegistry > m_pXmlIdRegistry;
// -------------------------------------------------------------------
- // sonstige
+ // other
sal_uInt16 nUndoPos; // akt. Undo-InsertPosition (fuers Redo!)
sal_uInt16 nUndoSavePos; // Position im Undo-Array, ab der das Doc
// nicht als modifiziert gilt
@@ -484,7 +484,7 @@ private:
bool mbPurgeOLE : 1; // TRUE: Purge OLE-Objects
bool mbKernAsianPunctuation : 1; // TRUE: kerning also for ASIAN punctuation
bool mbReadlineChecked : 1; // TRUE: if the query was already shown
- bool mbLinksUpdated : 1; // OD 2005-02-11 #i38810#
+ bool mbLinksUpdated : 1; // #i38810#
// flag indicating, that the links have been updated.
bool mbClipBoard : 1; // true: this document represents the clipboard
bool mbColumnSelection : 1; // true: this content has bee created by a column
selection
@@ -569,30 +569,30 @@ private:
bool mbAddFlyOffsets : 1;
bool mbAddExternalLeading : 1;
bool mbUseHiResolutionVirtualDevice : 1;
- bool mbOldLineSpacing : 1; // OD 2004-01-06 #i11859#
- bool mbAddParaSpacingToTableCells : 1; // OD 2004-02-16 #106629#
- bool mbUseFormerObjectPos : 1; // OD 2004-03-12 #i11860#
- bool mbUseFormerTextWrapping : 1; // FME 2005-05-11 #108724#
- bool mbConsiderWrapOnObjPos : 1; // OD 2004-05-05 #i28701#
+ bool mbOldLineSpacing : 1; // #i11859#
+ bool mbAddParaSpacingToTableCells : 1;
+ bool mbUseFormerObjectPos : 1; // #i11860#
+ bool mbUseFormerTextWrapping : 1;
+ bool mbConsiderWrapOnObjPos : 1; // #i28701#
// TRUE: object positioning algorithm has
consider the wrapping style of // the
floating screen objects as given by its attribute 'WrapInfluenceOnObjPos'
// non-ui-compatibility flags:
- bool mbOldNumbering : 1; // HBRINKM #111955#
- bool mbIgnoreFirstLineIndentInNumbering : 1; // FME 2005-05-30# i47448#
- bool mbDoNotJustifyLinesWithManualBreak : 1; // FME 2005-06-08 #i49277#
- bool mbDoNotResetParaAttrsForNumFont : 1; // FME 2005-08-11 #i53199#
- bool mbTableRowKeep : 1; // FME 2006-02-10 #131283#
- bool mbIgnoreTabsAndBlanksForLineCalculation : 1; // FME 2006-03-01 #i3952#
- bool mbDoNotCaptureDrawObjsOnPage : 1; // OD 2006-03-14 #i62875#
+ bool mbOldNumbering : 1;
+ bool mbIgnoreFirstLineIndentInNumbering : 1; // #i47448#
+ bool mbDoNotJustifyLinesWithManualBreak : 1; // #i49277#
+ bool mbDoNotResetParaAttrsForNumFont : 1; // #i53199#
+ bool mbTableRowKeep : 1;
+ bool mbIgnoreTabsAndBlanksForLineCalculation : 1; // #i3952#
+ bool mbDoNotCaptureDrawObjsOnPage : 1; // #i62875#
bool mbOutlineLevelYieldsOutlineRule : 1;
- bool mbClipAsCharacterAnchoredWriterFlyFrames : 1; // OD 2006-04-13 #b6402800#
- bool mbUnixForceZeroExtLeading : 1; // FME 2006-10-09 #i60945#
- bool mbOldPrinterMetrics : 1; // FME 2007-05-14 #147385#
+ bool mbClipAsCharacterAnchoredWriterFlyFrames : 1; // #b6402800#
+ bool mbUnixForceZeroExtLeading : 1; // #i60945#
+ bool mbOldPrinterMetrics : 1;
bool mbTabRelativeToIndent : 1; // #i24363# tab stops relative to indent
bool mbProtectForm : 1;
bool mbInvertBorderSpacing : 1;
bool mbCollapseEmptyCellPara : 1;
- bool mbTabAtLeftIndentForParagraphsInList; // OD 2008-06-05 #i89181# - see above
+ bool mbTabAtLeftIndentForParagraphsInList; // #i89181# - see above
sal_uInt32 n32DummyCompatabilityOptions1;
sal_uInt32 n32DummyCompatabilityOptions2;
@@ -605,7 +605,7 @@ private:
static SwAutoCompleteWord *pACmpltWords; // Liste aller Worte fuers AutoComplete
static sal_uInt16 nUndoActions; // anzahl von Undo ::com::sun::star::chaos::Action
- //---------------- privat Methods ------------------------------
+ //---------------- private Methods ------------------------------
void checkRedlining(RedlineMode_t& _rReadlineMode);
sal_Bool DelUndoObj( sal_uInt16 nEnde ); // loescht alle UndoObjecte vom Anfang
@@ -1067,11 +1067,11 @@ public:
SwFlyFrmFmt *MakeFlyFrmFmt (const String &rFmtName, SwFrmFmt *pDerivedFrom);
SwDrawFrmFmt *MakeDrawFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom);
- // JP 08.05.98: fuer Flys muss jetzt diese Schnittstelle benutzt
- // werden. pAnchorPos muss gesetzt sein, wenn keine
- // Seitenbindung vorliegt UND der ::com::sun::star::chaos::Anchor
nicht schon
- // im FlySet/FrmFmt mit gueltiger CntntPos gesetzt ist
- /* #109161# new parameter bCalledFromShell
+ // fuer Flys muss jetzt diese Schnittstelle benutzt
+ // werden. pAnchorPos muss gesetzt sein, wenn keine
+ // Seitenbindung vorliegt UND der ::com::sun::star::chaos::Anchor nicht schon
+ // im FlySet/FrmFmt mit gueltiger CntntPos gesetzt ist
+ /* new parameter bCalledFromShell
TRUE: An existing adjust item at pAnchorPos is propagated to
the content node of the new fly section. That propagation only
@@ -1498,16 +1498,6 @@ public:
const bool bResetIndentAttrs = false );
void SetCounted( const SwPaM&, bool bCounted);
- // no longer needed.
- // SwDoc::SetNumRule( rPaM, rNumRule, false, <ListId>, sal_True, true ) have to be used
instead.
-// /**
-// Replace numbering rules in a PaM by another numbering rule.
-
-// \param rPaM PaM to replace the numbering rules in
-// \param rNumRule numbering rule to replace the present numbering rules
-// */
-// void ReplaceNumRule(const SwPaM & rPaM, const SwNumRule & rNumRule);
-
void MakeUniqueNumRules(const SwPaM & rPaM);
void SetNumRuleStart( const SwPosition& rPos, sal_Bool bFlag = sal_True );
@@ -2122,7 +2112,7 @@ namespace docfunc
/** method to check, if the outline style has to written as a normal list style
- OD 2006-09-27 #i69627#
+ #i69627#
The outline style has to written as a normal list style, if a parent
paragraph style of one of the paragraph styles, which are assigned to
the list levels of the outline style, has a list style set or inherits
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index b3950f3..4e06b3f 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -80,7 +80,6 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
// Grafik-Links. Sind alle da,
// dann ist Doc voll. geladen
- //SvPersistRef xOLEChildList; // fuers RemoveOLEObjects
comphelper::EmbeddedObjectContainer* pOLEChildList;
sal_Int16 nUpdateDocMode; // contains the com::sun::star::document::UpdateDocMode
bool bInUpdateFontList; //prevent nested calls of UpdateFontList
@@ -258,15 +257,12 @@ public:
BOOL bColumn = FALSE,
SwWrtShell* pActShell = 0 );
- // --> OD 2006-11-07 #i59688#
+ // #i59688#
// linked graphics are now loaded on demand.
// Thus, loading of linked graphics no longer needed and necessary for
// the load of document being finished.
-// // Timer starten fuers ueberpruefen der Grafik-Links. Sind alle
-// // vollstaendig geladen, dann ist das Doc fertig
-// void StartLoadFinishedTimer();
+
void LoadingFinished();
- // <--
// eine Uebertragung wird abgebrochen (wird aus dem SFX gerufen)
virtual void CancelTransfers();
@@ -291,15 +287,14 @@ public:
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > GetEventNames();
- // --> FME 2004-08-05 #i20883# Digital Signatures and Encryption
+ // #i20883# Digital Signatures and Encryption
virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates );
- // <--
- // --> FME 2005-02-25 #i42634# Overwrites SfxObjectShell::UpdateLinks
+
+ // #i42634# Overwrites SfxObjectShell::UpdateLinks
// This new function is necessary to trigger update of links in docs
// read by the binary filter:
virtual void UpdateLinks();
- // <--
::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
GetController();
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index e7c353b..a6012a7 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -72,7 +72,6 @@ class SwAutoCompleteWord;
class SwFmtRefMark;
class SwNumRule; // Numerierung
-//class SwNodeNum; // Numerierung
class SwUndoIds; // fuer Undo
class SwTxtFmtColl;
@@ -228,7 +227,6 @@ public:
// alle Cursor. Copy und Paste muss aufgrund der FlyFrames in
// der FEShell stehen!
// kopiere alle Selectionen und das Doc
- //JP 21.10.96: und fuer die SVX-Autokorrektur
BOOL _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 );
long SplitNode( BOOL bAutoFormat = FALSE, BOOL bCheckTableStart = TRUE );
@@ -246,10 +244,7 @@ public:
// Anwenden / Entfernen von Attributen
// liefert Attribute im angeforderten AttributSet. Wenn nicht eindeutig
// steht im Set ein DONT_CARE !!
- // --> OD 2008-01-16 #newlistlevelattrs#
- // Renaming method to <GetCurAttr(..)> indicating that the attributes at
- // the current cursors are retrieved.
- // Introduce 2nd optional parameter <bMergeIndentValuesOfNumRule>.
+ // 2nd optional parameter <bMergeIndentValuesOfNumRule>.
// If <bMergeIndentValuesOfNumRule> == TRUE, the indent attributes of
// the corresponding list level of an applied list style is merged into
// the requested item set as a LR-SPACE item, if corresponding node has not
@@ -257,7 +252,6 @@ public:
// level is SvxNumberFormat::LABEL_ALIGNMENT.
BOOL GetCurAttr( SfxItemSet& ,
const bool bMergeIndentValuesOfNumRule = false ) const;
- // <--
void SetAttr( const SfxPoolItem&, USHORT nFlags = 0 );
void SetAttr( const SfxItemSet&, USHORT nFlags = 0 );
@@ -305,11 +299,10 @@ public:
USHORT GetTxtFmtCollCount() const;
SwTxtFmtColl& GetTxtFmtColl( USHORT nTxtFmtColl) const;
SwTxtFmtColl* GetCurTxtFmtColl() const;
- // --> OD 2007-11-06 #i62675#
+ // #i62675#
// Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTxtFmtColl(..)>
void SetTxtFmtColl( SwTxtFmtColl*,
bool bResetListAttrs = false );
- // <--
SwTxtFmtColl *MakeTxtFmtColl(const String &rFmtCollName,
SwTxtFmtColl *pDerivedFrom = 0);
void FillByEx(SwTxtFmtColl*, BOOL bReset = FALSE);
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index cbcea3d..80d33e9 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -161,7 +161,6 @@ class SW_DLLPUBLIC SwSetExpFieldType : public SwValueFieldType
{
String sName;
const SwNode* pOutlChgNd;
-// sal_Unicode cDelim;
String sDelim;
USHORT nType;
BYTE nLevel;
@@ -193,8 +192,6 @@ public:
String MakeSeqName( USHORT nSeqNo );
// Seqencefelder ggfs. Kapitelweise numerieren
-// sal_Unicode GetDelimiter() const { return cDelim; }
-// void SetDelimiter( sal_Unicode c ) { cDelim = c; }
const String& GetDelimiter() const { return sDelim; }
void SetDelimiter( const String& s ) { sDelim = s; }
BYTE GetOutlineLvl() const { return nLevel; }
@@ -396,11 +393,6 @@ public:
};
-// MSC will den hier nicht
-//typedef void (SwField:: *FnScanFormel)( const SwTable&, String&,
-// String&, String* = 0,
void* = 0 );
-
-
class SwTblField : public SwValueField, public SwTableFormula
{
String sExpand;
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index ce910fc..3d39aa0 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -39,7 +39,6 @@ class SwNodeIndex;
class SW_DLLPUBLIC SwPosFlyFrm
{
const SwFrmFmt* pFrmFmt; // das FlyFrmFmt
-// SwPosition* pPos; // Position in den ContentNode
SwNodeIndex* pNdIdx; // es reicht ein Index auf den Node
UINT32 nOrdNum;
public:
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index ac4d1f5..bbb537b 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -45,8 +45,6 @@ class SwDoc;
class SW_DLLPUBLIC SwFmt : public SwModify
{
-// friend class SwSwgReader;
-// friend class SwSwgWriter;
String aFmtName;
SwAttrSet aSet;
@@ -101,19 +99,14 @@ public:
BOOL bInParents = TRUE ) const;
inline SfxItemState GetItemState( USHORT nWhich, BOOL bSrchInParent = TRUE,
const SfxPoolItem **ppItem = 0 ) const;
- // --> OD 2008-03-03 #refactorlists#
- // methods renamed and made virtual
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#
- // Method renamed and made virtual
+
// Nimmt alle Hints aus dem Delta-Array,
// liefert die Anzahl der geloeschten Hints
virtual USHORT ResetAllFmtAttr();
- // <--
inline SwFmt* DerivedFrom() const { return (SwFmt*)pRegisteredIn; }
inline BOOL IsDefault() const { return DerivedFrom() == 0; }
@@ -187,7 +180,6 @@ public:
// den Parents gesucht werden soll. Wird nichts gefunden,
// wird das deflt. Attribut returnt.
// Charakter-Attribute - impl. steht im charatr.hxx
- // AMA 12.10.94: Umstellung von SwFmt... auf Svx...
inline const SvxPostureItem &GetPosture( BOOL = TRUE ) const;
inline const SvxWeightItem &GetWeight( BOOL = TRUE ) const;
inline const SvxShadowedItem &GetShadowed( BOOL = TRUE ) const;
@@ -264,9 +256,9 @@ public:
inline const SvxFrameDirectionItem &GetFrmDir( BOOL = TRUE ) const;
inline const SwTextGridItem &GetTextGrid( BOOL = TRUE ) const;
inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( BOOL = TRUE )
const;
- // OD 18.09.2003 #i18732#
+ // #i18732#
inline const SwFmtFollowTextFlow &GetFollowTextFlow(BOOL = TRUE) const;
- // OD 2004-05-05 #i28701#
+ // #i28701#
inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(BOOL = TRUE) const;
// Grafik-Attribute - impl. steht im grfatr.hxx
@@ -308,7 +300,6 @@ public:
/** SwFmt::IsBackgroundTransparent - for feature #99657#
- OD 22.08.2002
Virtual method to determine, if background of format is transparent.
Default implementation returns false. Thus, subclasses have to overload
method, if the specific subclass can have a transparent background.
@@ -321,7 +312,6 @@ public:
/** SwFmt::IsShadowTransparent - for feature #99657#
- OD 22.08.2002
Virtual method to determine, if shadow of format is transparent.
Default implementation returns false. Thus, subclasses have to overload
method, if the specific subclass can have a transparent shadow.
@@ -333,7 +323,7 @@ public:
virtual sal_Bool IsShadowTransparent() const;
};
-// --------------- inline Implementierungen ------------------------
+// --------------- inline Implementations ------------------------
inline const SfxPoolItem& SwFmt::GetFmtAttr( USHORT nWhich,
BOOL bInParents ) const
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 0d6ce3a..8c66f1e 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -64,7 +64,6 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion
sal_Bool bIsConvSpecial; // true if special regions: header, footer, ... should be converted
sal_Bool bStartDone;
sal_Bool bEndDone;
-// sal_Bool bLastRet;
// from SvxSpellWrapper copied and modified
sal_Bool ConvNext_impl(); // former SpellNext
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index c26e283..fc2dfcb 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -61,7 +61,6 @@ class SvStream;
class SvStrings;
class SvxFontItem;
class SvxMacroTableDtor;
-//class Sw3Io;
class SwCntntNode;
class SwCrsrShell;
class SwDoc;
@@ -175,18 +174,15 @@ class SwReader: public SwDocFac
public:
/*
* Initiales Einlesen. Dokument wird erst beim Read(..) angelegt.
- * JP 25.04.95: oder falls es mitgegeben wird, in dieses.
+ * oder falls es mitgegeben wird, in dieses.
* Sonderfall fuer Load mit Sw3Reader
*/
- //SwReader( SotStorage&, const String& rFilename, SwDoc *pDoc = 0 );
- //SwReader( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const
String& rFilename, SwDoc *pDoc = 0 );
SwReader( SfxMedium&, const String& rFilename, SwDoc *pDoc = 0 );
/*
* In ein existierendes Dokument einlesen, Dokument und
* Position im Dokument werden aus dem SwPaM uebernommen.
*/
SwReader( SvStream&, const String& rFilename, const String& rBaseURL, SwPaM& );
- //SwReader( SotStorage&, const String& rFilename, SwPaM& );
SwReader( SfxMedium&, const String& rFilename, SwPaM& );
SwReader( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const
String& rFilename, SwPaM& );
@@ -209,7 +205,6 @@ protected:
-/* */
/**************** SPEZIELLE Reader ************************/
// spezielle - Reader koennen beides sein !! (Excel, W4W, .. )
@@ -221,7 +216,6 @@ class SW_DLLPUBLIC Reader
friend class SwReader;
SwDoc* pTemplate;
String aTemplateNm;
- //String sBaseURL;
Date aDStamp;
Time aTStamp;
@@ -306,11 +300,6 @@ public:
AsciiReader(): Reader() {}
};
-/*class SwgReader: public Reader
-{
- virtual ULONG Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &);
-};
-*/
class SW_DLLPUBLIC StgReader : public Reader
{
String aFltName;
@@ -325,22 +314,6 @@ public:
};
-/*class Sw3Reader : public StgReader
-{
- Sw3Io* pIO;
- virtual ULONG Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &);
-public:
- Sw3Reader() : pIO( 0 ) {}
-
- void SetSw3Io( Sw3Io* pIo ) { pIO = pIo; }
-
- // read the sections of the document, which is equal to the medium.
- // returns the count of it
- virtual USHORT GetSectionList( SfxMedium& rMedium,
- SvStrings& rStrings ) const;
-};*/
-
-/* */
////////////////////////////////////////////////////////////////////////////
// Der uebergebene Stream muss dynamisch angelegt werden und
@@ -351,8 +324,6 @@ class SwImpBlocks;
class SW_DLLPUBLIC SwTextBlocks
{
-// friend class Sw2TextBlocks;
-// friend class Sw3IoImp;
SwImpBlocks* pImp;
ULONG nErr;
@@ -413,7 +384,6 @@ extern void _FinitFilter();
extern SwRead ReadAscii, /*ReadSwg, ReadSw3, */ReadHTML, ReadXML;
-//SW_DLLPUBLIC SwRead SwGetReaderSw3();
SW_DLLPUBLIC SwRead SwGetReaderXML();
// END source/filter/basflt/fltini.cxx
@@ -422,7 +392,6 @@ SW_DLLPUBLIC SwRead SwGetReaderXML();
extern BOOL SetHTMLTemplate( SwDoc &rDoc ); //Fuer Vorlagen aus HTML.vor laden shellio.cxx
-/* */
/////////////////////////////////////////////////////////////////////////////
/*
@@ -495,7 +464,6 @@ public:
virtual void SetPasswd( const String& );
virtual void SetVersion( const String&, long );
virtual BOOL IsStgWriter() const;
-// virtual BOOL IsSw3Writer() const;
void SetShowProgress( BOOL bFlag = FALSE ) { bShowProgress = bFlag; }
@@ -578,22 +546,6 @@ public:
SotStorage& GetStorage() const { return *pStg; }
};
-/*class Sw3Writer : public StgWriter
-{
- Sw3Io* pIO;
- BOOL bSaveAs : 1;
-
- virtual ULONG WriteStorage();
- virtual ULONG WriteMedium( SfxMedium& );
-
-public:
- Sw3Writer() : pIO( 0 ), bSaveAs( FALSE ) {}
-
- virtual BOOL IsSw3Writer() const;
-};
-
-*/
-
// Schnittstellenklasse fuer den allgemeinen Zugriff auf die
// speziellen Writer
@@ -608,8 +560,6 @@ class SwWriter
SwCrsrShell *pShell;
SwDoc &rDoc;
- //String sBaseURL;
-
BOOL bWriteAll;
public:
@@ -619,19 +569,13 @@ public:
SwWriter( SvStream&, SwDoc & );
SwWriter( SvStream&, SwPaM &, BOOL bWriteAll = FALSE );
-// SwWriter( SotStorage&, SwCrsrShell &,BOOL bWriteAll = FALSE );
SwWriter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, SwDoc& );
-// SwWriter( SotStorage&, SwPaM&, BOOL bWriteAll = FALSE );
SwWriter( SfxMedium&, SwCrsrShell &,BOOL bWriteAll = FALSE );
SwWriter( SfxMedium&, SwDoc & );
-// SwWriter( SfxMedium&, SwPaM&, BOOL bWriteAll = FALSE );
-
- //const String& GetBaseURL() const { return sBaseURL;}
};
-/* */
/////////////////////////////////////////////////////////////////////////////
typedef Reader* (*FnGetReader)();
@@ -671,7 +615,6 @@ namespace SwReaderWriter
void GetRTFWriter( const String&, const String&, WriterRef& );
void GetASCWriter( const String&, const String&, WriterRef& );
-//void GetSw3Writer( const String&, const String&, WriterRef& );
void GetHTMLWriter( const String&, const String&, WriterRef& );
void GetXMLWriter( const String&, const String&, WriterRef& );
void GetWW8Writer( const String&, const String&, WriterRef& );
diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx
index 2fd9e3f..c279f4d 100644
--- a/sw/inc/swrect.hxx
+++ b/sw/inc/swrect.hxx
@@ -44,10 +44,10 @@ public:
inline SwRect( const Point& rLT, const Point& rRB );
inline SwRect( long X, long Y, long Width, long Height );
- //SV-SS z.B. SwRect( pWin->GetClipRect() );
+ //SV-SS e.g. SwRect( pWin->GetClipRect() );
SwRect( const Rectangle &rRect );
- //Set-Methoden
+ //Set-Methods
inline void Chg( const Point& rNP, const Size &rNS );
inline void Pos( const Point& rNew );
inline void Pos( const long nNewX, const long nNewY );
@@ -60,7 +60,7 @@ public:
inline void Top( const long nTop );
inline void Bottom( const long nBottom );
- //Get-Methoden
+ //Get-Methods
inline const Point &Pos() const;
inline const Size &SSize() const;
inline long Width() const;
@@ -104,13 +104,9 @@ public:
inline SwRect &operator+=( const Size &rSz );
inline SwRect &operator-=( const Size &rSz );
- //SV-SS z.B. pWin->DrawRect( aSwRect.SVRect() );
+ //SV-SS e.g. pWin->DrawRect( aSwRect.SVRect() );
inline Rectangle SVRect() const;
- //Zortech wuerde hier fehlerhaften Code erzeugen.
-// inline operator SRectangle() const;
-// inline operator Rectangle() const { return Rectangle( aPos, aSize ); }
-
// Ausgabeoperator fuer die Debugging-Gemeinde
friend SvStream &operator<<( SvStream &rStream, const SwRect &rRect );
@@ -158,7 +154,7 @@ public:
BOOL OverStepRight( long ) const;
};
-// Implementation in in swrect.cxx
+// Implementation in swrect.cxx
extern SvStream &operator<<( SvStream &rStream, const SwRect &rRect );
typedef void (SwRect:: *SwRectSet)( const long nNew );
@@ -170,7 +166,7 @@ typedef long (SwRect:: *SwRectDist)( long ) const;
typedef void (SwRect:: *SwRectSetTwice)( long, long );
typedef void (SwRect:: *SwRectSetPos)( const Point& );
-//---------------------------------- Set-Methoden
+// Set-Methods
inline void SwRect::Chg( const Point& rNP, const Size &rNS )
{
m_Point = rNP;
@@ -221,7 +217,7 @@ inline void SwRect::Bottom( const long nBottom )
m_Size.setHeight(nBottom - m_Point.getY() + 1);
}
-//----------------------------------- Get-Methoden
+// Get-Methods
inline const Point &SwRect::Pos() const
{
return m_Point;
@@ -263,7 +259,7 @@ inline long SwRect::Bottom() const
return m_Size.getHeight() ? m_Point.getY() + m_Size.getHeight() - 1 : m_Point.getY();
}
-//----------------------------------- operatoren
+// operators
inline SwRect &SwRect::operator = ( const SwRect &rRect )
{
m_Point = rRect.m_Point;
@@ -304,7 +300,7 @@ inline SwRect &SwRect::operator-=( const Size &rSz )
}
-//--------------------------- Sonstiges
+// other
inline Rectangle SwRect::SVRect() const
{
ASSERT( !IsEmpty(), "SVRect() without Width or Height" );
@@ -334,7 +330,7 @@ inline void SwRect::Clear()
m_Size.setHeight(0);
}
-//-------------------------- CToren
+// constructors
inline SwRect::SwRect() :
m_Point( 0, 0 ),
m_Size( 0, 0 )
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index bcdb975..13f6c4e 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -364,8 +364,6 @@ class SW_DLLPUBLIC SwForm
TOXTypes eType;
USHORT nFormMaxLevel;
- //USHORT nFirstTabPos; -> Value in tab token
-// BOOL bHasFirstTabPos : 1;
BOOL bGenerateTabPos : 1;
BOOL bIsRelTabPos : 1;
BOOL bCommaSeparated : 1;
@@ -466,7 +464,6 @@ namespace nsSwTOOElements
const SwTOOElements TOO_CHART = 0x02;
const SwTOOElements TOO_CALC = 0x08;
const SwTOOElements TOO_DRAW_IMPRESS = 0x10;
-// const SwTOOElements TOO_IMPRESS = 0x20;
const SwTOOElements TOO_OTHER = 0x80;
}
@@ -770,9 +767,6 @@ inline USHORT SwTOXBase::GetLevel() const
inline void SwTOXBase::SetTemplateName(const String& rName)
{
-// ASSERT(GetTOXType()->GetType() == TOX_USER, "Falscher Feldtyp");
-// ASSERT(aData.pTemplateName, "pTemplateName == 0");
-// (*aData.pTemplateName) = rName;
DBG_WARNING("SwTOXBase::SetTemplateName obsolete");
aStyleNames[0] = rName;
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index a286ace..de87889 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -44,8 +44,6 @@ public:
// @@@ semantic: no copy ctor.
SwUnoCrsr( SwUnoCrsr& );
private:
- // forbidden and not implemented.
- //SwUnoCrsr( const SwUnoCrsr& );
SwUnoCrsr & operator= ( const SwUnoCrsr& );
protected:
@@ -56,8 +54,6 @@ protected:
public:
-// virtual SwCursor* Create( SwPaM* pRing = 0 ) const;
-
// gibt es eine Selection vom Content in die Tabelle
// Return Wert gibt an, ob der Crsr auf der alten Position verbleibt
virtual BOOL IsSelOvr( int eFlags =
@@ -101,8 +97,6 @@ public:
SwUnoTableCrsr( const SwPosition& rPos );
virtual ~SwUnoTableCrsr();
-// virtual SwCursor* Create( SwPaM* pRing = 0 ) const;
-
// gibt es eine Selection vom Content in die Tabelle
// Return Wert gibt an, ob der Crsr auf der alten Position verbleibt
virtual BOOL IsSelOvr( int eFlags =
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index ff4f080..02babe3 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.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
@@ -45,7 +45,6 @@
#include <com/sun/star/document/XEventsSupplier.hpp>
#include <calbck.hxx>
-
#include <com/sun/star/style/XAutoStyleFamily.hpp>
#include <com/sun/star/style/XAutoStyles.hpp>
#include <com/sun/star/style/XAutoStyle.hpp>
@@ -64,9 +63,7 @@ typedef boost::shared_ptr<SfxItemSet> SfxItemSet_Pointer_t;
/******************************************************************************
*
******************************************************************************/
-/*-----------------12.02.98 08:27-------------------
---------------------------------------------------*/
class SwXStyleFamilies : public cppu::WeakImplHelper4
<
::com::sun::star::container::XIndexAccess,
@@ -88,7 +85,6 @@ protected:
public:
SwXStyleFamilies(SwDocShell& rDocShell);
-
//XNameAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw(
::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw(
::com::sun::star::uno::RuntimeException );
@@ -106,16 +102,12 @@ public:
virtual void SAL_CALL loadStylesFromURL(const rtl::OUString& rURL, const
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions) throw(
::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL
getStyleLoaderOptions(void) throw( ::com::sun::star::uno::RuntimeException );
-
//XServiceInfo
virtual rtl::OUString SAL_CALL getImplementationName(void) throw(
::com::sun::star::uno::RuntimeException );
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 );
};
-/* -----------------26.05.98 10:56-------------------
- *
- * --------------------------------------------------*/
class SwXStyleFamily : public cppu::WeakImplHelper4
<
::com::sun::star::container::XNameContainer,
@@ -125,9 +117,8 @@ class SwXStyleFamily : public cppu::WeakImplHelper4
,
public SfxListener
{
- SfxStyleFamily eFamily; // Familie
+ SfxStyleFamily eFamily;
SfxStyleSheetBasePool* pBasePool;
-// const SfxItemPropertyMap* _pPropMap;
SwDocShell* pDocShell;
SwXStyle* _FindStyle(const String& rStyleName) const;
@@ -170,9 +161,7 @@ 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 );
};
-/* -----------------20.05.98 09:51-------------------
- *
- * --------------------------------------------------*/
+
class SwXStyle : public cppu::WeakImplHelper7
<
::com::sun::star::style::XStyle,
@@ -190,7 +179,7 @@ class SwXStyle : public cppu::WeakImplHelper7
SwDoc* m_pDoc;
String sStyleName;
SfxStyleSheetBasePool* pBasePool;
- SfxStyleFamily eFamily; // fuer Notify
+ SfxStyleFamily eFamily; // for Notify
sal_Bool bIsDescriptor : 1;
sal_Bool bIsConditional : 1;
@@ -216,8 +205,8 @@ public:
SwXStyle(SwDoc* pDoc, SfxStyleFamily eFam = SFX_STYLE_FAMILY_PARA, BOOL bConditional = FALSE);
SwXStyle(SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam,
SwDoc* pDoc,
- const String& rStyleName);//,
- //const SfxItemPropertyMap* _pMap);
+ const String& rStyleName);
+
~SwXStyle();
TYPEINFO();
@@ -247,7 +236,6 @@ public:
virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const
::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, ::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);
@@ -261,7 +249,6 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString&
aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XMultiPropertyStates
- //virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL
getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw
(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setAllPropertiesToDefault( ) throw
(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence<
::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL
getPropertyDefaults( 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);
@@ -289,9 +276,7 @@ public:
SwDoc* GetDoc() const { return m_pDoc; }
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
};
-/* -----------------------------15.12.00 14:25--------------------------------
- ---------------------------------------------------------------------------*/
class SwXFrameStyle : public SwXStyle,
public com::sun::star::document::XEventsSupplier
{
@@ -313,9 +298,7 @@ public:
friend class SwFrameStyleEventDescriptor;
};
-/* -----------------24.08.98 16:04-------------------
- *
- * --------------------------------------------------*/
+
class SwXPageStyle : public SwXStyle
{
SwDocShell* pDocShell;
@@ -326,8 +309,7 @@ protected:
public:
SwXPageStyle(SfxStyleSheetBasePool& rPool, SwDocShell* pDocSh, SfxStyleFamily eFam,
- const String& rStyleName);//,
- //const SfxItemPropertyMap* _pMap);
+ const String& rStyleName);
SwXPageStyle(SwDocShell* pDocSh);
~SwXPageStyle();
@@ -338,9 +320,8 @@ public:
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);
};
-/*-- 19.05.2006 11:20:22---------------------------------------------------
- access to all automatic style families
- -----------------------------------------------------------------------*/
+
+// access to all automatic style families
class SwXAutoStyles :
public cppu::WeakImplHelper1< ::com::sun::star::style::XAutoStyles >,
public SwUnoCollection
@@ -369,9 +350,8 @@ public:
virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw(
::com::sun::star::uno::RuntimeException );
};
-/*-- 19.05.2006 11:20:12---------------------------------------------------
- access to a family of automatic styles (character or paragraph or ...)
- -----------------------------------------------------------------------*/
+
+// access to a family of automatic styles (character or paragraph or ...)
class SwXAutoStyleFamily : public cppu::WeakImplHelper1< com::sun::star::style::XAutoStyleFamily >,
public SwClient
{
@@ -408,10 +388,8 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL nextElement( ) throw
(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
};
-/*-- 19.05.2006 11:20:02---------------------------------------------------
- an automatic style
- -----------------------------------------------------------------------*/
+// an automatic style
class SwXAutoStyle : public cppu::WeakImplHelper3
<
::com::sun::star::beans::XPropertySet,
@@ -441,7 +419,6 @@ public:
virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const
::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, ::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);
@@ -455,7 +432,6 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString&
aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XMultiPropertyStates
- // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL
getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw
(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setAllPropertiesToDefault( ) throw
(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence<
::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL
getPropertyDefaults( 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);
@@ -465,5 +441,4 @@ public:
};
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index cfd89da..c71bfb1 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -42,7 +42,6 @@ class ViewShell;
class SwDocShell;
namespace svtools{ class ColorConfig;}
-//#define VIEWOPT_1_IDLE 0x00000001L no longer used, see new member 'bIdle'
#define VIEWOPT_1_TAB 0x00000002L
#define VIEWOPT_1_BLANK 0x00000004L
#define VIEWOPT_1_HARDBLANK 0x00000008L
@@ -54,8 +53,6 @@ namespace svtools{ class ColorConfig;}
#define VIEWOPT_1_REF 0x00000400L
#define VIEWOPT_1_FLDNAME 0x00000800L
-//#define 0x00001000L
-//#define 0x00002000L
#define VIEWOPT_1_POSTITS 0x00004000L
#define VIEWOPT_1_FLD_HIDDEN 0x00008000L
#define VIEWOPT_1_CHAR_HIDDEN 0x00010000L
@@ -63,13 +60,11 @@ namespace svtools{ class ColorConfig;}
#define VIEWOPT_1_TABLE 0x00040000L
#define VIEWOPT_1_DRAW 0x00080000L
#define VIEWOPT_1_CONTROL 0x00100000L
-//#define 0x00200000L
#define VIEWOPT_1_CROSSHAIR 0x00400000L
#define VIEWOPT_1_SNAP 0x00800000L
#define VIEWOPT_1_SYNCHRONIZE 0x01000000L
#define VIEWOPT_1_GRIDVISIBLE 0x02000000L
#define VIEWOPT_1_ONLINESPELL 0x04000000L
-//#define VIEWOPT_1_HIDESPELL 0x08000000L /* removed #i91949 */
#define VIEWOPT_1_RESERVED1 0x10000000L
#define VIEWOPT_1_VIEWMETACHARS 0x20000000L
#define VIEWOPT_1_PAGEBACK 0x40000000L
@@ -159,9 +154,7 @@ protected:
BOOL bStarOneSetting : 1;// prevent from UI automatics (no scrollbars in
readonly documents)
BOOL bIsPagePreview : 1; // the preview mustn't print field/footnote/... shadings
BOOL bSelectionInReadonly : 1; //determines whether selection is switched on in
readonly documents
- // --> FME 2004-06-29 #114856# Formular view
BOOL bFormView : 1;
- // <--
BOOL bBookview : 1; // view mode for page preview
BOOL mbViewLayoutBookMode : 1; // book view mode for edit view
sal_Bool bShowPlaceHolderFields : 1; //only used in printing!
@@ -390,11 +383,6 @@ public:
inline void SetPrinting(BOOL b)
{ (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_PRINTING) : (nCore2Options &=
~VIEWOPT_CORE2_PRINTING);}
-/*---------------------------------------------------------------------------
-
-----------------------------------------------------------------------------*/
-
-
inline short GetDivisionX() const { return nDivisionX; }
inline void SetDivisionX( short n ){ nDivisionX = n; }
inline short GetDivisionY() const { return nDivisionY; }
@@ -410,17 +398,14 @@ public:
BOOL IsSelectionInReadonly() const {return bSelectionInReadonly;}
void SetSelectionInReadonly(BOOL bSet) {bSelectionInReadonly = bSet;}
- // --> FME 2004-06-29 #114856# Formular view
BOOL IsFormView() const { return bFormView; }
void SetFormView( BOOL bSet ) { bFormView = bSet; }
- // <--
inline BOOL IsPagePrevBookview() const { return bBookview; }
inline void SetPagePrevBookview(BOOL bSet) { bBookview = bSet; }
BOOL IsAutoCompleteWords() const;
- // PAGES01
bool IsViewLayoutBookMode() const { return mbViewLayoutBookMode; }
void SetViewLayoutBookMode( bool bNew ) { mbViewLayoutBookMode = bNew; }
USHORT GetViewLayoutColumns() const { return mnViewLayoutColumns; }
diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx
index ede176b..a15f873 100644
--- a/sw/source/ui/docvw/edtdd.cxx
+++ b/sw/source/ui/docvw/edtdd.cxx
@@ -233,7 +233,7 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
}
- // dvo 2002-05-27, #99027#: There's a special treatment for file lists with a single
+ // There's a special treatment for file lists with a single
// element, that depends on the actual content of the
// Transferable to be accessible. Since the transferable
// may only be accessed after the drop has been accepted
@@ -247,7 +247,6 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
GetDataFlavorExVector(),
m_nDropDestination,
rEvt.mnAction,
-//!! rEvt.GetSourceOptions(),
nUserOpt, m_nDropFormat, nEventAction, 0,
&rEvt.maDropEvent.Transferable );
@@ -256,7 +255,6 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
nRet = rEvt.mnAction;
if( !SwTransferable::PasteData( aData, rSh, m_nDropAction, m_nDropFormat,
m_nDropDestination, FALSE, rEvt.mbDefault, &aDocPt, nRet))
-//!! nRet = SFX_APP()->ExecuteDrop( rEvt );
nRet = DND_ACTION_NONE;
else if ( SW_MOD()->pDragDrop )
//Bei internem D&D nicht mehr aufraeumen!
@@ -404,7 +402,6 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
GetDataFlavorExVector(),
m_nDropDestination,
rEvt.mnAction,
-//!! rEvt.GetSourceOptions(),
nUserOpt, m_nDropFormat, nEventAction );
if( EXCHG_INOUT_ACTION_NONE != m_nDropAction )
@@ -433,7 +430,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
}
else if( rEvt.mbDefault )
{
- // JP 13.08.98: internes Drag&Drop: bei gleichem Doc ein Move
+ // internes Drag&Drop: bei gleichem Doc ein Move
// ansonten ein Copy - Task 54974
nEventAction = pSrcSh->GetDoc() == rSh.GetDoc()
? DND_ACTION_MOVE
@@ -495,7 +492,6 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
CleanupDropUserMarker();
rSh.UnSetVisCrsr();
-//!! return SFX_APP()->AcceptDrop( rEvt );
return DND_ACTION_NONE;
}
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx
index aa9d890..128bea7 100644
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/ui/docvw/edtwin2.cxx
@@ -192,7 +192,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
sSuffix.EqualsAscii( pMarkToOLE ))
sTxt = sTxt.Copy( 0, nFound - 1);
}
- // --> OD 2009-08-18 #i104300#
+ // #i104300#
// special handling if target is a cross-reference bookmark
{
String sTmpSearchStr = sTxt.Copy( 1, sTxt.Len() );
@@ -223,8 +223,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
}
}
}
- // <--
- // --> OD 2007-07-26 #i80029#
+ // #i80029#
BOOL bExecHyperlinks = rView.GetDocShell()->IsReadOnly();
if ( !bExecHyperlinks )
{
@@ -237,7 +236,6 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
sTxt.Insert( ViewShell::GetShellRes()->aHyperlinkClick, 0 );
}
}
- // <--
break;
}
case SwContentAtPos::SW_SMARTTAG:
@@ -313,24 +311,6 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
case RES_POSTITFLD:
{
- /*
- SwPostItMgr* pMgr = rView.GetPostItMgr();
- if (pMgr->ShowNotes())
- {
- SwFmtFld* pSwFmtFld = 0;
- if (pMgr->ShowPreview(pFld,pSwFmtFld))
- {
- SwPostIt* pPostIt = new
SwPostIt(static_cast<Window*>(this),0,pSwFmtFld,pMgr,PB_Preview);
- pPostIt->InitControls();
- pPostIt->SetReadonly(true);
-
pMgr->SetColors(pPostIt,static_cast<SwPostItField*>(pSwFmtFld->GetFld()));
-
pPostIt->SetVirtualPosSize(rEvt.GetMousePosPixel(),Size(180,70));
- pPostIt->ShowNote();
- SetPointerPosPixel(pPostIt->GetPosPixel() + Point(20,20));
- }
- return;
- }
- */
break;
}
case RES_INPUTFLD: // BubbleHelp, da der Hinweis ggf ziemlich lang
sein kann
@@ -358,7 +338,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
case RES_GETREFFLD:
{
- // --> OD 2008-01-09 #i85090#
+ // #i85090#
const SwGetRefField* pRefFld( dynamic_cast<const SwGetRefField*>(pFld)
);
OSL_ENSURE( pRefFld,
"<SwEditWin::RequestHelp(..)> - unexpected type of <pFld>" );
@@ -381,7 +361,6 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
sTxt = ((SwGetRefField*)pFld)->GetSetRefName();
}
}
- // <--
}
break;
}
@@ -430,7 +409,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
case SW_TABROW_VERT:
nTabRes = STR_TABLE_ROW_ADJUST;
break;
- // --> FME 2004-07-30 #i32329# Enhanced table selection
+ // #i32329# Enhanced table selection
case SW_TABSEL_HORI:
case SW_TABSEL_HORI_RTL:
case SW_TABSEL_VERT:
@@ -445,7 +424,6 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
case SW_TABCOLSEL_VERT:
nTabRes = STR_TABLE_SELECT_COL;
break;
- // <--
}
if(nTabRes)
{
@@ -458,14 +436,6 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
}
}
-/*
-aktuelle Zeichenvorlage anzeigen?
- if( bWeiter && rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON ))
- {
- SwCharFmt* pChrFmt = rSh.GetCurCharFmt();
-
- }
-*/
if( bWeiter && pSdrView && bQuickBalloon)
{
SdrViewEvent aVEvt;
@@ -571,16 +541,7 @@ void SwEditWin::Paint(const Rectangle& rRect)
bPaintShadowCrsr = TRUE;
}
}
-/*
- //TODO/LATER: what's the replacement for this? Do we need it?
- SwDocShell* pDocShell = GetView().GetDocShell();
-
- SvInPlaceEnvironment *pIpEnv = pDocShell ?
- pDocShell->GetIPEnv() : 0;
- if ( pIpEnv && pIpEnv->GetRectsChangedLockCount() )
- //Wir stehen in Groessenverhandlungen (MM), Paint verzoegern
- Invalidate( rRect );
- else */
+
if ( GetView().GetVisArea().GetWidth() <= 0 ||
GetView().GetVisArea().GetHeight() <= 0 )
Invalidate( rRect );
diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx
index d3cfde4..3d336b2 100644
--- a/sw/source/ui/docvw/edtwin3.cxx
+++ b/sw/source/ui/docvw/edtwin3.cxx
@@ -138,7 +138,7 @@ BOOL SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, BOOL bVerticalMode)
}
// #i23726#
-// --> OD 2005-02-18 #i42921# - add 3rd parameter <bVerticalMode> in order
+// #i42921# - add 3rd parameter <bVerticalMode> in order
// to consider vertical layout
BOOL SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt,
const bool bVerticalMode )
@@ -146,7 +146,6 @@ BOOL SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt,
SvxRuler& rRuler = bVerticalMode ? rView.GetVLineal() : rView.GetHLineal();
return !rRuler.StartDocDrag( rMEvt, RULER_TYPE_INDENT);
}
-// <--
LAYOUT_NS Dialog* GetSearchDialog()
{
@@ -179,8 +178,8 @@ void SwEditWin::DataChanged( const DataChangedEvent& rDCEvt )
Window::DataChanged( rDCEvt );
SwWrtShell* pSh = GetView().GetWrtShellPtr();
- //#99906# DataChanged() is sometimes called prior to creating
- // the SwWrtShell
+ // DataChanged() is sometimes called prior to creating
+ // the SwWrtShell
if(!pSh)
return;
BOOL bViewWasLocked = pSh->IsViewLocked(), bUnlockPaint = FALSE;
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx
index a089a21..9cda99d 100644
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/ui/docvw/srcedtw.cxx
@@ -66,16 +66,8 @@ struct SwTextPortion
SV_DECL_VARARR(SwTextPortions, SwTextPortion,16,16)
-/* -----------------15.01.97 12.07-------------------
-
---------------------------------------------------*/
-
SV_IMPL_VARARR(SwTextPortions, SwTextPortion)
-/*-----------------15.01.97 12.08-------------------
-
---------------------------------------------------*/
-
static void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList)
{
const sal_Unicode cOpenBracket = '<';
@@ -502,12 +494,12 @@ void SwSrcEditWindow::CreateTextEngine()
//Scrollbars anlegen
pHScrollbar = new ScrollBar(this, WB_3DLOOK |WB_HSCROLL|WB_DRAG);
- pHScrollbar->EnableRTL( false ); // #107300# --- RTL --- no mirroring for scrollbars
+ pHScrollbar->EnableRTL( false ); // --- RTL --- no mirroring for scrollbars
pHScrollbar->SetScrollHdl(LINK(this, SwSrcEditWindow, ScrollHdl));
pHScrollbar->Show();
pVScrollbar = new ScrollBar(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG);
- pVScrollbar->EnableRTL( false ); // #107300# --- RTL --- no mirroring for scrollbars
+ pVScrollbar->EnableRTL( false ); // --- RTL --- no mirroring for scrollbars
pVScrollbar->SetScrollHdl(LINK(this, SwSrcEditWindow, ScrollHdl));
pHScrollbar->EnableDrag();
pVScrollbar->Show();
@@ -541,7 +533,6 @@ void SwSrcEditWindow::CreateTextEngine()
SfxBindings& rBind = GetSrcView()->GetViewFrame()->GetBindings();
rBind.Invalidate( SID_TABLE_CELL );
-// rBind.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
}
/*--------------------------------------------------------------------
@@ -607,15 +598,10 @@ IMPL_LINK(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll)
return 0;
}
-/*-----------------15.01.97 09.22-------------------
-
---------------------------------------------------*/
-
IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer )
{
Time aSyntaxCheckStart;
OSL_ENSURE( pTextView, "Noch keine View, aber Syntax-Highlight ?!" );
- // pTextEngine->SetUpdateMode( FALSE );
bHighlighting = TRUE;
USHORT nLine;
@@ -662,16 +648,6 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer )
break;
}
}
- // os: #43050# hier wird ein TextView-Problem umpopelt:
- // waehrend des Highlightings funktionierte das Scrolling nicht
- /* MT: Shouldn't be a oproblem any more, using IdeFormatter in Insert/RemoveAttrib now.
-
- TextView* pTmp = pTextEngine->GetActiveView();
- pTextEngine->SetActiveView(0);
- // pTextEngine->SetUpdateMode( TRUE );
- pTextEngine->SetActiveView(pTmp);
- pTextView->ShowCursor(FALSE, FALSE);
- */
if(aSyntaxLineTable.Count() && !pTimer->IsActive())
pTimer->Start();
@@ -685,9 +661,6 @@ IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Timer *, pTimer )
return 0;
}
-/*-----------------15.01.97 10.01-------------------
-
---------------------------------------------------*/
void SwSrcEditWindow::DoSyntaxHighlight( USHORT nPara )
{
@@ -700,14 +673,11 @@ void SwSrcEditWindow::DoSyntaxHighlight( USHORT nPara )
String aSource( pTextEngine->GetText( nPara ) );
pTextEngine->SetUpdateMode( FALSE );
ImpDoHighlight( aSource, nPara );
- // os: #43050# hier wird ein TextView-Problem umpopelt:
- // waehrend des Highlightings funktionierte das Scrolling nicht
TextView* pTmp = pTextEngine->GetActiveView();
pTmp->SetAutoScroll(FALSE);
pTextEngine->SetActiveView(0);
pTextEngine->SetUpdateMode( TRUE );
pTextEngine->SetActiveView(pTmp);
- // Bug 72887 show the cursor
pTmp->SetAutoScroll(TRUE);
pTmp->ShowCursor( FALSE/*pTmp->IsAutoScroll()*/ );
@@ -716,10 +686,6 @@ void SwSrcEditWindow::DoSyntaxHighlight( USHORT nPara )
}
}
-/*-----------------15.01.97 09.49-------------------
-
---------------------------------------------------*/
-
void SwSrcEditWindow::DoDelayedSyntaxHighlight( USHORT nPara )
{
if ( !bHighlighting && bDoSyntaxHighlight )
@@ -729,10 +695,6 @@ void SwSrcEditWindow::DoDelayedSyntaxHighlight( USHORT nPara )
}
}
-/*-----------------15.01.97 11.32-------------------
-
---------------------------------------------------*/
-
void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff )
{
SwTextPortions aPortionList;
@@ -801,10 +763,6 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff )
}
}
-/*-----------------30.06.97 09:12-------------------
-
---------------------------------------------------*/
-
void SwSrcEditWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
if ( rHint.ISA( TextHint ) )
@@ -836,10 +794,6 @@ void SwSrcEditWindow::ConfigurationChanged( utl::ConfigurationBroadcaster*
pBrdC
SetFont();
}
-/*-----------------30.06.97 13:22-------------------
-
---------------------------------------------------*/
-
void SwSrcEditWindow::Invalidate(USHORT )
{
pOutWin->Invalidate();
@@ -876,15 +830,6 @@ void SwSrcEditWindow::GetFocus()
pOutWin->GrabFocus();
}
-/*void SwSrcEditWindow::LoseFocus()
-{
- Window::LoseFocus();
-// pOutWin->LoseFocus();
-// rView.LostFocus();
-} */
-/* -----------------------------29.08.2002 13:21------------------------------
-
- ---------------------------------------------------------------------------*/
BOOL lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType aLanguages[])
{
switch(eEnc)
@@ -1081,9 +1026,7 @@ void SwSrcEditWindow::SetFont()
GetTextEngine()->SetFont( aFont );
pOutWin->SetFont(aFont);
}
-/* -----------------------------29.08.2002 13:47------------------------------
- ---------------------------------------------------------------------------*/
void SwSrcEditWindow::SetTextEncoding(rtl_TextEncoding eEncoding)
{
eSourceEncoding = eEncoding;
diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx
index 298ac5b..b7a964e 100644
--- a/sw/source/ui/ribbar/drawbase.cxx
+++ b/sw/source/ui/ribbar/drawbase.cxx
@@ -101,7 +101,6 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
SdrView *pSdrView = m_pSh->GetDrawView();
// #i33136#
- // pSdrView->SetOrtho(rMEvt.IsShift());
pSdrView->SetOrtho(doConstructOrthogonal() ? !rMEvt.IsShift() : rMEvt.IsShift());
pSdrView->SetAngleSnapEnabled(rMEvt.IsShift());
@@ -212,8 +211,6 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
{
bNoInterrupt = TRUE;
pSdrView->MarkPoint(*pHdl);
-// bReturn = pSdrView->BegDragObj(m_aStartPos, (OutputDevice*) NULL, pHdl);
-// m_pWin->SetDrawAction(TRUE);
}
}
}
@@ -240,11 +237,9 @@ BOOL SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
{
if (!pSdrView->HasMarkablePoints())
{
- //JP 10.10.2001: Bug 89619 - don't scroll the
- // cursor into the visible area
BOOL bUnlockView = !m_pSh->IsViewLocked();
m_pSh->LockView( TRUE ); //lock visible section
- m_pSh->SelectObj(Point(LONG_MAX, LONG_MAX)); // Alles deselektieren
+ m_pSh->SelectObj(Point(LONG_MAX, LONG_MAX)); // deselect all
if( bUnlockView )
m_pSh->LockView( FALSE );
}
@@ -281,7 +276,6 @@ BOOL SwDrawBase::MouseMove(const MouseEvent& rMEvt)
if (IsCreateObj() && !m_pWin->IsDrawSelMode() && pSdrView->IsCreateObj())
{
// #i33136#
- // pSdrView->SetOrtho(rMEvt.IsShift());
pSdrView->SetOrtho(doConstructOrthogonal() ? !rMEvt.IsShift() : rMEvt.IsShift());
pSdrView->SetAngleSnapEnabled(rMEvt.IsShift());
@@ -531,9 +525,6 @@ void __EXPORT SwDrawBase::Deactivate()
m_pWin->ReleaseMouse();
bNoInterrupt = FALSE;
-// if(!m_pSh->IsObjSelected())
-// m_pSh->Edit();
-
if(m_pWin->GetApplyTemplate())
m_pWin->SetApplyTemplate(SwApplyTemplate());
m_pSh->GetView().GetViewFrame()->GetBindings().Invalidate(SID_INSERT_DRAW);
@@ -647,7 +638,6 @@ void SwDrawBase::BreakCreate()
m_pWin->ReleaseMouse();
Deactivate();
-// m_pView->LeaveDrawCreate();
}
/*************************************************************************
@@ -700,9 +690,7 @@ void SwDrawBase::EnterSelectMode(const MouseEvent& rMEvt)
m_pView->NoRotate();
}
}
-/* -----------------------------03.04.2002 10:52------------------------------
- ---------------------------------------------------------------------------*/
void SwDrawBase::CreateDefaultObject()
{
Point aStartPos = GetDefaultCenterPos();
@@ -714,9 +702,7 @@ void SwDrawBase::CreateDefaultObject()
Rectangle aRect(aStartPos, aEndPos);
m_pSh->CreateDefaultShape( static_cast< UINT16 >(m_pWin->GetSdrDrawMode()), aRect, m_nSlotId);
}
-/* -----------------25.10.2002 14:14-----------------
- *
- * --------------------------------------------------*/
+
Point SwDrawBase::GetDefaultCenterPos()
{
Size aDocSz(m_pSh->GetDocSize());
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index 604786a..5826753 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -214,8 +214,8 @@ void SwInputWindow::ShowWin()
OSL_ENSURE(pMgr == 0, "FieldManager not deleted");
pMgr = new SwFldMgr;
- // JP 13.01.97: Formel soll immer mit einem "=" beginnen, hier
- // also setzen
+ // Formel soll immer mit einem "=" beginnen, hier
+ // also setzen
String sEdit( '=' );
if( pMgr->GetCurFld() && TYP_FORMELFLD == pMgr->GetCurTypeId() )
{
@@ -379,8 +379,8 @@ void SwInputWindow::ApplyFormula()
}
pWrtShell->Pop( FALSE );
- // JP 13.01.97: Formel soll immer mit einem "=" beginnen, hier
- // also wieder entfernen
+ // Formel soll immer mit einem "=" beginnen, hier
+ // also wieder entfernen
String sEdit( aEdit.GetText() );
sEdit.EraseLeadingChars().EraseTrailingChars();
if( sEdit.Len() && '=' == sEdit.GetChar( 0 ) )
@@ -594,8 +594,7 @@ void __EXPORT InputEdit::UpdateRange(const String& rBoxes,
nEndPos = nStartPos;
while( nEndPos < nLen )
{
- if( cClose == (cCh = aActText.GetChar( nEndPos )) /*||
- cCh == cCloseBracket*/ )
+ if( cClose == (cCh = aActText.GetChar( nEndPos )))
{
bFound = TRUE;
break;
@@ -627,7 +626,6 @@ void __EXPORT InputEdit::UpdateRange(const String& rBoxes,
{
SetText( aActText );
SetSelection( Selection( nPos, nPos ) );
-// GetModifyHdl().Call( this );
}
}
GrabFocus();
@@ -635,7 +633,6 @@ void __EXPORT InputEdit::UpdateRange(const String& rBoxes,
}
//==================================================================
-
SwInputChild::SwInputChild(Window* _pParent,
USHORT nId,
SfxBindings* pBindings,
@@ -662,26 +659,4 @@ SfxChildWinInfo __EXPORT SwInputChild::GetInfo() const
return aInfo;
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx
index 0f9278b..2d51e3a 100644
--- a/sw/source/ui/ribbar/tbxanchr.cxx
+++ b/sw/source/ui/ribbar/tbxanchr.cxx
@@ -121,8 +121,6 @@ void SwTbxAnchor::Click()
pDispatch = pViewFrame->GetDispatcher();
}
-// SfxDispatcher* pDispatch = GetBindings().GetDispatcher();
-// SfxViewFrame* pViewFrame = pDispatch ? pDispatch->GetFrame() : 0;
SwView* pActiveView = 0;
if(pViewFrame)
{
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 772342b..a4d6212 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -58,7 +58,7 @@
#include <vcl/svapp.hxx>
-//JP 14.01.99: Size Abpruefung
+// Size Abpruefung
#define NAVI_ENTRIES 20
#if NAVI_ENTRIES != NID_COUNT
#error SwScrollNaviPopup-CTOR static Array falsche Size. Wurden neue IDs zugefuegt ??
@@ -73,9 +73,6 @@ using namespace ::com::sun::star::frame;
SFX_IMPL_TOOLBOX_CONTROL( SwTbxInsertCtrl, SfxImageItem);
SFX_IMPL_TOOLBOX_CONTROL( SwTbxAutoTextCtrl, SfxBoolItem );
-/**********************************************************************
-
-**********************************************************************/
SwTbxInsertCtrl::SwTbxInsertCtrl(
USHORT nSlotId,
USHORT nId,
@@ -85,9 +82,7 @@ SwTbxInsertCtrl::SwTbxInsertCtrl(
{
rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
}
-/**********************************************************************
-**********************************************************************/
SwTbxInsertCtrl::~SwTbxInsertCtrl()
{
}
@@ -108,11 +103,6 @@ void SAL_CALL SwTbxInsertCtrl::update() throw (uno::RuntimeException)
SfxToolBoxControl::update();
}
-/**********************************************************************
-
-**********************************************************************/
-
-
void SwTbxInsertCtrl::StateChanged( USHORT /*nSID*/,
SfxItemState eState,
const SfxPoolItem* pState )
@@ -144,10 +134,6 @@ void SwTbxInsertCtrl::StateChanged( USHORT /*nSID*/,
}
}
-/**********************************************************************
-
-**********************************************************************/
-
SfxPopupWindow* SwTbxInsertCtrl::CreatePopupWindow()
{
@@ -164,22 +150,12 @@ SfxPopupWindow* SwTbxInsertCtrl::CreatePopupWindow()
return NULL;
}
-/**********************************************************************
-
-**********************************************************************/
-
-
SfxPopupWindowType SwTbxInsertCtrl::GetPopupWindowType() const
{
return nLastSlotId ? SFX_POPUPWINDOW_ONTIMEOUT : SFX_POPUPWINDOW_ONCLICK;
}
-/**********************************************************************
-
-**********************************************************************/
-
-
void SwTbxInsertCtrl::Select( BOOL /*bMod1*/ )
{
if( nLastSlotId )
@@ -199,11 +175,6 @@ void SwTbxInsertCtrl::Select( BOOL /*bMod1*/ )
}
}
-/**********************************************************************
-
-**********************************************************************/
-
-
SwTbxAutoTextCtrl::SwTbxAutoTextCtrl(
USHORT nSlotId,
USHORT nId,
@@ -214,21 +185,12 @@ SwTbxAutoTextCtrl::SwTbxAutoTextCtrl(
{
rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
}
-/**********************************************************************
-
-**********************************************************************/
-
SwTbxAutoTextCtrl::~SwTbxAutoTextCtrl()
{
DelPopup();
}
-/**********************************************************************
-
-**********************************************************************/
-
-
SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
{
pView = ::GetActiveView();
@@ -304,21 +266,11 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
}
-/**********************************************************************
-
-**********************************************************************/
-
-
SfxPopupWindowType SwTbxAutoTextCtrl::GetPopupWindowType() const
{
return SFX_POPUPWINDOW_ONTIMEOUT;
}
-/**********************************************************************
-
-**********************************************************************/
-
-
void SwTbxAutoTextCtrl::StateChanged( USHORT nSID,
SfxItemState eState,
const SfxPoolItem* pState )
@@ -330,11 +282,6 @@ void SwTbxAutoTextCtrl::StateChanged( USHORT nSID,
}
}
-/**********************************************************************
-
-**********************************************************************/
-
-
IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
{
USHORT nId = pMenu->GetCurItemId();
@@ -392,11 +339,6 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
return 0;
}
-/**********************************************************************
-
-**********************************************************************/
-
-
void SwTbxAutoTextCtrl::DelPopup()
{
if(pPopup)
@@ -414,9 +356,7 @@ void SwTbxAutoTextCtrl::DelPopup()
}
}
-/*-----------------19.02.97 10.52-------------------
- Navigations-Popup
---------------------------------------------------*/
+/* Navigations-Popup */
// determine the order of the toolbox items
static USHORT __READONLY_DATA aNavigationInsertIds[ NAVI_ENTRIES ] =
{
@@ -534,16 +474,11 @@ SwScrollNaviPopup::SwScrollNaviPopup( USHORT nId, const Reference< XFrame >&
rFr
aToolBox.StartSelection();
aToolBox.Show();
}
-/*-----------------19.02.97 12.45-------------------
-
---------------------------------------------------*/
SwScrollNaviPopup::~SwScrollNaviPopup()
{
}
-/* -----------------------------08.05.2002 14:00------------------------------
- ---------------------------------------------------------------------------*/
void SwScrollNaviPopup::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -552,9 +487,7 @@ void SwScrollNaviPopup::DataChanged( const DataChangedEvent& rDCEvt )
Window::DataChanged( rDCEvt );
}
-/* -----------------------------08.05.2002 14:02------------------------------
- ---------------------------------------------------------------------------*/
void SwScrollNaviPopup::ApplyImageList()
{
ImageList& rImgLst = aToolBox.GetSettings().GetStyleSettings().GetHighContrastMode() ?
@@ -565,19 +498,12 @@ void SwScrollNaviPopup::ApplyImageList()
aToolBox.SetItemImage(nNaviId, rImgLst.GetImage(nNaviId));
}
}
-/*-----------------19.02.97 13.58-------------------
-
---------------------------------------------------*/
SfxPopupWindow* SwScrollNaviPopup::Clone() const
{
return new SwScrollNaviPopup( GetId(), GetFrame() );
}
-/*-----------------19.02.97 14.10-------------------
-
---------------------------------------------------*/
-
IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
{
USHORT nSet = pSet->GetCurItemId();
@@ -608,9 +534,6 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
}
return 0;
}
-/*-----------------23.02.97 18.21-------------------
-
---------------------------------------------------*/
void SwScrollNaviToolBox::MouseButtonUp( const MouseEvent& rMEvt )
{
@@ -619,9 +542,6 @@ void SwScrollNaviToolBox::MouseButtonUp( const MouseEvent& rMEvt )
((SwScrollNaviPopup*)GetParent())->EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL );
}
-/*-----------------20.06.97 13:28-------------------
-
---------------------------------------------------*/
void SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt )
{
SetItemText(NID_NEXT, SwScrollNaviPopup::GetQuickHelpText(TRUE));
@@ -630,9 +550,6 @@ void SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt )
}
-/*-----------------20.06.97 13:41-------------------
-
---------------------------------------------------*/
String SwScrollNaviPopup::GetQuickHelpText(BOOL bNext)
{
USHORT nResId = STR_IMGBTN_START;
@@ -641,17 +558,12 @@ String SwScrollNaviPopup::GetQuickHelpText(BOOL bNext)
nResId += NID_COUNT;
return String(SW_RES(nResId));
}
-/* -----------------------------05.09.2002 13:53------------------------------
- ---------------------------------------------------------------------------*/
void SwNaviImageButton::Click()
{
-// SfxBindings& rBind = SfxViewFrame::Current()->GetBindings();
-// rBind.ENTERREGISTRATIONS();
pPopup = new
SwScrollNaviPopup( FN_SCROLL_NAVIGATION,
m_xFrame );
-// rBind.LEAVEREGISTRATIONS();
Point aPos = OutputToScreenPixel(Point(0,0));
Rectangle aRect(aPos, GetSizePixel());
SetPopupWindow( pPopup );
@@ -700,10 +612,6 @@ IMPL_LINK( SwNaviImageButton, ClosePopupWindow, SfxPopupWindow *, pWindow )
return 1;
}
-/*-----------------21.02.97 09:41-------------------
-
---------------------------------------------------*/
-
void SwHlpImageButton::RequestHelp( const HelpEvent& rHEvt )
{
@@ -712,10 +620,6 @@ void SwHlpImageButton::RequestHelp( const HelpEvent& rHEvt )
ImageButton::RequestHelp(rHEvt);
}
-/*-----------------25.02.97 12:38-------------------
-
---------------------------------------------------*/
-
SwNaviImageButton::SwNaviImageButton(
Window* pParent,
const Reference< XFrame >& rFrame ) :
@@ -733,9 +637,7 @@ SwNaviImageButton::SwNaviImageButton(
SetQuickHelpText(sQuickText);
SetModeImage( GetSettings().GetStyleSettings().GetHighContrastMode() ? aImageH : aImage);
}
-/* -----------------------------2002/07/05 9:41-------------------------------
- ---------------------------------------------------------------------------*/
void SwNaviImageButton::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -744,9 +646,7 @@ void SwNaviImageButton::DataChanged( const DataChangedEvent& rDCEvt )
Window::DataChanged( rDCEvt );
}
-/* -----------------26.11.2002 09:28-----------------
- *
- * --------------------------------------------------*/
+
class SwZoomBox_Impl : public ComboBox
{
USHORT nSlotId;
@@ -767,9 +667,7 @@ protected:
void ReleaseFocus();
};
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
+
SwZoomBox_Impl::SwZoomBox_Impl(
Window* pParent,
USHORT nSlot,
@@ -789,14 +687,10 @@ SwZoomBox_Impl::SwZoomBox_Impl(
InsertEntry(sEntry);
}
}
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
+
SwZoomBox_Impl::~SwZoomBox_Impl()
{}
-/* -----------------26.11.2002 09:34-----------------
- *
- * --------------------------------------------------*/
+
void SwZoomBox_Impl::Select()
{
if ( !IsTravelSelect() )
@@ -826,9 +720,7 @@ void SwZoomBox_Impl::Select()
ReleaseFocus();
}
}
-/* -----------------02.12.2002 07:49-----------------
- *
- * --------------------------------------------------*/
+
long SwZoomBox_Impl::Notify( NotifyEvent& rNEvt )
{
long nHandled = 0;
@@ -865,9 +757,7 @@ long SwZoomBox_Impl::Notify( NotifyEvent& rNEvt )
return nHandled ? nHandled : ComboBox::Notify( rNEvt );
}
-/* -----------------02.12.2002 07:51-----------------
- *
- * --------------------------------------------------*/
+
void SwZoomBox_Impl::ReleaseFocus()
{
if ( !bRelease )
@@ -886,9 +776,6 @@ void SwZoomBox_Impl::ReleaseFocus()
}
}
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
SFX_IMPL_TOOLBOX_CONTROL( SwPreviewZoomControl, SfxUInt16Item);
SwPreviewZoomControl::SwPreviewZoomControl(
@@ -898,15 +785,11 @@ SwPreviewZoomControl::SwPreviewZoomControl(
SfxToolBoxControl( nSlotId, nId, rTbx )
{
}
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
+
SwPreviewZoomControl::~SwPreviewZoomControl()
{
}
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
+
void SwPreviewZoomControl::StateChanged( USHORT /*nSID*/,
SfxItemState eState,
const SfxPoolItem* pState )
@@ -922,9 +805,7 @@ void SwPreviewZoomControl::StateChanged( USHORT /*nSID*/,
pBox->SaveValue();
}
}
-/* -----------------26.11.2002 09:29-----------------
- *
- * --------------------------------------------------*/
+
Window* SwPreviewZoomControl::CreateItemWindow( Window *pParent )
{
SwZoomBox_Impl* pRet = new SwZoomBox_Impl( pParent, GetSlotId(), Reference< XDispatchProvider
( m_xFrame->getController(), UNO_QUERY ));
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 20ef70a..d445c67 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -284,7 +284,6 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
}
}
return TRUE;
- //break;
// Funktionen, die eine direkte Aktion ausloesen
case FN_SELECT_FOOTER:
@@ -400,9 +399,6 @@ IMPL_LINK( SwNavigationPI, ToolBoxClickHdl, ToolBox *, pBox )
return TRUE;
}
-/*-----------------13.07.04 -------------------
- ----------------------------------------------*/
-
IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox )
{
const USHORT nCurrItemId = pBox->GetCurItemId();
@@ -421,9 +417,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox )
{
pMenu->InsertItem( i + 1, aContextArr[i] );
pMenu->SetHelpId(i + 1, HID_NAVI_DRAG_HYP + i);
- /*HID_NAVI_DRAG_HYP
- HID_NAVI_DRAG_LINK
- HID_NAVI_DRAG_COPY */
+
}
pMenu->CheckItem( nRegionMode + 1 );
pMenu->SetSelectHdl(LINK(this, SwNavigationPI, MenuSelectHdl));
@@ -461,15 +455,11 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox )
return TRUE;
}
-/*-----------------13.07.04 -------------------
---------------------------------------------------*/
SwNavHelpToolBox::SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId) :
SwHelpToolBox(pParent, rResId)
{}
-/*-----------------19.06.97 09:09-------------------
---------------------------------------------------*/
void SwNavHelpToolBox::MouseButtonDown(const MouseEvent &rEvt)
{
if(rEvt.GetButtons() == MOUSE_LEFT &&
@@ -480,18 +470,13 @@ void SwNavHelpToolBox::MouseButtonDown(const MouseEvent &rEvt)
else
SwHelpToolBox::MouseButtonDown(rEvt);
}
-/* -----------------------------12.03.2002 16:55------------------------------
- ---------------------------------------------------------------------------*/
void SwNavigationPI::CreateNavigationTool(const Rectangle& rRect, BOOL bSetFocus)
{
-// SfxBindings& rBind = GetCreateView()->GetViewFrame()->GetBindings();
-// rBind.ENTERREGISTRATIONS();
Reference< XFrame > xFrame = GetCreateView()->GetViewFrame()->GetFrame().GetFrameInterface();
SwScrollNaviPopup* pPopup = new
SwScrollNaviPopup(FN_SCROLL_NAVIGATION,
xFrame );
-// rBind.LEAVEREGISTRATIONS();
Rectangle aRect(rRect);
Point aT1 = aRect.TopLeft();
@@ -506,9 +491,6 @@ void SwNavigationPI::CreateNavigationTool(const Rectangle& rRect, BOOL bSetFocus
}
}
-/*-----------------19.06.97 10:12-------------------
-
---------------------------------------------------*/
void SwNavHelpToolBox::RequestHelp( const HelpEvent& rHEvt )
{
USHORT nItemId = GetItemId(ScreenToOutputPixel(rHEvt.GetMousePosPixel()));
@@ -795,8 +777,6 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
bPageCtrlsVisible = TRUE;
-// Rectangle aFirstRect = aContentToolBox.GetItemRect(FN_SHOW_ROOT);
-// USHORT nWidth = 2 * (USHORT)aFirstRect.Left();
//doppelte Separatoren sind nicht erlaubt, also muss
//die passende Groesse anders ermittelt werden
Rectangle aFirstRect = aContentToolBox.GetItemRect(FN_SELECT_FOOTNOTE);
@@ -1172,7 +1152,7 @@ void SwNavigationPI::UpdateListBox()
while (pView)
{
SfxObjectShell* pDoc = pView->GetDocShell();
- // pb: #i53333# don't show help pages here
+ // #i53333# don't show help pages here
if ( !pDoc->IsHelpDocument() )
{
String sEntry = pDoc->GetTitle();
@@ -1225,10 +1205,6 @@ void SwNavigationPI::UpdateListBox()
aDocListBox.SetUpdateMode(TRUE);
}
-/*-----------------16.06.97 15:05-------------------
-
---------------------------------------------------*/
-
/*------------------------------------------------------------------------
Beschreibung:
------------------------------------------------------------------------*/
@@ -1344,10 +1320,6 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt )
return nRet;
}
-/*-----------------27.11.96 13.00-------------------
-
---------------------------------------------------*/
-
void SwNavigationPI::SetRegionDropMode(USHORT nNewMode)
{
nRegionMode = nNewMode;
@@ -1367,10 +1339,6 @@ void SwNavigationPI::SetRegionDropMode(USHORT nNewMode)
}
-/*-----------------12.06.97 09:47-------------------
-
---------------------------------------------------*/
-
BOOL SwNavigationPI::ToggleTree()
{
BOOL bRet = TRUE;
@@ -1404,9 +1372,6 @@ BOOL SwNavigationPI::ToggleTree()
return bRet;
}
-/*-----------------13.06.97 09:42-------------------
-
---------------------------------------------------*/
BOOL SwNavigationPI::IsGlobalDoc() const
{
BOOL bRet = FALSE;
@@ -1418,18 +1383,14 @@ BOOL SwNavigationPI::IsGlobalDoc() const
}
return bRet;
}
-/* -----------------26.10.98 08:10-------------------
- *
- * --------------------------------------------------*/
+
IMPL_LINK( SwNavigationPI, ChangePageHdl, Timer*, EMPTYARG )
{
EditAction(&GetPageEdit());
GetPageEdit().GrabFocus();
return 0;
}
-/* -----------------26.10.98 08:14-------------------
- *
- * --------------------------------------------------*/
+
IMPL_LINK( SwNavigationPI, PageEditModifyHdl, Edit*, EMPTYARG )
{
if(aPageChgTimer.IsActive())
@@ -1438,9 +1399,6 @@ IMPL_LINK( SwNavigationPI, PageEditModifyHdl, Edit*, EMPTYARG )
return 0;
}
-/* -----------------------------23.04.01 07:34--------------------------------
-
- ---------------------------------------------------------------------------*/
SwView* SwNavigationPI::GetCreateView() const
{
if(!pCreateView)
@@ -1492,9 +1450,7 @@ SwNavigationChild::SwNavigationChild( Window* pParent,
pNavi->_ZoomIn();
}
}
-/* -----------------------------06.05.2002 10:06------------------------------
- ---------------------------------------------------------------------------*/
void SwNavigationPI::DataChanged( const DataChangedEvent& rDCEvt )
{
Window::DataChanged( rDCEvt );
@@ -1508,9 +1464,7 @@ void SwNavigationPI::DataChanged( const DataChangedEvent& rDCEvt )
SetBackground( aBack );
}
}
-/* -----------------------------06.05.2002 10:07------------------------------
- ---------------------------------------------------------------------------*/
void SwNavigationPI::InitImageList()
{
USHORT k;
--
1.7.1
From 9f77a641cb70916ce5782aba54bdf05970f26f53 Mon Sep 17 00:00:00 2001
From: Robert Roth <robert.roth.off@gmail.com>
Date: Fri, 5 Nov 2010 09:10:04 +0200
Subject: [PATCH 6/6] Some more bogus comments, commented code removed.
---
sw/source/ui/frmdlg/wrap.cxx | 4 +-
sw/source/ui/uiview/uivwimp.cxx | 2 -
sw/source/ui/utlui/content.cxx | 93 +++++++-------------------------------
sw/source/ui/utlui/glbltree.cxx | 9 ----
sw/source/ui/utlui/prcntfld.cxx | 8 +---
sw/source/ui/utlui/unotools.cxx | 2 -
6 files changed, 21 insertions(+), 97 deletions(-)
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index dee3c62..4bf818d 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -42,7 +42,7 @@
#include <editeng/opaqitem.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/lrspitem.hxx>
-// OD 18.09.2003 #i18732#
+// #i18732#
#include <fmtfollowtextflow.hxx>
#include <svx/swframevalidation.hxx>
@@ -447,7 +447,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
aVal.bAutoHeight = rFrmSize.GetHeightSizeType() == ATT_MIN_SIZE;
aVal.bAutoWidth = rFrmSize.GetWidthSizeType() == ATT_MIN_SIZE;
aVal.bMirror = rHori.IsPosToggle();
- // OD 18.09.2003 #i18732#
+ // #i18732#
aVal.bFollowTextFlow =
static_cast<const SwFmtFollowTextFlow&>(rSet.Get(RES_FOLLOW_TEXT_FLOW)).GetValue();
diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx
index 3350d8d..5394818 100644
--- a/sw/source/ui/uiview/uivwimp.cxx
+++ b/sw/source/ui/uiview/uivwimp.cxx
@@ -158,8 +158,6 @@ void SwView_Impl::ExecuteScan( SfxRequest& rReq )
else
{
rReq.Ignore();
-// KA 04.07.2002
-// InfoBox( 0, SW_RES(MSG_SCAN_NOSOURCE) ).Execute();
}
}
break;
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index b7bd209..b032530 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -97,7 +97,6 @@
#include "globals.hrc"
#include <unomid.h>
-
#define CTYPE_CNT 0
#define CTYPE_CTT 1
@@ -107,7 +106,6 @@ using namespace ::com::sun::star::text;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
-
#define NAVI_BOOKMARK_DELIM (sal_Unicode)1
typedef SwContent* SwContentPtr;
@@ -116,7 +114,6 @@ SV_IMPL_OP_PTRARR_SORT(SwContentArr, SwContentPtr)
sal_Bool SwContentTree::bIsInDrag = sal_False;
-
namespace
{
static sal_Bool lcl_IsContent(SvLBoxEntry* pEntry)
@@ -124,13 +121,11 @@ namespace
return ((SwTypeNumber*)pEntry->GetUserData())->GetTypeId() == CTYPE_CNT;
}
-
static sal_Bool lcl_IsContentType(SvLBoxEntry* pEntry)
{
return ((SwTypeNumber*)pEntry->GetUserData())->GetTypeId() == CTYPE_CTT;
}
-
static sal_Bool lcl_FindShell(SwWrtShell* pShell)
{
sal_Bool bFound = sal_False;
@@ -328,7 +323,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
if( !pFmt->GetInfo( aAskItem ) &&
!aAskItem.pObject ) // not visible
pCnt->SetInvisible();
- pMember->Insert(pCnt);//, pMember->Count());
+ pMember->Insert(pCnt);
sal_uInt16 nPos = pMember->Count() - 1;
if(nOldRegionCount > nPos &&
@@ -386,7 +381,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
RTL_TEXTENCODING_UTF8 ),
&p->rINetAttr,
n );
- pMember->Insert( pCnt );//, n );
+ pMember->Insert( pCnt );
}
bEdit = sal_True;
nOldMemberCount = nMemberCount;
@@ -423,28 +418,8 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
nMemberCount++;
}
}
- /*
- // this code can be used once we want redline comments in the margin
- else // redcomment
- {
- SwRedline* pRedline = static_cast<SwRedline*>((*i)->GetBroadCaster());
- if ( pRedline->GetComment() !=
String(::rtl::OUString::createFromAscii("")) )
- {
- String sEntry = pRedline->GetComment();
- RemoveNewline(sEntry);
- SwPostItContent* pCnt = new SwPostItContent(
- this,
- sEntry, // hier steht der Text
- pRedline,
- nMemberCount);
- pMember->Insert(pCnt);
- nMemberCount++;
- }
- }
- */
}
}
- //
sTypeToken = aEmptyStr;
bEdit = sal_True;
nOldMemberCount = nMemberCount;
@@ -462,10 +437,8 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
for( sal_uInt32 i=0; i< nCount; i++ )
{
SdrObject* pTemp = pPage->GetObj(i);
- // --> OD 2006-03-09 #i51726# - all drawing objects can be named now
-// if(pTemp->ISA(SdrObjGroup) && pTemp->GetName().Len())
+ // #i51726# - all drawing objects can be named now
if ( pTemp->GetName().Len() )
- // <--
nMemberCount++;
}
}
@@ -578,7 +551,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
!aAskItem.pObject ) // not visible
pCnt->SetInvisible();
- pMember->Insert(pCnt);//, i);
+ pMember->Insert(pCnt);
if(nOldMemberCount > (int)i &&
(pOldMember->GetObject(i))->IsInvisible() != pCnt->IsInvisible())
@@ -623,7 +596,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
if( !pFrmFmt->GetInfo( aAskItem ) &&
!aAskItem.pObject ) // not visible
pCnt->SetInvisible();
- pMember->Insert(pCnt);//, i);
+ pMember->Insert(pCnt);
if(nOldMemberCount > (int)i &&
(pOldMember->GetObject(i))->IsInvisible() != pCnt->IsInvisible())
*pbLevelOrVisibiblityChanged = sal_True;
@@ -642,7 +615,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
const String& rBkmName = ppBookmark->get()->GetName();
//nYPos von 0 -> text::Bookmarks werden nach Alphabet sortiert
SwContent* pCnt = new SwContent(this, rBkmName, 0);
- pMember->Insert(pCnt);//, pMember->Count());
+ pMember->Insert(pCnt);
}
}
}
@@ -675,7 +648,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
if( !pFmt->GetInfo( aAskItem ) &&
!aAskItem.pObject ) // not visible
pCnt->SetInvisible();
- pMember->Insert(pCnt);//, pMember->Count());
+ pMember->Insert(pCnt);
sal_uInt16 nPos = pMember->Count() - 1;
if(nOldMemberCount > nPos &&
@@ -697,7 +670,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
//Referenzen nach Alphabet sortiert
SwContent* pCnt = new SwContent(
this, *aRefMarks.GetObject(i), 0);
- pMember->Insert(pCnt);//, i);
+ pMember->Insert(pCnt);
}
}
break;
@@ -718,7 +691,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
RTL_TEXTENCODING_UTF8 ),
&p->rINetAttr,
n );
- pMember->Insert( pCnt );//, n );
+ pMember->Insert( pCnt );
}
}
break;
@@ -738,7 +711,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
!aAskItem.pObject ) // not visible
pCnt->SetInvisible();
- pMember->Insert( pCnt );//, nTox );
+ pMember->Insert( pCnt );
sal_uInt16 nPos = pMember->Count() - 1;
if(nOldMemberCount > nPos &&
(pOldMember->GetObject(nPos))->IsInvisible()
@@ -796,7 +769,6 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
*/
}
}
- //
}
break;
case CONTENT_TYPE_DRAWOBJECT:
@@ -816,10 +788,8 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
for( sal_uInt32 i=0; i< nCount; i++ )
{
SdrObject* pTemp = pPage->GetObj(i);
- // --> OD 2006-03-09 #i51726# - all drawing objects can be named now
-// if(pTemp->ISA(SdrObjGroup) && pTemp->GetName().Len())
+ // #i51726# - all drawing objects can be named now
if ( pTemp->GetName().Len() )
- // <--
{
SwContact* pContact = (SwContact*)pTemp->GetUserCall();
long nYPos = 0;
@@ -1017,7 +987,6 @@ sal_Int8 SwContentTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
return bIsInDrag ? DND_ACTION_NONE : GetParentWindow()->ExecuteDrop(rEvt);
}
-
/***************************************************************************
Beschreibung: Handler fuer Dragging und ContextMenu
***************************************************************************/
@@ -1172,14 +1141,6 @@ PopupMenu* SwContentTree::CreateContextMenu( void )
pSubPop4->InsertItem(600, sPostItShow );
pSubPop4->InsertItem(601, sPostItHide );
pSubPop4->InsertItem(602, sPostItDelete );
- /*
- pSubPop4->InsertItem(603,rtl::OUString::createFromAscii("Sort"));
- PopupMenu* pMenuSort = new PopupMenu;
- pMenuSort->InsertItem(604,rtl::OUString::createFromAscii("By Position"));
- pMenuSort->InsertItem(605,rtl::OUString::createFromAscii("By Author"));
- pMenuSort->InsertItem(606,rtl::OUString::createFromAscii("By Date"));
- pSubPop4->SetPopupMenu(603, pMenuSort);
- */
pPop->InsertItem(4, pType->GetSingleName());
pPop->SetPopupMenu(4, pSubPop4);
}
@@ -1383,7 +1344,6 @@ sal_Bool SwContentTree::Collapse( SvLBoxEntry* pParent )
bRet = SvTreeListBox::Collapse(pParent);
}
else
-// bRet = sal_False;
bRet = SvTreeListBox::Collapse(pParent);
return bRet;
}
@@ -1484,7 +1444,6 @@ void SwContentTree::Display( sal_Bool bActive )
if(!*ppContentT)
(*ppContentT) = new SwContentType(pShell, nCntType, nOutlineLevel );
-
String sEntry = (*ppContentT)->GetName();
SvLBoxEntry* pEntry;
const Image& rImage = aEntryImages.GetImage(SID_SW_START + nCntType);
@@ -1651,7 +1610,7 @@ sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
OSL_ENSURE(nPos < pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount(),
"outlinecnt changed");
- // #100738# make sure outline may actually be copied
+ // make sure outline may actually be copied
if( pWrtShell->IsOutlineCopyable( nPos ) )
{
const SwNumRule* pOutlRule = pWrtShell->GetOutlineNumRule();
@@ -1686,7 +1645,7 @@ sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
break;
case CONTENT_TYPE_URLFIELD:
sUrl = ((SwURLFieldContent*)pCnt)->GetURL();
- // kein break;
+ // no break;
case CONTENT_TYPE_OLE:
case CONTENT_TYPE_GRAPHIC:
if(GetParentWindow()->GetRegionDropMode() != REGION_MODE_NONE)
@@ -2035,8 +1994,6 @@ void SwContentTree::FindActiveTypeAndRemoveUserData()
if(pEntry->GetUserData() && lcl_IsContentType(pEntry))
nLastSelType = ((SwContentType*)pEntry->GetUserData())->GetType();
}
-// else
-// nLastSelType = USHRT_MAX;
pEntry = First();
while(pEntry)
{
@@ -2385,7 +2342,7 @@ sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget,
aActiveContentArr[CONTENT_TYPE_OUTLINE]->Invalidate();
Display(sal_True);
}
- //TreeListBox wird aus dem Dokument neu geladen
+ //TreeListBox will be reloaed from the document
return sal_False;
}
@@ -2416,7 +2373,6 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget,
}
-
OSL_ENSURE( pEntry &&
lcl_IsContent(pEntry),"Source == 0 or Source has no Content" );
GetParentWindow()->MoveOutline( nSourcePos, nTargetPos, sal_False);
@@ -2707,7 +2663,7 @@ void SwContentTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry )
break;
}
//Anzeige
- default: // nSelectedPopupEntry > 300
+ default:
if(nSelectedPopupEntry > 300 && nSelectedPopupEntry < 400)
{
nSelectedPopupEntry -= 300;
@@ -2949,15 +2905,6 @@ void SwContentTree::EditEntry(SvLBoxEntry* pEntry, sal_uInt8 nMode)
pActiveShell->GetView().GetPostItMgr()->SetActiveSidebarWin(0);
pActiveShell->DelRight();
}
- /*
- // this code can be used once we want redline comments in the margin
- else
- {
- SwMarginWin* pComment =
pActiveShell->GetView().GetPostItMgr()->GetPostIt(((SwPostItContent*)pCnt)->GetRedline());
- if (pComment)
- pComment->Delete();
- }
- */
}
else
{
@@ -3127,10 +3074,8 @@ void SwContentTree::GotoContent(SwContent* pCnt)
for( sal_uInt32 i=0; i< nCount; i++ )
{
SdrObject* pTemp = pPage->GetObj(i);
- // --> OD 2006-03-09 #i51726# - all drawing objects can be named now
-// if(pTemp->ISA(SdrObjGroup) && pTemp->GetName() == pCnt->GetName())
+ // #i51726# - all drawing objects can be named now
if ( pTemp->GetName() == pCnt->GetName() )
- // <--
{
SdrPageView* pPV = pDrawView->GetSdrPageView();
if( pPV )
@@ -3154,9 +3099,7 @@ void SwContentTree::GotoContent(SwContent* pCnt)
rView.GetEditWin().GrabFocus();
}
-/*-----------------06.02.97 19.14-------------------
- Jetzt nochtdie passende text::Bookmark
---------------------------------------------------*/
+/* Jetzt nochtdie passende text::Bookmark */
NaviContentBookmark::NaviContentBookmark()
:
nDocSh(0),
@@ -3231,7 +3174,6 @@ void SwContentLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16
nFl
if(lcl_IsContent(pEntry) &&
((SwContent *)pEntry->GetUserData())->IsInvisible())
{
- //* pCont = (SwContent*)pEntry->GetUserData();
Font aOldFont( rDev.GetFont());
Font aFont(aOldFont);
Color aCol( COL_LIGHTGRAY );
@@ -3257,5 +3199,4 @@ void SwContentTree::DataChanged( const DataChangedEvent& rDCEvt )
SvTreeListBox::DataChanged( rDCEvt );
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index 90ab5f9..ee43c7c 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -78,8 +78,6 @@ using ::rtl::OUString;
// Kontextmenue fuer GlobalTree
#define CTX_INSERT_ANY_INDEX 10
-//#define CTX_INSERT_CNTIDX 11
-//#define CTX_INSERT_USRIDX 12
#define CTX_INSERT_FILE 11
#define CTX_INSERT_NEW_FILE 12
#define CTX_INSERT_TEXT 13
@@ -413,8 +411,6 @@ void SwGlobalTree::TbxMenuHdl(USHORT nTbxId, ToolBox* pBox)
pMenu->SetHelpId(i, aHelpForMenu[i] );
}
pMenu->EnableItem(CTX_INSERT_ANY_INDEX, 0 != (nEnableFlags & ENABLE_INSERT_IDX ));
-// pMenu->EnableItem(CTX_INSERT_CNTIDX, 0 != (nEnableFlags & ENABLE_INSERT_IDX ));
-// pMenu->EnableItem(CTX_INSERT_USRIDX, 0 != (nEnableFlags & ENABLE_INSERT_IDX ));
pMenu->EnableItem(CTX_INSERT_TEXT, 0 != (nEnableFlags & ENABLE_INSERT_TEXT));
pMenu->EnableItem(CTX_INSERT_FILE, 0 != (nEnableFlags & ENABLE_INSERT_FILE));
pMenu->EnableItem(CTX_INSERT_NEW_FILE, 0 != (nEnableFlags & ENABLE_INSERT_FILE));
@@ -792,9 +788,7 @@ IMPL_LINK( SwGlobalTree, PopupHdl, Menu* , pMenu)
}
void SwGlobalTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry )
-//IMPL_LINK( SwGlobalTree, PopupHdl, Menu* , pMenu)
{
-// USHORT nId = pMenu->GetCurItemId();
SvLBoxEntry* pEntry = FirstSelected();
SwGlblDocContent* pCont = pEntry ? (SwGlblDocContent*)pEntry->GetUserData() : 0;
// wird waehrend des Dialogs ein RequestHelp gerufen,
@@ -889,8 +883,6 @@ void SwGlobalTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry )
}
break;
case CTX_INSERT_ANY_INDEX:
-// case CTX_INSERT_CNTIDX:
-// case CTX_INSERT_USRIDX:
{
if(pContCopy)
{
@@ -1024,7 +1016,6 @@ void SwGlobalTree::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry )
delete pContCopy;
else
bDeleteContentCopy = true;
-// return TRUE;
}
IMPL_LINK( SwGlobalTree, Timeout, Timer*, EMPTYARG )
diff --git a/sw/source/ui/utlui/prcntfld.cxx b/sw/source/ui/utlui/prcntfld.cxx
index 18a6ef6..5b7dfbb 100644
--- a/sw/source/ui/utlui/prcntfld.cxx
+++ b/sw/source/ui/utlui/prcntfld.cxx
@@ -31,8 +31,6 @@
#include "prcntfld.hxx"
-// STATIC DATA -----------------------------------------------------------
-
PercentField::PercentField( Window* pWin, const ResId& rResId ) :
MetricField ( pWin, rResId ),
@@ -84,7 +82,7 @@ void PercentField::ShowPercent(BOOL bPercent)
SetDecimalDigits( 0 );
nAktWidth = ConvertValue(nOldMin, 0, nOldDigits, eOldUnit, FUNIT_TWIP);
- // Um 0.5 Prozent aufrunden
+ // round to 0.5 percent
nPercent = ((nAktWidth * 10) / nRefValue + 5) / 10;
MetricField::SetMin(Max(static_cast< sal_Int64 >(1), nPercent));
@@ -101,7 +99,6 @@ void PercentField::ShowPercent(BOOL bPercent)
}
else
MetricFormatter::SetValue(nLastPercent);
-// SetValue(100, FUNIT_CUSTOM);
}
else
{
@@ -215,7 +212,6 @@ void PercentField::SetMax(sal_Int64 nNewMax, FieldUnit eInUnit)
{
if (eInUnit == FUNIT_NONE)
eInUnit = eOldUnit;
-// SetRefValue(Convert(nNewMax, eInUnit, FUNIT_TWIP));
}
}
@@ -297,7 +293,7 @@ sal_Int64 PercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit e
nAktWidth = nValue;
else
nAktWidth = ConvertValue(nValue, 0, nOldDigits, eInUnit, FUNIT_TWIP);
- // Um 0.5 Prozent runden
+ // Round to 0.5 percent
return ((nAktWidth * 1000) / nRefValue + 5) / 10;
}
diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx
index a61579e..f9dd3cf 100644
--- a/sw/source/ui/utlui/unotools.cxx
+++ b/sw/source/ui/utlui/unotools.cxx
@@ -97,7 +97,6 @@ SwOneExampleFrame::SwOneExampleFrame( Window& rWin,
// the controller is asynchronously set
aLoadedTimer.SetTimeoutHdl(LINK(this, SwOneExampleFrame, TimeoutHdl));
-// aLoadedTimer.SetTimeout(500);
aLoadedTimer.SetTimeout(200);
rWin.Enable(sal_False);
@@ -146,7 +145,6 @@ void SwOneExampleFrame::CreateControl()
uno::Reference< beans::XPropertySet > xPrSet(xInst, uno::UNO_QUERY);
uno::Any aURL;
- //
// create new doc
String sTempURL = C2S(cFactory);
if(sArgumentURL.Len())
--
1.7.1
Context
- [Libreoffice] Removal of some more bogus comments and commented code · Robert Roth
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.