[Libreoffice-commits] .: starmath/inc starmath/source sw/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Oct 18 04:56:32 PDT 2010
starmath/inc/applicat.hxx | 23 +------
starmath/inc/document.hxx | 2
starmath/inc/node.hxx | 14 +---
starmath/inc/rect.hxx | 3
starmath/inc/symbol.hxx | 5 +
starmath/inc/toolbox.hxx | 1
starmath/inc/types.hxx | 2
starmath/source/symbol.cxx | 2
starmath/source/symbol.src | 11 +--
starmath/source/utility.cxx | 2
starmath/source/view.cxx | 6 -
sw/source/core/doc/doc.cxx | 37 +++++++----
sw/source/core/doc/docdraw.cxx | 14 +---
sw/source/core/doc/doclay.cxx | 10 ---
sw/source/core/doc/docnum.cxx | 129 ++++------------------------------------
sw/source/core/doc/lineinfo.cxx | 2
sw/source/core/inc/docsort.hxx | 1
sw/source/core/inc/visiturl.hxx | 7 --
sw/source/core/inc/wrong.hxx | 4 -
sw/source/ui/app/app.src | 2
sw/source/ui/app/error.src | 1
sw/source/ui/app/mn.src | 2
22 files changed, 77 insertions(+), 203 deletions(-)
New commits:
commit f00c3862356491374e4fd10531fa869728993d95
Author: Júlio Hoffimann <julio.hoffimann at gmail.com>
Date: Mon Oct 18 12:55:43 2010 +0100
comments cleanup
diff --git a/starmath/inc/applicat.hxx b/starmath/inc/applicat.hxx
index a7f9cc9..e232906 100644
--- a/starmath/inc/applicat.hxx
+++ b/starmath/inc/applicat.hxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-
#ifndef APPLICAT_HXX
#define APPLICAT_HXX
@@ -34,23 +33,10 @@ class SvxErrorHandler;
#include <sfx2/app.hxx>
-/**************************************************************************/
-/*
-**
-** MACRO DEFINITION
-**
-**/
-
-#define SMDLL 1
-#define APPLICATIONNAME "smath3"
+#define SMDLL 1
+#define APPLICATIONNAME "smath3"
-/**************************************************************************/
-/*
-**
-** CLASS DEFINITION
-**
-**/
#ifdef WIN
#define RELEASE "WIN304"
@@ -89,10 +75,10 @@ class SmApplicat: public SfxApplication
protected:
SvxErrorHandler *pSvxErrorHandler;
- virtual void OpenClients();
+ virtual void OpenClients();
// initialization / deinitialization
- virtual void Init();
+ virtual void Init();
virtual void Exit();
public:
@@ -106,6 +92,7 @@ public:
};
#endif
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 8fe5084..c9896d4 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef DOCUMENT_HXX
#define DOCUMENT_HXX
@@ -222,7 +223,6 @@ public:
virtual void SetModified(BOOL bModified);
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 212cfab..8c8213b 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -26,11 +26,9 @@
*
************************************************************************/
-
#ifndef NODE_HXX
#define NODE_HXX
-
#include <vector>
#include "parse.hxx"
@@ -88,16 +86,14 @@ enum SmNodeType
class SmNode : public SmRect
{
- SmFace aFace;
+ SmFace aFace;
- SmToken aNodeToken;
+ SmToken aNodeToken;
SmNodeType eType;
SmScaleMode eScaleMode;
RectHorAlign eRectHorAlign;
- USHORT nFlags,
- nAttributes;
- BOOL bIsPhantom,
- bIsDebug;
+ USHORT nFlags, nAttributes;
+ BOOL bIsPhantom, bIsDebug;
protected:
SmNode(SmNodeType eNodeType, const SmToken &rNodeToken);
@@ -272,7 +268,7 @@ public:
using SmRect::Draw;
#endif
virtual void Draw(OutputDevice &rDev, const Point &rPosition) const;
-
+
void CreateTextFromNode(String &rText);
};
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index 6ff3ded..16a61ea 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -31,7 +31,6 @@
#include <new>
-
#include <tools/gen.hxx>
#include <vcl/outdev.hxx>
#include <vcl/metric.hxx>
@@ -256,8 +255,6 @@ inline Rectangle SmRect::AsRectangle() const
return Rectangle(Point(GetItalicLeft(), GetTop()), GetItalicSize());
}
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 83bd37f..148f31a 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef SYMBOL_HXX
#define SYMBOL_HXX
@@ -47,7 +48,7 @@
#include "smmod.hxx"
-#define SYMBOLSET_NONE 0xFFFF
+#define SYMBOLSET_NONE 0xFFFF
#define SYMBOL_NONE 0xFFFF
@@ -79,6 +80,7 @@ inline const String GetUiSymbolSetName( const String &rExportSymbolSetName )
class SmSym
{
+private:
SmFace m_aFace;
String m_aName;
String m_aExportName;
@@ -148,6 +150,7 @@ struct lt_SmSymPtr : public std::binary_function< const SmSym *, const SmSym *,
class SmSymbolManager : public SfxListener
{
+private:
SymbolMap_t m_aSymbols;
bool m_bModified;
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
index 8c67b81..9a418e5 100644
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef TOOLBOX_HXX
#define TOOLBOX_HXX
diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index 7d3ef86..833c88c 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef TYPES_HXX
#define TYPES_HXX
@@ -200,7 +201,6 @@ enum MathSymbol
MS_SETC = (sal_Unicode) 0x2102
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index 976d9f9..5e2c62f 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -88,7 +88,7 @@ SmSym::SmSym(const String& rName, const Font& rFont, sal_Unicode cChar,
m_aFace.SetTransparent(TRUE);
m_aFace.SetAlign(ALIGN_BASELINE);
- m_cChar = cChar;
+ m_cChar = cChar;
m_aSetName = rSet;
m_bPredefined = bIsPredefined;
m_bDocSymbol = FALSE;
diff --git a/starmath/source/symbol.src b/starmath/source/symbol.src
index dbac415..36c12cf 100644
--- a/starmath/source/symbol.src
+++ b/starmath/source/symbol.src
@@ -191,13 +191,12 @@ Resource RID_LOCALIZED_NAMES
};
StringArray RID_UI_SYMBOLSET_NAMES
{
- ItemList [ en-US ] =
- {
- < "Greek" ; > ;
- < "Special" ; > ;
- };
+ ItemList [ en-US ] =
+ {
+ < "Greek" ; > ;
+ < "Special" ; > ;
+ };
};
-
StringArray RID_EXPORT_SYMBOL_NAMES
{
ItemList =
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 07b1a35..71f1403 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -188,7 +188,7 @@ String SmFontPickList::GetStringItem(void *pItem)
aString.AppendAscii( pDelim );
aString += String(SmResId(RID_FONTITALIC));
}
- if (IsBold( *pFont )) // bold?
+ if (IsBold( *pFont ))
{
aString.AppendAscii( pDelim );
aString += String(SmResId(RID_FONTBOLD));
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index bc4bff1..5182d1b 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -80,10 +80,10 @@
#define MINWIDTH 200
#define MINHEIGHT 200
#define MINSPLIT 40
-#define SPLITTERWIDTH 2
+#define SPLITTERWIDTH 2
-#define MINZOOM 25
-#define MAXZOOM 800
+#define MINZOOM 25
+#define MAXZOOM 800
#define SmViewShell
#include "smslots.hxx"
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index b2f741f..f974902 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -82,7 +82,7 @@
#include <ndtxt.hxx>
#include <swundo.hxx> // fuer die UndoIds
#include <undobj.hxx>
-#include <pagedesc.hxx> //DTor
+#include <pagedesc.hxx> //DTor
#include <breakit.hxx>
#include <ndole.hxx>
#include <ndgrf.hxx>
@@ -253,7 +253,6 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value)
pOutlineRule->Validate();
// --> OD 2005-10-21 - counting of phantoms depends on <IsOldNumbering()>
pOutlineRule->SetCountPhantoms( !mbOldNumbering );
- // <--
}
}
break;
@@ -299,57 +298,67 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value)
case CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME:
mbClipAsCharacterAnchoredWriterFlyFrames = value;
break;
- // <--
+
case UNIX_FORCE_ZERO_EXT_LEADING:
mbUnixForceZeroExtLeading = value;
break;
- case PROTECT_FORM:
- mbProtectForm = value;
- break;
+
+ case PROTECT_FORM:
+ mbProtectForm = value;
+ break;
case USE_OLD_PRINTER_METRICS:
mbOldPrinterMetrics = value;
break;
case TABS_RELATIVE_TO_INDENT:
mbTabRelativeToIndent = value;
- break;
+ break;
// --> OD 2008-06-05 #i89181#
case TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST:
mbTabAtLeftIndentForParagraphsInList = value;
- break;
- // <--
- case INVERT_BORDER_SPACING:
- mbInvertBorderSpacing = value;
- break;
+ break;
+
+ case INVERT_BORDER_SPACING:
+ mbInvertBorderSpacing = value;
+ break;
+
case COLLAPSE_EMPTY_CELL_PARA:
mbCollapseEmptyCellPara = value;
- break;
+ break;
// COMPATIBILITY FLAGS END
case BROWSE_MODE:
mbBrowseMode = value;
break;
+
case HTML_MODE:
mbHTMLMode = value;
break;
+
case GLOBAL_DOCUMENT:
mbIsGlobalDoc = value;
break;
+
case GLOBAL_DOCUMENT_SAVE_LINKS:
mbGlblDocSaveLinks = value;
break;
+
case LABEL_DOCUMENT:
mbIsLabelDoc = value;
break;
+
case PURGE_OLE:
mbPurgeOLE = value;
break;
+
case KERN_ASIAN_PUNCTUATION:
mbKernAsianPunctuation = value;
break;
+
case DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT:
mbDoNotResetParaAttrsForNumFont = value;
break;
+
default:
ASSERT(false, "Invalid setting id");
}
@@ -667,7 +676,7 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart )
return false;
{
- // Bug 26675: DataChanged vorm loeschen verschicken, dann bekommt
+ // BUG 26675: DataChanged vorm loeschen verschicken, dann bekommt
// man noch mit, welche Objecte sich im Bereich befinden.
// Danach koennen sie vor/hinter der Position befinden.
SwDataChanged aTmp( this, rPos, 0 );
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 0bb444b..8d18e64 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -65,20 +65,17 @@
#include <svx/svdetc.hxx>
#include <editeng/fhgtitem.hxx>
-// OD 26.06.2003 #108784#
#include <svx/svdpagv.hxx>
-// OD 2004-04-01 #i26791#
+
#include <dcontact.hxx>
#include <txtfrm.hxx>
#include <frmfmt.hxx>
#include <editeng/frmdiritem.hxx>
#include <fmtornt.hxx>
-// --> OD 2006-03-14 #i62875#
+
#include <svx/svditer.hxx>
-// <--
-// --> OD 2006-11-01 #130889#
+
#include <vector>
-// <--
using namespace ::com::sun::star;
using namespace ::com::sun::star::linguistic2;
@@ -90,11 +87,8 @@ SV_IMPL_VARARR_SORT( _ZSortFlys, _ZSortFly )
|*
|* SwDoc::GroupSelection / SwDoc::UnGroupSelection
|*
-|* Ersterstellung JP 21.08.95
-|* Letzte Aenderung JP 21.08.95
-|*
|*************************************************************************/
-// OD 2004-04-01 #i26791# - local method to determine positioning and
+// local method to determine positioning and
// alignment attributes for a drawing object, which is newly connected to
// the layout. Used for a newly formed group object <SwDoc::GroupSelection(..)>
// and the members of a destroyed group <SwDoc::UnGroupSelection(..)>
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 478f71c..db90e87 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -101,21 +101,18 @@
#include <PostItMgr.hxx>
#include <comcore.hrc> // STR-ResId's
-// #i11176#
#include <unoframe.hxx>
-// OD 2004-05-24 #i28701#
+
#include <sortedobjs.hxx>
-// --> OD 2004-07-26 #i32089#
#include <vector>
-// <--
using namespace ::com::sun::star;
using ::rtl::OUString;
#define DEF_FLY_WIDTH 2268 //Defaultbreite fuer FlyFrms (2268 == 4cm)
-/* #109161# */
+
static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
{
bool bResult = false;
@@ -135,9 +132,6 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
|* entsprechende Formate-Array gestellt.
|* Wenn bereits ein passendes Format existiert, so wird dies
|* zurueckgeliefert.
-|* Ersterstellung MA 22. Sep. 92
-|* Letzte Aenderung JP 08.05.98
-|*
|*************************************************************************/
SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
{
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 67c62e7..f7702ac 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -56,10 +56,9 @@
#include <frmatr.hxx>
#include <SwStyleNameMapper.hxx>
#include <SwNodeNum.hxx>
-// --> OD 2008-03-13 #refactorlists#
+
#include <list.hxx>
#include <listfunc.hxx>
-// <--
#include <map>
@@ -87,21 +86,17 @@ void SwDoc::SetOutlineNumRule( const SwNumRule& rRule )
}
pOutlineRule->SetRuleType( OUTLINE_RULE );
- // --> OD 2008-07-08 #i91400#
pOutlineRule->SetName( String::CreateFromAscii(
SwNumRule::GetOutlineRuleName() ),
*this);
- // <--
- // --> OD 2006-09-21 #i69522#
+
// assure that the outline numbering rule is an automatic rule
pOutlineRule->SetAutoRule( TRUE );
- // <--
// teste ob die evt. gesetzen CharFormate in diesem Document
// definiert sind
pOutlineRule->CheckCharFmts( this );
- // --> OD 2008-05-13 #refactorlists#
// notify text nodes, which are registered at the outline style, about the
// changed outline style
SwNumRule::tTxtNodeList aTxtNodeList;
@@ -111,16 +106,14 @@ void SwDoc::SetOutlineNumRule( const SwNumRule& rRule )
{
SwTxtNode* pTxtNd = *aIter;
pTxtNd->NumRuleChgd();
- // --> OD 2009-01-20 #i94152#
+
// assure that list level corresponds to outline level
if ( pTxtNd->GetTxtColl()->IsAssignedToListLevelOfOutlineStyle() &&
pTxtNd->GetAttrListLevel() != pTxtNd->GetTxtColl()->GetAssignedOutlineStyleLevel() )
{
pTxtNd->SetAttrListLevel( pTxtNd->GetTxtColl()->GetAssignedOutlineStyleLevel() );
}
- // <--
}
- // <--
PropagateOutlineRule();
pOutlineRule->SetInvalidRule(TRUE);
@@ -146,15 +139,11 @@ void SwDoc::PropagateOutlineRule()
{
SwClientIter aIter(*pColl);
- // --> OD 2006-11-20 #i71764#
// Check only the list style, which is set at the paragraph style
const SwNumRuleItem & rCollRuleItem = pColl->GetNumRule( FALSE );
- // <--
- // --> OD 2006-11-20 #i71764#
// Check on document setting OUTLINE_LEVEL_YIELDS_OUTLINE_RULE no longer needed.
if ( rCollRuleItem.GetValue().Len() == 0 )
- // <--
{
SwNumRule * pMyOutlineRule = GetOutlineNumRule();
@@ -211,7 +200,6 @@ BOOL SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
}//<-end,zhaojianwei
}
- /* --> #111107# */
/* Find the last occupied level (backward). */
for (n = MAXLEVEL - 1; n > 0; n--)
{
@@ -271,7 +259,6 @@ BOOL SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
}
}
}
- /* <-- #111107# */
/* --> #i13747#
@@ -352,7 +339,7 @@ BOOL SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
if (aMoveArr[nLevel] == -1)
bMoveApplicable = false;
}//<-end,zhaojianwei
- // --> OD 2008-12-16 #i70748#
+
// Check on outline level attribute of text node, if text node is
// not an outline via a to outline style assigned paragraph style.
else
@@ -363,13 +350,11 @@ BOOL SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
bMoveApplicable = false;
}
}
- // <--
}
if (! bMoveApplicable )
return FALSE;
- /* <-- #i13747 # */
if( DoesUndo() )
{
ClearRedo();
@@ -880,25 +865,20 @@ void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
if( !nChgFmtLevel ) // es wurde nichts veraendert?
{
- // --> OD 2006-04-27 #i64311#
const bool bInvalidateNumRule( pOld->IsContinusNum() != rRule.IsContinusNum() );
- // <--
pOld->CheckCharFmts( &rDoc );
pOld->SetContinusNum( rRule.IsContinusNum() );
- // --> OD 2008-06-17 #i87166#
+
// Do NOT change list style type
// pOld->SetRuleType( rRule.GetRuleType() );
- // <--
- // --> OD 2006-04-27 #i64311#
if ( bInvalidateNumRule )
{
pOld->SetInvalidRule(TRUE);
}
- // <--
+
return ;
}
- // --> OD 2008-02-19 #refactorlists#
// SwNumRuleInfo* pUpd = new SwNumRuleInfo( rRule.GetName() );
// pUpd->MakeList( rDoc );
@@ -934,7 +914,6 @@ void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
}
}
}
- // <--
for( n = 0; n < MAXLEVEL; ++n )
if( nChgFmtLevel & ( 1 << n ))
@@ -943,14 +922,10 @@ void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
pOld->CheckCharFmts( &rDoc );
pOld->SetInvalidRule(TRUE);
pOld->SetContinusNum( rRule.IsContinusNum() );
- // --> OD 2008-06-17 #i87166#
// Do NOT change list style type
// pOld->SetRuleType( rRule.GetRuleType() );
- // <--
- // --> OD 2008-02-19 #refactorlists#
// delete pUpd;
- // <--
rDoc.UpdateNumRule();
}
@@ -998,7 +973,6 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
}
}
- // --> OD 2008-03-17 #refactorlists#
if ( bSetItem )
{
if ( bCreateNewList )
@@ -1027,12 +1001,10 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
SfxStringItem( RES_PARATR_LIST_ID, sContinuedListId ), 0 );
}
}
- // <--
if ( ! rPam.HasMark())
{
SwTxtNode * pTxtNd = rPam.GetPoint()->nNode.GetNode().GetTxtNode();
- // --> OD 2006-10-19 #134160#
// consider case that the PaM doesn't denote a text node - e.g. it denotes a graphic node
if ( pTxtNd )
{
@@ -1041,12 +1013,11 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
if (pRule && pRule->GetName() == pNew->GetName())
{
bSetItem = sal_False;
- // --> OD 2008-06-02 #refactorlists#
+
if ( !pTxtNd->IsInList() )
{
pTxtNd->AddToList();
}
- // <--
}
// --> OD 2005-10-26 #b6340308# - only clear numbering attribute at
// text node, if at paragraph style the new numbering rule is found.
@@ -1068,14 +1039,11 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
// <--
}
- // --> OD 2009-08-18 #i103817#
if ( bSetItem )
- // <--
{
InsertPoolItem( rPam, SwNumRuleItem( pNew->GetName() ), 0 );
}
- // --> OD 2008-02-08 #newlistlevelattrs#
if ( bResetIndentAttrs &&
pNew && pNew->Get( 0 ).GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT )
{
@@ -1083,7 +1051,6 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
aResetAttrsArray.Insert( RES_LR_SPACE );
ResetAttrs( rPam, sal_True, &aResetAttrsArray );
}
- // <--
if (DoesUndo())
EndUndo( UNDO_INSNUM, NULL );
@@ -1093,7 +1060,6 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
void SwDoc::SetCounted(const SwPaM & rPam, bool bCounted)
{
- // --> OD 2008-04-03 #refactorlists#
// ULONG nStartPos = rPam.Start()->nNode.GetIndex();
// ULONG nEndPos = rPam.End()->nNode.GetIndex();
@@ -1169,7 +1135,6 @@ void SwDoc::SetNodeNumStart( const SwPosition& rPos, USHORT nStt )
if (pTxtNd)
{
- // --> OD 2008-02-27 #refactorlists#
// const SwNumRule* pRule = pTxtNd->GetNumRule();
// if( pRule && nStt != pTxtNd->GetListRestartValue() )
// {
@@ -1194,7 +1159,6 @@ void SwDoc::SetNodeNumStart( const SwPosition& rPos, USHORT nStt )
SetModified();
}
- // <--
}
}
@@ -1203,14 +1167,12 @@ BOOL SwDoc::DelNumRule( const String& rName, BOOL bBroadcast )
{
USHORT nPos = FindNumRule( rName );
- // --> OD 2007-12-17 #151213#
if ( (*pNumRuleTbl)[ nPos ] == GetOutlineNumRule() )
{
ASSERT( false,
"<SwDoc::DelNumRule(..)> - No deletion of outline list style. This is serious defect - please inform OD" );
return FALSE;
}
- // <--
if( USHRT_MAX != nPos && !IsUsed( *(*pNumRuleTbl)[ nPos ] ))
{
@@ -1226,7 +1188,6 @@ BOOL SwDoc::DelNumRule( const String& rName, BOOL bBroadcast )
BroadcastStyleOperation(rName, SFX_STYLE_FAMILY_PSEUDO,
SFX_STYLESHEET_ERASED);
- // --> OD 2008-04-02 #refactorlists#
deleteListForListStyle( rName );
{
// delete further list, which have the deleted list style as default list style
@@ -1249,7 +1210,6 @@ BOOL SwDoc::DelNumRule( const String& rName, BOOL bBroadcast )
deleteList( pList->GetListId() );
}
}
- // <--
// --> FME 2004-11-02 #i34097# DeleteAndDestroy deletes rName if
// rName is directly taken from the numrule.
const String aTmpName( rName );
@@ -1263,10 +1223,8 @@ BOOL SwDoc::DelNumRule( const String& rName, BOOL bBroadcast )
return FALSE;
}
-// #106897#
void SwDoc::ChgNumRuleFmts( const SwNumRule& rRule, const String * pName )
{
- // #106897#
SwNumRule* pRule = FindNumRulePtr( pName ? *pName : rRule.GetName() );
if( pRule )
{
@@ -1302,19 +1260,14 @@ sal_Bool SwDoc::RenameNumRule(const String & rOldName, const String & rNewName,
AppendUndo(pUndo);
}
- // --> OD 2008-02-19 #refactorlists#
// SwNumRuleInfo aInfo(rOldName);
// aInfo.MakeList(*this);
SwNumRule::tTxtNodeList aTxtNodeList;
pNumRule->GetTxtNodeList( aTxtNodeList );
- // <--
- // --> OD 2008-07-08 #i91400#
pNumRule->SetName( rNewName, *this );
- // <--
SwNumRuleItem aItem(rNewName);
- // --> OD 2008-02-19 #refactorlists#
// for (ULONG nI = 0; nI < aInfo.GetList().Count(); ++nI)
// {
// SwTxtNode * pTxtNd = aInfo.GetList().GetObject(nI);
@@ -1326,7 +1279,6 @@ sal_Bool SwDoc::RenameNumRule(const String & rOldName, const String & rNewName,
SwTxtNode * pTxtNd = *aIter;
pTxtNd->SetAttr(aItem);
}
- // <--
bResult = sal_True;
@@ -1342,7 +1294,6 @@ void SwDoc::StopNumRuleAnimations( OutputDevice* pOut )
{
for( USHORT n = GetNumRuleTbl().Count(); n; )
{
- // --> OD 2008-02-19 #refactorlists#
// SwNumRuleInfo aUpd( GetNumRuleTbl()[ --n ]->GetName() );
// aUpd.MakeList( *this );
@@ -1368,7 +1319,6 @@ void SwDoc::StopNumRuleAnimations( OutputDevice* pOut )
if( ((SwTxtFrm*)pFrm)->HasAnimation() )
((SwTxtFrm*)pFrm)->StopAnimation( pOut );
}
- // <--
}
}
@@ -1380,7 +1330,6 @@ BOOL SwDoc::ReplaceNumRule( const SwPosition& rPos,
*pNewRule = FindNumRulePtr( rNewRule );
if( pOldRule && pNewRule && pOldRule != pNewRule )
{
- // --> OD 2008-02-19 #refactorlists#
SwUndoInsNum* pUndo = 0;
if( DoesUndo() )
{
@@ -1389,7 +1338,6 @@ BOOL SwDoc::ReplaceNumRule( const SwPosition& rPos,
AppendUndo( pUndo = new SwUndoInsNum( rPos, *pNewRule, rOldRule ) );
}
- // --> OD 2008-02-19 #refactorlists#
// apply new list style <pNewRule> to all text nodes, which have the
// old list style <pOldNRule> applied and belong to the same list as
// the text node of the given <SwPosition>.
@@ -1472,14 +1420,13 @@ BOOL SwDoc::ReplaceNumRule( const SwPosition& rPos,
EndUndo( UNDO_END, NULL );
SetModified();
- bRet = TRUE; // #106897#
+ bRet = TRUE;
}
}
return bRet;
}
-// --> OD 2008-03-18 #refactorlists#
namespace
{
struct ListStyleData
@@ -1495,16 +1442,13 @@ namespace
{}
};
}
-// <--
void SwDoc::MakeUniqueNumRules(const SwPaM & rPaM)
{
ASSERT( rPaM.GetDoc() == this, "need same doc" );
- // --> OD 2008-03-18 #refactorlists#
// map<SwNumRule *, SwNumRule *> aMyNumRuleMap;
::std::map<SwNumRule *, ListStyleData> aMyNumRuleMap;
- // <--
ULONG nStt = rPaM.Start()->nNode.GetIndex();
ULONG nEnd = rPaM.End()->nNode.GetIndex();
@@ -1521,7 +1465,6 @@ void SwDoc::MakeUniqueNumRules(const SwPaM & rPaM)
if (pRule && pRule->IsAutoRule() && ! pRule->IsOutlineRule())
{
- // --> OD 2008-03-18 #refactorlists#
// SwNumRule * pReplaceNumRule = aMyNumRuleMap[pRule];
ListStyleData aListStyleData = aMyNumRuleMap[pRule];
@@ -1544,10 +1487,10 @@ void SwDoc::MakeUniqueNumRules(const SwPaM & rPaM)
// pReplaceNumRule = new SwNumRule(*pRule);
// pReplaceNumRule->SetName(GetUniqueNumRuleName());
aListStyleData.pReplaceNumRule = new SwNumRule(*pRule);
- // --> OD 2008-07-08 #i91400#
+
aListStyleData.pReplaceNumRule->SetName(
GetUniqueNumRuleName(), *this );
- // <--
+
aListStyleData.bCreateNewList = true;
}
@@ -1622,13 +1565,8 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
for( ; nStt <= nEnd; ++nStt )
{
SwTxtNode* pTNd = GetNodes()[ nStt ]->GetTxtNode();
- // --> OD 2008-03-13 #refactorlists#
-// if( pTNd && 0 != ( pItem = pTNd->GetNoCondAttr(
-// RES_PARATR_NUMRULE, TRUE ) ) &&
-// ( pName = &((SwNumRuleItem*)pItem)->GetValue())->Len() )
SwNumRule* pNumRuleOfTxtNode = pTNd ? pTNd->GetNumRule() : 0;
if ( pTNd && pNumRuleOfTxtNode )
- // <--
{
// recognize changes of attribute for undo
aRegH.RegisterInModify( pTNd, *pTNd );
@@ -1645,13 +1583,11 @@ void SwDoc::DelNumRules( const SwPaM& rPam )
else
pTNd->SetAttr( aEmptyRule );
- // --> OD 2008-03-26 #refactorlists#
pTNd->ResetAttr( RES_PARATR_LIST_ID );
pTNd->ResetAttr( RES_PARATR_LIST_LEVEL );
pTNd->ResetAttr( RES_PARATR_LIST_ISRESTART );
pTNd->ResetAttr( RES_PARATR_LIST_RESTARTVALUE );
pTNd->ResetAttr( RES_PARATR_LIST_ISCOUNTED );
- // <--
if( RES_CONDTXTFMTCOLL == pTNd->GetFmtColl()->Which() )
pTNd->ChkCondColl();
@@ -1680,10 +1616,8 @@ void SwDoc::InvalidateNumRules()
BOOL lcl_IsNumOk( BYTE nSrchNum, BYTE& rLower, BYTE& rUpper,
BOOL bOverUpper, BYTE nNumber )
{
- // --> OD 2008-04-02 #refactorlists#
ASSERT( nNumber < MAXLEVEL,
"<lcl_IsNumOk(..)> - misusage of method" );
- // <--
BOOL bRet = FALSE;
{
@@ -1835,7 +1769,6 @@ BOOL SwDoc::GotoNextNum( SwPosition& rPos, BOOL bOverUpper,
return ::lcl_GotoNextPrevNum( rPos, TRUE, bOverUpper, pUpper, pLower );
}
-// -> #i23731#
// --> OD 2008-03-18 #refactorlists# - add output parameter <sListId>
const SwNumRule * SwDoc::SearchNumRule(const SwPosition & rPos,
const bool bForward,
@@ -1853,12 +1786,10 @@ const SwNumRule * SwDoc::SearchNumRule(const SwPosition & rPos,
{
SwNodeIndex aIdx(rPos.nNode);
- // --> OD 2005-10-20 #i55391#
// - the start node has also been investigated, if requested.
const SwNode * pNode = NULL;
do
{
- // --> OD 2005-10-20 #i55391#
if ( !bInvestigateStartNode )
{
if (bForward)
@@ -1866,7 +1797,7 @@ const SwNumRule * SwDoc::SearchNumRule(const SwPosition & rPos,
else
aIdx--;
}
- // <--
+
if (aIdx.GetNode().IsTxtNode())
{
pTxtNd = aIdx.GetNode().GetTxtNode();
@@ -1879,7 +1810,6 @@ const SwNumRule * SwDoc::SearchNumRule(const SwPosition & rPos,
( !bNum && pNumRule->Get(0).IsItemize() ) ) ) // #i22362#, #i29560#
{
pResult = pTxtNd->GetNumRule();
- // --> OD 2008-03-18 #refactorlists#
// provide also the list id, to which the text node belongs.
sListId = pTxtNd->GetListId();
}
@@ -1898,7 +1828,6 @@ const SwNumRule * SwDoc::SearchNumRule(const SwPosition & rPos,
}
}
- // --> OD 2005-10-20 #i55391#
if ( bInvestigateStartNode )
{
if (bForward)
@@ -1906,18 +1835,16 @@ const SwNumRule * SwDoc::SearchNumRule(const SwPosition & rPos,
else
aIdx--;
}
- // <--
pNode = &aIdx.GetNode();
}
while (! (pNode == aNodes.DocumentSectionStartNode(pStartFromNode) ||
pNode == aNodes.DocumentSectionEndNode(pStartFromNode)));
- // <--
}
return pResult;
}
-// <- #i23731#
+
BOOL SwDoc::GotoPrevNum( SwPosition& rPos, BOOL bOverUpper,
BYTE* pUpper, BYTE* pLower )
@@ -1954,12 +1881,10 @@ BOOL SwDoc::NumUpDown( const SwPaM& rPam, BOOL bDown )
}
}
}
- // <- #115901#
BOOL bRet = TRUE;
char nDiff = bDown ? 1 : -1;
- // ->#115901#
if (bOnlyOutline)
bRet = OutlineUpDown(rPam, nDiff);
else if (bOnlyNonOutline)
@@ -1993,7 +1918,6 @@ BOOL SwDoc::NumUpDown( const SwPaM& rPam, BOOL bDown )
if( bRet )
{
- /* <-- #i24560# */
if( DoesUndo() )
{
ClearRedo();
@@ -2431,9 +2355,7 @@ SwNumRule* SwDoc::GetCurrNumRule( const SwPosition& rPos ) const
if( pTNd )
{
- // --> OD 2008-02-20 #refactorlists#
// pTNd->SyncNumberAndNumRule();
- // <--
pRet = pTNd->GetNumRule();
}
@@ -2471,19 +2393,15 @@ SwNumRule* SwDoc::FindNumRulePtr( const String& rName ) const
return pResult;
}
-// #i36749#
void SwDoc::AddNumRule(SwNumRule * pRule)
{
pNumRuleTbl->Insert(pRule, pNumRuleTbl->Count());
maNumRuleMap[pRule->GetName()] = pRule;
pRule->SetNumRuleMap(&maNumRuleMap);
- // --> OD 2008-03-26 #refactorlists#
createListForListStyle( pRule->GetName() );
- // <--
}
-// --> OD 2008-02-11 #newlistlevelattrs#
USHORT SwDoc::MakeNumRule( const String &rName,
const SwNumRule* pCpy,
BOOL bBroadcast,
@@ -2494,31 +2412,26 @@ USHORT SwDoc::MakeNumRule( const String &rName,
{
pNew = new SwNumRule( *pCpy );
- // --> OD 2008-07-08 #i91400#
pNew->SetName( GetUniqueNumRuleName( &rName ), *this );
- // <--
+
if( pNew->GetName() != rName )
{
pNew->SetPoolFmtId( USHRT_MAX );
pNew->SetPoolHelpId( USHRT_MAX );
pNew->SetPoolHlpFileId( UCHAR_MAX );
- // --> OD 2008-04-03 #refactorlists#
pNew->SetDefaultListId( String() );
- // <--
}
pNew->CheckCharFmts( this );
}
else
{
- // --> OD 2008-02-11 #newlistlevelattrs#
pNew = new SwNumRule( GetUniqueNumRuleName( &rName ),
eDefaultNumberFormatPositionAndSpaceMode );
- // <--
}
USHORT nRet = pNumRuleTbl->Count();
- AddNumRule(pNew); // #i36749#
+ AddNumRule(pNew);
if (DoesUndo())
{
@@ -2618,7 +2531,6 @@ void SwDoc::UpdateNumRule()
rNmTbl[ n ]->Validate();
}
-// --> OD 2008-04-02 #refactorlists#
void SwDoc::MarkListLevel( const String& sListId,
const int nListLevel,
const BOOL bValue )
@@ -2638,10 +2550,7 @@ void SwDoc::MarkListLevel( SwList& rList,
// Set new marked list level and notify all affected nodes of the changed mark.
rList.MarkListLevel( nListLevel, bValue );
}
-// <- #i27615#
-// <--
-// #i23726#
BOOL SwDoc::IsFirstOfNumRule(SwPosition & rPos)
{
BOOL bResult = FALSE;
@@ -2658,7 +2567,6 @@ BOOL SwDoc::IsFirstOfNumRule(SwPosition & rPos)
return bResult;
}
-// --> OD 2007-10-26 #i83479#
// implementation for interface <IDocumentListItems>
bool SwDoc::lessThanNodeNum::operator()( const SwNodeNum* pNodeNumOne,
const SwNodeNum* pNodeNumTwo ) const
@@ -2738,9 +2646,7 @@ void SwDoc::getNumItems( tSortedNodeNumList& orNodeNumList ) const
}
}
}
-// <--
-// --> OD 2007-11-15 #i83479#
// implementation for interface <IDocumentOutlineNodes>
sal_Int32 SwDoc::getOutlineNodesCount() const
{
@@ -2780,9 +2686,7 @@ void SwDoc::getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOu
GetNodes().GetOutLineNds()[i]->GetTxtNode() );
}
}
-// <--
-// --> OD 2008-03-26 #refactorlists#
// implementation of interface IDocumentListsAccess
SwList* SwDoc::createList( String sListId,
const String sDefaultListStyleName )
@@ -2905,8 +2809,7 @@ void SwDoc::deleteListForListStyle( const String sListStyleName )
deleteList( sListId );
}
}
-// <--
-// --> OD 2008-07-08 #i91400#
+
void SwDoc::trackChangeOfListStyleName( const String sListStyleName,
const String sNewListStyleName )
{
@@ -2920,9 +2823,7 @@ void SwDoc::trackChangeOfListStyleName( const String sListStyleName,
maListStyleLists[sNewListStyleName] = pList;
}
}
-// <--
-// --> OD 2008-03-13 #refactorlists#
namespace listfunc
{
const String MakeListIdUnique( const SwDoc& rDoc,
diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx
index d778c5c..4b8f025 100644
--- a/sw/source/core/doc/lineinfo.cxx
+++ b/sw/source/core/doc/lineinfo.cxx
@@ -29,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-
#include "doc.hxx"
#include "lineinfo.hxx"
#include "charfmt.hxx"
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index fb1f078..92d9ab9 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -25,6 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _SORT_HXX
#define _SORT_HXX
diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx
index 1304621..c5a50cc 100644
--- a/sw/source/core/inc/visiturl.hxx
+++ b/sw/source/core/inc/visiturl.hxx
@@ -25,13 +25,12 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _VISITURL_HXX
#define _VISITURL_HXX
-
-
-
#include <svl/lstner.hxx>
+
class SwDoc;
class SwURLStateChanged : public SfxListener
@@ -44,8 +43,6 @@ public:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
};
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index ced0bde..4341af9 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -69,8 +69,8 @@ class SwWrongList
std::vector<SwWrongArea> maList;
WrongListType meType;
- xub_StrLen nBeginInvalid; // Start des ungueltigen Bereichs
- xub_StrLen nEndInvalid; // Ende des ungueltigen Bereichs
+ xub_StrLen nBeginInvalid; // Start of the invalid range
+ xub_StrLen nEndInvalid; // End of the invalid range
void ShiftLeft( xub_StrLen &rPos, xub_StrLen nStart, xub_StrLen nEnd )
{ if( rPos > nStart ) rPos = rPos > nEnd ? rPos - nEnd + nStart : nStart; }
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index deaab16..0d20e73 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -25,8 +25,6 @@
*
************************************************************************/
-
-
#include <svl/style.hrc>
#include <sfx2/sfx.hrc>
#include <svx/dialogs.hrc>
diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src
index 0345a21..822bf54 100644
--- a/sw/source/ui/app/error.src
+++ b/sw/source/ui/app/error.src
@@ -24,6 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#define __RSC
#include "globals.hrc"
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index f9f6f1b..c033410 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -25,8 +25,6 @@
*
************************************************************************/
-
-
#include "swmn.hrc"
/*------------------------------------------------------------------------
More information about the Libreoffice-commits
mailing list