Hi,
My first time contributing with an open source project. I hope to help with
a little.
Patch1: Some translate.
Patch2: Cleanup comments and some formatting.
From 597070b7ab917558ded733568921125a8c6e19ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlio=20Hoffimann?= <julio.hoffimann@gmail.com>
Date: Wed, 13 Oct 2010 22:56:07 -0300
Subject: [PATCH 1/2] My first commmit, just some translate
---
sw/source/core/table/swtable.cxx | 48 +++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 81b7566..8467458 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -186,7 +186,7 @@ void SwTableBox::setDummyFlag( bool bDummy )
pImpl->setDummyFlag( bDummy );
}
-//JP 15.09.98: Bug 55741 - Tabs beibehalten (vorne und hinten)
+//JP 15.09.98: Bug 55741 - Keep tabs (front and rear)
String& lcl_TabToBlankAtSttEnd( String& rTxt )
{
sal_Unicode c;
@@ -267,8 +267,8 @@ void _InsTblBox( SwDoc* pDoc, SwTableNode* pTblNd,
|*
|* SwTable::SwTable()
|*
-|* Ersterstellung MA 09. Mar. 93
-|* Letzte Aenderung MA 05. May. 93
+|* Created: MA 09. Mar. 93
+|* Last modified: MA 05. May. 93
|*
|*************************************************************************/
SwTable::SwTable( SwTableFmt* pFmt )
@@ -280,7 +280,7 @@ SwTable::SwTable( SwTableFmt* pFmt )
bModifyLocked( FALSE ),
bNewModel( TRUE )
{
- // default Wert aus den Optionen setzen
+ // default value set in the options
eTblChgMode = (TblChgMode)GetTblChgDefaultMode();
}
@@ -307,7 +307,7 @@ SwTable::~SwTable()
if( refObj.Is() )
{
SwDoc* pDoc = GetFrmFmt()->GetDoc();
- if( !pDoc->IsInDtor() ) // dann aus der Liste entfernen
+ if( !pDoc->IsInDtor() ) // then remove from the list
pDoc->GetLinkManager().RemoveServer( &refObj );
refObj->Closed();
@@ -336,8 +336,8 @@ SwTable::~SwTable()
|*
|* SwTable::Modify()
|*
-|* Ersterstellung JP ??
-|* Letzte Aenderung MA 06. May. 93
+|* Created: JP ??
+|* Last modified: MA 06. May. 93
|*
|*************************************************************************/
inline void FmtInArr( SvPtrarr& rFmtArr, SwFmt* pBoxFmt )
@@ -457,8 +457,8 @@ void SwTable::AdjustWidths( const long nOld, const long nNew )
|*
|* SwTable::GetTabCols()
|*
-|* Ersterstellung MA 04. May. 93
-|* Letzte Aenderung MA 30. Nov. 95
+|* Created: MA 04. May. 93
+|* Last modified: MA 30. Nov. 95
|*
|*************************************************************************/
void lcl_RefreshHidden( SwTabCols &rToFill, USHORT nPos )
@@ -620,7 +620,7 @@ void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
//Array aktualisiert.
if ( bRefreshHidden )
{
- //Korrekturen entfernen
+ // remove corrections
USHORT i;
for ( i = 0; i < rToFill.Count(); ++i )
{
@@ -711,8 +711,8 @@ void SwTable::GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
|*
|* SwTable::SetTabCols()
|*
-|* Ersterstellung MA 04. May. 93
-|* Letzte Aenderung MA 26. Aug. 98
+|* Created: MA 04. May. 93
+|* Last modified: MA 26. Aug. 98
|*
|*************************************************************************/
//Struktur zur Parameteruebergabe
@@ -1407,8 +1407,8 @@ void SwTable::NewSetTabCols( Parm &rParm, const SwTabCols &rNew,
|* const SwTableBox* SwTable::GetTblBox( const Strn?ng& rName ) const
|* gebe den Pointer auf die benannte Box zurueck.
|*
-|* Ersterstellung JP 30. Jun. 93
-|* Letzte Aenderung JP 30. Jun. 93
+|* Created: JP 30. Jun. 93
+|* Last modified: JP 30. Jun. 93
|*
|*************************************************************************/
@@ -1595,8 +1595,8 @@ BOOL SwTable::IsTblComplex() const
|*
|* SwTableLine::SwTableLine()
|*
-|* Ersterstellung MA 09. Mar. 93
-|* Letzte Aenderung MA 09. Mar. 93
+|* Created: MA 09. Mar. 93
+|* Last modified: MA 09. Mar. 93
|*
|*************************************************************************/
SwTableLine::SwTableLine( SwTableLineFmt *pFmt, USHORT nBoxes,
@@ -1621,8 +1621,8 @@ SwTableLine::~SwTableLine()
|*
|* SwTableLine::ClaimFrmFmt(), ChgFrmFmt()
|*
-|* Ersterstellung MA 03. May. 93
-|* Letzte Aenderung MA 07. Feb. 96
+|* Created: MA 03. May. 93
+|* Last modified: MA 07. Feb. 96
|*
|*************************************************************************/
SwFrmFmt* SwTableLine::ClaimFrmFmt()
@@ -1748,8 +1748,8 @@ SwTwips SwTableLine::GetTableLineHeight( bool& bLayoutAvailable ) const
|*
|* SwTableBox::SwTableBox()
|*
-|* Ersterstellung MA 04. May. 93
-|* Letzte Aenderung MA 04. May. 93
+|* Created: MA 04. May. 93
+|* Last modified: MA 04. May. 93
|*
|*************************************************************************/
SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, USHORT nLines, SwTableLine *pUp )
@@ -1853,8 +1853,8 @@ SwTableBoxFmt* SwTableBox::CheckBoxFmt( SwTableBoxFmt* pFmt )
|*
|* SwTableBox::ClaimFrmFmt(), ChgFrmFmt()
|*
-|* Ersterstellung MA 04. May. 93
-|* Letzte Aenderung MA 07. Feb. 96
+|* Created: MA 04. May. 93
+|* Last modified MA 07. Feb. 96
|*
|*************************************************************************/
SwFrmFmt* SwTableBox::ClaimFrmFmt()
@@ -1940,8 +1940,8 @@ void SwTableBox::ChgFrmFmt( SwTableBoxFmt* pNewFmt )
|* gebe den Namen dieser Box zurueck. Dieser wird dynamisch bestimmt
|* und ergibt sich aus der Position in den Lines/Boxen/Tabelle
|*
-|* Ersterstellung JP 30. Jun. 93
-|* Letzte Aenderung JP 30. Jun. 93
+|* Created: JP 30. Jun. 93
+|* Last modified: JP 30. Jun. 93
|*
|*************************************************************************/
void lcl_GetTblBoxColStr( USHORT nCol, String& rNm )
--
1.7.0.4
From a34f3d12b607357f38d31980d7316749680ac6dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlio=20Hoffimann?= <julio.hoffimann@gmail.com>
Date: Sun, 17 Oct 2010 16:50:54 -0300
Subject: [PATCH 2/2] Comments cleanup and some formatting
---
starmath/inc/applicat.hxx | 23 +--
starmath/inc/document.hxx | 2 +-
starmath/inc/format.hxx | 59 +++--
starmath/inc/node.hxx | 27 +-
starmath/inc/rect.hxx | 3 -
starmath/inc/starmath.hrc | 545 ++++++++++++++++++++-------------------
starmath/inc/symbol.hxx | 5 +-
starmath/inc/toolbox.hxx | 1 +
starmath/inc/types.hxx | 2 +-
starmath/source/action.cxx | 1 -
starmath/source/register.cxx | 2 -
starmath/source/symbol.cxx | 3 +-
starmath/source/symbol.src | 11 +-
starmath/source/toolbox.cxx | 1 -
starmath/source/unodoc.cxx | 1 -
starmath/source/utility.cxx | 4 +-
starmath/source/view.cxx | 6 +-
sw/source/core/doc/doc.cxx | 37 ++-
sw/source/core/doc/docbasic.cxx | 3 -
sw/source/core/doc/docdraw.cxx | 13 +-
sw/source/core/doc/doclay.cxx | 11 +-
sw/source/core/doc/docnum.cxx | 131 +---------
sw/source/core/doc/lineinfo.cxx | 2 -
sw/source/core/doc/number.cxx | 177 ++++---------
sw/source/core/doc/tblcpy.cxx | 1 -
sw/source/core/doc/visiturl.cxx | 2 -
sw/source/core/inc/docsort.hxx | 1 +
sw/source/core/inc/swfont.hxx | 47 ++--
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/applab.cxx | 1 -
sw/source/ui/app/docsh.cxx | 1 -
sw/source/ui/app/docstyle.cxx | 1 -
sw/source/ui/app/error.src | 1 +
sw/source/ui/app/mn.src | 2 -
sw/source/ui/app/swwait.cxx | 1 -
37 files changed, 467 insertions(+), 674 deletions(-)
diff --git a/starmath/inc/applicat.hxx b/starmath/inc/applicat.hxx
index 1c29e26..b5e0d75 100644
--- a/starmath/inc/applicat.hxx
+++ b/starmath/inc/applicat.hxx
@@ -25,7 +25,6 @@
*
************************************************************************/
-
#ifndef APPLICAT_HXX
#define APPLICAT_HXX
@@ -33,23 +32,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"
@@ -88,10 +74,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:
@@ -105,5 +91,6 @@ public:
};
#endif
+
#endif
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index fb2aa9d..ae4f080 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -24,6 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef DOCUMENT_HXX
#define DOCUMENT_HXX
@@ -221,6 +222,5 @@ public:
virtual void SetModified(BOOL bModified);
};
-
#endif
diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx
index 7b360f9..4175bad 100644
--- a/starmath/inc/format.hxx
+++ b/starmath/inc/format.hxx
@@ -24,6 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef FORMAT_HXX
#define FORMAT_HXX
@@ -47,15 +48,15 @@
#define SIZ_BEGIN 0
#define SIZ_TEXT 0
#define SIZ_INDEX 1
-#define SIZ_FUNCTION 2
-#define SIZ_OPERATOR 3
+#define SIZ_FUNCTION 2
+#define SIZ_OPERATOR 3
#define SIZ_LIMITS 4
#define SIZ_END 4
// symbolic names used as array indices
#define FNT_BEGIN 0
-#define FNT_VARIABLE 0
-#define FNT_FUNCTION 1
+#define FNT_VARIABLE 0
+#define FNT_FUNCTION 1
#define FNT_NUMBER 2
#define FNT_TEXT 3
#define FNT_SERIF 4
@@ -65,32 +66,32 @@
#define FNT_END 7
// symbolic names used as array indices
-#define DIS_BEGIN 0
-#define DIS_HORIZONTAL 0
-#define DIS_VERTICAL 1
-#define DIS_ROOT 2
-#define DIS_SUPERSCRIPT 3
-#define DIS_SUBSCRIPT 4
-#define DIS_NUMERATOR 5
-#define DIS_DENOMINATOR 6
-#define DIS_FRACTION 7
-#define DIS_STROKEWIDTH 8
-#define DIS_UPPERLIMIT 9
-#define DIS_LOWERLIMIT 10
-#define DIS_BRACKETSIZE 11
-#define DIS_BRACKETSPACE 12
-#define DIS_MATRIXROW 13
-#define DIS_MATRIXCOL 14
-#define DIS_ORNAMENTSIZE 15
-#define DIS_ORNAMENTSPACE 16
-#define DIS_OPERATORSIZE 17
-#define DIS_OPERATORSPACE 18
-#define DIS_LEFTSPACE 19
-#define DIS_RIGHTSPACE 20
-#define DIS_TOPSPACE 21
-#define DIS_BOTTOMSPACE 22
+#define DIS_BEGIN 0
+#define DIS_HORIZONTAL 0
+#define DIS_VERTICAL 1
+#define DIS_ROOT 2
+#define DIS_SUPERSCRIPT 3
+#define DIS_SUBSCRIPT 4
+#define DIS_NUMERATOR 5
+#define DIS_DENOMINATOR 6
+#define DIS_FRACTION 7
+#define DIS_STROKEWIDTH 8
+#define DIS_UPPERLIMIT 9
+#define DIS_LOWERLIMIT 10
+#define DIS_BRACKETSIZE 11
+#define DIS_BRACKETSPACE 12
+#define DIS_MATRIXROW 13
+#define DIS_MATRIXCOL 14
+#define DIS_ORNAMENTSIZE 15
+#define DIS_ORNAMENTSPACE 16
+#define DIS_OPERATORSIZE 17
+#define DIS_OPERATORSPACE 18
+#define DIS_LEFTSPACE 19
+#define DIS_RIGHTSPACE 20
+#define DIS_TOPSPACE 21
+#define DIS_BOTTOMSPACE 22
#define DIS_NORMALBRACKETSIZE 23
-#define DIS_END 23
+#define DIS_END 23
// to be broadcastet on format changes:
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 156a3c1..bfcf18f 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -25,11 +25,9 @@
*
************************************************************************/
-
#ifndef NODE_HXX
#define NODE_HXX
-
#include <vector>
#include "parse.hxx"
@@ -41,11 +39,11 @@
#define ATTR_BOLD 0x0001
#define ATTR_ITALIC 0x0002
-#define FNTSIZ_ABSOLUT 1
-#define FNTSIZ_PLUS 2
-#define FNTSIZ_MINUS 3
-#define FNTSIZ_MULTIPLY 4
-#define FNTSIZ_DIVIDE 5
+#define FNTSIZ_ABSOLUT 1
+#define FNTSIZ_PLUS 2
+#define FNTSIZ_MINUS 3
+#define FNTSIZ_MULTIPLY 4
+#define FNTSIZ_DIVIDE 5
// flags to interdict respective status changes
#define FLG_FONT 0x0001
@@ -54,7 +52,7 @@
#define FLG_ITALIC 0x0008
#define FLG_COLOR 0x0010
#define FLG_VISIBLE 0x0020
-#define FLG_HORALIGN 0x0040
+#define FLG_HORALIGN 0x0040
extern SmFormat *pActiveFormat;
@@ -87,16 +85,16 @@ 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);
@@ -851,4 +849,3 @@ public:
#endif
-
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index 78d98d5..857a807 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -30,7 +30,6 @@
#include <new>
-
#include <tools/gen.hxx>
#include <vcl/outdev.hxx>
#include <vcl/metric.hxx>
@@ -255,6 +254,4 @@ inline Rectangle SmRect::AsRectangle() const
return Rectangle(Point(GetItalicLeft(), GetTop()), GetItalicSize());
}
-
-
#endif
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 3483868..9f29a1c 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -24,6 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _STARMATH_HRC
#define _STARMATH_HRC
@@ -92,26 +93,26 @@
#define RID_FONTTYPEDIALOG (RID_APP_START + 4)
#define RID_DISTANCEDIALOG (RID_APP_START + 5)
#define RID_ALIGNDIALOG (RID_APP_START + 6)
-#define RID_PRINTOPTIONPAGE (RID_APP_START + 7)
+#define RID_PRINTOPTIONPAGE (RID_APP_START + 7)
#define RID_SYMBOLDIALOG (RID_APP_START + 8)
-#define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
-#define RID_EXTRAOPTIONPAGE (RID_APP_START + 10)
-#define RID_PRINTUIOPTIONS (RID_APP_START + 11)
+#define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
+#define RID_EXTRAOPTIONPAGE (RID_APP_START + 10)
+#define RID_PRINTUIOPTIONS (RID_APP_START + 11)
#define RID_MATH_TOOLBOX (RID_APP_START + 50)
// wegen #58705# entfernt
//#define RID_DRAW_OBJECTBAR (RID_APP_START + 51)
-#define RID_DEFAULTSAVEQUERY (RID_APP_START + 102)
-#define RID_WRITESYMBOLERROR (RID_APP_START + 202)
-#define RID_READSYMBOLERROR (RID_APP_START + 203)
-#define RID_NOMATHTYPEFACEWARNING (RID_APP_START + 204)
+#define RID_DEFAULTSAVEQUERY (RID_APP_START + 102)
+#define RID_WRITESYMBOLERROR (RID_APP_START + 202)
+#define RID_READSYMBOLERROR (RID_APP_START + 203)
+#define RID_NOMATHTYPEFACEWARNING (RID_APP_START + 204)
#define RID_OBJECTNAME (RID_APP_START + 501)
// free
#define RID_UNDOEDITNAME (RID_APP_START + 503)
#define RID_UNDOFORMATNAME (RID_APP_START + 504)
-#define RID_APPICO (RID_APP_START + 601)
-#define RID_TMPICO (RID_APP_START + 603)
+#define RID_APPICO (RID_APP_START + 601)
+#define RID_TMPICO (RID_APP_START + 603)
#define RID_COMMANDMENU (RID_APP_START + 701)
#define RID_VIEWMENU (RID_APP_START + 702)
#define RID_DISTANCEMENU (RID_APP_START + 703)
@@ -129,133 +130,133 @@
#define RID_CREATORSTR (RID_APP_START + 811)
#define RID_FILESMFTYP (RID_APP_START + 812)
#define RID_FILESYMTYP (RID_APP_START + 813)
-#define RID_SMMENU (RID_APP_START + 814)
+#define RID_SMMENU (RID_APP_START + 814)
#define RID_SMACCEL (RID_APP_START + 815)
#define RID_STATUSBAR (RID_APP_START + 816)
#define RID_APPNAMESTR (RID_APP_START + 817)
-#define STR_MATH_DOCUMENT_FULLTYPE_CURRENT (RID_APP_START + 821)
-#define RID_SMPLUGINMENU (RID_APP_START + 822)
-#define STR_STATSTR_READING (RID_APP_START + 823)
-#define STR_STATSTR_WRITING (RID_APP_START + 824)
-#define STR_CMDBOXWINDOW (RID_APP_START + 825)
+#define STR_MATH_DOCUMENT_FULLTYPE_CURRENT (RID_APP_START + 821)
+#define RID_SMPLUGINMENU (RID_APP_START + 822)
+#define STR_STATSTR_READING (RID_APP_START + 823)
+#define STR_STATSTR_WRITING (RID_APP_START + 824)
+#define STR_CMDBOXWINDOW (RID_APP_START + 825)
#define RID_ERR_IDENT (RID_APP_START + 920)
#define RID_ERR_UNKOWN (RID_APP_START + 921)
-#define RID_ERR_UNEXPECTEDCHARACTER (RID_APP_START + 922)
-#define RID_ERR_LGROUPEXPECTED (RID_APP_START + 923)
-#define RID_ERR_RGROUPEXPECTED (RID_APP_START + 924)
-#define RID_ERR_LBRACEEXPECTED (RID_APP_START + 925)
-#define RID_ERR_RBRACEEXPECTED (RID_APP_START + 926)
-#define RID_ERR_FUNCEXPECTED (RID_APP_START + 927)
-#define RID_ERR_UNOPEREXPECTED (RID_APP_START + 928)
-#define RID_ERR_BINOPEREXPECTED (RID_APP_START + 929)
-#define RID_ERR_SYMBOLEXPECTED (RID_APP_START + 930)
-#define RID_ERR_IDENTEXPECTED (RID_APP_START + 931)
-#define RID_ERR_POUNDEXPECTED (RID_APP_START + 932)
-#define RID_ERR_COLOREXPECTED (RID_APP_START + 933)
-#define RID_ERR_LPARENTEXPECTED (RID_APP_START + 934)
-#define RID_ERR_RPARENTEXPECTED (RID_APP_START + 935)
-#define RID_ERR_RIGHTEXPECTED (RID_APP_START + 936)
+#define RID_ERR_UNEXPECTEDCHARACTER (RID_APP_START + 922)
+#define RID_ERR_LGROUPEXPECTED (RID_APP_START + 923)
+#define RID_ERR_RGROUPEXPECTED (RID_APP_START + 924)
+#define RID_ERR_LBRACEEXPECTED (RID_APP_START + 925)
+#define RID_ERR_RBRACEEXPECTED (RID_APP_START + 926)
+#define RID_ERR_FUNCEXPECTED (RID_APP_START + 927)
+#define RID_ERR_UNOPEREXPECTED (RID_APP_START + 928)
+#define RID_ERR_BINOPEREXPECTED (RID_APP_START + 929)
+#define RID_ERR_SYMBOLEXPECTED (RID_APP_START + 930)
+#define RID_ERR_IDENTEXPECTED (RID_APP_START + 931)
+#define RID_ERR_POUNDEXPECTED (RID_APP_START + 932)
+#define RID_ERR_COLOREXPECTED (RID_APP_START + 933)
+#define RID_ERR_LPARENTEXPECTED (RID_APP_START + 934)
+#define RID_ERR_RPARENTEXPECTED (RID_APP_START + 935)
+#define RID_ERR_RIGHTEXPECTED (RID_APP_START + 936)
#define RID_ERR_OVERFLOW (RID_APP_START + 937)
// toolbox image lists for 'Selection' window
//!! RID_ILH_XYZ = RID_IL_XYZ + 1 !!
-#define RID_IL_CATALOG (RID_APP_START + 950)
-#define RID_ILH_CATALOG (RID_APP_START + 951)
-#define RID_IL_UNBINOPS (RID_APP_START + 952)
-#define RID_ILH_UNBINOPS (RID_APP_START + 953)
-#define RID_IL_RELATIONS (RID_APP_START + 954)
-#define RID_ILH_RELATIONS (RID_APP_START + 955)
-#define RID_IL_SETOPERATIONS (RID_APP_START + 956)
-#define RID_ILH_SETOPERATIONS (RID_APP_START + 957)
-#define RID_IL_FUNCTIONS (RID_APP_START + 958)
-#define RID_ILH_FUNCTIONS (RID_APP_START + 959)
-#define RID_IL_OPERATORS (RID_APP_START + 960)
-#define RID_ILH_OPERATORS (RID_APP_START + 961)
-#define RID_IL_ATTRIBUTES (RID_APP_START + 962)
-#define RID_ILH_ATTRIBUTES (RID_APP_START + 963)
-#define RID_IL_BRACKETS (RID_APP_START + 964)
-#define RID_ILH_BRACKETS (RID_APP_START + 965)
-#define RID_IL_FORMAT (RID_APP_START + 966)
-#define RID_ILH_FORMAT (RID_APP_START + 967)
-#define RID_IL_MISC (RID_APP_START + 968)
-#define RID_ILH_MISC (RID_APP_START + 969)
-
-#define RID_UNBINOPS_CAT (RID_APP_START + 1101)
-#define RID_RELATIONS_CAT (RID_APP_START + 1102)
+#define RID_IL_CATALOG (RID_APP_START + 950)
+#define RID_ILH_CATALOG (RID_APP_START + 951)
+#define RID_IL_UNBINOPS (RID_APP_START + 952)
+#define RID_ILH_UNBINOPS (RID_APP_START + 953)
+#define RID_IL_RELATIONS (RID_APP_START + 954)
+#define RID_ILH_RELATIONS (RID_APP_START + 955)
+#define RID_IL_SETOPERATIONS (RID_APP_START + 956)
+#define RID_ILH_SETOPERATIONS (RID_APP_START + 957)
+#define RID_IL_FUNCTIONS (RID_APP_START + 958)
+#define RID_ILH_FUNCTIONS (RID_APP_START + 959)
+#define RID_IL_OPERATORS (RID_APP_START + 960)
+#define RID_ILH_OPERATORS (RID_APP_START + 961)
+#define RID_IL_ATTRIBUTES (RID_APP_START + 962)
+#define RID_ILH_ATTRIBUTES (RID_APP_START + 963)
+#define RID_IL_BRACKETS (RID_APP_START + 964)
+#define RID_ILH_BRACKETS (RID_APP_START + 965)
+#define RID_IL_FORMAT (RID_APP_START + 966)
+#define RID_ILH_FORMAT (RID_APP_START + 967)
+#define RID_IL_MISC (RID_APP_START + 968)
+#define RID_ILH_MISC (RID_APP_START + 969)
+
+#define RID_UNBINOPS_CAT (RID_APP_START + 1101)
+#define RID_RELATIONS_CAT (RID_APP_START + 1102)
#define RID_SETOPERATIONS_CAT (RID_APP_START + 1103)
-#define RID_FUNCTIONS_CAT (RID_APP_START + 1104)
-#define RID_OPERATORS_CAT (RID_APP_START + 1105)
-#define RID_ATTRIBUTES_CAT (RID_APP_START + 1106)
-#define RID_BRACKETS_CAT (RID_APP_START + 1107)
-#define RID_FORMAT_CAT (RID_APP_START + 1108)
+#define RID_FUNCTIONS_CAT (RID_APP_START + 1104)
+#define RID_OPERATORS_CAT (RID_APP_START + 1105)
+#define RID_ATTRIBUTES_CAT (RID_APP_START + 1106)
+#define RID_BRACKETS_CAT (RID_APP_START + 1107)
+#define RID_FORMAT_CAT (RID_APP_START + 1108)
#define RID_UNBINOPS_CAT_HLP (RID_APP_START + 1109)
#define RID_RELATIONS_CAT_HLP (RID_APP_START + 1110)
-#define RID_SETOPEROPERATIONS_CAT_HLP (RID_APP_START + 1111)
+#define RID_SETOPEROPERATIONS_CAT_HLP (RID_APP_START + 1111)
#define RID_FUNCTIONS_CAT_HLP (RID_APP_START + 1112)
#define RID_OPERATORS_CAT_HLP (RID_APP_START + 1113)
#define RID_ATTRIBUTES_CAT_HLP (RID_APP_START + 1114)
#define RID_BRACKETS_CAT_HLP (RID_APP_START + 1115)
-#define RID_FORMAT_CAT_HLP (RID_APP_START + 1116)
-#define RID_MISC_CAT (RID_APP_START + 1117)
-#define RID_MISC_CAT_HLP (RID_APP_START + 1118)
+#define RID_FORMAT_CAT_HLP (RID_APP_START + 1116)
+#define RID_MISC_CAT (RID_APP_START + 1117)
+#define RID_MISC_CAT_HLP (RID_APP_START + 1118)
// new resource ID's
-#define RID_PLUSX (RID_APP_START + 1201)
-#define RID_MINUSX (RID_APP_START + 1202)
+#define RID_PLUSX (RID_APP_START + 1201)
+#define RID_MINUSX (RID_APP_START + 1202)
#define RID_PLUSMINUSX (RID_APP_START + 1203)
#define RID_MINUSPLUSX (RID_APP_START + 1204)
-#define RID_XPLUSY (RID_APP_START + 1205)
-#define RID_XCDOTY (RID_APP_START + 1206)
+#define RID_XPLUSY (RID_APP_START + 1205)
+#define RID_XCDOTY (RID_APP_START + 1206)
#define RID_XTIMESY (RID_APP_START + 1207)
#define RID_XSYMTIMESY (RID_APP_START + 1208)
#define RID_XMINUSY (RID_APP_START + 1209)
-#define RID_XOVERY (RID_APP_START + 1210)
-#define RID_XDIVY (RID_APP_START + 1211)
+#define RID_XOVERY (RID_APP_START + 1210)
+#define RID_XDIVY (RID_APP_START + 1211)
#define RID_XSYMDIVIDEY (RID_APP_START + 1212)
-#define RID_NEGX (RID_APP_START + 1213)
-#define RID_XANDY (RID_APP_START + 1214)
-#define RID_XORY (RID_APP_START + 1215)
+#define RID_NEGX (RID_APP_START + 1213)
+#define RID_XANDY (RID_APP_START + 1214)
+#define RID_XORY (RID_APP_START + 1215)
#define RID_XODIVIDEY (RID_APP_START + 1216)
-#define RID_XODOTY (RID_APP_START + 1217)
+#define RID_XODOTY (RID_APP_START + 1217)
#define RID_XOMINUSY (RID_APP_START + 1218)
#define RID_XOPLUSY (RID_APP_START + 1219)
#define RID_XOTIMESY (RID_APP_START + 1220)
-#define RID_XCIRCY (RID_APP_START + 1221)
+#define RID_XCIRCY (RID_APP_START + 1221)
#define RID_XWIDESLASHY (RID_APP_START + 1222)
#define RID_XWIDEBSLASHY (RID_APP_START + 1223)
-#define RID_XEQY (RID_APP_START + 1301)
-#define RID_XNEQY (RID_APP_START + 1302)
+#define RID_XEQY (RID_APP_START + 1301)
+#define RID_XNEQY (RID_APP_START + 1302)
#define RID_XEQUIVY (RID_APP_START + 1303)
#define RID_XORTHOY (RID_APP_START + 1304)
-#define RID_XLTY (RID_APP_START + 1305)
-#define RID_XGTY (RID_APP_START + 1306)
+#define RID_XLTY (RID_APP_START + 1305)
+#define RID_XGTY (RID_APP_START + 1306)
#define RID_XAPPROXY (RID_APP_START + 1307)
#define RID_XPARALLELY (RID_APP_START + 1308)
#define RID_XLESLANTY (RID_APP_START + 1309)
#define RID_XGESLANTY (RID_APP_START + 1310)
#define RID_XSIMEQY (RID_APP_START + 1311)
-#define RID_XPROPY (RID_APP_START + 1312)
-#define RID_XLEY (RID_APP_START + 1313)
-#define RID_XGEY (RID_APP_START + 1314)
-#define RID_XSIMY (RID_APP_START + 1315)
+#define RID_XPROPY (RID_APP_START + 1312)
+#define RID_XLEY (RID_APP_START + 1313)
+#define RID_XGEY (RID_APP_START + 1314)
+#define RID_XSIMY (RID_APP_START + 1315)
#define RID_XTOWARDY (RID_APP_START + 1316)
-#define RID_XLLY (RID_APP_START + 1317)
-#define RID_XGGY (RID_APP_START + 1318)
-#define RID_XDEFY (RID_APP_START + 1319)
+#define RID_XLLY (RID_APP_START + 1317)
+#define RID_XGGY (RID_APP_START + 1318)
+#define RID_XDEFY (RID_APP_START + 1319)
#define RID_XTRANSLY (RID_APP_START + 1320)
#define RID_XTRANSRY (RID_APP_START + 1321)
#define RID_XDIVIDESY (RID_APP_START + 1322)
#define RID_XNDIVIDESY (RID_APP_START + 1323)
-#define RID_DLARROW (RID_APP_START + 1324)
+#define RID_DLARROW (RID_APP_START + 1324)
#define RID_DLRARROW (RID_APP_START + 1325)
-#define RID_DRARROW (RID_APP_START + 1326)
+#define RID_DRARROW (RID_APP_START + 1326)
-#define RID_XINY (RID_APP_START + 1401)
+#define RID_XINY (RID_APP_START + 1401)
#define RID_XNOTINY (RID_APP_START + 1402)
-#define RID_XOWNSY (RID_APP_START + 1403)
+#define RID_XOWNSY (RID_APP_START + 1403)
#define RID_XINTERSECTIONY (RID_APP_START + 1405)
#define RID_XUNIONY (RID_APP_START + 1406)
#define RID_XSETMINUSY (RID_APP_START + 1407)
@@ -268,28 +269,28 @@
#define RID_XNSUBSETEQY (RID_APP_START + 1414)
#define RID_XNSUPSETY (RID_APP_START + 1415)
#define RID_XNSUPSETEQY (RID_APP_START + 1416)
-#define RID_SETN (RID_APP_START + 1417)
-#define RID_SETZ (RID_APP_START + 1418)
-#define RID_SETQ (RID_APP_START + 1419)
-#define RID_SETR (RID_APP_START + 1420)
-#define RID_SETC (RID_APP_START + 1421)
-
-#define RID_ABSX (RID_APP_START + 1501)
-#define RID_FACTX (RID_APP_START + 1502)
-#define RID_SQRTX (RID_APP_START + 1503)
+#define RID_SETN (RID_APP_START + 1417)
+#define RID_SETZ (RID_APP_START + 1418)
+#define RID_SETQ (RID_APP_START + 1419)
+#define RID_SETR (RID_APP_START + 1420)
+#define RID_SETC (RID_APP_START + 1421)
+
+#define RID_ABSX (RID_APP_START + 1501)
+#define RID_FACTX (RID_APP_START + 1502)
+#define RID_SQRTX (RID_APP_START + 1503)
#define RID_NROOTXY (RID_APP_START + 1504)
-#define RID_EX (RID_APP_START + 1505)
-#define RID_LNX (RID_APP_START + 1506)
-#define RID_EXPX (RID_APP_START + 1507)
-#define RID_LOGX (RID_APP_START + 1508)
-#define RID_SINX (RID_APP_START + 1509)
-#define RID_COSX (RID_APP_START + 1510)
-#define RID_TANX (RID_APP_START + 1511)
-#define RID_COTX (RID_APP_START + 1512)
-#define RID_SINHX (RID_APP_START + 1513)
-#define RID_COSHX (RID_APP_START + 1514)
-#define RID_TANHX (RID_APP_START + 1515)
-#define RID_COTHX (RID_APP_START + 1516)
+#define RID_EX (RID_APP_START + 1505)
+#define RID_LNX (RID_APP_START + 1506)
+#define RID_EXPX (RID_APP_START + 1507)
+#define RID_LOGX (RID_APP_START + 1508)
+#define RID_SINX (RID_APP_START + 1509)
+#define RID_COSX (RID_APP_START + 1510)
+#define RID_TANX (RID_APP_START + 1511)
+#define RID_COTX (RID_APP_START + 1512)
+#define RID_SINHX (RID_APP_START + 1513)
+#define RID_COSHX (RID_APP_START + 1514)
+#define RID_TANHX (RID_APP_START + 1515)
+#define RID_COTHX (RID_APP_START + 1516)
#define RID_ARCSINX (RID_APP_START + 1517)
#define RID_ARCCOSX (RID_APP_START + 1518)
#define RID_ARCTANX (RID_APP_START + 1519)
@@ -297,45 +298,45 @@
#define RID_ARSINHX (RID_APP_START + 1521)
#define RID_ARCOSHX (RID_APP_START + 1522)
#define RID_ARTANHX (RID_APP_START + 1523)
-#define RID_ARCOTHX (RID_APP_START + 1524)
+#define RID_ARCOTHX (RID_APP_START + 1524)
-#define RID_LIMX (RID_APP_START + 1601)
-#define RID_SUMX (RID_APP_START + 1602)
-#define RID_PRODX (RID_APP_START + 1603)
+#define RID_LIMX (RID_APP_START + 1601)
+#define RID_SUMX (RID_APP_START + 1602)
+#define RID_PRODX (RID_APP_START + 1603)
#define RID_COPRODX (RID_APP_START + 1604)
-#define RID_INTX (RID_APP_START + 1605)
-#define RID_IINTX (RID_APP_START + 1606)
-#define RID_IIINTX (RID_APP_START + 1607)
-#define RID_LINTX (RID_APP_START + 1609)
-#define RID_LLINTX (RID_APP_START + 1610)
+#define RID_INTX (RID_APP_START + 1605)
+#define RID_IINTX (RID_APP_START + 1606)
+#define RID_IIINTX (RID_APP_START + 1607)
+#define RID_LINTX (RID_APP_START + 1609)
+#define RID_LLINTX (RID_APP_START + 1610)
#define RID_LLLINTX (RID_APP_START + 1611)
#define RID_FROMXTOY (RID_APP_START + 1613)
-#define RID_FROMX (RID_APP_START + 1614)
-#define RID_TOX (RID_APP_START + 1615)
+#define RID_FROMX (RID_APP_START + 1614)
+#define RID_TOX (RID_APP_START + 1615)
#define RID_LIMINFX (RID_APP_START + 1616)
#define RID_LIMSUPX (RID_APP_START + 1617)
-#define RID_ACUTEX (RID_APP_START + 1701)
-#define RID_GRAVEX (RID_APP_START + 1702)
-#define RID_CHECKX (RID_APP_START + 1703)
-#define RID_BREVEX (RID_APP_START + 1704)
-#define RID_BARX (RID_APP_START + 1705)
-#define RID_VECX (RID_APP_START + 1706)
-#define RID_HATX (RID_APP_START + 1707)
-#define RID_TILDEX (RID_APP_START + 1708)
+#define RID_ACUTEX (RID_APP_START + 1701)
+#define RID_GRAVEX (RID_APP_START + 1702)
+#define RID_CHECKX (RID_APP_START + 1703)
+#define RID_BREVEX (RID_APP_START + 1704)
+#define RID_BARX (RID_APP_START + 1705)
+#define RID_VECX (RID_APP_START + 1706)
+#define RID_HATX (RID_APP_START + 1707)
+#define RID_TILDEX (RID_APP_START + 1708)
#define RID_CIRCLEX (RID_APP_START + 1709)
-#define RID_DOTX (RID_APP_START + 1710)
-#define RID_DDOTX (RID_APP_START + 1711)
-#define RID_DDDOTX (RID_APP_START + 1712)
+#define RID_DOTX (RID_APP_START + 1710)
+#define RID_DDOTX (RID_APP_START + 1711)
+#define RID_DDDOTX (RID_APP_START + 1712)
#define RID_OVERLINEX (RID_APP_START + 1713)
#define RID_UNDERLINEX (RID_APP_START + 1714)
#define RID_OVERSTRIKEX (RID_APP_START + 1715)
#define RID_PHANTOMX (RID_APP_START + 1716)
-#define RID_BOLDX (RID_APP_START + 1717)
-#define RID_ITALX (RID_APP_START + 1718)
-#define RID_SIZEXY (RID_APP_START + 1719)
-#define RID_FONTXY (RID_APP_START + 1720)
-#define RID_COLORX (RID_APP_START + 1721)
+#define RID_BOLDX (RID_APP_START + 1717)
+#define RID_ITALX (RID_APP_START + 1718)
+#define RID_SIZEXY (RID_APP_START + 1719)
+#define RID_FONTXY (RID_APP_START + 1720)
+#define RID_COLORX (RID_APP_START + 1721)
#define RID_WIDEHATX (RID_APP_START + 1722)
#define RID_WIDETILDEX (RID_APP_START + 1723)
#define RID_WIDEVECX (RID_APP_START + 1724)
@@ -365,100 +366,100 @@
#define RID_XUNDERBRACEY (RID_APP_START + 1826)
#define RID_NEWLINE (RID_APP_START + 1901)
-#define RID_SBLANK (RID_APP_START + 1902)
-#define RID_BLANK (RID_APP_START + 1903)
-#define RID_RSUBX (RID_APP_START + 1904)
+#define RID_SBLANK (RID_APP_START + 1902)
+#define RID_BLANK (RID_APP_START + 1903)
+#define RID_RSUBX (RID_APP_START + 1904)
#define RID_BINOMXY (RID_APP_START + 1905)
-#define RID_STACK (RID_APP_START + 1906)
-#define RID_MATRIX (RID_APP_START + 1907)
-#define RID_RSUPX (RID_APP_START + 1908)
+#define RID_STACK (RID_APP_START + 1906)
+#define RID_MATRIX (RID_APP_START + 1907)
+#define RID_RSUPX (RID_APP_START + 1908)
#define RID_ALIGNLX (RID_APP_START + 1909)
#define RID_ALIGNCX (RID_APP_START + 1910)
#define RID_ALIGNRX (RID_APP_START + 1911)
-#define RID_LSUBX (RID_APP_START + 1912)
-#define RID_LSUPX (RID_APP_START + 1916)
-#define RID_CSUBX (RID_APP_START + 1917)
-#define RID_CSUPX (RID_APP_START + 1918)
-#define RID_NOSPACE (RID_APP_START + 1919)
+#define RID_LSUBX (RID_APP_START + 1912)
+#define RID_LSUPX (RID_APP_START + 1916)
+#define RID_CSUBX (RID_APP_START + 1917)
+#define RID_CSUPX (RID_APP_START + 1918)
+#define RID_NOSPACE (RID_APP_START + 1919)
-#define RID_ALEPH (RID_APP_START + 2001)
+#define RID_ALEPH (RID_APP_START + 2001)
#define RID_EMPTYSET (RID_APP_START + 2002)
-#define RID_RE (RID_APP_START + 2003)
-#define RID_IM (RID_APP_START + 2004)
+#define RID_RE (RID_APP_START + 2003)
+#define RID_IM (RID_APP_START + 2004)
#define RID_INFINITY (RID_APP_START + 2005)
#define RID_PARTIAL (RID_APP_START + 2006)
-#define RID_WP (RID_APP_START + 2007)
+#define RID_WP (RID_APP_START + 2007)
#define RID_DOTSAXIS (RID_APP_START + 2008)
-#define RID_DOTSUP (RID_APP_START + 2009)
+#define RID_DOTSUP (RID_APP_START + 2009)
#define RID_DOTSDOWN (RID_APP_START + 2010)
#define RID_DOTSLOW (RID_APP_START + 2011)
#define RID_DOTSVERT (RID_APP_START + 2012)
-#define RID_NABLA (RID_APP_START + 2013)
-#define RID_HBAR (RID_APP_START + 2014)
+#define RID_NABLA (RID_APP_START + 2013)
+#define RID_HBAR (RID_APP_START + 2014)
#define RID_LAMBDABAR (RID_APP_START + 2015)
#define RID_LEFTARROW (RID_APP_START + 2016)
#define RID_RIGHTARROW (RID_APP_START + 2017)
-#define RID_UPARROW (RID_APP_START + 2018)
+#define RID_UPARROW (RID_APP_START + 2018)
#define RID_DOWNARROW (RID_APP_START + 2019)
-#define RID_EXISTS (RID_APP_START + 1608)
-#define RID_FORALL (RID_APP_START + 1612)
+#define RID_EXISTS (RID_APP_START + 1608)
+#define RID_FORALL (RID_APP_START + 1612)
// new menue resource ID's
#define RID_UNBINOPS_MENU (RID_APP_START + 2164)
#define RID_RELATIONS_MENU (RID_APP_START + 2165)
-#define RID_SETOPERATIONS_MENU (RID_APP_START + 2166)
+#define RID_SETOPERATIONS_MENU (RID_APP_START + 2166)
#define RID_FUNCTIONS_MENU (RID_APP_START + 2167)
#define RID_OPERATORS_MENU (RID_APP_START + 2168)
#define RID_ATTRIBUTES_MENU (RID_APP_START + 2169)
#define RID_BRACKETS_MENU (RID_APP_START + 2170)
#define RID_FORMAT_MENU (RID_APP_START + 2171)
#define RID_MISC_MENU (RID_APP_START + 2172)
-#define RID_FUNCTIONSOTHER1_MENU (RID_APP_START + 2173)
-
-#define RID_XPP_LINE (RID_APP_START + 3000)
-#define RID_XPP_DLINE (RID_APP_START + 3001)
-#define RID_XPP_SQRT (RID_APP_START + 3002)
-#define RID_XPP_SQRT2 (RID_APP_START + 3003)
-#define RID_XPP_HAT (RID_APP_START + 3004)
-#define RID_XPP_TILDE (RID_APP_START + 3005)
-#define RID_XPP_BAR (RID_APP_START + 3006)
-#define RID_XPP_VEC (RID_APP_START + 3007)
-#define RID_XPP_LBRACE (RID_APP_START + 3008)
-#define RID_XPP_RBRACE (RID_APP_START + 3009)
-#define RID_XPP_LPARENT (RID_APP_START + 3010)
-#define RID_XPP_RPARENT (RID_APP_START + 3011)
-#define RID_XPP_LANGLE (RID_APP_START + 3012)
-#define RID_XPP_RANGLE (RID_APP_START + 3013)
-#define RID_XPP_LBRACKET (RID_APP_START + 3014)
-#define RID_XPP_RBRACKET (RID_APP_START + 3015)
-#define RID_XPP_LDBRACKET (RID_APP_START + 3016)
-#define RID_XPP_RDBRACKET (RID_APP_START + 3017)
-#define RID_XPP_LCEIL (RID_APP_START + 3018)
-#define RID_XPP_RCEIL (RID_APP_START + 3019)
-#define RID_XPP_LFLOOR (RID_APP_START + 3020)
-#define RID_XPP_RFLOOR (RID_APP_START + 3021)
-#define RID_XPP_OVERBRACE (RID_APP_START + 3022)
-#define RID_XPP_UNDERBRACE (RID_APP_START + 3023)
-
-#define RID_LOCALIZED_NAMES (RID_APP_START + 3101)
-#define RID_UI_SYMBOL_NAMES (RID_APP_START + 3102)
-#define RID_EXPORT_SYMBOL_NAMES (RID_APP_START + 3103)
-#define RID_LOCALIZED_SYMBOLSET_NAMES (RID_APP_START + 3104)
-#define RID_UI_SYMBOLSET_NAMES (RID_APP_START + 3105)
-#define RID_EXPORT_SYMBOLSET_NAMES (RID_APP_START + 3106)
-#define RID_FRENCH_50_NAMES (RID_APP_START + 3107)
-#define RID_FRENCH_60_NAMES (RID_APP_START + 3108)
-#define RID_ITALIAN_50_NAMES (RID_APP_START + 3109)
-#define RID_ITALIAN_60_NAMES (RID_APP_START + 3110)
-#define RID_SWEDISH_50_NAMES (RID_APP_START + 3111)
-#define RID_SWEDISH_60_NAMES (RID_APP_START + 3112)
-#define RID_SPANISH_50_NAMES (RID_APP_START + 3113)
-#define RID_SPANISH_60_NAMES (RID_APP_START + 3114)
-
-#define MN_SUB_SENDTO (RID_APP_START + 3120)
+#define RID_FUNCTIONSOTHER1_MENU (RID_APP_START + 2173)
+
+#define RID_XPP_LINE (RID_APP_START + 3000)
+#define RID_XPP_DLINE (RID_APP_START + 3001)
+#define RID_XPP_SQRT (RID_APP_START + 3002)
+#define RID_XPP_SQRT2 (RID_APP_START + 3003)
+#define RID_XPP_HAT (RID_APP_START + 3004)
+#define RID_XPP_TILDE (RID_APP_START + 3005)
+#define RID_XPP_BAR (RID_APP_START + 3006)
+#define RID_XPP_VEC (RID_APP_START + 3007)
+#define RID_XPP_LBRACE (RID_APP_START + 3008)
+#define RID_XPP_RBRACE (RID_APP_START + 3009)
+#define RID_XPP_LPARENT (RID_APP_START + 3010)
+#define RID_XPP_RPARENT (RID_APP_START + 3011)
+#define RID_XPP_LANGLE (RID_APP_START + 3012)
+#define RID_XPP_RANGLE (RID_APP_START + 3013)
+#define RID_XPP_LBRACKET (RID_APP_START + 3014)
+#define RID_XPP_RBRACKET (RID_APP_START + 3015)
+#define RID_XPP_LDBRACKET (RID_APP_START + 3016)
+#define RID_XPP_RDBRACKET (RID_APP_START + 3017)
+#define RID_XPP_LCEIL (RID_APP_START + 3018)
+#define RID_XPP_RCEIL (RID_APP_START + 3019)
+#define RID_XPP_LFLOOR (RID_APP_START + 3020)
+#define RID_XPP_RFLOOR (RID_APP_START + 3021)
+#define RID_XPP_OVERBRACE (RID_APP_START + 3022)
+#define RID_XPP_UNDERBRACE (RID_APP_START + 3023)
+
+#define RID_LOCALIZED_NAMES (RID_APP_START + 3101)
+#define RID_UI_SYMBOL_NAMES (RID_APP_START + 3102)
+#define RID_EXPORT_SYMBOL_NAMES (RID_APP_START + 3103)
+#define RID_LOCALIZED_SYMBOLSET_NAMES (RID_APP_START + 3104)
+#define RID_UI_SYMBOLSET_NAMES (RID_APP_START + 3105)
+#define RID_EXPORT_SYMBOLSET_NAMES (RID_APP_START + 3106)
+#define RID_FRENCH_50_NAMES (RID_APP_START + 3107)
+#define RID_FRENCH_60_NAMES (RID_APP_START + 3108)
+#define RID_ITALIAN_50_NAMES (RID_APP_START + 3109)
+#define RID_ITALIAN_60_NAMES (RID_APP_START + 3110)
+#define RID_SWEDISH_50_NAMES (RID_APP_START + 3111)
+#define RID_SWEDISH_60_NAMES (RID_APP_START + 3112)
+#define RID_SPANISH_50_NAMES (RID_APP_START + 3113)
+#define RID_SPANISH_60_NAMES (RID_APP_START + 3114)
+
+#define MN_SUB_SENDTO (RID_APP_START + 3120)
#define HID_SMA_OPTIONSDIALOG (HID_SMA_START + 1)
-#define HID_SMA_FONTDIALOG (HID_SMA_START + 2)
+#define HID_SMA_FONTDIALOG (HID_SMA_START + 2)
#define HID_SMA_FONTSIZEDIALOG (HID_SMA_START + 3)
#define HID_SMA_FONTTYPEDIALOG (HID_SMA_START + 4)
#define HID_SMA_DISTANCEDIALOG (HID_SMA_START + 5)
@@ -474,32 +475,32 @@
#define HID_SMA_ILLEGALFILEERROR (HID_SMA_START + 15)
#define HID_SMA_WRITESYMBOLERROR (HID_SMA_START + 16)
#define HID_SMA_READSYMBOLERROR (HID_SMA_START + 17)
-#define HID_SMA_NOMATHTYPEFACEWARNING (HID_SMA_START + 18)
-#define HID_SMA_OBJECTNAME (HID_SMA_START + 19)
-#define HID_SMA_VIEWNAME (HID_SMA_START + 20)
+#define HID_SMA_NOMATHTYPEFACEWARNING (HID_SMA_START + 18)
+#define HID_SMA_OBJECTNAME (HID_SMA_START + 19)
+#define HID_SMA_VIEWNAME (HID_SMA_START + 20)
#define HID_SMA_UNDOEDITNAME (HID_SMA_START + 21)
#define HID_SMA_UNDOFORMATNAME (HID_SMA_START + 22)
-#define HID_SMA_APPICO (HID_SMA_START + 23)
-#define HID_SMA_DOCICO (HID_SMA_START + 24)
-#define HID_SMA_TMPICO (HID_SMA_START + 25)
+#define HID_SMA_APPICO (HID_SMA_START + 23)
+#define HID_SMA_DOCICO (HID_SMA_START + 24)
+#define HID_SMA_TMPICO (HID_SMA_START + 25)
#define HID_SMA_COMMANDMENU (HID_SMA_START + 26)
-#define HID_SMA_VIEWMENU (HID_SMA_START + 27)
+#define HID_SMA_VIEWMENU (HID_SMA_START + 27)
#define HID_SMA_DISTANCEMENU (HID_SMA_START + 28)
-#define HID_SMA_FONTMENU (HID_SMA_START + 29)
+#define HID_SMA_FONTMENU (HID_SMA_START + 29)
#define HID_SMA_STARTUPWINDOW (HID_SMA_START + 30)
#define HID_SMA_TOOLBOXWINDOW (HID_SMA_START + 31)
#define HID_SMA_CMDBOXWINDOW (HID_SMA_START + 32)
#define HID_SMA_UPDATEOBJECT (HID_SMA_START + 33)
#define HID_SMA_FONTREGULAR (HID_SMA_START + 34)
-#define HID_SMA_FONTITALIC (HID_SMA_START + 35)
-#define HID_SMA_FONTBOLD (HID_SMA_START + 36)
+#define HID_SMA_FONTITALIC (HID_SMA_START + 35)
+#define HID_SMA_FONTBOLD (HID_SMA_START + 36)
#define HID_SMA_PRINTOPTION (HID_SMA_START + 37)
#define HID_SMA_DOCUMENTSTR (HID_SMA_START + 38)
#define HID_SMA_SYMBOLFILESSTR (HID_SMA_START + 39)
#define HID_SMA_ALLFILESSTR (HID_SMA_START + 40)
-#define HID_SMA_CREATORSTR (HID_SMA_START + 41)
-#define HID_SMA_FILESMFTYP (HID_SMA_START + 42)
-#define HID_SMA_FILESYMTYP (HID_SMA_START + 43)
+#define HID_SMA_CREATORSTR (HID_SMA_START + 41)
+#define HID_SMA_FILESMFTYP (HID_SMA_START + 42)
+#define HID_SMA_FILESYMTYP (HID_SMA_START + 43)
#define HID_SMA_WIN_DOCUMENT (HID_SMA_START + 44)
#define HID_SMA_COMMAND_WIN_EDIT (HID_SMA_START + 45)
@@ -513,7 +514,7 @@
#define HID_SMA_XCDOTY (HID_SMA_START + 57)
#define HID_SMA_XTIMESY (HID_SMA_START + 58)
#define HID_SMA_XSYMTIMESY (HID_SMA_START + 59)
-#define HID_SMA_XSYMDIVIDEY (HID_SMA_START + 60)
+#define HID_SMA_XSYMDIVIDEY (HID_SMA_START + 60)
#define HID_SMA_XDIVY (HID_SMA_START + 61)
#define HID_SMA_XOVERY (HID_SMA_START + 62)
#define HID_SMA_XODIVIDEY (HID_SMA_START + 63)
@@ -548,7 +549,7 @@
#define HID_SMA_XNOTINY (HID_SMA_START + 92)
#define HID_SMA_XOWNSY (HID_SMA_START + 93)
#define HID_SMA_XUNIONY (HID_SMA_START + 94)
-#define HID_SMA_XINTERSECTIONY (HID_SMA_START + 95)
+#define HID_SMA_XINTERSECTIONY (HID_SMA_START + 95)
#define HID_SMA_XSETMINUSY (HID_SMA_START + 96)
#define HID_SMA_XSLASHY (HID_SMA_START + 97)
#define HID_SMA_XSUBSETY (HID_SMA_START + 98)
@@ -556,14 +557,14 @@
#define HID_SMA_XSUPSETY (HID_SMA_START + 100)
#define HID_SMA_XSUPSETEQY (HID_SMA_START + 101)
#define HID_SMA_XNSUBSETY (HID_SMA_START + 102)
-#define HID_SMA_XNSUBSETEQY (HID_SMA_START + 103)
+#define HID_SMA_XNSUBSETEQY (HID_SMA_START + 103)
#define HID_SMA_XNSUPSETY (HID_SMA_START + 104)
-#define HID_SMA_XNSUPSETEQY (HID_SMA_START + 105)
+#define HID_SMA_XNSUPSETEQY (HID_SMA_START + 105)
#define HID_SMA_ABSX (HID_SMA_START + 106)
#define HID_SMA_FACTX (HID_SMA_START + 107)
#define HID_SMA_SQRTX (HID_SMA_START + 108)
#define HID_SMA_NROOTXY (HID_SMA_START + 109)
-#define HID_SMA_EX (HID_SMA_START + 110)
+#define HID_SMA_EX (HID_SMA_START + 110)
#define HID_SMA_EXPX (HID_SMA_START + 111)
#define HID_SMA_LNX (HID_SMA_START + 112)
#define HID_SMA_LOGX (HID_SMA_START + 113)
@@ -609,28 +610,28 @@
#define HID_SMA_DRARROW (HID_SMA_START + 153)
#define HID_SMA_MISC_CAT (HID_SMA_START + 154)
-#define HID_SMA_UNBINOPS_CAT (HID_SMA_START + 155)
-#define HID_SMA_RELATIONS_CAT (HID_SMA_START + 156)
-#define HID_SMA_SETOPERATIONS_CAT (HID_SMA_START + 157)
-#define HID_SMA_FUNCTIONS_CAT (HID_SMA_START + 158)
-#define HID_SMA_OPERATORS_CAT (HID_SMA_START + 159)
-#define HID_SMA_ATTRIBUTES_CAT (HID_SMA_START + 160)
-#define HID_SMA_BRACKETS_CAT (HID_SMA_START + 161)
+#define HID_SMA_UNBINOPS_CAT (HID_SMA_START + 155)
+#define HID_SMA_RELATIONS_CAT (HID_SMA_START + 156)
+#define HID_SMA_SETOPERATIONS_CAT (HID_SMA_START + 157)
+#define HID_SMA_FUNCTIONS_CAT (HID_SMA_START + 158)
+#define HID_SMA_OPERATORS_CAT (HID_SMA_START + 159)
+#define HID_SMA_ATTRIBUTES_CAT (HID_SMA_START + 160)
+#define HID_SMA_BRACKETS_CAT (HID_SMA_START + 161)
#define HID_SMA_FORMAT_CAT (HID_SMA_START + 162)
-#define HID_SMA_OPERATOR_WIN (HID_SMA_START + 163)
-#define HID_SMA_UNBINOPS_TBX (HID_SMA_START + 164)
-#define HID_SMA_RELATIONS_TBX (HID_SMA_START + 165)
-#define HID_SMA_SETOPERATIONS_TBX (HID_SMA_START + 166)
-#define HID_SMA_FUNCTIONS_TBX (HID_SMA_START + 167)
-#define HID_SMA_OPERATORS_TBX (HID_SMA_START + 168)
-#define HID_SMA_ATTRIBUTES_TBX (HID_SMA_START + 169)
-#define HID_SMA_BRACKETS_TBX (HID_SMA_START + 170)
+#define HID_SMA_OPERATOR_WIN (HID_SMA_START + 163)
+#define HID_SMA_UNBINOPS_TBX (HID_SMA_START + 164)
+#define HID_SMA_RELATIONS_TBX (HID_SMA_START + 165)
+#define HID_SMA_SETOPERATIONS_TBX (HID_SMA_START + 166)
+#define HID_SMA_FUNCTIONS_TBX (HID_SMA_START + 167)
+#define HID_SMA_OPERATORS_TBX (HID_SMA_START + 168)
+#define HID_SMA_ATTRIBUTES_TBX (HID_SMA_START + 169)
+#define HID_SMA_BRACKETS_TBX (HID_SMA_START + 170)
#define HID_SMA_FORMAT_TBX (HID_SMA_START + 171)
-#define HID_SMA_SELECTION_TBX (HID_SMA_START + 172)
-#define HID_SMA_COMMAND_WIN (HID_SMA_START + 173)
+#define HID_SMA_SELECTION_TBX (HID_SMA_START + 172)
+#define HID_SMA_COMMAND_WIN (HID_SMA_START + 173)
#define HID_SMA_MISC_MENU (HID_SMA_START + 174)
-#define HID_SMA_FUNCTIONSOTHER1_MENU (HID_SMA_START + 175)
+#define HID_SMA_FUNCTIONSOTHER1_MENU (HID_SMA_START + 175)
#define HID_SMA_ACUTEX (HID_SMA_START + 180)
#define HID_SMA_BARX (HID_SMA_START + 181)
@@ -646,7 +647,7 @@
#define HID_SMA_VECX (HID_SMA_START + 191)
#define HID_SMA_UNDERLINEX (HID_SMA_START + 192)
#define HID_SMA_OVERLINEX (HID_SMA_START + 193)
-#define HID_SMA_OVERSTRIKEX (HID_SMA_START + 194)
+#define HID_SMA_OVERSTRIKEX (HID_SMA_START + 194)
#define HID_SMA_PHANTOMX (HID_SMA_START + 195)
#define HID_SMA_BOLDX (HID_SMA_START + 196)
#define HID_SMA_ITALX (HID_SMA_START + 197)
@@ -663,7 +664,7 @@
#define HID_SMA_LRLINEX (HID_SMA_START + 208)
#define HID_SMA_LRDLINEX (HID_SMA_START + 209)
#define HID_SMA_SLRPARENTX (HID_SMA_START + 210)
-#define HID_SMA_SLRBRACKETX (HID_SMA_START + 211)
+#define HID_SMA_SLRBRACKETX (HID_SMA_START + 211)
#define HID_SMA_SLRBRACEX (HID_SMA_START + 212)
#define HID_SMA_SLRANGLEX (HID_SMA_START + 213)
#define HID_SMA_SLRCEILX (HID_SMA_START + 214)
@@ -685,17 +686,17 @@
#define HID_SMA_ALIGNRX (HID_SMA_START + 230)
#define HID_SMA_ALEPH (HID_SMA_START + 231)
#define HID_SMA_EMPTYSET (HID_SMA_START + 232)
-#define HID_SMA_RE (HID_SMA_START + 233)
-#define HID_SMA_IM (HID_SMA_START + 234)
+#define HID_SMA_RE (HID_SMA_START + 233)
+#define HID_SMA_IM (HID_SMA_START + 234)
#define HID_SMA_INFINITY (HID_SMA_START + 235)
#define HID_SMA_PARTIAL (HID_SMA_START + 236)
-#define HID_SMA_WP (HID_SMA_START + 237)
+#define HID_SMA_WP (HID_SMA_START + 237)
#define HID_SMA_DOTSAXIS (HID_SMA_START + 238)
#define HID_SMA_DOTSUP (HID_SMA_START + 239)
#define HID_SMA_DOTSDOWN (HID_SMA_START + 240)
#define HID_SMA_DOTSLOW (HID_SMA_START + 241)
#define HID_SMA_DOTSVERT (HID_SMA_START + 242)
-#define HID_SMA_NOSPACE (HID_SMA_START + 243)
+#define HID_SMA_NOSPACE (HID_SMA_START + 243)
#define HID_SMA_SETN (HID_SMA2_START + 1)
#define HID_SMA_SETZ (HID_SMA2_START + 2)
@@ -714,44 +715,44 @@
#define HID_SMA_UPARROW (HID_SMA2_START + 15)
#define HID_SMA_DOWNARROW (HID_SMA2_START + 16)
-#define HID_SMA_DEFAULT_DIST (HID_SMA2_START + 17)
+#define HID_SMA_DEFAULT_DIST (HID_SMA2_START + 17)
#define HID_SMA_LINE_DIST (HID_SMA2_START + 18)
#define HID_SMA_ROOT_DIST (HID_SMA2_START + 19)
#define HID_SMA_SUP_DIST (HID_SMA2_START + 20)
#define HID_SMA_SUB_DIST (HID_SMA2_START + 21)
-#define HID_SMA_NUMERATOR_DIST (HID_SMA2_START + 22)
-#define HID_SMA_DENOMINATOR_DIST (HID_SMA2_START + 23)
-#define HID_SMA_FRACLINE_EXCWIDTH (HID_SMA2_START + 24)
-#define HID_SMA_FRACLINE_LINEWIDTH (HID_SMA2_START + 25)
-#define HID_SMA_UPPERLIMIT_DIST (HID_SMA2_START + 26)
-#define HID_SMA_LOWERLIMIT_DIST (HID_SMA2_START + 27)
-#define HID_SMA_BRACKET_EXCHEIGHT (HID_SMA2_START + 28)
-#define HID_SMA_BRACKET_DIST (HID_SMA2_START + 29)
-#define HID_SMA_MATRIXROW_DIST (HID_SMA2_START + 30)
-#define HID_SMA_MATRIXCOL_DIST (HID_SMA2_START + 31)
-#define HID_SMA_ATTRIBUT_DIST (HID_SMA2_START + 32)
-#define HID_SMA_INTERATTRIBUT_DIST (HID_SMA2_START + 33)
-#define HID_SMA_OPERATOR_EXCHEIGHT (HID_SMA2_START + 34)
-#define HID_SMA_OPERATOR_DIST (HID_SMA2_START + 35)
-#define HID_SMA_LEFTBORDER_DIST (HID_SMA2_START + 36)
-#define HID_SMA_RIGHTBORDER_DIST (HID_SMA2_START + 37)
-#define HID_SMA_UPPERBORDER_DIST (HID_SMA2_START + 38)
-#define HID_SMA_LOWERBORDER_DIST (HID_SMA2_START + 39)
-#define HID_SMA_SCALE_ALL_BRACKETS (HID_SMA2_START + 40)
-#define HID_SMA_BRACKET_EXCHEIGHT2 (HID_SMA2_START + 41)
+#define HID_SMA_NUMERATOR_DIST (HID_SMA2_START + 22)
+#define HID_SMA_DENOMINATOR_DIST (HID_SMA2_START + 23)
+#define HID_SMA_FRACLINE_EXCWIDTH (HID_SMA2_START + 24)
+#define HID_SMA_FRACLINE_LINEWIDTH (HID_SMA2_START + 25)
+#define HID_SMA_UPPERLIMIT_DIST (HID_SMA2_START + 26)
+#define HID_SMA_LOWERLIMIT_DIST (HID_SMA2_START + 27)
+#define HID_SMA_BRACKET_EXCHEIGHT (HID_SMA2_START + 28)
+#define HID_SMA_BRACKET_DIST (HID_SMA2_START + 29)
+#define HID_SMA_MATRIXROW_DIST (HID_SMA2_START + 30)
+#define HID_SMA_MATRIXCOL_DIST (HID_SMA2_START + 31)
+#define HID_SMA_ATTRIBUT_DIST (HID_SMA2_START + 32)
+#define HID_SMA_INTERATTRIBUT_DIST (HID_SMA2_START + 33)
+#define HID_SMA_OPERATOR_EXCHEIGHT (HID_SMA2_START + 34)
+#define HID_SMA_OPERATOR_DIST (HID_SMA2_START + 35)
+#define HID_SMA_LEFTBORDER_DIST (HID_SMA2_START + 36)
+#define HID_SMA_RIGHTBORDER_DIST (HID_SMA2_START + 37)
+#define HID_SMA_UPPERBORDER_DIST (HID_SMA2_START + 38)
+#define HID_SMA_LOWERBORDER_DIST (HID_SMA2_START + 39)
+#define HID_SMA_SCALE_ALL_BRACKETS (HID_SMA2_START + 40)
+#define HID_SMA_BRACKET_EXCHEIGHT2 (HID_SMA2_START + 41)
#define HID_SMA_LMRANGLEXY (HID_SMA2_START + 42)
#define HID_SMA_SLMRANGLEXY (HID_SMA2_START + 43)
#define HID_SMA_XWIDESLASHY (HID_SMA2_START + 44)
-#define HID_SMA_XWIDEBSLASHY (HID_SMA2_START + 45)
+#define HID_SMA_XWIDEBSLASHY (HID_SMA2_START + 45)
#define HID_SMA_XOVERBRACEY (HID_SMA2_START + 46)
-#define HID_SMA_XUNDERBRACEY (HID_SMA2_START + 47)
+#define HID_SMA_XUNDERBRACEY (HID_SMA2_START + 47)
#define HID_SMA_LRDBRACKETX (HID_SMA2_START + 48)
-#define HID_SMA_SLRDBRACKETX (HID_SMA2_START + 49)
+#define HID_SMA_SLRDBRACKETX (HID_SMA2_START + 49)
-#define HID_SMA_CONTROL_SYMBOLSET_VIEW (HID_SMA2_START + 50)
-#define HID_SMA_CONTROL_FONTCHAR_VIEW (HID_SMA2_START + 51)
+#define HID_SMA_CONTROL_SYMBOLSET_VIEW (HID_SMA2_START + 50)
+#define HID_SMA_CONTROL_FONTCHAR_VIEW (HID_SMA2_START + 51)
-#define BMP_ARROW_RIGHT 1
+#define BMP_ARROW_RIGHT 1
#define MN_WIN 60
#define MN_SUB_VIEW 31
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 2cd7c54..210896b 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -24,6 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef SYMBOL_HXX
#define SYMBOL_HXX
@@ -46,7 +47,7 @@
#include "smmod.hxx"
-#define SYMBOLSET_NONE 0xFFFF
+#define SYMBOLSET_NONE 0xFFFF
#define SYMBOL_NONE 0xFFFF
@@ -78,6 +79,7 @@ inline const String GetUiSymbolSetName( const String &rExportSymbolSetName )
class SmSym
{
+private:
SmFace m_aFace;
String m_aName;
String m_aExportName;
@@ -147,6 +149,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 b41102f..6cd7e17 100644
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
@@ -24,6 +24,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 a3c1872..3cecfe2 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -24,6 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef TYPES_HXX
#define TYPES_HXX
@@ -199,6 +200,5 @@ enum MathSymbol
MS_SETC = (sal_Unicode) 0x2102
};
-
#endif
diff --git a/starmath/source/action.cxx b/starmath/source/action.cxx
index 6265c19..31996c4 100644
--- a/starmath/source/action.cxx
+++ b/starmath/source/action.cxx
@@ -64,4 +64,3 @@ UniString SmFormatAction::GetComment() const
return (SmResId(RID_UNDOFORMATNAME));
}
-
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx
index 7e393fe..771bba1 100644
--- a/starmath/source/register.cxx
+++ b/starmath/source/register.cxx
@@ -315,5 +315,3 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
}
} // extern "C"
-
-
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index 1c0e0a7..ad1fef4 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -87,7 +87,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;
@@ -329,4 +329,3 @@ void SmSymbolManager::Save()
}
}
-
diff --git a/starmath/source/symbol.src b/starmath/source/symbol.src
index dbac415..f349fcd 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/toolbox.cxx b/starmath/source/toolbox.cxx
index a36fc38..2bc413f 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -406,4 +406,3 @@ SmToolBoxWrapper::SmToolBoxWrapper(Window *pParentWindow,
((SfxFloatingWindow *)pWindow)->Initialize(pInfo);
}
-
diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx
index c857b44..2098fdd 100644
--- a/starmath/source/unodoc.cxx
+++ b/starmath/source/unodoc.cxx
@@ -68,4 +68,3 @@ uno::Reference< uno::XInterface > SAL_CALL SmDocument_createInstance(
return uno::Reference< uno::XInterface >();
}
-
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 520181e..c3761bf 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -187,7 +187,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));
@@ -377,5 +377,3 @@ SmFace & operator *= (SmFace &rFace, const Fraction &rFrac)
return rFace;
}
-
-
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index f6d8852..3d81e36 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -79,10 +79,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 e2c101b..ea65cf6 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -81,7 +81,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>
@@ -257,7 +257,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;
@@ -303,57 +302,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");
}
@@ -673,7 +682,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/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index 6ad87d4..457d575 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -267,6 +267,3 @@ USHORT SwDoc::CallEvent( USHORT nEvent, const SwCallMouseEvent& rCallEvent,
return nRet;
}
-
-
-
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 19ec62e..4605aa6 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -64,20 +64,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;
@@ -89,8 +86,8 @@ SV_IMPL_VARARR_SORT( _ZSortFlys, _ZSortFly )
|*
|* SwDoc::GroupSelection / SwDoc::UnGroupSelection
|*
-|* Ersterstellung JP 21.08.95
-|* Letzte Aenderung JP 21.08.95
+|* Created: JP 21.08.95
+|* Last Modified: JP 21.08.95
|*
|*************************************************************************/
// OD 2004-04-01 #i26791# - local method to determine positioning and
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 021bb55..058524e 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -100,21 +100,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;
@@ -134,8 +131,8 @@ 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
+|* Created: MA 22. Sep. 92
+|* Last modified: JP 08.05.98
|*
|*************************************************************************/
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index f5a10ae..ec171fa 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -55,10 +55,9 @@
#include <frmatr.hxx>
#include <SwStyleNameMapper.hxx>
#include <SwNodeNum.hxx>
-// --> OD 2008-03-13 #refactorlists#
+
#include <list.hxx>
#include <listfunc.hxx>
-// <--
#include <map>
@@ -86,21 +85,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;
@@ -110,16 +105,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);
@@ -145,15 +138,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();
@@ -210,7 +199,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--)
{
@@ -270,7 +258,6 @@ BOOL SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
}
}
}
- /* <-- #111107# */
/* --> #i13747#
@@ -351,7 +338,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
@@ -362,13 +349,11 @@ BOOL SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
bMoveApplicable = false;
}
}
- // <--
}
if (! bMoveApplicable )
return FALSE;
- /* <-- #i13747 # */
if( DoesUndo() )
{
ClearRedo();
@@ -889,25 +874,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 );
@@ -943,7 +923,6 @@ void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
}
}
}
- // <--
for( n = 0; n < MAXLEVEL; ++n )
if( nChgFmtLevel & ( 1 << n ))
@@ -952,14 +931,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();
}
@@ -1007,7 +982,6 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
}
}
- // --> OD 2008-03-17 #refactorlists#
if ( bSetItem )
{
if ( bCreateNewList )
@@ -1036,12 +1010,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 )
{
@@ -1050,12 +1022,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.
@@ -1077,14 +1048,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 )
{
@@ -1092,7 +1060,6 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
aResetAttrsArray.Insert( RES_LR_SPACE );
ResetAttrs( rPam, sal_True, &aResetAttrsArray );
}
- // <--
if (DoesUndo())
EndUndo( UNDO_INSNUM, NULL );
@@ -1102,7 +1069,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();
@@ -1178,7 +1144,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() )
// {
@@ -1203,7 +1168,6 @@ void SwDoc::SetNodeNumStart( const SwPosition& rPos, USHORT nStt )
SetModified();
}
- // <--
}
}
@@ -1212,14 +1176,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 ] ))
{
@@ -1235,7 +1197,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
@@ -1258,7 +1219,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 );
@@ -1272,10 +1232,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 )
{
@@ -1311,19 +1269,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);
@@ -1335,7 +1288,6 @@ sal_Bool SwDoc::RenameNumRule(const String & rOldName, const String &
rNewName,
SwTxtNode * pTxtNd = *aIter;
pTxtNd->SetAttr(aItem);
}
- // <--
bResult = sal_True;
@@ -1351,7 +1303,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 );
@@ -1377,7 +1328,6 @@ void SwDoc::StopNumRuleAnimations( OutputDevice* pOut )
if( ((SwTxtFrm*)pFrm)->HasAnimation() )
((SwTxtFrm*)pFrm)->StopAnimation( pOut );
}
- // <--
}
}
@@ -1389,7 +1339,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() )
{
@@ -1398,7 +1347,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>.
@@ -1481,14 +1429,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
@@ -1504,16 +1451,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();
@@ -1530,7 +1474,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];
@@ -1553,10 +1496,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;
}
@@ -1631,13 +1574,11 @@ 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 );
@@ -1654,13 +1595,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();
@@ -1690,10 +1629,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;
{
@@ -1845,7 +1782,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,
@@ -1863,12 +1799,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)
@@ -1876,7 +1810,7 @@ const SwNumRule * SwDoc::SearchNumRule(const SwPosition & rPos,
else
aIdx--;
}
- // <--
+
if (aIdx.GetNode().IsTxtNode())
{
pTxtNd = aIdx.GetNode().GetTxtNode();
@@ -1889,7 +1823,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();
}
@@ -1908,7 +1841,6 @@ const SwNumRule * SwDoc::SearchNumRule(const SwPosition & rPos,
}
}
- // --> OD 2005-10-20 #i55391#
if ( bInvestigateStartNode )
{
if (bForward)
@@ -1916,18 +1848,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 )
@@ -1964,12 +1894,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)
@@ -2003,7 +1931,6 @@ BOOL SwDoc::NumUpDown( const SwPaM& rPam, BOOL bDown )
if( bRet )
{
- /* <-- #i24560# */
if( DoesUndo() )
{
ClearRedo();
@@ -2441,9 +2368,7 @@ SwNumRule* SwDoc::GetCurrNumRule( const SwPosition& rPos ) const
if( pTNd )
{
- // --> OD 2008-02-20 #refactorlists#
// pTNd->SyncNumberAndNumRule();
- // <--
pRet = pTNd->GetNumRule();
}
@@ -2481,19 +2406,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,
@@ -2504,31 +2425,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())
{
@@ -2628,7 +2544,6 @@ void SwDoc::UpdateNumRule()
rNmTbl[ n ]->Validate();
}
-// --> OD 2008-04-02 #refactorlists#
void SwDoc::MarkListLevel( const String& sListId,
const int nListLevel,
const BOOL bValue )
@@ -2648,10 +2563,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;
@@ -2668,7 +2580,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
@@ -2748,9 +2659,7 @@ void SwDoc::getNumItems( tSortedNodeNumList& orNodeNumList ) const
}
}
}
-// <--
-// --> OD 2007-11-15 #i83479#
// implementation for interface <IDocumentOutlineNodes>
sal_Int32 SwDoc::getOutlineNodesCount() const
{
@@ -2790,9 +2699,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 )
@@ -2915,8 +2822,7 @@ void SwDoc::deleteListForListStyle( const String sListStyleName )
deleteList( sListId );
}
}
-// <--
-// --> OD 2008-07-08 #i91400#
+
void SwDoc::trackChangeOfListStyleName( const String sListStyleName,
const String sNewListStyleName )
{
@@ -2930,9 +2836,7 @@ void SwDoc::trackChangeOfListStyleName( const String sListStyleName,
maListStyleLists[sNewListStyleName] = pList;
}
}
-// <--
-// --> OD 2008-03-13 #refactorlists#
namespace listfunc
{
const String MakeListIdUnique( const SwDoc& rDoc,
@@ -2951,17 +2855,12 @@ namespace listfunc
}
const String CreateUniqueListId( const SwDoc& rDoc )
{
- // --> OD 2008-08-06 #i92478#
String aNewListId = String::CreateFromAscii( "list" );
- // <--
sal_Int64 n = Time().GetTime();
n += Date().GetDate();
n += rand();
- // --> OD 2008-08-06 #i92478#
aNewListId += String::CreateFromInt64( n );
- // <--
return MakeListIdUnique( rDoc, aNewListId );
}
}
-// <--
diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx
index 19a19c4..aadacd3 100644
--- a/sw/source/core/doc/lineinfo.cxx
+++ b/sw/source/core/doc/lineinfo.cxx
@@ -28,8 +28,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/doc/number.cxx b/sw/source/core/doc/number.cxx
index 5a54a49..11c1fca 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -46,24 +46,21 @@
#include <docary.hxx>
#include <docsh.hxx>
#include <SwStyleNameMapper.hxx>
-// --> OD 2006-06-28 #b6440955#
+
// Needed to load default bullet list configuration
#include <unotools/configitem.hxx>
-// <--
+
#include <numrule.hxx>
#include <SwNodeNum.hxx>
#include <hash_map>
-// --> OD 2008-02-19 #refactorlists#
+
#include <list.hxx>
#include <algorithm>
-// <--
-// --> OD 2008-06-06 #i89178#
+
#include <unotools/saveopt.hxx>
-// <--
-// --> OD 2008-07-08 #i91400#
+
#include <IDocumentListsAccess.hxx>
-// <--
using namespace ::com::sun::star;
@@ -71,14 +68,13 @@ using namespace ::com::sun::star;
USHORT SwNumRule::nRefCount = 0;
SwNumFmt* SwNumRule::aBaseFmts[ RULE_END ][ MAXLEVEL ] = {
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };
-// --> OD 2008-02-11 #newlistlevelattrs#
+
SwNumFmt* SwNumRule::aLabelAlignmentBaseFmts[ RULE_END ][ MAXLEVEL ] = {
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } };
char sOutline[] = "Outline";
char* SwNumRule::pDefOutlineName = sOutline;
-// #i30312#
USHORT SwNumRule::aDefNumIndents[ MAXLEVEL ] = {
//inch: 0,5 1,0 1,5 2,0 2,5 3,0 3,5 4,0 4,5 5,0
1440/4, 1440/2, 1440*3/4, 1440, 1440*5/4, 1440*3/2, 1440*7/4, 1440*2,
@@ -90,23 +86,22 @@ const SwNumFmt& SwNumRule::Get( USHORT i ) const
ASSERT_ID( i < MAXLEVEL && eRuleType < RULE_END, ERR_NUMLEVEL);
return aFmts[ i ]
? *aFmts[ i ]
- // --> OD 2008-02-11 #newlistlevelattrs#
: ( meDefaultNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION
? *aBaseFmts[ eRuleType ][ i ]
: *aLabelAlignmentBaseFmts[ eRuleType ][ i ] );
- // <--
}
+
const SwNumFmt* SwNumRule::GetNumFmt( USHORT i ) const
{
ASSERT_ID( i < MAXLEVEL && eRuleType < RULE_END, ERR_NUMLEVEL);
return aFmts[ i ];
}
-// --> OD 2008-07-08 #i91400#
+
void SwNumRule::SetName( const String & rName,
IDocumentListsAccess& rDocListAccess)
-// <--
+
{
if ( sName != rName )
{
@@ -115,29 +110,29 @@ void SwNumRule::SetName( const String & rName,
pNumRuleMap->erase(sName);
(*pNumRuleMap)[rName] = this;
- // --> OD 2008-07-08 #i91400#
if ( GetDefaultListId().Len() > 0 )
{
rDocListAccess.trackChangeOfListStyleName( sName, rName );
}
- // <--
}
sName = rName;
}
}
-// --> OD 2008-02-19 #refactorlists#
+
void SwNumRule::GetTxtNodeList( SwNumRule::tTxtNodeList& rTxtNodeList ) const
{
rTxtNodeList = maTxtNodeList;
}
+
SwNumRule::tTxtNodeList::size_type SwNumRule::GetTxtNodeListSize() const
{
return maTxtNodeList.size();
}
+
void SwNumRule::AddTxtNode( SwTxtNode& rTxtNode )
{
tTxtNodeList::iterator aIter =
@@ -149,6 +144,7 @@ void SwNumRule::AddTxtNode( SwTxtNode& rTxtNode )
}
}
+
void SwNumRule::RemoveTxtNode( SwTxtNode& rTxtNode )
{
tTxtNodeList::iterator aIter =
@@ -159,7 +155,7 @@ void SwNumRule::RemoveTxtNode( SwTxtNode& rTxtNode )
maTxtNodeList.erase( aIter );
}
}
-// <--
+
void SwNumRule::SetNumRuleMap(std::hash_map<String, SwNumRule *, StringHash> *
_pNumRuleMap)
@@ -167,12 +163,14 @@ void SwNumRule::SetNumRuleMap(std::hash_map<String, SwNumRule *, StringHash> *
pNumRuleMap = _pNumRuleMap;
}
+
USHORT SwNumRule::GetNumIndent( BYTE nLvl )
{
ASSERT( MAXLEVEL > nLvl, "NumLevel is out of range" );
return aDefNumIndents[ nLvl ];
}
+
USHORT SwNumRule::GetBullIndent( BYTE nLvl )
{
ASSERT( MAXLEVEL > nLvl, "NumLevel is out of range" );
@@ -180,24 +178,21 @@ USHORT SwNumRule::GetBullIndent( BYTE nLvl )
}
-
static void lcl_SetRuleChgd( SwTxtNode& rNd, BYTE nLevel )
{
if( rNd.GetActualListLevel() == nLevel )
rNd.NumRuleChgd();
}
-/* -----------------------------22.02.01 13:41--------------------------------
- ---------------------------------------------------------------------------*/
+
SwNumFmt::SwNumFmt() :
SvxNumberFormat(SVX_NUM_ARABIC),
SwClient( 0 ),
pVertOrient(new SwFmtVertOrient( 0, text::VertOrientation::NONE))
{
}
-/* -----------------------------22.02.01 13:42--------------------------------
- ---------------------------------------------------------------------------*/
+
SwNumFmt::SwNumFmt( const SwNumFmt& rFmt) :
SvxNumberFormat(rFmt),
SwClient( rFmt.pRegisteredIn ),
@@ -207,9 +202,8 @@ SwNumFmt::SwNumFmt( const SwNumFmt& rFmt) :
SetGraphicBrush( rFmt.GetBrush(), &rFmt.GetGraphicSize(),
&eMyVertOrient);
}
-/* -----------------------------22.02.01 13:58--------------------------------
- ---------------------------------------------------------------------------*/
+
SwNumFmt::SwNumFmt(const SvxNumberFormat& rNumFmt, SwDoc* pDoc) :
SvxNumberFormat(rNumFmt),
pVertOrient(new SwFmtVertOrient( 0, rNumFmt.GetVertOrient()))
@@ -235,23 +229,21 @@ SwNumFmt::SwNumFmt(const SvxNumberFormat& rNumFmt, SwDoc* pDoc) :
pRegisteredIn->Remove( this );
}
-/* -----------------------------22.02.01 13:42--------------------------------
- ---------------------------------------------------------------------------*/
+
SwNumFmt::~SwNumFmt()
{
delete pVertOrient;
}
-/* -----------------------------02.07.01 15:37--------------------------------
- ---------------------------------------------------------------------------*/
+
void SwNumFmt::NotifyGraphicArrived()
{
if( GetCharFmt() )
UpdateNumNodes( (SwDoc*)GetCharFmt()->GetDoc() );
}
-// #i22362#
+
BOOL SwNumFmt::IsEnumeration() const
{
// --> FME 2004-08-12 #i30655# native numbering did not work any longer
@@ -285,7 +277,7 @@ BOOL SwNumFmt::IsEnumeration() const
*/
}
-// #i29560#
+
BOOL SwNumFmt::IsItemize() const
{
BOOL bResult;
@@ -307,9 +299,6 @@ BOOL SwNumFmt::IsItemize() const
}
-/* -----------------------------23.02.01 09:28--------------------------------
-
- ---------------------------------------------------------------------------*/
SwNumFmt& SwNumFmt::operator=( const SwNumFmt& rNumFmt)
{
SvxNumberFormat::operator=(rNumFmt);
@@ -319,9 +308,8 @@ SwNumFmt& SwNumFmt::operator=( const SwNumFmt& rNumFmt)
pRegisteredIn->Remove( this );
return *this;
}
-/* -----------------------------23.02.01 09:28--------------------------------
- ---------------------------------------------------------------------------*/
+
BOOL SwNumFmt::operator==( const SwNumFmt& rNumFmt) const
{
BOOL bRet = SvxNumberFormat::operator==(rNumFmt) &&
@@ -329,9 +317,7 @@ BOOL SwNumFmt::operator==( const SwNumFmt& rNumFmt) const
return bRet;
}
-/* -----------------------------22.02.01 13:44--------------------------------
- ---------------------------------------------------------------------------*/
void SwNumFmt::SetCharFmt( SwCharFmt* pChFmt)
{
if( pChFmt )
@@ -339,9 +325,8 @@ void SwNumFmt::SetCharFmt( SwCharFmt* pChFmt)
else if( GetRegisteredIn() )
pRegisteredIn->Remove( this );
}
-/* -----------------------------22.02.01 13:45--------------------------------
- ---------------------------------------------------------------------------*/
+
void SwNumFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
{
// dann suche mal in dem Doc nach dem NumRules-Object, in dem dieses
@@ -360,16 +345,14 @@ void SwNumFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
else
SwClient::Modify( pOld, pNew );
}
-/* -----------------------------23.02.01 11:08--------------------------------
- ---------------------------------------------------------------------------*/
+
void SwNumFmt::SetCharFmtName(const String& rSet)
{
SvxNumberFormat::SetCharFmtName(rSet);
}
-/* -----------------------------22.02.01 13:47--------------------------------
- ---------------------------------------------------------------------------*/
+
const String& SwNumFmt::GetCharFmtName() const
{
if((SwCharFmt*)pRegisteredIn)
@@ -377,9 +360,8 @@ const String& SwNumFmt::GetCharFmtName() const
else
return aEmptyStr;
}
-/* -----------------------------22.02.01 16:05--------------------------------
- ---------------------------------------------------------------------------*/
+
void SwNumFmt::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize,
const sal_Int16* pOrient)
{
@@ -387,23 +369,20 @@ void SwNumFmt::SetGraphicBrush( const SvxBrushItem* pBrushItem, const
Size* pSiz
pVertOrient->SetVertOrient( *pOrient );
SvxNumberFormat::SetGraphicBrush( pBrushItem, pSize, pOrient);
}
-/* -----------------------------22.02.01 16:05--------------------------------
- ---------------------------------------------------------------------------*/
+
void SwNumFmt::SetVertOrient(sal_Int16 eSet)
{
SvxNumberFormat::SetVertOrient(eSet);
}
-/* -----------------------------22.02.01 16:05--------------------------------
- ---------------------------------------------------------------------------*/
+
sal_Int16 SwNumFmt::GetVertOrient() const
{
return SvxNumberFormat::GetVertOrient();
}
-/* -----------------------------22.02.01 13:54--------------------------------
- ---------------------------------------------------------------------------*/
+
void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
{
BOOL bDocIsModified = pDoc->IsModified();
@@ -458,9 +437,8 @@ void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
if( bFnd && !bDocIsModified )
pDoc->ResetModified();
}
-/* -----------------------------31.05.01 16:08--------------------------------
- ---------------------------------------------------------------------------*/
+
const SwFmtVertOrient* SwNumFmt::GetGraphicOrientation() const
{
sal_Int16 eOrient = SvxNumberFormat::GetVertOrient();
@@ -477,16 +455,13 @@ const SwFmtVertOrient* SwNumFmt::GetGraphicOrientation() const
long int SwNumRule::nInstances = 0;
#endif
-// --> OD 2008-02-11 #newlistlevelattrs#
// handle new parameter <eDefaultNumberFormatPositionAndSpaceMode>
SwNumRule::SwNumRule( const String& rNm,
const SvxNumberFormat::SvxNumPositionAndSpaceMode
eDefaultNumberFormatPositionAndSpaceMode,
SwNumRuleType eType,
BOOL bAutoFlg )
: maTxtNodeList(),
- // --> OD 2008-03-03 #refactorlists#
maParagraphStyleList(),
- // <--
pNumRuleMap(0),
sName( rNm ),
eRuleType( eType ),
@@ -497,15 +472,9 @@ SwNumRule::SwNumRule( const String& rNm,
bInvalidRuleFlag( TRUE ),
bContinusNum( FALSE ),
bAbsSpaces( FALSE ),
- // --> OD 2005-10-21 - initialize member <mbCountPhantoms>
mbCountPhantoms( true ),
- // <--
- // --> OD 2008-02-11 #newlistlevelattrs#
meDefaultNumberFormatPositionAndSpaceMode( eDefaultNumberFormatPositionAndSpaceMode ),
- // <--
- // --> OD 2008-04-03 #refactorlists#
msDefaultListId()
- // <--
{
#ifdef DBG_UTIL
nSerial = nInstances++;
@@ -527,12 +496,9 @@ SwNumRule::SwNumRule( const String& rNm,
pFmt->SetAbsLSpace( lNumIndent + SwNumRule::GetNumIndent( n ) );
pFmt->SetFirstLineOffset( lNumFirstLineOffset );
pFmt->SetSuffix( aDotStr );
- // --> OD 2006-06-29 #b6440955#
pFmt->SetBulletChar( numfunc::GetBulletChar(n));
- // <--
SwNumRule::aBaseFmts[ NUM_RULE ][ n ] = pFmt;
}
- // --> OD 2008-02-11 #newlistlevelattrs#
// position-and-space mode LABEL_ALIGNMENT
// first line indent of general numbering in inch: -0,25 inch
const long cFirstLineIndent = -1440/4;
@@ -547,18 +513,15 @@ SwNumRule::SwNumRule( const String& rNm,
pFmt = new SwNumFmt;
pFmt->SetIncludeUpperLevels( 1 );
pFmt->SetStart( 1 );
- // --> OD 2008-01-15 #newlistlevelattrs#
pFmt->SetPositionAndSpaceMode( SvxNumberFormat::LABEL_ALIGNMENT );
pFmt->SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
pFmt->SetListtabPos( cIndentAt[ n ] );
pFmt->SetFirstLineIndent( cFirstLineIndent );
pFmt->SetIndentAt( cIndentAt[ n ] );
- // <--
pFmt->SetSuffix( aDotStr );
pFmt->SetBulletChar( numfunc::GetBulletChar(n));
SwNumRule::aLabelAlignmentBaseFmts[ NUM_RULE ][ n ] = pFmt;
}
- // <--
// outline:
// position-and-space mode LABEL_WIDTH_AND_POSITION:
@@ -569,12 +532,9 @@ SwNumRule::SwNumRule( const String& rNm,
pFmt->SetIncludeUpperLevels( MAXLEVEL );
pFmt->SetStart( 1 );
pFmt->SetCharTextDistance( lOutlineMinTextDistance );
- // --> OD 2006-06-29 #b6440955#
pFmt->SetBulletChar( numfunc::GetBulletChar(n));
- // <--
SwNumRule::aBaseFmts[ OUTLINE_RULE ][ n ] = pFmt;
}
- // --> OD 2008-02-11 #newlistlevelattrs#
// position-and-space mode LABEL_ALIGNMENT:
// indent values of default outline numbering in inch:
// 0,3 0,4 0,5 0,6 0,7
@@ -596,7 +556,6 @@ SwNumRule::SwNumRule( const String& rNm,
pFmt->SetBulletChar( numfunc::GetBulletChar(n));
SwNumRule::aLabelAlignmentBaseFmts[ OUTLINE_RULE ][ n ] = pFmt;
}
- // <--
}
memset( aFmts, 0, sizeof( aFmts ));
ASSERT( sName.Len(), "NumRule ohne Namen!" );
@@ -604,9 +563,7 @@ SwNumRule::SwNumRule( const String& rNm,
SwNumRule::SwNumRule( const SwNumRule& rNumRule )
: maTxtNodeList(),
- // --> OD 2008-03-03 #refactorlists#
maParagraphStyleList(),
- // <--
pNumRuleMap(0),
sName( rNumRule.sName ),
eRuleType( rNumRule.eRuleType ),
@@ -617,15 +574,9 @@ SwNumRule::SwNumRule( const SwNumRule& rNumRule )
bInvalidRuleFlag( TRUE ),
bContinusNum( rNumRule.bContinusNum ),
bAbsSpaces( rNumRule.bAbsSpaces ),
- // --> OD 2005-10-21 - initialize member <mbCountPhantoms>
mbCountPhantoms( true ),
- // <--
- // --> OD 2008-02-11 #newlistlevelattrs#
meDefaultNumberFormatPositionAndSpaceMode(
rNumRule.meDefaultNumberFormatPositionAndSpaceMode ),
- // <--
- // --> OD 2008-04-03 #refactorlists#
msDefaultListId( rNumRule.msDefaultListId )
- // <--
{
#ifdef DBG_UTIL
nSerial = nInstances++;
@@ -670,10 +621,8 @@ SwNumRule::~SwNumRule()
// <--
}
- // --> OD 2008-02-19 #refactorlists#
maTxtNodeList.clear();
maParagraphStyleList.clear();
- // <--
}
void SwNumRule::CheckCharFmts( SwDoc* pDoc )
@@ -790,28 +739,23 @@ String SwNumRule::MakeNumString( const SwNumberTree::tNumberVector &
rNumVector,
String aStr;
unsigned int nLevel = rNumVector.size() - 1;
- // --> OD 2005-10-17 #126238#
+
if ( nLevel > _nRestrictToThisLevel )
{
nLevel = _nRestrictToThisLevel;
}
- // <--
if (nLevel < MAXLEVEL)
{
const SwNumFmt& rMyNFmt = Get( static_cast<USHORT>(nLevel) );
- // --> OD 2006-06-02 #b6432095#
// - levels with numbering none has to provide prefix and suffix string
// if( SVX_NUM_NUMBER_NONE != rMyNFmt.GetNumberingType() )
- // <--
{
BYTE i = static_cast<BYTE>(nLevel);
if( !IsContinusNum() &&
- // --> OD 2006-09-19 #i69672#
// - do not include upper levels, if level isn't numbered.
rMyNFmt.GetNumberingType() != SVX_NUM_NUMBER_NONE &&
- // <--
rMyNFmt.GetIncludeUpperLevels() ) // nur der eigene Level ?
{
BYTE n = rMyNFmt.GetIncludeUpperLevels();
@@ -863,7 +807,7 @@ String SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVector,
return aStr;
}
-// --> OD 2007-09-07 #i81002#
+
String SwNumRule::MakeRefNumString( const SwNodeNum& rNodeNum,
const bool bInclSuperiorNumLabels,
const sal_uInt8 nRestrictInclToThisLevel ) const
@@ -946,9 +890,8 @@ SwNumRule& SwNumRule::CopyNumRule( SwDoc* pDoc, const SwNumRule& rNumRule )
bInvalidRuleFlag = TRUE;
return *this;
}
-/* -----------------30.10.98 08:33-------------------
- *
- * --------------------------------------------------*/
+
+
void SwNumRule::SetSvxRule(const SvxNumRule& rNumRule, SwDoc* pDoc)
{
for( USHORT n = 0; n < MAXLEVEL; ++n )
@@ -961,9 +904,8 @@ void SwNumRule::SetSvxRule(const SvxNumRule& rNumRule, SwDoc* pDoc)
bInvalidRuleFlag = TRUE;
bContinusNum = rNumRule.IsContinuousNumbering();
}
-/* -----------------30.10.98 08:33-------------------
- *
- * --------------------------------------------------*/
+
+
SvxNumRule SwNumRule::MakeSvxNumRule() const
{
SvxNumRule aRule(NUM_CONTINUOUS|NUM_CHAR_TEXT_DISTANCE|NUM_CHAR_STYLE|
@@ -983,11 +925,11 @@ SvxNumRule SwNumRule::MakeSvxNumRule() const
return aRule;
}
+
void SwNumRule::SetInvalidRule(BOOL bFlag)
{
if (bFlag)
{
- // --> OD 2008-03-13 #refactorlists#
// tPamAndNums::iterator aIt;
// for (aIt = aNumberRanges.begin(); aIt != aNumberRanges.end(); aIt++)
// (*aIt).second->InvalidateTree();
@@ -1101,14 +1043,13 @@ void SwNumRule::ChangeIndent( const short nDiff )
}
else if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- // --> OD 2009-01-20 #i93399#
// adjust also the list tab position, if a list tab stop is applied
if ( aTmpNumFmt.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
{
const long nNewListTab = aTmpNumFmt.GetListtabPos() + nDiff;
aTmpNumFmt.SetListtabPos( nNewListTab );
}
- // <--
+
const long nNewIndent = nDiff +
aTmpNumFmt.GetIndentAt();
aTmpNumFmt.SetIndentAt( nNewIndent );
@@ -1134,7 +1075,6 @@ void SwNumRule::SetIndent( const short nNewIndent,
}
else if ( ePosAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- // --> OD 2009-01-20 #i93399#
// adjust also the list tab position, if a list tab stop is applied
if ( aTmpNumFmt.GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
{
@@ -1142,7 +1082,7 @@ void SwNumRule::SetIndent( const short nNewIndent,
( nNewIndent - aTmpNumFmt.GetIndentAt() );
aTmpNumFmt.SetListtabPos( nNewListTab );
}
- // <--
+
aTmpNumFmt.SetIndentAt( nNewIndent );
}
@@ -1174,11 +1114,10 @@ void SwNumRule::SetIndentOfFirstListLevelAndChangeOthers( const short
nNewIndent
ChangeIndent( nDiff );
}
}
-// <--
+
void SwNumRule::Validate()
{
- // --> OD 2008-03-13 #refactorlists#
// tPamAndNums::iterator aIt;
// for (aIt = aNumberRanges.begin(); aIt != aNumberRanges.end(); aIt++)
// (*aIt).second->NotifyInvalidChildren();
@@ -1191,27 +1130,30 @@ void SwNumRule::Validate()
}
std::for_each( aLists.begin(), aLists.end(),
std::mem_fun( &SwList::ValidateListTree ) );
- // <--
+
SetInvalidRule(FALSE);
}
+
bool SwNumRule::IsCountPhantoms() const
{
return mbCountPhantoms;
}
+
void SwNumRule::SetCountPhantoms(bool bCountPhantoms)
{
mbCountPhantoms = bCountPhantoms;
}
-// --> OD 2008-03-03 #refactorlists#
+
SwNumRule::tParagraphStyleList::size_type SwNumRule::GetParagraphStyleListSize() const
{
return maParagraphStyleList.size();
}
+
void SwNumRule::AddParagraphStyle( SwTxtFmtColl& rTxtFmtColl )
{
tParagraphStyleList::iterator aIter =
@@ -1223,6 +1165,7 @@ void SwNumRule::AddParagraphStyle( SwTxtFmtColl& rTxtFmtColl )
}
}
+
void SwNumRule::RemoveParagraphStyle( SwTxtFmtColl& rTxtFmtColl )
{
tParagraphStyleList::iterator aIter =
@@ -1233,9 +1176,8 @@ void SwNumRule::RemoveParagraphStyle( SwTxtFmtColl& rTxtFmtColl )
maParagraphStyleList.erase( aIter );
}
}
-// <--
-// --> OD 2006-06-27 #b6440955#
+
namespace numfunc
{
/** class containing default bullet list configuration data
@@ -1259,24 +1201,27 @@ namespace numfunc
{
return msFontname;
}
- // --> OD 2008-06-02 #i63395#
+
inline bool IsFontnameUserDefined() const
{
return mbUserDefinedFontname;
}
- // <--
+
inline const Font& GetFont() const
{
return *mpFont;
}
+
inline short GetFontWeight() const
{
return static_cast<short>(meFontWeight);
}
+
inline short GetFontItalic() const
{
return static_cast<short>(meFontItalic);
}
+
inline sal_Unicode GetChar( BYTE p_nListLevel ) const
{
if ( p_nListLevel > MAXLEVEL )
@@ -1326,9 +1271,7 @@ namespace numfunc
// default bullet list configuration data
String msFontname;
- // --> OD 2008-06-02 #i63395#
bool mbUserDefinedFontname;
- // <--
FontWeight meFontWeight;
FontItalic meFontItalic;
sal_Unicode mnLevelChars[MAXLEVEL];
@@ -1341,11 +1284,9 @@ namespace numfunc
SwDefBulletConfig::SwDefBulletConfig()
: ConfigItem( rtl::OUString::createFromAscii("Office.Writer/Numbering/DefaultBulletList")
),
- // --> OD 2008-06-02 #i63395#
// default bullet font is now OpenSymbol
msFontname( String::CreateFromAscii("OpenSymbol") ),
mbUserDefinedFontname( false ),
- // <--
meFontWeight( WEIGHT_DONTKNOW ),
meFontItalic( ITALIC_NONE ),
mpFont( 0 )
@@ -1360,7 +1301,6 @@ namespace numfunc
void SwDefBulletConfig::SetToDefault()
{
- // --> OD 2008-06-02 #i63395#
// default bullet font name is now OpenSymbol
// msFontname = String::CreateFromAscii("StarSymbol");
msFontname = String::CreateFromAscii("OpenSymbol");
@@ -1369,7 +1309,6 @@ namespace numfunc
meFontWeight = WEIGHT_DONTKNOW;
meFontItalic = ITALIC_NONE;
- // --> OD 2008-06-03 #i63395#
// new bullet characters
// mnLevelChars[0] = 0x25cf;
// mnLevelChars[1] = 0x25cb;
@@ -1391,7 +1330,6 @@ namespace numfunc
mnLevelChars[7] = 0x25e6;
mnLevelChars[8] = 0x25aa;
mnLevelChars[9] = 0x2022;
- // <--
}
uno::Sequence<rtl::OUString> SwDefBulletConfig::GetPropNames() const
@@ -1436,9 +1374,7 @@ namespace numfunc
rtl::OUString aStr;
pValues[nProp] >>= aStr;
msFontname = aStr;
- // --> OD 2008-06-02 #i63395#
mbUserDefinedFontname = true;
- // <--
}
break;
case 1:
@@ -1500,12 +1436,10 @@ namespace numfunc
return SwDefBulletConfig::getInstance()->GetFontname();
}
- // --> OD 2008-06-02 #i63395#
bool IsDefBulletFontUserDefined()
{
return SwDefBulletConfig::getInstance()->IsFontnameUserDefined();
}
- // <--
const Font& GetDefBulletFont()
{
@@ -1651,7 +1585,6 @@ namespace numfunc
return
SwNumberingUIBehaviorConfig::getInstance()->ChangeIndentOnTabAtFirstPosOfFirstListItem();
}
- // --> OD 2008-06-06 #i89178#
SvxNumberFormat::SvxNumPositionAndSpaceMode GetDefaultPositionAndSpaceMode()
{
SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode;
@@ -1672,6 +1605,4 @@ namespace numfunc
return ePosAndSpaceMode;
}
- // <--
}
-// <--
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 1e8cc6e..7f1b445 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -1097,4 +1097,3 @@ SwSelBoxes& SwTable::SelLineFromBox( const SwTableBox* pBox,
return rBoxes;
}
-
diff --git a/sw/source/core/doc/visiturl.cxx b/sw/source/core/doc/visiturl.cxx
index 3d8b05a..971ed83 100644
--- a/sw/source/core/doc/visiturl.cxx
+++ b/sw/source/core/doc/visiturl.cxx
@@ -135,5 +135,3 @@ BOOL SwDoc::IsVisitedURL( const String& rURL ) const
return bRet;
}
-
-
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index 1298105..581aed0 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -24,6 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _SORT_HXX
#define _SORT_HXX
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index edcc219..f53bad4 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -42,11 +42,11 @@ class SwScriptInfo; // _GetTxtSize
class ViewShell;
class IDocumentSettingAccess;
-const xub_Unicode CH_BLANK = ' '; // ' ' Leerzeichen
-const xub_Unicode CH_BREAK = 0x0A; //
-const xub_Unicode CH_TAB = '\t'; // \t
-const xub_Unicode CH_PAR = 0xB6; // Paragraph
-const xub_Unicode CH_BULLET = 0xB7; // mittiger Punkt
+const xub_Unicode CH_BLANK = ' ';
+const xub_Unicode CH_BREAK = 0x0A;
+const xub_Unicode CH_TAB = '\t';
+const xub_Unicode CH_PAR = 0xB6; // Paragraph
+const xub_Unicode CH_BULLET = 0xB7; // mittiger Punkt
class SwSubFont : public SvxFont
{
@@ -128,27 +128,27 @@ public:
#define SW_SCRIPTS 3
class SwFont
-{ // CJK == Chinese, Japanese, Korean
- // CTL == Complex text layout ( Hebrew, Arabic )
- SwSubFont aSub[SW_SCRIPTS]; // Latin-, CJK- and CTL-font
- Color* pBackColor; // background color (i.e. at character styles)
- Color aUnderColor; // color of the underlining
- Color aOverColor; // color of the overlining
- BYTE nToxCnt; // Zaehlt die Schachtelungstiefe der Tox
- BYTE nRefCnt; // Zaehlt die Schachtelungstiefe der Refs
- BYTE m_nMetaCount; // count META/METAFIELD
+{ // CJK == Chinese, Japanese, Korean
+ // CTL == Complex text layout ( Hebrew, Arabic )
+ SwSubFont aSub[SW_SCRIPTS]; // Latin-, CJK- and CTL-font
+ Color* pBackColor; // background color (i.e. at character styles)
+ Color aUnderColor; // color of the underlining
+ Color aOverColor; // color of the overlining
+ BYTE nToxCnt; // Zaehlt die Schachtelungstiefe der Tox
+ BYTE nRefCnt; // Zaehlt die Schachtelungstiefe der Refs
+ BYTE m_nMetaCount; // count META/METAFIELD
BYTE nActual; // actual font (Latin, CJK or CTL)
// Schalter fuer die Font-Extensions
- BOOL bNoHyph :1; // SwTxtNoHyphenHere: keine Trennstelle
- BOOL bBlink :1; // blinkender Font
- BOOL bPaintBlank :1; // Blanks nicht mit DrawRect
- BOOL bFntChg :1;
- BOOL bOrgChg :1; // nOrgHeight/Ascent sind invalid
- BOOL bURL :1;
- BOOL bPaintWrong :1; // Flag fuer Rechtschreibfehler
- BOOL bGreyWave :1; // Fuers extended TextInput: Graue Wellenlinie
- BOOL bNoColReplace :1; // Replacement without colormanipulation
+ BOOL bNoHyph :1; // SwTxtNoHyphenHere: keine Trennstelle
+ BOOL bBlink :1; // blinkender Font
+ BOOL bPaintBlank :1; // Blanks nicht mit DrawRect
+ BOOL bFntChg :1;
+ BOOL bOrgChg :1; // nOrgHeight/Ascent sind invalid
+ BOOL bURL :1;
+ BOOL bPaintWrong :1; // Flag fuer Rechtschreibfehler
+ BOOL bGreyWave :1; // Fuers extended TextInput: Graue Wellenlinie
+ BOOL bNoColReplace :1; // Replacement without colormanipulation
BOOL operator==( const SwFont &rFnt ) const;
@@ -894,4 +894,3 @@ inline void SvStatistics::PrintOn( SvStream &rOS ) const //$ ostream
#endif /* PRODUCT */
#endif
-
diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx
index 3e77783..821a022 100644
--- a/sw/source/core/inc/visiturl.hxx
+++ b/sw/source/core/inc/visiturl.hxx
@@ -24,13 +24,12 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#ifndef _VISITURL_HXX
#define _VISITURL_HXX
-
-
-
#include <svl/lstner.hxx>
+
class SwDoc;
class SwURLStateChanged : public SfxListener
@@ -43,7 +42,5 @@ public:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
};
-
-
#endif
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 792283a..07fe744 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -68,8 +68,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/applab.cxx b/sw/source/ui/app/applab.cxx
index fe67cb8..1584aeb 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -450,4 +450,3 @@ static sal_uInt16 nBCTitleNo = 0;
delete pNewDBMgr;
}
-
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index fc79da2..d6e55b1 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -1364,4 +1364,3 @@ bool SwDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence<
sal
return bRes;
}
-
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 48853b8..3f6e94f 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -2863,4 +2863,3 @@ void SwStyleSheetIterator::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
}
-
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"
/*------------------------------------------------------------------------
diff --git a/sw/source/ui/app/swwait.cxx b/sw/source/ui/app/swwait.cxx
index 2f484b8..ccc509c 100644
--- a/sw/source/ui/app/swwait.cxx
+++ b/sw/source/ui/app/swwait.cxx
@@ -72,4 +72,3 @@ SwWait::~SwWait()
rDoc.LeaveWait( bLock );
}
-
--
1.7.0.4
Context
- [Libreoffice] PATCH · Júlio Hoffimann
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.