diff options
| author | Robert Roth <robert.roth.off@gmail.com> | 2010-11-15 11:59:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-15 11:59:57 +0000 |
| commit | d67e79934fa19cd667c2455e5e95dd48df511179 (patch) | |
| tree | fad02748be4007f72432d57a8a40e2ae9f64d49c | |
| parent | 54d8e263fe5f44f408038d23997039f19c90e09c (diff) | |
Comment translations, bogus comments, commented code removed from SW includes
103 files changed, 200 insertions, 524 deletions
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx index 08ac070fd891..879eefe432e3 100644 --- a/sw/inc/IDocumentContentOperations.hxx +++ b/sw/inc/IDocumentContentOperations.hxx @@ -93,7 +93,7 @@ /** complete delete of a given PaM - OD 2009-08-20 #i100466# + #i100466# Add optional parameter <bForceJoinNext>, default value <false> Needed for hiding of deletion redlines */ diff --git a/sw/inc/IDocumentDrawModelAccess.hxx b/sw/inc/IDocumentDrawModelAccess.hxx index 9d247673ece2..36e1d354321d 100644 --- a/sw/inc/IDocumentDrawModelAccess.hxx +++ b/sw/inc/IDocumentDrawModelAccess.hxx @@ -54,13 +54,11 @@ public: virtual SdrLayerID GetInvisibleControlsId() const = 0; /** method to notify drawing page view about the invisible layers - OD 26.06.2003 #108784# @author OD */ virtual void NotifyInvisibleLayers( SdrPageView& _rSdrPageView ) = 0; /** method to determine, if a layer ID belongs to the visible ones. - OD 25.06.2003 #108784# Note: If given layer ID is unknown, method asserts and returns <false>. @author OD @@ -74,7 +72,6 @@ public: /** method to determine, if the corresponding visible layer ID for a invisible one. - OD 25.06.2003 #108784# Note: If given layer ID is a visible one, method returns given layer ID. Note: If given layer ID is unknown, method returns given layer ID. @@ -90,7 +87,6 @@ public: /** method to determine, if the corresponding invisible layer ID for a visible one. - OD 25.06.2003 #108784# Note: If given layer ID is a invisible one, method returns given layer ID. Note: If given layer ID is unknown, method returns given layer ID. diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx index d5b3ec4aa7f5..dd5801e97cad 100644 --- a/sw/inc/IDocumentFieldsAccess.hxx +++ b/sw/inc/IDocumentFieldsAccess.hxx @@ -82,7 +82,6 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } */ virtual void InsDeletedFldType(SwFieldType &) = 0; - // #111840# /** Puts a value into a field at a certain position. @@ -99,7 +98,6 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } // rufe das Update der Expression Felder auf; alle Ausdruecke werden // neu berechnet. - // #111840# /** Updates a field. diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx index 449316fa0729..d627cae9901d 100644 --- a/sw/inc/IDocumentLinksAdministration.hxx +++ b/sw/inc/IDocumentLinksAdministration.hxx @@ -56,7 +56,7 @@ namespace sfx2 { class SvLinkSource; class LinkManager; } */ virtual const sfx2::LinkManager& GetLinkManager() const = 0; - /** FME 2005-02-25 #i42634# Moved common code of SwReader::Read() and + /** #i42634# Moved common code of SwReader::Read() and SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks(): */ virtual void UpdateLinks(BOOL bUI) = 0; diff --git a/sw/inc/IDocumentListsAccess.hxx b/sw/inc/IDocumentListsAccess.hxx index b5f47031d9e3..7685a0bd6568 100644 --- a/sw/inc/IDocumentListsAccess.hxx +++ b/sw/inc/IDocumentListsAccess.hxx @@ -46,11 +46,9 @@ class IDocumentListsAccess virtual SwList* createListForListStyle( const String sListStyleName ) = 0; virtual SwList* getListForListStyle( const String sListStyleName ) const = 0; virtual void deleteListForListStyle( const String sListStyleName ) = 0; - // --> OD 2008-07-08 #i91400# + // #i91400# virtual void trackChangeOfListStyleName( const String sListStyleName, const String sNewListStyleName ) = 0; - // <-- - protected: virtual ~IDocumentListsAccess() {}; }; diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx index 2b120901f6ba..931c2266536d 100644 --- a/sw/inc/IDocumentSettingAccess.hxx +++ b/sw/inc/IDocumentSettingAccess.hxx @@ -77,9 +77,8 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd USE_OLD_PRINTER_METRICS, TABS_RELATIVE_TO_INDENT, PROTECT_FORM, - // --> OD 2008-06-05 #i89181# + // #i89181# TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, - // <-- INVERT_BORDER_SPACING, COLLAPSE_EMPTY_CELL_PARA, // COMPATIBILITY FLAGS END diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx index 45f33f58dc1b..4dcc0d2a0809 100644 --- a/sw/inc/IDocumentUndoRedo.hxx +++ b/sw/inc/IDocumentUndoRedo.hxx @@ -78,7 +78,7 @@ public: 0 letzte Aktion, sonst Aktionen bis zum Start der Klammerung nUndoId In rUndoRange wird der restaurierte Bereich gesetzt. */ - virtual bool Undo( SwUndoIter& ) = 0; // -> #111827# + virtual bool Undo( SwUndoIter& ) = 0; /** Opens undo block. @@ -109,7 +109,7 @@ public: */ virtual SwUndoId EndUndo( SwUndoId eUndoId, const SwRewriter * pRewriter) = 0; - /** <- #111827# + /** loescht die gesamten UndoObjecte ( fuer Methoden die am Nodes Array drehen ohne entsprechendes Undo !!) */ @@ -137,7 +137,7 @@ public: virtual SwUndo* RemoveLastUndo(SwUndoId eUndoId) = 0; - /** 2002-05-31 dvo, #95884#: To prevent an undo array overflow when + /** To prevent an undo array overflow when doing nested undos, undo may have to be disabled. Undo-intensive actions (like auto-format) should check this manually. */ diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 946492a3b794..2a3b6d956e13 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -169,7 +169,6 @@ class SwPostItMgr: public SfxListener typedef std::list<sw::sidebarwindows::SwSidebarWin*>::iterator SwSidebarWin_iterator; void AddPostIts(bool bCheckExistance = true,bool bFocus = true); - //void AddRedlineComments(bool bCheckExistance, bool bFocus); void RemoveSidebarWin(); void PreparePageContainer(); void Scroll(const long lScroll,const unsigned long aPage ); diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 7720c387b7ea..83389d6f0442 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -51,7 +51,6 @@ class SwEditWin; class SwView; class Edit; class MenuButton; -//class SwRedline; class SwFrm; @@ -239,36 +238,6 @@ class SwSidebarWin : public Window } } // eof namespace sw::sidebarwindows - -// implementation for change tracking comments, fully functional, but not yet used -/* -class SwRedComment : public SwSidebarWin -{ - private: - SwRedline* pRedline; - - protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - public: - SwRedComment( Window* pParent, WinBits nBits,SwPostItMgr* aMgr,SwPostItBits aBits,SwRedline* pRed); - virtual ~SwRedComment() {}; - - virtual void UpdateData(); - virtual void SetPostItText(); - virtual void Delete(); - virtual void GotoPos(); - virtual void SetPopup(); - virtual void ActivatePostIt(); - virtual void DeactivatePostIt(); - - virtual String GetAuthor(); - virtual Date GetDate(); - virtual Time GetTime(); - - virtual bool IsProtected(); -}; -*/ - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx index 69cf305cd0e0..e9ca0ea05871 100644 --- a/sw/inc/SwNodeNum.hxx +++ b/sw/inc/SwNodeNum.hxx @@ -39,10 +39,9 @@ class SwNumFmt; class SW_DLLPUBLIC SwNodeNum : public SwNumberTreeNode { public: - // --> OD 2008-02-19 #refactorlists# + explicit SwNodeNum( SwTxtNode* pTxtNode ); explicit SwNodeNum( SwNumRule* pNumRule ); - // <-- virtual ~SwNodeNum(); SwNumRule* GetNumRule() const; @@ -61,11 +60,8 @@ public: virtual SwNumberTree::tSwNumTreeNumber GetStartValue() const; -// String ToString() const; - SwPosition GetPosition() const; - // --> OD 2006-03-07 #131436# // The number tree root node is deleted, when the corresponding numbering // rule is deleted. In this situation the number tree should be empty - // still registered text nodes aren't allowed. But it is possible, that @@ -74,11 +70,10 @@ public: // Text nodes of the document nodes array aren't allowed to be registered // in this situation - this will be asserted. static void HandleNumberTreeRootNodeDelete( SwNodeNum& rNodeNum ); - // <-- /** determines the <SwNodeNum> instance, which is preceding the given text node - OD 2007-09-06 #i81002# + #i81002# @author OD */ @@ -87,24 +82,20 @@ public: protected: virtual SwNumberTreeNode * Create() const; - // --> OD 2006-04-26 #i64010# + // --> #i64010# virtual bool HasCountedChildren() const; virtual bool IsCountedForNumbering() const; // <-- - // --> OD 2008-02-19 #refactorlists# // method called before this tree node has been added to the list tree virtual void PreAdd(); // method called at a child after this child has been removed from the list tree virtual void PostRemove(); - // <-- private: SwTxtNode * mpTxtNode; SwNumRule * mpNumRule; - // --> OD 2006-03-07 #131436# static void _UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum ); - // <-- SwNodeNum( const SwNodeNum& ); // no copy constructor SwNodeNum& operator=( const SwNodeNum& ); // no assignment operator diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx index d06293ad82bb..cd184928726c 100644 --- a/sw/inc/SwSmartTagMgr.hxx +++ b/sw/inc/SwSmartTagMgr.hxx @@ -56,13 +56,6 @@ public: virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw(::com::sun::star::uno::RuntimeException); }; -/* -namespace SwSmartTagMgr -{ - SmartTagMgr& Get(); -} -*/ - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/SwUndoPageDesc.hxx b/sw/inc/SwUndoPageDesc.hxx index 4b52347198a7..29004b3941e0 100644 --- a/sw/inc/SwUndoPageDesc.hxx +++ b/sw/inc/SwUndoPageDesc.hxx @@ -58,12 +58,12 @@ public: class SwUndoPageDescCreate : public SwUndo { - const SwPageDesc * pDesc; // #116530# + const SwPageDesc * pDesc; SwPageDescExt aNew; SwDoc * pDoc; public: - SwUndoPageDescCreate(const SwPageDesc * pNew, SwDoc * pDoc); // #116530# + SwUndoPageDescCreate(const SwPageDesc * pNew, SwDoc * pDoc); virtual ~SwUndoPageDescCreate(); virtual void Undo(SwUndoIter & rIt); diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx index 7a9971f8f875..046786473813 100644 --- a/sw/inc/SwXMLSectionList.hxx +++ b/sw/inc/SwXMLSectionList.hxx @@ -45,7 +45,6 @@ protected: public: SvStrings & rSectionList; - // #110680# SwXMLSectionList( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, SvStrings & rNewSectionList ); diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx index f191cc7dd5bd..ae3a3b1592e3 100644 --- a/sw/inc/anchoreddrawobject.hxx +++ b/sw/inc/anchoreddrawobject.hxx @@ -98,7 +98,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject instance has to be set. Note: This adjustment is not be done for as-character anchored drawing object - the positioning code takes care of this. - OD 2004-07-29 #i31698# - API for drawing objects in Writer has + #i31698# - API for drawing objects in Writer has been adjusted. Thus, this method will only set the internal anchor position of the <SdrObject> instance to the anchor position given by its anchor frame. diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index d6242c6301f9..51bf23aee9b0 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -178,7 +178,7 @@ public: virtual String GetDescription() const; }; -// --- inlines ----------------------------------------------------------- +// inlines inline const String& SwAuthEntry::GetAuthorField(ToxAuthorityField ePos)const { DBG_ASSERT(AUTH_FIELD_END > ePos, "wrong index"); diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx index 2032300ea0dc..88f0c247f619 100644 --- a/sw/inc/bparr.hxx +++ b/sw/inc/bparr.hxx @@ -54,7 +54,7 @@ typedef BigPtrEntry* ElementPtr; typedef BOOL (*FnForEach)( const ElementPtr&, void* pArgs ); -// 1000 Eintr„ge pro Block = etwas weniger als 4K +// 1000 entries per Block = a bit less then 4K #define MAXENTRY 1000 diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index 86fded93098b..c5a4424473ef 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -65,7 +65,7 @@ class SW_DLLPUBLIC SwClient friend class SwModify; friend class SwClientIter; - SwClient *pLeft, *pRight; // fuer die AVL-Sortierung + SwClient *pLeft, *pRight; // for the AVL-Sorting BOOL bModifyLocked : 1; // wird in SwModify::Modify benutzt, // eigentlich ein Member des SwModify // aber aus Platzgruenden hier. @@ -102,7 +102,7 @@ public: BOOL IsInCache() const { return bInCache; } BOOL IsInSwFntCache() const { return bInSwFntCache; } - // erfrage vom Client Informationen + // get client Information virtual BOOL GetInfo( SfxPoolItem& ) const; private: @@ -144,7 +144,7 @@ public: const SwClient* GetDepends() const { return pRoot; } - // erfrage vom Client Informationen + // get client information virtual BOOL GetInfo( SfxPoolItem& ) const; void SetInDocDTOR() { bInDocDTOR = TRUE; } @@ -185,7 +185,7 @@ public: SwClient* GetToTell() { return pToTell; } virtual void Modify( SfxPoolItem *pOldValue, SfxPoolItem *pNewValue ); - // erfrage vom Client Informationen + // get Client information virtual BOOL GetInfo( SfxPoolItem & ) const; private: diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 36614e6725f5..c2b773dfd366 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -120,9 +120,9 @@ class SwSbxValue : public SbxValue { bool bVoid; public: - //JP 03.02.99: immer auf eine Zahl defaulten, damit auch gerechnet wird. - // Ansonsten wird daraus ein SbxEMPTY und damit ist nichts - // anzufangen. + // immer auf eine Zahl defaulten, damit auch gerechnet wird. + // Ansonsten wird daraus ein SbxEMPTY und damit ist nichts + // anzufangen. SwSbxValue( long n = 0 ) : bVoid(false) { PutLong( n ); } SwSbxValue( const double& rD ) : bVoid(false) { PutDouble( rD ); } SwSbxValue( const SwSbxValue& rVal ) : diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index 27aae1368c83..47b50104ad40 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -42,7 +42,7 @@ public: SwTblBoxNumFormat( UINT32 nFormat = NUMBERFORMAT_TEXT, BOOL bAuto = FALSE ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; @@ -65,7 +65,7 @@ class SwTblBoxFormula : public SfxPoolItem, public SwTableFormula public: SwTblBoxFormula( const String& rFormula ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; @@ -94,7 +94,7 @@ public: SwTblBoxValue(); SwTblBoxValue( const double aVal ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx index 3480af7cade8..4c6be89d1d50 100644 --- a/sw/inc/charatr.hxx +++ b/sw/inc/charatr.hxx @@ -114,7 +114,7 @@ inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( BOOL bInP ) const /****************************************************************************** * Implementierung der Charakter-Attribut Methoden vom SwFmt - * AMA: 12.10.94: Umstellung auf SvxItems. + * Umstellung auf SvxItems. ******************************************************************************/ inline const SvxPostureItem &SwFmt::GetPosture(BOOL bInP) const diff --git a/sw/inc/chcmprse.hxx b/sw/inc/chcmprse.hxx index 30e322eb99a1..1a1d79b7e10b 100644 --- a/sw/inc/chcmprse.hxx +++ b/sw/inc/chcmprse.hxx @@ -35,8 +35,4 @@ enum SwCharCompressType{ CHARCOMPRESS_NONE, #endif - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc index 7ac2f46660f1..1907545caf14 100644 --- a/sw/inc/chrdlg.hrc +++ b/sw/inc/chrdlg.hrc @@ -40,7 +40,7 @@ #define DLG_DRAWCHAR (RC_CHRDLG_BEGIN + 9) #define DLG_DRAWPARA (RC_CHRDLG_BEGIN + 10) -// Tabpages -> jetzt in globals.hrc +// Tabpages -> now in globals.hrc #define STR_TEXTCOLL_HEADER (RC_CHRDLG_BEGIN + 2) #define STR_PAGEFMT_HEADER (RC_CHRDLG_BEGIN + 4) diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc index 22a31a49cc69..8719e1639a3f 100644 --- a/sw/inc/comcore.hrc +++ b/sw/inc/comcore.hrc @@ -30,7 +30,7 @@ #include "rcid.hrc" // --------------- -// die Strings +// Strings // --------------- #define STR_COMCORE_READERROR (RC_COMCORE_BEGIN + 0) @@ -87,7 +87,7 @@ #define RID_GRAPHIC_REPLACEBMP_HC (RC_COMCORE_BEGIN + 48) #define RID_GRAPHIC_ERRORBMP_HC (RC_COMCORE_BEGIN + 49) -// defines fuer die Autoformat Redline Kommentare +// defines for the Autoformat Redline Comments #define STR_AUTOFMTREDL_DEL_EMPTY_PARA 0 #define STR_AUTOFMTREDL_USE_REPLACE 1 #define STR_AUTOFMTREDL_CPTL_STT_WORD 2 @@ -110,7 +110,7 @@ #define STR_AUTOFMTREDL_SET_NUMBULET 19 #define STR_AUTOFMTREDL_DEL_MORELINES 20 #define STR_AUTOFMTREDL_NON_BREAK_SPACE 21 -// !!!!!!!!!!!!!!!!!!!!!!!!!! das Ende immer richtig setzen !!!!!!!!!!!! +// !!!!!!!!!!!!!!!!!!!!!!!!!! alwats set the correct end !!!!!!!!!!!! #define STR_AUTOFMTREDL_END 22 diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx index e3710a39c7df..84f9c0ac147b 100644 --- a/sw/inc/crstate.hxx +++ b/sw/inc/crstate.hxx @@ -184,7 +184,7 @@ struct SwCrsrMoveState b2Lines( FALSE ), bNoScroll( FALSE ), bPosMatchesBounds( FALSE ), - bCntntCheck( FALSE ), // --> FME 2005-05-13 #i43742# <-- + bCntntCheck( FALSE ), // #i43742# bInFrontOfLabel( FALSE ), // #i27615# bInNumPortion(FALSE), // #i26726# nInNumPostionOffset(0) // #i26726# @@ -205,7 +205,7 @@ struct SwCrsrMoveState b2Lines( FALSE ), bNoScroll( FALSE ), bPosMatchesBounds( FALSE ), - bCntntCheck( FALSE ), // --> FME 2005-05-13 #i43742# <-- + bCntntCheck( FALSE ), // #i43742# bInFrontOfLabel( FALSE ), // #i27615# bInNumPortion(FALSE), // #i23726# nInNumPostionOffset(0) // #i23726# diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc index e7feeb92e69a..29b4327ab2ae 100644 --- a/sw/inc/dbui.hrc +++ b/sw/inc/dbui.hrc @@ -83,7 +83,7 @@ // Bitmaps ------------------------------------------------------------------ -// Elemente ----------------------------------------------------------------- +// Elements ----------------------------------------------------------------- #define TLB_DBLIST 1 #define BTN_OK 2 diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 091cde1fd98b..0b999bcfa86d 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -284,7 +284,6 @@ class SW_DLLPUBLIC SwDoc : //---------------- private Member -------------------------------- // ------------------------------------------------------------------- - // die Objecte SwNodes aNodes; // document content SwNodes aUndoNodes; // content for undo SwAttrPool* mpAttrPool; // attribute pool @@ -417,7 +416,7 @@ private: // ------------------------------------------------------------------- // other - sal_uInt16 nUndoPos; // akt. Undo-InsertPosition (fuers Redo!) + sal_uInt16 nUndoPos; // akt. Undo-InsertPosition (for Redo!) sal_uInt16 nUndoSavePos; // Position im Undo-Array, ab der das Doc // nicht als modifiziert gilt sal_uInt16 nUndoCnt; // Anzahl von Undo Aktionen @@ -683,7 +682,7 @@ private: // falls keine angegeben ist, nehme die Kapitelvorlage der 1. Ebene sal_Bool SplitDoc( sal_uInt16 eDocType, const String& rPath, const SwTxtFmtColl* pSplitColl ); - sal_Bool SplitDoc( sal_uInt16 eDocType, const String& rPath, int nOutlineLevel = 0 ); //#outline level,add by zhaijianwei. + sal_Bool SplitDoc( sal_uInt16 eDocType, const String& rPath, int nOutlineLevel = 0 ); // Charts der angegebenen Tabelle updaten void _UpdateCharts( const SwTable& rTbl, ViewShell& rVSh ) const; @@ -1048,7 +1047,7 @@ public: */ bool IsOLEPrtNotifyPending() const { return mbOLEPrtNotifyPending; } inline void SetOLEPrtNotifyPending( bool bSet = true ); - void PrtOLENotify( sal_Bool bAll ); //Alle oder nur Markierte + void PrtOLENotify( sal_Bool bAll ); //All or only marked #ifdef DBG_UTIL bool InXMLExport() const { return mbXMLExport; } @@ -1584,7 +1583,7 @@ public: // Bewegt selektierte Absaetze (nicht nur Numerierungen) // entsprechend des Offsets. (negativ: zum Doc-Anf.) sal_Bool MoveParagraph( const SwPaM&, long nOffset = 1, sal_Bool bIsOutlMv = sal_False ); - // No-/Numerierung ueber Delete/Backspace ein/abschalten #115901# + // No-/Numerierung ueber Delete/Backspace ein/abschalten sal_Bool NumOrNoNum( const SwNodeIndex& rIdx, sal_Bool bDel = sal_False); // Animation der Grafiken stoppen void StopNumRuleAnimations( OutputDevice* ); @@ -1841,10 +1840,10 @@ public: // falls keine angegeben ist, nehme die Kapitelvorlage der 1. Ebene sal_Bool GenerateGlobalDoc( const String& rPath, const SwTxtFmtColl* pSplitColl = 0 ); - sal_Bool GenerateGlobalDoc( const String& rPath, int nOutlineLevel = 0 ); //#outline level,add by zhaojianwei + sal_Bool GenerateGlobalDoc( const String& rPath, int nOutlineLevel = 0 ); sal_Bool GenerateHTMLDoc( const String& rPath, const SwTxtFmtColl* pSplitColl = 0 ); - sal_Bool GenerateHTMLDoc( const String& rPath, int nOutlineLevel = 0 ); //#outline level,add by zhaojianwei + sal_Bool GenerateHTMLDoc( const String& rPath, int nOutlineLevel = 0 ); // vergleiche zwei Dokument miteinander long CompareDoc( const SwDoc& rDoc ); diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index c7b0d4fde10f..cf902e76910b 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -110,21 +110,17 @@ public: BOOL IsPhysical() const { return bPhysical; } void SetPhysical(BOOL bPhys); - // --> OD 2008-02-11 #newlistlevelattrs# // add optional parameter <bResetIndentAttrsAtParagraphStyle>, default value FALSE, // which indicates that the indent attributes at a paragraph style should // be reset in case that a list style is applied to the paragraph style and // no indent attributes are applied. void SetItemSet( const SfxItemSet& rSet, const bool bResetIndentAttrsAtParagraphStyle = false ); - // <-- virtual SfxItemSet& GetItemSet(); - // --> OD 2008-02-12 #newlistlevelattrs# // new method for paragraph styles to merge indent attributes of applied list // style into the given item set, if the list style indent attributes are applicable. void MergeIndentAttrsOfListStyle( SfxItemSet& rSet ); - // <-- virtual const String& GetParent() const; virtual const String& GetFollow() const; diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index ca3707496435..2bc174fb47fe 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -184,7 +184,6 @@ public: virtual void SetPar2(const String& rStr); virtual USHORT GetSubType() const; - // virtual void SetSubType(USHORT nSub); // OM: entfernt, da unbenoetigt und gefaehrlich virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); @@ -398,7 +397,7 @@ public: virtual USHORT GetSubType() const; - // virtual void SetSubType(USHORT nSub); // OM: entfernt, da unbenoetigt und gefaehrlich + virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich ); }; diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx index f08dbcfdac6c..200ce214a1f6 100644 --- a/sw/inc/drawdoc.hxx +++ b/sw/inc/drawdoc.hxx @@ -54,10 +54,9 @@ public: virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const; protected: - // --> OD 2006-03-01 #b6382898# + // #b6382898# // overload of <SdrModel::createUnoModel()> is needed to provide corresponding uno model. virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel(); - // <-- }; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 787646081ed7..ce5e3a58473d 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -432,12 +432,10 @@ public: // setzt, wenn noch keine Numerierung, sonst wird geaendert // arbeitet mit alten und neuen Regeln, nur Differenzen aktualisieren - // --> OD 2008-02-08 #newlistlevelattrs# // Add optional parameter <bResetIndentAttrs> (default value FALSE). // If <bResetIndentAttrs> equals true, the indent attributes "before text" // and "first line indent" are additionally reset at the current selection, // if the list style makes use of the new list level attributes. - // --> OD 2008-03-17 #refactorlists# // introduce parameters <bCreateNewList> and <sContinuedListId> // <bCreateNewList> indicates, if a new list is created by applying the // given list style. @@ -447,7 +445,6 @@ public: const bool bCreateNewList /*= false*/, const String sContinuedListId = String(), const bool bResetIndentAttrs = false ); - // <-- // Absaetze ohne Numerierung, aber mit Einzuegen BOOL NoNum(); // Loeschen, Splitten der Aufzaehlungsliste @@ -457,28 +454,25 @@ public: // Hoch-/Runtermoven sowohl innerhalb als auch ausserhalb von Numerierungen BOOL MoveParagraph( long nOffset = 1); BOOL MoveNumParas( BOOL bUpperLower, BOOL bUpperLeft ); - // No-/Numerierung ueber Delete/Backspace ein/abschalten #115901# + // No-/Numerierung ueber Delete/Backspace ein/abschalten BOOL NumOrNoNum( BOOL bDelete = FALSE, BOOL bChkStart = TRUE); - // -> #i23726# - // --> OD 2008-06-09 #i90078# + // #i23726# + // #i90078# // Remove unused default parameter <nLevel> and <bRelative>. // Adjust method name and parameter name void ChangeIndentOfAllListLevels( short nDiff ); // Adjust method name void SetIndent(short nIndent, const SwPosition & rPos); - // <-- BOOL IsFirstOfNumRule() const; BOOL IsFirstOfNumRule(const SwPaM & rPaM) const; - // <- #i23726# BOOL IsNoNum( BOOL bChkStart = TRUE ) const; // returne den Num-Level des Nodes, in dem sich der Point vom // Cursor befindet. Return kann sein : // - NO_NUMBERING, 0..MAXLEVEL-1, NO_NUMLEVEL .. NO_NUMLEVEL|MAXLEVEL-1 - // --> OD 2008-02-29 #refactorlists# - removed <pHasChilds> -// BYTE GetNumLevel( BOOL* pHasChilds = 0 ) const; + BYTE GetNumLevel() const; - // <-- + // detect highest and lowest level to check moving of outline levels void GetCurrentOutlineLevels( sal_uInt8& rUpper, sal_uInt8& rLower ); @@ -486,10 +480,9 @@ public: // get Outline level of current paragraph int GetCurrentParaOutlineLevel( ) const;// #outlinelevel add by zhaojianwei - // -> i29560 + // i29560 BOOL HasNumber() const; BOOL HasBullet() const; - // <- i29560 String GetUniqueNumRuleName( const String* pChkStr = 0, BOOL bAutoNum = TRUE ) const; void ChgNumRuleFmts( const SwNumRule& rRule ); @@ -498,12 +491,11 @@ public: void SetNumRuleStart( BOOL bFlag = TRUE ); BOOL IsNumRuleStart() const; void SetNodeNumStart( USHORT nStt ); - // --> OD 2008-02-29 #refactorlists# + USHORT GetNodeNumStart() const; - // <-- + BOOL ReplaceNumRule( const String& rOldRule, const String& rNewRule ); // Searches for a text node with a numbering rule. - // --> OD 2008-03-18 #refactorlists# - add output parameter <sListId> // in case a list style is found, <sListId> holds the list id, to which the // text node belongs, which applies the found list style. const SwNumRule * SearchNumRule(const bool bForward, @@ -511,7 +503,6 @@ public: const bool bOutline, int nNonEmptyAllowed, String& sListId ); - // <-- // Undo // UndoHistory am Dokument pflegen @@ -582,10 +573,10 @@ public: * SwGrfNode zeigt (und Mark nicht gesetzt ist oder auf die * gleiche Graphic zeigt), sonst gibt's was auf die Finger */ - // --> OD 2005-02-09 #119353# - robust + const Graphic* GetGraphic( BOOL bWait = TRUE ) const; const GraphicObject* GetGraphicObj() const; - // <-- + BOOL IsGrfSwapOut( BOOL bOnlyLinked = FALSE ) const; USHORT GetGraphicType() const; @@ -616,16 +607,12 @@ public: const Graphic* pGraphic = 0, const GraphicObject* pGrafObj = 0 ); -// // alternativen Text einer Grafik/OLe-Objectes abfragen/setzen -// const String& GetAlternateText() const; -// void SetAlternateText( const String& rTxt ); - //eindeutige Identifikation des Objektes (fuer ImageMapDlg) void *GetIMapInventor() const; - // --> OD 2007-03-01 #i73788# + // #i73788# // remove default parameter, because method always called this default value Graphic GetIMapGraphic() const; //liefert eine Graphic fuer alle Flys! - // <-- + const SwFlyFrmFmt* FindFlyByName( const String& rName, BYTE nNdTyp = 0 ) const; //liefert ein ClientObject, wenn CurCrsr->Point() auf einen @@ -921,7 +908,6 @@ public: // von japanischen/chinesischen Zeichen) SwExtTextInput* CreateExtTextInput(LanguageType eInputLanguage); String DeleteExtTextInput( SwExtTextInput* pDel = 0, BOOL bInsText = TRUE); -// SwExtTextInput* GetExtTextInput() const; void SetExtTextInputData( const CommandExtTextInputData& ); // Schnistelle fuer den Zugriff auf die AutoComplete-Liste diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index 3f1bc140dae0..ef4c42f18d3f 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -61,7 +61,7 @@ public: TYPEINFO(); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 3e372bf5a744..7c0cdacf1e58 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -494,7 +494,7 @@ public: BOOL IsDrawCreate() const; void CreateDefaultShape( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, USHORT nSlotId); - // Funktionen f�r Rubberbox, um Draw-Objekte zu selektieren + // Functions for Rubberbox, ti select Draw-Objects BOOL BeginMark( const Point &rPos ); void MoveMark ( const Point &rPos ); BOOL EndMark (); @@ -506,7 +506,6 @@ public: void UnGroupSelection(); //Die Einzelobjekte sind Selektiert //Es koennen noch immer Gruppen dabei sein. - // OD 27.06.2003 #108784# - change return type. bool IsGroupAllowed() const; void MirrorSelection( BOOL bHorizontal ); //Bei FALSE Vertikal diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index ddb950b35ae2..8db24243b4e1 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -44,7 +44,7 @@ class Time; enum SwDateFormat { DF_BEGIN, - //neue Formate: + // new formats DFF_SSYS = DF_BEGIN, DFF_LSYS , DFF_DMY , @@ -63,7 +63,7 @@ enum SwDateFormat DFF_YMD , DFF_YYMD , DF_END , -// Kompatibilitaet: + // Compatibility DF_SSYS = DFF_SSYS, DF_LSYS = DFF_LSYS, DF_SHORT = DFF_DMY, @@ -114,7 +114,7 @@ public: class SW_DLLPUBLIC SwDateTimeField : public SwValueField { USHORT nSubType; - long nOffset; // Offset in Minuten + long nOffset; // Offset in Minutes public: SwDateTimeField(SwDateTimeFieldType* pType, USHORT nSubType = DATEFLD, diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index ab6cc9d91af1..6dc4f08f10e0 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -48,7 +48,7 @@ class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem RndStdIds nAnchorId; USHORT nPageNum; //Seitennummer bei Seitengeb. Rahmen. - // OD 2004-05-05 #i28701# - getting anchor positions ordered + // #i28701# - getting anchor positions ordered sal_uInt32 mnOrder; static sal_uInt32 mnOrderCounter; @@ -60,7 +60,7 @@ public: // Zuweisungsoperator SwFmtAnchor &operator=( const SwFmtAnchor& ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -75,7 +75,7 @@ public: RndStdIds GetAnchorId() const { return nAnchorId; } USHORT GetPageNum() const { return nPageNum; } const SwPosition *GetCntntAnchor() const { return pCntntAnchor; } - // OD 2004-05-05 #i28701# + // #i28701# sal_uInt32 GetOrder() const; void SetType( RndStdIds nRndId ) { nAnchorId = nRndId; } diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx index 9d8775f6f121..ba97935d3c92 100644 --- a/sw/inc/fmtclbl.hxx +++ b/sw/inc/fmtclbl.hxx @@ -40,7 +40,7 @@ public: SwFmtNoBalancedColumns( BOOL bFlag = FALSE ) : SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {} - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; }; diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 7c9115794f0f..4eb70e3fe58e 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -106,7 +106,7 @@ public: SwFmtCol& operator=( const SwFmtCol& ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index ef5fbf6e4970..acfe46844cf3 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -51,7 +51,7 @@ public: inline SwFmtChain &operator=( const SwFmtChain& ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index a6a09a223ed0..07163c955b1a 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -48,7 +48,7 @@ public: SwFmtCntnt( const SwFmtCntnt &rCpy ); ~SwFmtCntnt(); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index e6f9ba70fa43..10357a0fa96e 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -65,8 +65,8 @@ class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl bool mbStayAssignedToListLevelOfOutlineStyle; protected: - //BYTE nOutlineLevel; //<-#outline level, removed by zhaojianwei - bool mbAssignedToOutlineStyle;//<-#outline level added by zhaojianwei + + bool mbAssignedToOutlineStyle; SwTxtFmtColl *pNextTxtFmtColl; diff --git a/sw/inc/fmtcolfunc.hxx b/sw/inc/fmtcolfunc.hxx index 87dec890101a..296a45c79791 100644 --- a/sw/inc/fmtcolfunc.hxx +++ b/sw/inc/fmtcolfunc.hxx @@ -38,7 +38,7 @@ namespace TxtFmtCollFunc /** Checks, if assignment of paragraph style to list level of outline style has to be deleted, and deletes the assignment, if needed. - OD 2006-11-22 #i71574# + #i71574# The assignment of a paragraph style to a list level of the outline style has to be deleted, if the numbering rule, which is set at the paragraph style isn't the outline style. @@ -51,8 +51,6 @@ namespace TxtFmtCollFunc /** determines the list style, which directly set at the given paragraph style - OD 2008-03-04 #refactorlists# - @author OD @param rTxtFmtColl @@ -65,7 +63,6 @@ namespace TxtFmtCollFunc /** adds the given paragraph style at the directly set list style - OD 2008-03-04 #refactorlists# Note: If the given paragraph style has no directly set list style, nothing happens @param rTxtFmtColl @@ -77,7 +74,6 @@ namespace TxtFmtCollFunc /** removes te given paragraph style from the directly set list style - OD 2008-03-04 #refactorlists# Note: If the given paragraph style has no directly set list style, nothing happens @param rTxtFmtColl diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index c8ba2f4538a8..5880557e0704 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -42,7 +42,7 @@ public: SwFmtEditInReadonly( USHORT nId = RES_EDIT_IN_READONLY, BOOL bPrt = FALSE ) : SfxBoolItem( nId, bPrt ) {} - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methos" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx index f40452edf101..fd8921650d2f 100644 --- a/sw/inc/fmtflcnt.hxx +++ b/sw/inc/fmtflcnt.hxx @@ -40,12 +40,12 @@ class SwFmtFlyCnt : public SfxPoolItem friend class SwTxtFlyCnt; SwTxtFlyCnt* pTxtAttr; // mein TextAttribut SwFrmFmt* pFmt; // mein Fly/DrawFrame-Format - // geschuetzter CopyCtor + // protected CopyCtor SwFmtFlyCnt& operator=(const SwFmtFlyCnt& rFlyCnt); public: SwFmtFlyCnt( SwFrmFmt *pFrmFmt ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; @@ -57,7 +57,6 @@ public: const SwTxtFlyCnt *GetTxtFlyCnt() const { return pTxtAttr; } SwTxtFlyCnt *GetTxtFlyCnt() { return pTxtAttr; } - // OD 27.06.2003 #108784# bool Sw3ioExportAllowed() const; }; diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 991a12d27aa5..33ebafb5068d 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -50,7 +50,7 @@ class SW_DLLPUBLIC SwFmtFld : public SfxPoolItem, public SwClient, public SfxBro SwFmtFld(); // das default-Attibut - // geschuetzter CopyCtor + // protected CopyCtor // @@@ copy construction allowed, but copy assignment is not? @@@ SwFmtFld& operator=(const SwFmtFld& rFld); @@ -65,7 +65,7 @@ public: virtual ~SwFmtFld(); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; @@ -75,7 +75,6 @@ public: const SwField *GetFld() const { return pField; } SwField *GetFld() { return pField; } - // #111840# /** Sets current field. diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index fa7cb6ee84ab..ab0bc99a46b0 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -44,7 +44,7 @@ public: TYPEINFO(); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx index 7e97e669f614..4410dbc83dff 100644 --- a/sw/inc/fmtfordr.hxx +++ b/sw/inc/fmtfordr.hxx @@ -50,7 +50,7 @@ public: SwFmtFillOrder( SwFillOrder = ATT_TOP_DOWN ); inline SwFmtFillOrder &operator=( const SwFmtFillOrder &rCpy ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual USHORT GetValueCount() const; diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index 7af1d51f4ff0..660f33dc7fb7 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -73,7 +73,7 @@ public: SwTwips nWidth = 0, SwTwips nHeight = 0 ); SwFmtFrmSize& operator=( const SwFmtFrmSize& rCpy ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx index a1d8f3692e55..85f9ca390ca6 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -40,12 +40,12 @@ class SwTxtFtn; class SW_DLLPUBLIC SwFmtFtn: public SfxPoolItem { friend class SwTxtFtn; - SwTxtFtn* pTxtAttr; //mein TextAttribut - String aNumber; //Benutzerdefinierte 'Nummer' - USHORT nNumber; //Automatische Nummerierung + SwTxtFtn* pTxtAttr; //my TextAttribute + String aNumber; //user-defined 'Number' + USHORT nNumber; //automatic numbering bool m_bEndNote; // is it an End note? - // geschuetzter CopyCtor + // protected CopyCtor SwFmtFtn& operator=(const SwFmtFtn& rFtn); SwFmtFtn( const SwFmtFtn& ); @@ -53,7 +53,7 @@ public: SwFmtFtn( bool bEndNote = false ); virtual ~SwFmtFtn(); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index 1059c43bd316..3ae0cedfcf5f 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -37,8 +37,8 @@ class SwFrmFmt; class IntlWrapper; -//Kopfzeile, fuer Seitenformate -//Client von FrmFmt das den Header beschreibt. +//Header, for PageFormats +//Client of FrmFmt discribing the header. class SW_DLLPUBLIC SwFmtHeader: public SfxPoolItem, public SwClient { @@ -53,7 +53,7 @@ public: TYPEINFO(); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -69,8 +69,8 @@ public: void SetActive( BOOL bNew = TRUE ) { bActive = bNew; } }; -//Fusszeile, fuer Seitenformate -//Client von FrmFmt das den Footer beschreibt. +//Footer, for pageformats +//Client of FrmFmt describing the footer class SW_DLLPUBLIC SwFmtFooter: public SfxPoolItem, public SwClient { @@ -85,7 +85,7 @@ public: TYPEINFO(); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index 17ded9853de4..332c0e0961ad 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -43,13 +43,13 @@ class SW_DLLPUBLIC SwFmtINetFmt: public SfxPoolItem { friend class SwTxtINetFmt; - String aURL; // die URL + String aURL; // URL String aTargetFrame; // in diesen Frame soll die URL String aINetFmt; String aVisitedFmt; - String aName; // Name des Links + String aName; // name of the link SvxMacroTableDtor* pMacroTbl; - SwTxtINetFmt* pTxtAttr; // mein TextAttribut + SwTxtINetFmt* pTxtAttr; // my TextAttribute USHORT nINetId; USHORT nVisitedId; public: @@ -60,7 +60,7 @@ public: TYPEINFO(); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -97,11 +97,11 @@ public: USHORT GetVisitedFmtId() const { return nVisitedId; } void SetVisitedFmtId( USHORT nNew ) { nVisitedId = nNew; } - // setze eine neue oder loesche die akt. MakroTabelle + // set a new MacroTable or clear the current one void SetMacroTbl( const SvxMacroTableDtor* pTbl = 0 ); const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTbl; } - // setze / erfrage ein Makro + // Macro getter and setter void SetMacro( USHORT nEvent, const SvxMacro& rMacro ); const SvxMacro* GetMacro( USHORT nEvent ) const; }; diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index cdd0c349f629..4c3658bc9468 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -47,7 +47,7 @@ public: TYPEINFO(); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx index b700cc3a8046..99126a0ba2eb 100644 --- a/sw/inc/fmtlsplt.hxx +++ b/sw/inc/fmtlsplt.hxx @@ -40,7 +40,7 @@ class SW_DLLPUBLIC SwFmtLayoutSplit : public SfxBoolItem public: SwFmtLayoutSplit( BOOL bSplit = TRUE ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {} - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index 58351442b4f3..c7cdc895b70a 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -53,7 +53,7 @@ public: sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA ); inline SwFmtVertOrient &operator=( const SwFmtVertOrient &rCpy ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -73,7 +73,7 @@ public: void SetPos( SwTwips nNew ) { nYPos = nNew; } }; -//SwFmtHoriOrient, wie und woran orientiert -- +// SwFmtHoriOrient, wie und woran orientiert -- // sich der FlyFrm in der Hoizontalen ---------- #define IVER_HORIORIENT_TOGGLE ((USHORT)0x0001) @@ -91,7 +91,7 @@ public: sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA, BOOL bPos = FALSE ); inline SwFmtHoriOrient &operator=( const SwFmtHoriOrient &rCpy ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 5ed51fd6817d..505aa3b2b0fd 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -65,7 +65,7 @@ public: TYPEINFO(); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx index 4682c51bd46f..1eb7232d82da 100644 --- a/sw/inc/fmtrfmrk.hxx +++ b/sw/inc/fmtrfmrk.hxx @@ -41,7 +41,7 @@ class SwFmtRefMark : public SfxPoolItem friend class SwTxtRefMark; SwTxtRefMark* pTxtAttr; // mein TextAttribut - // geschuetzter CopyCtor + // protected CopyCtor SwFmtRefMark& operator=(const SwFmtRefMark& rRefMark); String aRefName; @@ -50,7 +50,7 @@ public: SwFmtRefMark( const SwFmtRefMark& rRefMark ); ~SwFmtRefMark( ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx index 6b01ba4777aa..3ac1b2a2e527 100644 --- a/sw/inc/fmtrowsplt.hxx +++ b/sw/inc/fmtrowsplt.hxx @@ -40,7 +40,7 @@ class SW_DLLPUBLIC SwFmtRowSplit : public SfxBoolItem public: SwFmtRowSplit( BOOL bSplit = TRUE ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {} - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index 1e30ad697938..81f0de4907ed 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -52,7 +52,7 @@ public: SwFmtRuby& operator=( const SwFmtRuby& rAttr ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index f9661580e5b5..17bb84a43782 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -41,8 +41,8 @@ class IntlWrapper; class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem { String sTargetFrameName; // in diesen Frame soll die URL - String sURL; //Einfache URL - String sName; // Name des Anchors + String sURL; // simple URL + String sName; // Name of the anchor ImageMap *pMap; //ClientSide Images BOOL bIsServerMap; //mit der URL eine ServerSideImageMap @@ -57,7 +57,7 @@ public: virtual ~SwFmtURL(); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -70,7 +70,7 @@ public: void SetTargetFrameName( const String& rStr ) { sTargetFrameName = rStr; } void SetURL( const String &rURL, BOOL bServerMap ); - void SetMap( const ImageMap *pM ); //Pointer wird kopiert! + void SetMap( const ImageMap *pM ); //Pointer will be copied const String &GetTargetFrameName()const { return sTargetFrameName; } const String &GetURL() const { return sURL; } diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index d7b0a1176961..e7e0bc22eb58 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -41,11 +41,10 @@ private: public: TYPEINFO(); - // --> OD 2004-10-18 #i35017# - constant name has changed + // #i35017# - constant name has changed SwFmtWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition = com::sun::star::text::WrapInfluenceOnPosition::ONCE_CONCURRENT ); - // <-- SwFmtWrapInfluenceOnObjPos( const SwFmtWrapInfluenceOnObjPos& _rCpy ); ~SwFmtWrapInfluenceOnObjPos(); @@ -62,11 +61,10 @@ public: // direct accessors to data void SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition ); - // --> OD 2004-10-18 #i35017# - add parameter <_bIterativeAsOnceConcurrent> + // #i35017# - add parameter <_bIterativeAsOnceConcurrent> // to control, if value <ITERATIVE> has to be treated as <ONCE_CONCURRENT> sal_Int16 GetWrapInfluenceOnObjPos( const bool _bIterativeAsOnceConcurrent = false ) const; - // <-- }; inline const SwFmtWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(BOOL bInP) const diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index a875ec21e017..ef5c8da16bfa 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -298,7 +298,7 @@ public: inline const SwTblBoxFormula &GetTblBoxFormula( BOOL = TRUE ) const; inline const SwTblBoxValue &GetTblBoxValue( BOOL = TRUE ) const; - /** SwFmt::IsBackgroundTransparent - for feature #99657# + /** SwFmt::IsBackgroundTransparent Virtual method to determine, if background of format is transparent. Default implementation returns false. Thus, subclasses have to overload @@ -310,7 +310,7 @@ public: */ virtual sal_Bool IsBackgroundTransparent() const; - /** SwFmt::IsShadowTransparent - for feature #99657# + /** SwFmt::IsShadowTransparent Virtual method to determine, if shadow of format is transparent. Default implementation returns false. Thus, subclasses have to overload diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 4b928c5345ce..84e8265ee5ab 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -186,7 +186,7 @@ public: void SetObjDescription( const String& rDescription, bool bBroadcast = false ); - /** SwFlyFrmFmt::IsBackgroundTransparent - for #99657# + /** SwFlyFrmFmt::IsBackgroundTransparent overloading virtual method and its default implementation, because format of fly frame provides transparent backgrounds. @@ -199,7 +199,7 @@ public: */ virtual sal_Bool IsBackgroundTransparent() const; - /** SwFlyFrmFmt::IsBackgroundBrushInherited - for #103898# + /** SwFlyFrmFmt::IsBackgroundBrushInherited method to determine, if the brush for drawing the background is "inherited" from its parent/grandparent. diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 89d3f156f149..e22b31da6965 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -64,10 +64,10 @@ public: bGrfToggle( rMirrorGrf.IsGrfToggle() ) {} - // pure virtual-Methoden von SfxPoolItem + // pure virtual methods of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - // pure virtual-Methiden von SfxEnumItem + // pure virtual methods of SfxEnumItem virtual USHORT GetValueCount() const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -105,7 +105,7 @@ public: SwCropGrf( sal_Int32 nLeft, sal_Int32 nRight, sal_Int32 nTop, sal_Int32 nBottom ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; }; @@ -120,7 +120,7 @@ public: : SfxUInt16Item( RES_GRFATR_ROTATION, nVal ), aUnrotatedSize( rSz ) {} - // pure virtual-Methiden from SfxInt16Item + // pure virtual methods from SfxInt16Item virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -144,7 +144,7 @@ public: : SfxInt16Item( RES_GRFATR_LUMINANCE, nVal ) {} - // pure virtual-Methiden from SfxInt16Item + // pure virtual methods from SfxInt16Item virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -160,7 +160,7 @@ public: : SfxInt16Item( RES_GRFATR_CONTRAST, nVal ) {} - // pure virtual-Methiden from SfxInt16Item + // pure virtual methods from SfxInt16Item virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -177,7 +177,7 @@ protected: {} public: - // pure virtual-Methiden from SfxInt16Item + // pure virtual methods from SfxInt16Item virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -228,7 +228,7 @@ public: return *this; } - // pure virtual-Methiden von SfxEnumItem + // pure virtual methods from SfxEnumItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -254,7 +254,7 @@ public: : SfxBoolItem( RES_GRFATR_INVERT, bVal ) {} - // pure virtual-Methiden from SfxInt16Item + // pure virtual methods from SfxInt16Item virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -270,7 +270,7 @@ public: : SfxByteItem( RES_GRFATR_TRANSPARENCY, nVal ) {} - // pure virtual-Methiden from SfxInt16Item + // pure virtual methods from SfxInt16Item virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -290,10 +290,10 @@ public: : SfxEnumItem( RES_GRFATR_DRAWMODE, nMode ) {} - // pure virtual-Methoden von SfxPoolItem + // pure virtual methods of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - // pure virtual-Methiden von SfxEnumItem + // pure virtual methods of SfxEnumItem virtual USHORT GetValueCount() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 049abfa1afd3..3eb2c7ada8e9 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -220,7 +220,7 @@ #define HID_MULTI_TOX_DLG (HID_BASE + 305) #define HID_ASCII_FILTER (HID_BASE + 306) #define HID_GLBLTREE_EDIT_LINK (HID_BASE + 307) -#define HID_FORMAT_NAME_OBJECT_NAME (HID_BASE + 308)// #100286# +#define HID_FORMAT_NAME_OBJECT_NAME (HID_BASE + 308) #define HID_REFSELECTION_TOOLTIP (HID_BASE + 309) // #i83479# diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx index 77b4b0abc6dd..6dd5efbde153 100644 --- a/sw/inc/hfspacingitem.hxx +++ b/sw/inc/hfspacingitem.hxx @@ -41,7 +41,7 @@ public: SwHeaderAndFooterEatSpacingItem( USHORT nId = RES_HEADER_FOOTER_EAT_SPACING, BOOL bPrt = FALSE ) : SfxBoolItem( nId, bPrt ) {} - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx index bd7b8f386270..af0b83b148c4 100644 --- a/sw/inc/hintids.hxx +++ b/sw/inc/hintids.hxx @@ -28,7 +28,7 @@ #ifndef _HINTIDS_HXX #define _HINTIDS_HXX -#include <tools/solar.h> // fuer __FAR_DATA +#include <tools/solar.h> // for __FAR_DATA #include <sal/types.h> // for sal_Unicode #include "swdllapi.h" @@ -45,7 +45,7 @@ #define CH_TXT_ATR_FORMELEMENT ((sal_Unicode)0x06) /* - * Hier kommen erst mal die enums fuer die Hints + * Enums for the hints */ #define HINT_BEGIN 1 @@ -101,7 +101,7 @@ RES_CHRATR_BEGIN = HINT_BEGIN, RES_CHRATR_END }; -// diese Attribute stehen nur im SwpAttr-Array vom TextNode +// this Attribute used only in a TextNodes SwpAttr-Array enum RES_TXTATR { RES_TXTATR_BEGIN = RES_CHRATR_END, @@ -135,7 +135,7 @@ RES_TXTATR_WITHEND_BEGIN = RES_TXTATR_BEGIN , RES_TXTATR_DUMMY5, // 50 RES_TXTATR_WITHEND_END, -// alle TextAttribute ohne ein Ende +// all TextAttributes without an end RES_TXTATR_NOEND_BEGIN = RES_TXTATR_WITHEND_END, RES_TXTATR_FIELD = RES_TXTATR_NOEND_BEGIN, // 51 RES_TXTATR_FLYCNT, // 52 @@ -274,7 +274,7 @@ RES_UNKNOWNATR_END -// ID-s fuer die Formate +// Format IDs enum RES_FMT { RES_FMT_BEGIN = RES_UNKNOWNATR_END, @@ -288,7 +288,7 @@ RES_FMT_BEGIN = RES_UNKNOWNATR_END, RES_FMT_END }; -// die ID's fuer Messages in den Formaten +// ID's for Messages in the Formats enum RES_MSG { RES_MSG_BEGIN = RES_FMT_END, @@ -438,38 +438,38 @@ SW_DLLPUBLIC const SfxPoolItem* GetDfltAttr( USHORT nWhich ); SW_DLLPUBLIC USHORT GetWhichOfScript( USHORT nWhich, USHORT nScript ); -// return for the given TextAttribut without an end the correct character. +// return for the given TextAttribute without an end the correct character. // This function returns -// CH_TXTATR_BREAKWORD for Textattribut which breaks a word (default) -// CH_TXTATR_INWORD for Textattribut which dont breaks a word +// CH_TXTATR_BREAKWORD for Textattribute which breaks a word (default) +// CH_TXTATR_INWORD for Textattribute which dont breaks a word class SwTxtAttr; sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr ); -// alle Sets stehen im init.cxx +// all Sets defined in init.cxx -// AttrSet-Range fuer die 3 Break-Attribute +// AttrSet-Range for the 3 Break-Attribute extern USHORT __FAR_DATA aBreakSetRange[]; -// AttrSet-Range fuer die TxtFmtColl +// AttrSet-Range for TxtFmtColl extern USHORT __FAR_DATA aTxtFmtCollSetRange[]; -// AttrSet-Range fuer die GrfFmtColl +// AttrSet-Range for GrfFmtColl extern USHORT __FAR_DATA aGrfFmtCollSetRange[]; -// AttrSet-Range fuer die TextNode +// AttrSet-Range for TextNode SW_DLLPUBLIC extern USHORT __FAR_DATA aTxtNodeSetRange[]; -// AttrSet-Range fuer die NoTxtNode +// AttrSet-Range for NoTxtNode extern USHORT __FAR_DATA aNoTxtNodeSetRange[]; -// AttrSet-Range fuer die SwTable +// AttrSet-Range for SwTable extern USHORT __FAR_DATA aTableSetRange[]; -// AttrSet-Range fuer die SwTableLine +// AttrSet-Range for SwTableLine extern USHORT __FAR_DATA aTableLineSetRange[]; -// AttrSet-Range fuer die SwTableBox +// AttrSet-Range for SwTableBox extern USHORT __FAR_DATA aTableBoxSetRange[]; -// AttrSet-Range fuer die SwFrmFmt +// AttrSet-Range for SwFrmFmt SW_DLLPUBLIC extern USHORT __FAR_DATA aFrmFmtSetRange[]; -// AttrSet-Range fuer die SwCharFmt +// AttrSet-Range for SwCharFmt extern USHORT __FAR_DATA aCharFmtSetRange[]; -// AttrSet-Range fuer die character autostyles +// AttrSet-Range for the autostyles extern USHORT __FAR_DATA aCharAutoFmtSetRange[]; -// AttrSet-Range fuer die SwPageDescFmt +// AttrSet-Range for SwPageDescFmt extern USHORT __FAR_DATA aPgFrmFmtSetRange[]; // check if ID is InRange of AttrSet-Ids diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index aaedccd9be9b..58a5aeec2663 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -34,7 +34,7 @@ #include <editeng/svxenum.hxx> #include "swtypes.hxx" -#include "node.hxx" // Fuer SwStartNode +#include "node.hxx" // For SwStartNode class SwTableBox; diff --git a/sw/inc/io.hxx b/sw/inc/io.hxx index 7db22fc9de19..2a2cc76eed61 100644 --- a/sw/inc/io.hxx +++ b/sw/inc/io.hxx @@ -46,25 +46,6 @@ #include <vcl/keycod.hxx> #include <tools/stream.hxx> -/*$ -class BinaryFile { - int fd; -public: - enum IO_OpenMode { - BF_READ = O_RDONLY, - BF_WRITE = O_RDWR, - BF_CREATE = O_CREAT, - BF_TRUNC = O_TRUNC - }; - // ctor oeffnet File im BinearMode, dtor schliesst es - BinaryFile(const String &, int eOpenMode); - ~BinaryFile(); - BOOL Ok() const { - return -1 != fd; - } - operator int() const { return fd; } -}; -*/ class SwIOin { private: diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx index 1fbf9b82262c..2fbe4ff1cda8 100644 --- a/sw/inc/iodetect.hxx +++ b/sw/inc/iodetect.hxx @@ -118,7 +118,6 @@ public: static bool IsDetectableText( const sal_Char* pBuf, ULONG &rLen, CharSet *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0, bool bEncodedFilter = false ); - // static bool IsDetectableW4W(const String& rFileName, const String& rUserData); static const SfxFilter* GetTextFilter( const sal_Char* pBuf, ULONG nLen ); diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 918336f2aea3..ac142f37c7d5 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -41,7 +41,6 @@ #include <tools/globname.hxx> class SwModuleOptions; -//----------------------------------------------------------------------------- class InsCaptionOpt; typedef InsCaptionOpt* InsCaptionOptPtr; SV_DECL_PTRARR_SORT_DEL(InsCapOptArr, InsCaptionOptPtr, 0, 5) @@ -89,10 +88,7 @@ class SwInsertConfig : public utl::ConfigItem sal_Bool bInsWithCaption; //Insert/Caption/Automatic // Objekte beschriftet einfuegen sal_Bool bCaptionOrderNumberingFirst; //#i61007# caption order starting with numbering -// sal_uInt16 nInsTblFlags; //Insert/Table/Header // Flags fuer Tabellen einfuegen - //Insert/Table/RepeatHeader - //Insert/Table/Split - //Insert/Table/Border + SwInsertTableOptions aInsTblOpts; sal_Bool bIsWeb; @@ -160,9 +156,6 @@ class SwMiscConfig : public utl::ConfigItem void SetModified(){ConfigItem::SetModified();} }; -/* --------------------------------------------------------------------------- - - ---------------------------------------------------------------------------*/ class SW_DLLPUBLIC SwModuleOptions { SwRevisionConfig aRevisionConfig; diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 684e8bd05f49..ba462e514670 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -93,7 +93,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode // embedded graphic stream couldn't be inside a 3.1 - 5.2 storage any more. // Thus, return value isn't needed any more. void _GetStreamStorageNames( String& rStrmName, String& rStgName ) const; - // <-- + void DelStreamName(); DECL_LINK( SwapGraphic, GraphicObject* ); diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index ef9adde86338..37c0723f1e7e 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -147,9 +147,9 @@ public: void CheckFileLink_Impl(); - // --> OD 2009-03-05 #i99665# + // #i99665# bool IsChart() const; - // <-- + #ifndef _FESHVIEW_ONLY_INLINE_NEEDED const String& GetChartTblName() const { return sChartTblName; } diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index bce04be69709..39b5ed6990a8 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -98,7 +98,6 @@ class SW_DLLPUBLIC SwNode : private /* public*/ BigPtrEntry BYTE nNodeType; - // JP 28.03.96 // fuer Textnodes: Stufungslevel der Autoformatierung. Ist erstmal hier // gelandet, weil noch Bits frei sind BYTE nAFmtNumLvl : 3; @@ -369,9 +368,6 @@ private: // -------------------- class SW_DLLPUBLIC SwCntntNode: public SwModify, public SwNode, public SwIndexReg { - // Der Reader darf NewAttrSet() aufrufen! -// friend class SwSwgReader; -// friend class Sw3IoImp; //FEATURE::CONDCOLL SwDepend* pCondColl; @@ -447,7 +443,7 @@ public: virtual xub_StrLen Len() const; virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0; - // erfrage vom Client Informationen + // erfrage vom Client Informationen virtual BOOL GetInfo( SfxPoolItem& ) const; // SS fuer die PoolItems: (Harte-(Fmt)Attrbutierung) @@ -461,7 +457,6 @@ public: virtual BOOL ResetAttr( USHORT nWhich1, USHORT nWhich2 = 0 ); virtual BOOL ResetAttr( const SvUShorts& rWhichArr ); virtual USHORT ResetAllAttr(); - // <-- // liefert das Attribut, das nicht ueber die bedingte Vorlage kommt! const SfxPoolItem* GetNoCondAttr( USHORT nWhich, BOOL bInParents ) const; @@ -492,7 +487,6 @@ public: // position. Return -1, if text direction could *not* be determined. short GetTextDirection( const SwPosition& rPos, const Point* pPt ) const; - // <-- inline void SetModifyAtAttr( bool bSetModifyAtAttr ) const { mbSetModifyAtAttr = bSetModifyAtAttr; } inline bool GetModifyAtAttr() const { return mbSetModifyAtAttr; } diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index 173e299a6f00..15630e958db1 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -255,39 +255,31 @@ inline void SwPageDesc::ChgHeaderShare( BOOL bNew ) { if ( bNew ) eUse = (UseOnPage) (eUse | nsUseOnPage::PD_HEADERSHARE); - // (USHORT&)eUse |= (USHORT)nsUseOnPage::PD_HEADERSHARE; else eUse = (UseOnPage) (eUse & nsUseOnPage::PD_NOHEADERSHARE); - // (USHORT&)eUse &= (USHORT)nsUseOnPage::PD_NOHEADERSHARE; } inline void SwPageDesc::ChgFooterShare( BOOL bNew ) { if ( bNew ) eUse = (UseOnPage) (eUse | nsUseOnPage::PD_FOOTERSHARE); - // (USHORT&)eUse |= (USHORT)nsUseOnPage::PD_FOOTERSHARE; else eUse = (UseOnPage) (eUse & nsUseOnPage::PD_NOFOOTERSHARE); - // (USHORT&)eUse &= (USHORT)nsUseOnPage::PD_NOFOOTERSHARE; } inline void SwPageDesc::SetUseOn( UseOnPage eNew ) { UseOnPage eTmp = nsUseOnPage::PD_NONE; if ( eUse & nsUseOnPage::PD_HEADERSHARE ) eTmp = nsUseOnPage::PD_HEADERSHARE; - // (USHORT&)eTmp |= (USHORT)nsUseOnPage::PD_HEADERSHARE; if ( eUse & nsUseOnPage::PD_FOOTERSHARE ) eTmp = (UseOnPage) (eTmp | nsUseOnPage::PD_FOOTERSHARE); - // (USHORT&)eTmp |= (USHORT)nsUseOnPage::PD_FOOTERSHARE; eUse = (UseOnPage) (eTmp | eNew); - // (USHORT&)eUse = eTmp | eNew; + } inline UseOnPage SwPageDesc::GetUseOn() const { UseOnPage eRet = eUse; eRet = (UseOnPage) (eRet & nsUseOnPage::PD_NOHEADERSHARE); - // (USHORT&)eRet &= (USHORT)nsUseOnPage::PD_NOHEADERSHARE; eRet = (UseOnPage) (eRet & nsUseOnPage::PD_NOFOOTERSHARE); - // (USHORT&)eRet &= (USHORT)nsUseOnPage::PD_NOFOOTERSHARE; return eRet; } diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx index f936ab878fda..200ad618279d 100644 --- a/sw/inc/pagepreviewlayout.hxx +++ b/sw/inc/pagepreviewlayout.hxx @@ -20,8 +20,6 @@ struct PrevwPage; // ============================================================================= /** page preview functionality in the writer - OD 11.12.2002 #103492# - class <SwPagePreviewLayout> - @author OD */ class SwPagePreviewLayout @@ -55,8 +53,7 @@ private: sal_uInt16 mnCols; sal_uInt16 mnRows; sal_uInt16 mnPages; - // OD 19.02.2003 #107369# - new flag for leaving blank left-top-corner - // OD 2004-03-05 #i18143# - the book preview is controlled by this flag + // #i18143# - the book preview is controlled by this flag bool mbBookPreview; bool mbBookPreviewModeToggled; @@ -81,7 +78,7 @@ private: std::vector<PrevwPage*> maPrevwPages; - // OD 07.11.2003 #i22014# - internal booleans to indicate, that a new print + // #i22014# - internal booleans to indicate, that a new print // preview layout has been created during a paint. mutable bool mbInPaint; mutable bool mbNewLayoutDuringPaint; @@ -90,40 +87,30 @@ private: /** clear internal data about current page preview - OD 11.12.2002 #103492# - @author OD */ void _Clear(); /** helper method to clear preview page layout sizes - OD 18.12.2002 #103492# - @author OD */ void _ClearPrevwLayoutSizes(); /** helper method to clear data in preview page vectors - OD 13.12.2002 #103492# - @author OD */ void _ClearPrevwPageData(); /** calculate page preview layout sizes - OD 18.12.2002 #103492# - @author OD */ void _CalcPrevwLayoutSizes(); /** apply new zoom at given view shell - OD 11.12.2002 #103492# - @author OD @param _aNewZoom @@ -133,7 +120,6 @@ private: /** calculate additional paint offset - OD 12.12.2002 #103492# helper method called by <Prepare> in order to calculate an additional paint offset to center output in given window size. The booleans <mbDoesLayoutRowsFitIntoWindow> and <mbDoesLayoutColsFitIntoWindow> @@ -150,7 +136,6 @@ private: /** calculate painted preview document rectangle - OD 12.12.2002 #103492# helper method called by <Prepare> in order to calculate the rectangle, which will be painted for the document arranged by the given preview layout. @@ -165,7 +150,6 @@ private: /** determines preview data for a given page and a given preview offset - OD 13.12.2002 #103492# @author OD @@ -189,7 +173,6 @@ private: /** calculate preview pages - OD 12.12.2002 #103492# helper method called by <Prepare> in order to determine which pages will be visible in the current preview and calculate the data needed to paint these pages. Also the accessible pages with its needed data @@ -201,8 +184,6 @@ private: /** get preview page by physical page number - OD 17.12.2002 #103492# - @author OD @param _nPageNum @@ -216,8 +197,6 @@ private: /** paint selection mark at page - OD 17.12.2002 #103492# - @author OD */ void _PaintSelectMarkAtPage( const PrevwPage* _aSelectedPrevwPage ) const; @@ -225,8 +204,6 @@ private: public: /** constructor of <SwPagePreviewLayout> - OD 11.12.2002 #103492# - @author OD @param _rParentViewShell @@ -247,8 +224,6 @@ public: /** destructor of <SwPagePreviewLayout> - OD 17.12.2002 #103492# - @author */ inline ~SwPagePreviewLayout() @@ -258,7 +233,6 @@ public: /** init page preview layout - OD 11.12.2002 #103492# initialize the page preview settings for a given layout. side effects: (1) If parameter <_bCalcScale> is true, mapping mode with calculated @@ -292,8 +266,6 @@ public: /** method to adjust page preview layout to document changes - OD 18.12.2002 #103492# - @author OD @return boolean, indicating, if preview layout is successful initialized. @@ -302,7 +274,6 @@ public: /** prepare paint of page preview - OD 12.12.2002 #103492# With the valid preview layout settings - calculated and set by method <Init(..)> - the paint of a specific part of the virtual preview document is prepared. The corresponding part is given by either @@ -310,7 +281,6 @@ public: (parameter <_aProposedStartPoint>). The accessibility preview will also be updated via a corresponding method call. - OD 21.03.2003 #108282# - delete parameter _onStartPageVirtNum @author OD @@ -351,8 +321,6 @@ public: /** get selected page number - OD 13.12.2002 #103492# - @author OD */ inline sal_uInt16 SelectedPage() @@ -362,8 +330,6 @@ public: /** set selected page number - OD 14.01.2003 #103492# - @author OD */ inline void SetSelectedPage( sal_uInt16 _nSelectedPageNum ) @@ -373,8 +339,6 @@ public: /** paint prepared preview - OD 12.12.2002 #103492# - @author OD @param _aOutRect @@ -386,7 +350,6 @@ public: /** repaint pages on page preview - OD 18.12.2002 #103492# method to invalidate visible pages due to changes in a different view shell. @@ -396,7 +359,6 @@ public: /** paint to mark new selected page - OD 17.12.2002 #103492# Perform paint for current selected page in order to unmark it. Set new selected page and perform paint to mark this page. @@ -409,7 +371,6 @@ public: /** calculate start position for new scale - OD 12.12.2002 #103492# calculate new start position for a new scale. Calculation bases on the current visible part of the document arranged in the given preview layout. preconditions: @@ -425,8 +386,6 @@ public: /** determines, if page with given page number is visible in preview - OD 12.12.2002 #103492# - @author OD @param _nPageNum @@ -440,8 +399,6 @@ public: /** calculate data to bring new selected page into view. - OD 12.12.2002 #103492# - @author OD @param _nHoriMove @@ -471,8 +428,6 @@ public: /** checks, if given position is inside a shown document page - OD 17.12.2002 #103492# - @author OD @param _aPrevwPos @@ -517,8 +472,6 @@ public: /** determine preview window page scroll amount - OD 17.12.2002 #103492# - @author OD @param _nWinPagesToScroll @@ -532,8 +485,6 @@ public: /** determine row the page with the given number is in - OD 17.01.2003 #103492# - @author OD @param _nPageNum @@ -546,8 +497,6 @@ public: /** determine column the page with the given number is in - OD 17.01.2003 #103492# - @author OD @param _nPageNum @@ -558,13 +507,10 @@ public: */ sal_uInt16 GetColOfPage( sal_uInt16 _nPageNum ) const; - // OD 18.12.2002 #103492# Size GetPrevwDocSize() const; /** get size of a preview page by its physical page number - OD 15.01.2003 #103492# - @author OD @param _nPageNum @@ -577,8 +523,6 @@ public: /** get virtual page number by its physical page number - OD 21.03.2003 #108282# - @author OD @param _nPageNum @@ -592,8 +536,6 @@ public: /** enable/disable book preview - OD 2004-03-04 #i18143# - @author OD */ bool SetBookPreviewMode( const bool _bEnableBookPreview, diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 79e3fa0dfdff..b9ff1d7665a0 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -66,7 +66,6 @@ struct SW_DLLPUBLIC SwPosition SwPosition( const SwPosition & ); SwPosition &operator=(const SwPosition &); - // #111827# /** Returns the document this position is in. diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 5355e440a6a3..42fda6e21315 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -72,7 +72,7 @@ private: SwFmtDrop & operator= (const SwFmtDrop &); public: - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -118,7 +118,7 @@ public: // @@@ public copy assignment, but no copy ctor? inline SwRegisterItem& operator=( const SwRegisterItem& rRegister ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -143,7 +143,6 @@ class SW_DLLPUBLIC SwNumRuleItem : public SfxStringItem public: TYPEINFO(); - // --> OD 2008-03-04 #refactorlists# - removed <pDefinedIn> SwNumRuleItem() : SfxStringItem( RES_PARATR_NUMRULE, aEmptyStr ) {} @@ -155,9 +154,8 @@ public: SwNumRuleItem& operator=( const SwNumRuleItem& rCpy ) { SetValue( rCpy.GetValue() ); return *this; } - // <-- - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -180,7 +178,7 @@ public: // @@@ public copy assignment, but no copy ctor? inline SwParaConnectBorderItem& operator=( const SwParaConnectBorderItem& rConnect ); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/sw/inc/pausethreadstarting.hxx b/sw/inc/pausethreadstarting.hxx index 62d2c91a33f3..55e9fd712cf2 100644 --- a/sw/inc/pausethreadstarting.hxx +++ b/sw/inc/pausethreadstarting.hxx @@ -31,7 +31,7 @@ /** Helper class to pause starting of threads during existence of an instance of this class - OD 2007-03-16 #i73788# + #i73788# @author OD */ diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx index 94553a44a48f..e235cf1ee504 100644 --- a/sw/inc/poolfmt.hxx +++ b/sw/inc/poolfmt.hxx @@ -91,7 +91,6 @@ const USHORT POOLGRP_CHARFMT = (0 << 11) + POOLGRP_NOCOLLID; const USHORT POOLGRP_FRAMEFMT = (1 << 11) + POOLGRP_NOCOLLID; const USHORT POOLGRP_PAGEDESC = (2 << 11) + POOLGRP_NOCOLLID; const USHORT POOLGRP_NUMRULE = (3 << 11) + POOLGRP_NOCOLLID; -//const USHORT POOLGRP_GRFFMT = (4 << 11) + POOLGRP_NOCOLLID; // ? // fuer Erkennung ob Benutzer-Vorlage oder nicht: const USHORT POOL_IDUSER_FMT = @@ -432,14 +431,6 @@ inline BOOL IsConditionalByPoolId(USHORT nId) { return RES_POOLCOLL_TEXT == nId; } -// die Id's fuer die Grafik-Formate -/*enum RES_POOL_GRFFMT_TYPE -{ -RES_POOLGRF_BEGIN = RES_POOLPAR_END, -RES_POOLGRF_1 = RES_POOLGRF_BEGIN, -RES_POOLGRF_END -}; -*/ #endif diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx index 2eaa37542688..9884a140b312 100644 --- a/sw/inc/postithelper.hxx +++ b/sw/inc/postithelper.hxx @@ -112,27 +112,6 @@ public: SwPostItMgr& aMgr, SwPostItBits aBits) = 0; }; -/* -class SwRedCommentItem: public SwSidebarItem -{ -private: - SwRedline* pRedline; -public: - - SwRedCommentItem( SwRedline* pRed, bool aShow, bool aFocus) - : SwSidebarItem(aShow,aFocus), - pRedline(pRed) {} - virtual ~SwRedCommentItem() {} - virtual SwPosition GetAnchorPosition() const; - virtual bool UseElement(); - virtual SwFmtFld* GetFmtFld() const {return 0; } - virtual SfxBroadcaster* GetBroadCaster() const { return dynamic_cast<SfxBroadcaster *> (pRedline); } - virtual sw::sidebarwindows::SwSidebarWin* GetSidebarWindow( SwEditWin& rEditWin, - WinBits nBits, - SwPostItMgr& aMgr, - SwPostItBits aBits); -}; -*/ class SwAnnotationItem: public SwSidebarItem { diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index f2170b0d4721..866ebc19534d 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -71,9 +71,9 @@ public: bPrintLeftPages, bPrintRightPages, bPrintReverse, bPrintProspect, bPrintProspectRTL, bPrintSingleJobs, bPaperFromSetup, - // --> FME 2005-12-13 #b6354161# Print empty pages + // #b6354161# Print empty pages bPrintEmptyPages, - // <-- + // #i56195# no field update while printing mail merge documents bUpdateFieldsInPrinting, bModified; @@ -207,7 +207,7 @@ public: bool IsPrintWithBlackTextColor() const { return getBoolValue( "PrintBlackFonts", m_rDefaultPrintData.bPrintBlackFont ); } sal_Int16 GetPrintPostItsType() const { return static_cast< sal_Int16 >(getIntValue( "PrintAnnotationMode", m_rDefaultPrintData.nPrintPostIts )); } bool IsPaperFromSetup() const { return getBoolValue( "PrintPaperFromSetup", m_rDefaultPrintData.bPaperFromSetup ); } - bool IsPrintReverse() const { return false; /*handled by print dialog now*/ /*getBoolValue( "PrintReversed", m_rDefaultPrintData.bPrintReverse );*/ } + bool IsPrintReverse() const { return false; /*handled by print dialog now*/ } bool IsPrintLeftPages() const; bool IsPrintRightPages() const; diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 2a3f088dfe61..39f3c62a2385 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -268,7 +268,6 @@ public: void PushData( const SwRedline& rRedl, BOOL bOwnAsNext = TRUE ); BOOL PopData(); - // #111827# /** Returns textual description of this a redline data element of this redline. diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index e82fbf2b87c1..6233dfb6372f 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -56,7 +56,7 @@ enum REFERENCEMARK REF_ONLYNUMBER, REF_ONLYCAPTION, REF_ONLYSEQNO, - // --> OD 2007-08-24 #i81002# + // --> #i81002# // new reference format types for referencing bookmarks and set references REF_NUMBER, REF_NUMBER_NO_CONTEXT, @@ -100,11 +100,11 @@ private: USHORT nSubType; USHORT nSeqNo; - // --> OD 2007-08-24 #i81002# + // #i81002# String MakeRefNumStr( const SwTxtNode& rTxtNodeOfField, const SwTxtNode& rTxtNodeOfReferencedItem, const sal_uInt32 nRefNumFormat ) const; - // <-- + public: SwGetRefField( SwGetRefFieldType*, const String& rSetRef, USHORT nSubType, USHORT nSeqNo, ULONG nFmt ); @@ -117,7 +117,7 @@ public: const String& GetSetRefName() const { return sSetRefName; } - // --> OD 2007-09-06 #i81002# + // #i81002# // The <SwTxtFld> instance, which represents the text attribute for the // <SwGetRefField> instance, has to be passed to the method. // This <SwTxtFld> instance is needed for the reference format type REF_UPDOWN @@ -125,21 +125,21 @@ public: // Note: This instance may be NULL (field in Undo/Redo). This will cause // no update for these reference format types. void UpdateField( const SwTxtFld* pFldTxtAttr ); - // <-- + void SetExpand( const String& rStr ) { sTxt = rStr; } // SubType erfragen/setzen virtual USHORT GetSubType() const; virtual void SetSubType( USHORT n ); - // --> OD 2007-11-09 #i81002# + // --> #i81002# bool IsRefToHeadingCrossRefBookmark() const; bool IsRefToNumItemCrossRefBookmark() const; const SwTxtNode* GetReferencedTxtNode() const; // <-- - // --> OD 2008-01-09 #i85090# + // #i85090# String GetExpandedTxtOfReferencedTxtNode() const; - // <-- + // SequenceNo erfragen/setzen (nur fuer REF_SEQUENCEFLD interressant) USHORT GetSeqNo() const { return nSeqNo; } diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 23c4ed535e75..e62735c0a2c3 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -65,12 +65,6 @@ enum SectionType { CONTENT_SECTION, TOX_CONTENT_SECTION, DDE_LINK_SECTION = OBJECT_CLIENT_DDE, FILE_LINK_SECTION = OBJECT_CLIENT_FILE -/* -// verbleiben noch: - OBJECT_CLIENT_SO = 0x80, - OBJECT_CLIENT_OLE = 0x82, - OBJECT_CLIENT_OLE_CACHE = 0x83, -*/ }; enum LinkCreateType @@ -88,7 +82,7 @@ private: String m_sSectionName; String m_sCondition; String m_sLinkFileName; - String m_sLinkFilePassword; // JP 27.02.2001: must be changed to Sequence + String m_sLinkFilePassword; // must be changed to Sequence ::com::sun::star::uno::Sequence <sal_Int8> m_Password; /// it seems this flag caches the current final "hidden" state @@ -98,9 +92,9 @@ private: /// format attr has value for this section, while flag is /// effectively ORed with parent sections! bool m_bProtectFlag : 1; - // --> FME 2004-06-22 #114856# edit in readonly sections + // edit in readonly sections bool m_bEditInReadonlyFlag : 1; - // <-- + bool m_bHidden : 1; // all paragraphs hidden? bool m_bCondHiddenFlag : 1; // Hiddenflag for condition bool m_bConnectFlag : 1; // connected to server? @@ -127,11 +121,9 @@ public: bool IsProtectFlag() const { return m_bProtectFlag; } SW_DLLPRIVATE void SetProtectFlag(bool const bFlag) { m_bProtectFlag = bFlag; } - // --> FME 2004-06-22 #114856# edit in readonly sections bool IsEditInReadonlyFlag() const { return m_bEditInReadonlyFlag; } void SetEditInReadonlyFlag(bool const bFlag) { m_bEditInReadonlyFlag = bFlag; } - // <-- void SetCondHidden(bool const bFlag = true) { m_bCondHiddenFlag = bFlag; }; bool IsCondHidden() const { return m_bCondHiddenFlag; } @@ -205,18 +197,14 @@ public: void SetHidden (bool const bFlag = true); bool IsProtect() const; void SetProtect(bool const bFlag = true); - // --> FME 2004-06-22 #114856# edit in readonly sections bool IsEditInReadonly() const; void SetEditInReadonly(bool const bFlag = true); - // <-- // erfrage die internen Flags (Zustand inklusive Parents nicht, was // aktuell an der Section gesetzt ist!!) bool IsHiddenFlag() const { return m_Data.IsHiddenFlag(); } bool IsProtectFlag() const { return m_Data.IsProtectFlag(); } - // --> FME 2004-06-22 #114856# edit in readonly sections bool IsEditInReadonlyFlag() const { return m_Data.IsEditInReadonlyFlag(); } - // <-- void SetCondHidden(bool const bFlag = true); bool IsCondHidden() const { return m_Data.IsCondHidden(); } @@ -275,9 +263,8 @@ public: // return the TOX base class if the section is a TOX section const SwTOXBase* GetTOXBase() const; - // --> OD 2007-02-14 #b6521322# + // #b6521322# void BreakLink(); - // <-- }; diff --git a/sw/inc/swdbtoolsclient.hxx b/sw/inc/swdbtoolsclient.hxx index ee4d59651f9f..11bdcee9dc58 100644 --- a/sw/inc/swdbtoolsclient.hxx +++ b/sw/inc/swdbtoolsclient.hxx @@ -33,9 +33,9 @@ #include <osl/module.h> #include "swdllapi.h" -/* -----------------------------30.08.2001 11:01------------------------------ +/* Client to use the dbtools library as load-on-call - ---------------------------------------------------------------------------*/ +*/ class SW_DLLPUBLIC SwDbtoolsClient { private: diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index 420a9d2d9aa5..6dcb67029666 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -269,9 +269,9 @@ inline void SwModule::SetLngSvcEvtListener( } -/*-----------------08.07.97 10.33------------------- +/* Zugriff auf das SwModule, die ::com::sun::star::sdbcx::View und die Shell ---------------------------------------------------*/ +*/ #define SW_MOD() ( *(SwModule**) GetAppData(SHL_WRITER)) diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 600d5cd3949c..fd73bdbb7d55 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -249,19 +249,17 @@ public: // lese die 1. Nummer und loesche sie aus dem String // (wird von GetTblBox und SwTblFld benutzt) - // --> OD 2007-08-03 #i80314# + // #i80314# // add 3rd parameter in order to control validation check on <rStr> static USHORT _GetBoxNum( String& rStr, BOOL bFirst = FALSE, const bool bPerformValidCheck = false ); - // <-- // suche die Inhaltstragende Box mit dem Namen - // --> OD 2007-08-03 #i80314# + // #i80314# // add 2nd parameter in order to control validation check in called method // <_GetBoxNum(..)> const SwTableBox* GetTblBox( const String& rName, const bool bPerformValidCheck = false ) const; - // <-- // kopiere die selektierten Boxen in ein anderes Dokument. BOOL MakeCopy( SwDoc*, const SwPosition&, const SwSelBoxes&, BOOL bCpyNds = TRUE, BOOL bCpyName = FALSE ) const; diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index ca97a55169ed..d911bad31b1d 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -41,8 +41,6 @@ #include <com/sun/star/uno/Reference.h> #include "swdllapi.h" #include <i18npool/lang.h> -// wenn das hier geaendert wird, dann auch im globals.hrc aendern!!! -//#define SW_FILEFORMAT_40 SOFFICE_FILEFORMAT_40 namespace com { namespace sun { namespace star { namespace linguistic2{ diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx index f8d00a182f81..ae89b213e222 100644 --- a/sw/inc/swundo.hxx +++ b/sw/inc/swundo.hxx @@ -77,10 +77,8 @@ enum SwUndoId UNDO_MERGE_TABLE, // 38 UNDO_TRANSLITERATE, // 39 - // -> #111827# - UNDO_PASTE_CLIPBOARD, // 40 + UNDO_PASTE_CLIPBOARD, // 40 UNDO_TYPING, // 41 - // <- #111827# UNDO_REPEAT_DUMMY_6, // 42 UNDO_REPEAT_DUMMY_7, // 43 UNDO_REPEAT_DUMMY_8, // 44 @@ -128,13 +126,13 @@ enum SwUndoId UNDO_SETFLYFRMFMT, // 84 UNDO_SETRUBYATTR, // 85 - UNDO_TMPAUTOCORR, // 86 #102505# + UNDO_TMPAUTOCORR, // 86 UNDO_TOXCHANGE, // 87 UNDO_CREATE_PAGEDESC, // 88 UNDO_CHANGE_PAGEDESC, // 89 UNDO_DELETE_PAGEDESC, // 90 UNDO_HEADER_FOOTER, // 91 #i7983# - UNDO_FIELD, // 92 #111840# + UNDO_FIELD, // 92 UNDO_TXTFMTCOL_CREATE, // 93 UNDO_TXTFMTCOL_DELETE, // 94 UNDO_TXTFMTCOL_RENAME, // 95 @@ -154,7 +152,7 @@ enum SwUndoId UNDO_ROW_DELETE, // 109 UNDO_RENAME_PAGEDESC, // 110 UNDO_NUMDOWN, // 111 - // --> OD 2009-07-16 #i73249# + // --> #i73249# UNDO_FLYFRMFMT_TITLE, // 112 UNDO_FLYFRMFMT_DESCRIPTION, // 113 // <-- diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index f391cb862d5a..58610145cb2c 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -30,7 +30,7 @@ /************************************************************************* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -JP 20.07.95: + Die akt. Struktur der Autoformatierung darf nicht mehr veraendert werden. Diese wird durch unterschiedlichen Code vom StartWriter und vom StarCalc @@ -247,7 +247,7 @@ public: BOOL Save( SvStream& rStream ) const; #ifdef READ_OLDVERS - // lade alte Version + // load old versions BOOL LoadOld( SvStream& rStream, USHORT aLoadVer[] ); #endif }; diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index a00aa747a9ff..8178cdc47746 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -56,7 +56,7 @@ public: SwTextGridItem(); virtual ~SwTextGridItem(); - // "pure virtual Methoden" vom SfxPoolItem + // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 4289039a7741..4206fcae582a 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -250,16 +250,6 @@ struct SW_DLLPUBLIC SwFormToken String GetString() const; }; -// -> #i21237# -/** - Functor that is true when a given token has a certain token type. - - @param _eType the type to check for - @param rToken the token to check - - @retval TRUE the token has the given type - @retval FALSE else -*/ struct SwFormTokenEqualToFormTokenType { FormTokenType eType; @@ -354,7 +344,6 @@ public: */ const SwFormTokens & GetTokens() const { return aTokens; } }; -// <- #i21237# class SW_DLLPUBLIC SwForm { @@ -467,7 +456,7 @@ namespace nsSwTOOElements const SwTOOElements TOO_OTHER = 0x80; } -#define TOX_STYLE_DELIMITER ((sal_Unicode)0x01) //JP 19.07.00: use a control char +#define TOX_STYLE_DELIMITER ((sal_Unicode)0x01) /*-------------------------------------------------------------------- Description: Class for all indexes diff --git a/sw/inc/unoatxt.hxx b/sw/inc/unoatxt.hxx index f85cb347cf56..929dc3529ea4 100644 --- a/sw/inc/unoatxt.hxx +++ b/sw/inc/unoatxt.hxx @@ -124,7 +124,7 @@ protected: virtual ~SwXAutoTextGroup(); // ref-counted objects are not to be deleted from outside -> protected dtor public: - SwXAutoTextGroup(const rtl::OUString& rName, SwGlossaries* pGloss/*SwTextBlocks* pGroup*/); + SwXAutoTextGroup(const rtl::OUString& rName, SwGlossaries* pGloss); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx index 6697692268f0..e49568b6256f 100644 --- a/sw/inc/unobaseclass.hxx +++ b/sw/inc/unobaseclass.hxx @@ -63,9 +63,9 @@ enum CursorType CURSOR_META, // meta/meta-field }; -/*-----------------04.03.98 11:54------------------- +/* Start/EndAction or Start/EndAllAction - -------------------------------------------------- */ +*/ class UnoActionContext { private: @@ -78,9 +78,9 @@ class UnoActionContext void InvalidateDocument() { m_pDoc = 0; } }; -/* -----------------07.07.98 12:03------------------- +/* interrupt Actions for a little while - -------------------------------------------------- */ +*/ class UnoActionRemoveContext { private: diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index 43980eac959c..006f78e7a3d3 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -81,9 +81,6 @@ class SwUnoCollection SwDoc* GetDoc() const {return pDoc;} }; -/****************************************************************************** - * - ******************************************************************************/ #define SW_SERVICE_TYPE_TEXTTABLE 0 #define SW_SERVICE_TYPE_TEXTFRAME 1 #define SW_SERVICE_TYPE_GRAPHIC 2 @@ -365,8 +362,6 @@ public: SwXTextFrames(SwDoc* pDoc); -// SMART_UNO_DECLARATION( SwXTextFrames, UsrObject ); - //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 ); @@ -381,9 +376,6 @@ protected: public: SwXTextGraphicObjects(SwDoc* pDoc); - -// SMART_UNO_DECLARATION( SwXTextGraphicObjects, UsrObject ); - //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 ); @@ -399,8 +391,6 @@ public: SwXTextEmbeddedObjects(SwDoc* pDoc); -// SMART_UNO_DECLARATION( SwXTextEmbeddedObjects, UsrObject ); - //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 ); diff --git a/sw/inc/unoevtlstnr.hxx b/sw/inc/unoevtlstnr.hxx index c66568dbee53..fb9387e40dcb 100644 --- a/sw/inc/unoevtlstnr.hxx +++ b/sw/inc/unoevtlstnr.hxx @@ -37,9 +37,9 @@ namespace com{namespace sun{namespace star{ class XEventListener; } }}} -/* -----------------22.04.99 11:18------------------- +/* * Verwaltung der EventListener - * --------------------------------------------------*/ + * */ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > * XEventListenerPtr; SV_DECL_PTRARR(SwEvtLstnrArray, XEventListenerPtr, 4, 4) diff --git a/sw/inc/unoidx.hxx b/sw/inc/unoidx.hxx index 8d5a5b7c52bb..a975cdac55a8 100644 --- a/sw/inc/unoidx.hxx +++ b/sw/inc/unoidx.hxx @@ -47,10 +47,6 @@ class SwTOXBaseSection; class SwTOXMark; class SwTOXType; -/* -----------------07.12.98 10:08------------------- - * - * --------------------------------------------------*/ - typedef ::cppu::ImplInheritanceHelper5 < ::sfx2::MetadatableMixin , ::com::sun::star::lang::XUnoTunnel @@ -191,9 +187,6 @@ public: }; -/* -----------------07.12.98 10:08------------------- - * - * --------------------------------------------------*/ typedef ::cppu::WeakImplHelper4 < ::com::sun::star::lang::XUnoTunnel , ::com::sun::star::lang::XServiceInfo @@ -319,9 +312,6 @@ public: }; -/* -----------------05.05.99 12:27------------------- - * - * --------------------------------------------------*/ class SwXDocumentIndexes : public SwCollectionBaseClass , public SwUnoCollection diff --git a/sw/inc/unomailmerge.hxx b/sw/inc/unomailmerge.hxx index 6539fcefec4c..cdfb12748a1a 100644 --- a/sw/inc/unomailmerge.hxx +++ b/sw/inc/unomailmerge.hxx @@ -106,7 +106,6 @@ class SwXMailMerge : cppu::OInterfaceContainerHelper aMergeListeners; OPropertyListenerContainerHelper aPropListeners; - //SfxItemPropertySet aPropSet; const SfxItemPropertySet* pPropSet; SfxObjectShellRef xDocSh; // the document diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx index 426b39e3331c..7e29591c91fb 100644 --- a/sw/inc/unomap.hxx +++ b/sw/inc/unomap.hxx @@ -189,7 +189,6 @@ #define WID_LEVEL_FORMAT 1021 #define WID_LEVEL_PARAGRAPH_STYLES 1022 #define WID_RECALC_TAB_STOPS 1023 -//#define WID_??? 1024 #define WID_MAIN_ENTRY_CHARACTER_STYLE_NAME 1025 #define WID_CREATE_FROM_TABLES 1026 #define WID_CREATE_FROM_TEXT_FRAMES 1027 @@ -316,9 +315,6 @@ #define WID_TXTCOL_IS_AUTOMATIC 5 #define WID_TXTCOL_AUTO_DISTANCE 6 -/* -----------------04.07.98 11:41------------------- - * - * --------------------------------------------------*/ class SwItemPropertySet : public SfxItemPropertySet { protected: @@ -327,9 +323,6 @@ public: SwItemPropertySet( const SfxItemPropertyMapEntry *pMap ) : SfxItemPropertySet( pMap ){} }; -/* -----------------04.07.98 11:41------------------- - * - * --------------------------------------------------*/ class SwUnoPropertyMapProvider { SfxItemPropertyMapEntry* aMapEntriesArr[PROPERTY_MAP_END]; diff --git a/sw/inc/unomod.hxx b/sw/inc/unomod.hxx index fade17c38db4..983e16908086 100644 --- a/sw/inc/unomod.hxx +++ b/sw/inc/unomod.hxx @@ -174,32 +174,6 @@ public: void Invalidate() {bObjectValid = sal_False;} }; -/*class SwXTerminateListener : public ::com::sun::star::frame::XTerminateListener, - public UsrObject -{ -public: - SwXTerminateListener(); - virtual ~SwXTerminateListener(); - - SMART_UNO_DECLARATION( SwXTerminateListener, UsrObject ); - - virtual UString getClassName(); -// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen! -// virtual ::com::sun::star::uno::XInterface * queryInterface( ::com::sun::star::uno::Uik aUik); - -// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen! -// virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void); - - - //XTerminateListener - virtual void queryTermination(const ::com::sun::star::lang::EventObject& aEvent); - virtual void notifyTermination(const ::com::sun::star::lang::EventObject& aEvent); - - //XEventListener - virtual void disposing(const ::com::sun::star::lang::EventObject& Source); -}; - -*/ #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/unoparaframeenum.hxx b/sw/inc/unoparaframeenum.hxx index a4905542545b..686f00f6e5be 100644 --- a/sw/inc/unoparaframeenum.hxx +++ b/sw/inc/unoparaframeenum.hxx @@ -66,7 +66,7 @@ typedef ::std::deque< ::boost::shared_ptr<SwDepend> > FrameDependList_t; -// OD 2004-05-07 #i28701# - adjust 4th parameter +// #i28701# - adjust 4th parameter void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx, FrameDependSortList_t & rFrames, const bool _bAtCharAnchoredObjs ); diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx index 629de6e54fb7..95e47ae29755 100644 --- a/sw/inc/unoparagraph.hxx +++ b/sw/inc/unoparagraph.hxx @@ -58,9 +58,6 @@ class SwTable; class SwXText; -/*-----------------07.04.98 08:15------------------- - ---------------------------------------------------*/ typedef ::cppu::ImplInheritanceHelper10 < ::sfx2::MetadatableMixin , ::com::sun::star::lang::XUnoTunnel @@ -317,9 +314,6 @@ public: }; -/*-----------------07.04.98 08:10------------------- - ---------------------------------------------------*/ class SwXParagraphEnumeration : public SwSimpleEnumeration_Base { diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx index 410bff43b829..b059647d5f8d 100644 --- a/sw/inc/unoredline.hxx +++ b/sw/inc/unoredline.hxx @@ -68,9 +68,7 @@ public: virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); }; -/* --------------------------------------------------------------------------- - ---------------------------------------------------------------------------*/ class SwXRedlinePortion : public SwXTextPortion { const SwRedline* pRedline; diff --git a/sw/inc/unosection.hxx b/sw/inc/unosection.hxx index 4cf88ce54773..d1447b0750d9 100644 --- a/sw/inc/unosection.hxx +++ b/sw/inc/unosection.hxx @@ -48,10 +48,6 @@ class SwSectionFmt; -/*-----------------09.03.98 13:57------------------- - ---------------------------------------------------*/ - struct SwTextSectionProperties_Impl; diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx index b1d17b187f88..5e1543acfcde 100644 --- a/sw/inc/unotext.hxx +++ b/sw/inc/unotext.hxx @@ -55,9 +55,6 @@ class OTextCursorHelper; class SwXTextRange; -/* -----------------03.12.98 12:22------------------- - * - * --------------------------------------------------*/ class SwXText : public ::com::sun::star::lang::XTypeProvider |