summaryrefslogtreecommitdiff
path: root/sw/source/core/bastyp
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/bastyp')
-rw-r--r--sw/source/core/bastyp/SwSmartTagMgr.cxx8
-rw-r--r--sw/source/core/bastyp/bparr.cxx30
-rw-r--r--sw/source/core/bastyp/breakit.cxx6
-rw-r--r--sw/source/core/bastyp/calc.cxx380
-rw-r--r--sw/source/core/bastyp/checkit.cxx2
-rw-r--r--sw/source/core/bastyp/index.cxx48
-rw-r--r--sw/source/core/bastyp/init.cxx284
-rw-r--r--sw/source/core/bastyp/ring.cxx6
-rw-r--r--sw/source/core/bastyp/swcache.cxx116
-rw-r--r--sw/source/core/bastyp/swrect.cxx54
-rw-r--r--sw/source/core/bastyp/swregion.cxx42
-rw-r--r--sw/source/core/bastyp/swtypes.cxx28
-rw-r--r--sw/source/core/bastyp/tabcol.cxx12
13 files changed, 508 insertions, 508 deletions
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx
index d550ae2f9ee7..68e6308ba3a8 100644
--- a/sw/source/core/bastyp/SwSmartTagMgr.cxx
+++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -64,10 +64,10 @@ SwSmartTagMgr::~SwSmartTagMgr()
void SwSmartTagMgr::modified( const lang::EventObject& rEO ) throw( RuntimeException )
{
SolarMutexGuard aGuard;
-
+
// Installed recognizers have changed. We remove all existing smart tags:
SW_MOD()->CheckSpellChanges( sal_False, sal_True, sal_True, sal_True );
-
+
SmartTagMgr::modified( rEO );
}
@@ -87,7 +87,7 @@ SmartTagMgr& SwSmartTagMgr::Get()
{
if ( !pSmartTagMgr )
pSmartTagMgr = new SmartTagMgr( SwDocShell::Factory().GetModuleName() );
-
+
return *pSmartTagMgr;
}
*/
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index 4e448882ab9e..28a4daa767ae 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -70,7 +70,7 @@ BigPtrArray::BigPtrArray()
{
nBlock = nCur = 0;
nSize = 0;
- nMaxBlock = nBlockGrowSize; // == 20 * 1000 Eintraege
+ nMaxBlock = nBlockGrowSize; // == 20 * 1000 Eintraege
ppInf = new BlockInfo* [ nMaxBlock ];
}
@@ -98,7 +98,7 @@ void BigPtrArray::Move( ULONG from, ULONG to )
USHORT cur = Index2Block( from );
BlockInfo* p = ppInf[ cur ];
ElementPtr pElem = p->pData[ from - p->nStart ];
- Insert( pElem, to ); // erst einfuegen, dann loeschen !!!!
+ Insert( pElem, to ); // erst einfuegen, dann loeschen !!!!
Remove( ( to < from ) ? ( from + 1 ) : from );
}
@@ -250,7 +250,7 @@ BlockInfo* BigPtrArray::InsBlock( USHORT pos )
p->nStart = p->nEnd = ppInf[ pos-1 ]->nEnd + 1;
else
p->nStart = p->nEnd = 0;
- p->nEnd--; // keine Elemente
+ p->nEnd--; // keine Elemente
p->nElem = 0;
p->pData = new ElementPtr [ MAXENTRY ];
p->pBigArr = this;
@@ -377,10 +377,10 @@ void BigPtrArray::Remove( ULONG pos, ULONG n )
{
CHECKIDX( ppInf, nBlock, nSize, nCur );
- USHORT nBlkdel = 0; // entfernte Bloecke
- USHORT cur = Index2Block( pos ); // aktuelle Blocknr
+ USHORT nBlkdel = 0; // entfernte Bloecke
+ USHORT cur = Index2Block( pos ); // aktuelle Blocknr
USHORT nBlk1 = cur; // 1. behandelter Block
- USHORT nBlk1del = USHRT_MAX; // 1. entfernter Block
+ USHORT nBlk1del = USHRT_MAX; // 1. entfernter Block
BlockInfo* p = ppInf[ cur ];
pos -= p->nStart;
ULONG nElem = n;
@@ -431,7 +431,7 @@ void BigPtrArray::Remove( ULONG pos, ULONG n )
( nBlock - nBlkdel - nBlk1del ) * sizeof( BlockInfo* ) );
// JP 19.07.95: nicht den ersten behandelten, sondern den davor!!
- // UpdateIdx updatet nur alle Nachfolgende!!
+ // UpdateIdx updatet nur alle Nachfolgende!!
if( !nBlk1 )
{
p = ppInf[ 0 ];
@@ -441,7 +441,7 @@ void BigPtrArray::Remove( ULONG pos, ULONG n )
else
--nBlk1;
}
- BlockDel( nBlkdel ); // es wurden Bloecke geloescht
+ BlockDel( nBlkdel ); // es wurden Bloecke geloescht
}
nSize -= n;
@@ -484,10 +484,10 @@ USHORT BigPtrArray::Compress( short nMax )
// benutzt; wobei pp das "alte" Array, qq das "neue" Array ist.
BlockInfo** pp = ppInf, **qq = pp;
BlockInfo* p;
- BlockInfo* pLast(0); // letzter nicht voller Block
- USHORT nLast = 0; // fehlende Elemente
- USHORT nBlkdel = 0; // Anzahl der geloeschte Bloecke
- USHORT nFirstChgPos = USHRT_MAX; // ab welcher Pos gab es die 1. Aenderung?
+ BlockInfo* pLast(0); // letzter nicht voller Block
+ USHORT nLast = 0; // fehlende Elemente
+ USHORT nBlkdel = 0; // Anzahl der geloeschte Bloecke
+ USHORT nFirstChgPos = USHRT_MAX; // ab welcher Pos gab es die 1. Aenderung?
// von Fuell-Prozenten auf uebrige Eintrage umrechnen
nMax = MAXENTRY - (long) MAXENTRY * nMax / 100;
@@ -548,9 +548,9 @@ USHORT BigPtrArray::Compress( short nMax )
}
}
- if( p ) // die Blockinfo wurde nicht geloescht
+ if( p ) // die Blockinfo wurde nicht geloescht
{
- *qq++ = p; // dann setze sie an die richtige neue Position
+ *qq++ = p; // dann setze sie an die richtige neue Position
// eventuell den letzten halbvollen Block festhalten
if( !nLast && p->nElem < MAXENTRY )
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index 3805541242ab..b670b13058c9 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -71,8 +71,8 @@ SwBreakIt::SwBreakIt(
//if ( m_xMSF.is() )
//{
// xBreak = uno::Reference< i18n::XBreakIterator >(
- // m_xMSF->createInstance(
- // rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ),
+ // m_xMSF->createInstance(
+ // rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ),
// uno::UNO_QUERY);
// xCTLDetect = uno::Reference< i18n::XScriptTypeDetector >(
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index ce1d90e297c7..a40f06508f2d 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -69,35 +69,35 @@ using namespace ::com::sun::star;
// tippt sich schneller
#define RESOURCE ViewShell::GetShellRes()
-const sal_Char __FAR_DATA sCalc_Add[] = "add";
-const sal_Char __FAR_DATA sCalc_Sub[] = "sub";
-const sal_Char __FAR_DATA sCalc_Mul[] = "mul";
-const sal_Char __FAR_DATA sCalc_Div[] = "div";
-const sal_Char __FAR_DATA sCalc_Phd[] = "phd";
-const sal_Char __FAR_DATA sCalc_Sqrt[] = "sqrt";
-const sal_Char __FAR_DATA sCalc_Pow[] = "pow";
-const sal_Char __FAR_DATA sCalc_Or[] = "or";
-const sal_Char __FAR_DATA sCalc_Xor[] = "xor";
-const sal_Char __FAR_DATA sCalc_And[] = "and";
-const sal_Char __FAR_DATA sCalc_Not[] = "not";
-const sal_Char __FAR_DATA sCalc_Eq[] = "eq";
-const sal_Char __FAR_DATA sCalc_Neq[] = "neq";
-const sal_Char __FAR_DATA sCalc_Leq[] = "leq";
-const sal_Char __FAR_DATA sCalc_Geq[] = "geq";
-const sal_Char __FAR_DATA sCalc_L[] = "l";
-const sal_Char __FAR_DATA sCalc_G[] = "g";
-const sal_Char __FAR_DATA sCalc_Sum[] = "sum";
-const sal_Char __FAR_DATA sCalc_Mean[] = "mean";
-const sal_Char __FAR_DATA sCalc_Min[] = "min";
-const sal_Char __FAR_DATA sCalc_Max[] = "max";
-const sal_Char __FAR_DATA sCalc_Sin[] = "sin";
-const sal_Char __FAR_DATA sCalc_Cos[] = "cos";
-const sal_Char __FAR_DATA sCalc_Tan[] = "tan";
-const sal_Char __FAR_DATA sCalc_Asin[] = "asin";
-const sal_Char __FAR_DATA sCalc_Acos[] = "acos";
-const sal_Char __FAR_DATA sCalc_Atan[] = "atan";
-const sal_Char __FAR_DATA sCalc_Round[] = "round";
-const sal_Char __FAR_DATA sCalc_Date[] = "date";
+const sal_Char __FAR_DATA sCalc_Add[] = "add";
+const sal_Char __FAR_DATA sCalc_Sub[] = "sub";
+const sal_Char __FAR_DATA sCalc_Mul[] = "mul";
+const sal_Char __FAR_DATA sCalc_Div[] = "div";
+const sal_Char __FAR_DATA sCalc_Phd[] = "phd";
+const sal_Char __FAR_DATA sCalc_Sqrt[] = "sqrt";
+const sal_Char __FAR_DATA sCalc_Pow[] = "pow";
+const sal_Char __FAR_DATA sCalc_Or[] = "or";
+const sal_Char __FAR_DATA sCalc_Xor[] = "xor";
+const sal_Char __FAR_DATA sCalc_And[] = "and";
+const sal_Char __FAR_DATA sCalc_Not[] = "not";
+const sal_Char __FAR_DATA sCalc_Eq[] = "eq";
+const sal_Char __FAR_DATA sCalc_Neq[] = "neq";
+const sal_Char __FAR_DATA sCalc_Leq[] = "leq";
+const sal_Char __FAR_DATA sCalc_Geq[] = "geq";
+const sal_Char __FAR_DATA sCalc_L[] = "l";
+const sal_Char __FAR_DATA sCalc_G[] = "g";
+const sal_Char __FAR_DATA sCalc_Sum[] = "sum";
+const sal_Char __FAR_DATA sCalc_Mean[] = "mean";
+const sal_Char __FAR_DATA sCalc_Min[] = "min";
+const sal_Char __FAR_DATA sCalc_Max[] = "max";
+const sal_Char __FAR_DATA sCalc_Sin[] = "sin";
+const sal_Char __FAR_DATA sCalc_Cos[] = "cos";
+const sal_Char __FAR_DATA sCalc_Tan[] = "tan";
+const sal_Char __FAR_DATA sCalc_Asin[] = "asin";
+const sal_Char __FAR_DATA sCalc_Acos[] = "acos";
+const sal_Char __FAR_DATA sCalc_Atan[] = "atan";
+const sal_Char __FAR_DATA sCalc_Round[] = "round";
+const sal_Char __FAR_DATA sCalc_Date[] = "date";
@@ -111,41 +111,41 @@ struct _CalcOp
SwCalcOper eOp;
};
-_CalcOp __READONLY_DATA aOpTable[] = {
+_CalcOp __READONLY_DATA aOpTable[] = {
/* ACOS */ {{sCalc_Acos}, CALC_ACOS}, // Arcuscosinus
/* ADD */ {{sCalc_Add}, CALC_PLUS}, // Addition
-/* AND */ {{sCalc_And}, CALC_AND}, // log. und
+/* AND */ {{sCalc_And}, CALC_AND}, // log. und
/* ASIN */ {{sCalc_Asin}, CALC_ASIN}, // Arcussinus
/* ATAN */ {{sCalc_Atan}, CALC_ATAN}, // Arcustangens
-/* COS */ {{sCalc_Cos}, CALC_COS}, // Cosinus
-/* DATE */ {{sCalc_Date}, CALC_DATE}, // Date
+/* COS */ {{sCalc_Cos}, CALC_COS}, // Cosinus
+/* DATE */ {{sCalc_Date}, CALC_DATE}, // Date
/* DIV */ {{sCalc_Div}, CALC_DIV}, // Dividieren
-/* EQ */ {{sCalc_Eq}, CALC_EQ}, // gleich
-/* G */ {{sCalc_G}, CALC_GRE}, // groesser
-/* GEQ */ {{sCalc_Geq}, CALC_GEQ}, // groesser gleich
-/* L */ {{sCalc_L}, CALC_LES}, // kleiner
-/* LEQ */ {{sCalc_Leq}, CALC_LEQ}, // kleiner gleich
-/* MAX */ {{sCalc_Max}, CALC_MAX}, // Maximalwert
+/* EQ */ {{sCalc_Eq}, CALC_EQ}, // gleich
+/* G */ {{sCalc_G}, CALC_GRE}, // groesser
+/* GEQ */ {{sCalc_Geq}, CALC_GEQ}, // groesser gleich
+/* L */ {{sCalc_L}, CALC_LES}, // kleiner
+/* LEQ */ {{sCalc_Leq}, CALC_LEQ}, // kleiner gleich
+/* MAX */ {{sCalc_Max}, CALC_MAX}, // Maximalwert
/* MEAN */ {{sCalc_Mean}, CALC_MEAN}, // Mittelwert
-/* MIN */ {{sCalc_Min}, CALC_MIN}, // Minimalwert
-/* MUL */ {{sCalc_Mul}, CALC_MUL}, // Multiplizieren
-/* NEQ */ {{sCalc_Neq}, CALC_NEQ}, // nicht gleich
-/* NOT */ {{sCalc_Not}, CALC_NOT}, // log. nicht
-/* OR */ {{sCalc_Or}, CALC_OR}, // log. oder
+/* MIN */ {{sCalc_Min}, CALC_MIN}, // Minimalwert
+/* MUL */ {{sCalc_Mul}, CALC_MUL}, // Multiplizieren
+/* NEQ */ {{sCalc_Neq}, CALC_NEQ}, // nicht gleich
+/* NOT */ {{sCalc_Not}, CALC_NOT}, // log. nicht
+/* OR */ {{sCalc_Or}, CALC_OR}, // log. oder
/* PHD */ {{sCalc_Phd}, CALC_PHD}, // Prozent
-/* POW */ {{sCalc_Pow}, CALC_POW}, // Potenzieren
-/* ROUND */ {{sCalc_Round}, CALC_ROUND}, // Runden
-/* SIN */ {{sCalc_Sin}, CALC_SIN}, // Sinus
-/* SQRT */ {{sCalc_Sqrt}, CALC_SQRT}, // Wurzel
-/* SUB */ {{sCalc_Sub}, CALC_MINUS}, // Subtraktion
-/* SUM */ {{sCalc_Sum}, CALC_SUM}, // Summe
-/* TAN */ {{sCalc_Tan}, CALC_TAN}, // Tangens
-/* XOR */ {{sCalc_Xor}, CALC_XOR} // log. xoder
+/* POW */ {{sCalc_Pow}, CALC_POW}, // Potenzieren
+/* ROUND */ {{sCalc_Round}, CALC_ROUND}, // Runden
+/* SIN */ {{sCalc_Sin}, CALC_SIN}, // Sinus
+/* SQRT */ {{sCalc_Sqrt}, CALC_SQRT}, // Wurzel
+/* SUB */ {{sCalc_Sub}, CALC_MINUS}, // Subtraktion
+/* SUM */ {{sCalc_Sum}, CALC_SUM}, // Summe
+/* TAN */ {{sCalc_Tan}, CALC_TAN}, // Tangens
+/* XOR */ {{sCalc_Xor}, CALC_XOR} // log. xoder
};
double __READONLY_DATA nRoundVal[] = {
- 5.0e+0, 0.5e+0, 0.5e-1, 0.5e-2, 0.5e-3, 0.5e-4, 0.5e-5, 0.5e-6,
- 0.5e-7, 0.5e-8, 0.5e-9, 0.5e-10,0.5e-11,0.5e-12,0.5e-13,0.5e-14,
+ 5.0e+0, 0.5e+0, 0.5e-1, 0.5e-2, 0.5e-3, 0.5e-4, 0.5e-5, 0.5e-6,
+ 0.5e-7, 0.5e-8, 0.5e-9, 0.5e-10,0.5e-11,0.5e-12,0.5e-13,0.5e-14,
0.5e-15,0.5e-16
};
@@ -258,10 +258,10 @@ double lcl_ConvertToDateValue( SwDoc& rDoc, sal_Int32 nDate )
/******************************************************************************
|*
-|* SwCalc::SwCalc( SwDoc* pD ) :
+|* SwCalc::SwCalc( SwDoc* pD ) :
|*
-|* Erstellung OK 12-02-93 11:04am
-|* Letzte Aenderung JP 03.11.95
+|* Erstellung OK 12-02-93 11:04am
+|* Letzte Aenderung JP 03.11.95
|*
|******************************************************************************/
@@ -400,17 +400,17 @@ static ULONG SwDocStat::* __READONLY_DATA aDocStat2[ 4 ] =
// at time its better not to use "graph", because then the im-/export have
// to change in all formulas this name.
-// nVal.PutLong( rDocStat.*aDocStat1[ 1 ] );
-// VarTable[ aHashValue[ 26 ] ]->pNext = new SwCalcExp(
-// sNTypeTab[ 26 ], nVal, 0 );
+// nVal.PutLong( rDocStat.*aDocStat1[ 1 ] );
+// VarTable[ aHashValue[ 26 ] ]->pNext = new SwCalcExp(
+// sNTypeTab[ 26 ], nVal, 0 );
}
/******************************************************************************
|*
-|* SwCalc::~SwCalc()
+|* SwCalc::~SwCalc()
|*
-|* Erstellung OK 12-02-93 11:04am
-|* Letzte Aenderung OK 12-02-93 11:04am
+|* Erstellung OK 12-02-93 11:04am
+|* Letzte Aenderung OK 12-02-93 11:04am
|*
|******************************************************************************/
@@ -426,10 +426,10 @@ SwCalc::~SwCalc()
/******************************************************************************
|*
-|* SwSbxValue SwCalc::Calculate( const String& rStr )
+|* SwSbxValue SwCalc::Calculate( const String& rStr )
|*
-|* Erstellung OK 12-02-93 11:04am
-|* Letzte Aenderung OK 12-02-93 11:04am
+|* Erstellung OK 12-02-93 11:04am
+|* Letzte Aenderung OK 12-02-93 11:04am
|*
|******************************************************************************/
@@ -442,7 +442,7 @@ SwSbxValue SwCalc::Calculate( const String& rStr )
return nResult;
nListPor = 0;
- eCurrListOper = CALC_PLUS; // defaulten auf Summe
+ eCurrListOper = CALC_PLUS; // defaulten auf Summe
sCommand = rStr;
nCommandPos = 0;
@@ -458,13 +458,13 @@ SwSbxValue SwCalc::Calculate( const String& rStr )
/******************************************************************************
|*
-|* String SwCalc::GetStrResult( SwSbxValue nValue, BOOL bRound = TRUE )
-|* Beschreibung Der Parameter bRound ist auf TRUE defaultet und darf
-|* nur beim errechnen von Tabellenzellen auf FALSE gesetzt
-|* werden, damit keine Rundungsfehler beim zusammenstellen
-|* der Formel entstehen.
-|* Erstellung OK 12-02-93 11:04am
-|* Letzte Aenderung JP 19.02.98
+|* String SwCalc::GetStrResult( SwSbxValue nValue, BOOL bRound = TRUE )
+|* Beschreibung Der Parameter bRound ist auf TRUE defaultet und darf
+|* nur beim errechnen von Tabellenzellen auf FALSE gesetzt
+|* werden, damit keine Rundungsfehler beim zusammenstellen
+|* der Formel entstehen.
+|* Erstellung OK 12-02-93 11:04am
+|* Letzte Aenderung JP 19.02.98
|*
|******************************************************************************/
@@ -482,18 +482,18 @@ String SwCalc::GetStrResult( double nValue, BOOL )
if( nValue >= DBL_MAX )
switch( eError )
{
- case CALC_SYNTAX : return RESOURCE->aCalc_Syntax;
- case CALC_ZERODIV : return RESOURCE->aCalc_ZeroDiv;
- case CALC_BRACK : return RESOURCE->aCalc_Brack;
- case CALC_POWERR : return RESOURCE->aCalc_Pow;
- case CALC_VARNFND : return RESOURCE->aCalc_VarNFnd;
- case CALC_OVERFLOW : return RESOURCE->aCalc_Overflow;
- case CALC_WRONGTIME : return RESOURCE->aCalc_WrongTime;
- default : return RESOURCE->aCalc_Default;
+ case CALC_SYNTAX : return RESOURCE->aCalc_Syntax;
+ case CALC_ZERODIV : return RESOURCE->aCalc_ZeroDiv;
+ case CALC_BRACK : return RESOURCE->aCalc_Brack;
+ case CALC_POWERR : return RESOURCE->aCalc_Pow;
+ case CALC_VARNFND : return RESOURCE->aCalc_VarNFnd;
+ case CALC_OVERFLOW : return RESOURCE->aCalc_Overflow;
+ case CALC_WRONGTIME : return RESOURCE->aCalc_WrongTime;
+ default : return RESOURCE->aCalc_Default;
}
- USHORT nDec = 15; //pLclData->getNumDigits();
- String aRetStr( ::rtl::math::doubleToUString( nValue,
+ USHORT nDec = 15; //pLclData->getNumDigits();
+ String aRetStr( ::rtl::math::doubleToUString( nValue,
rtl_math_StringFormat_Automatic,
nDec,
pLclData->getNumDecimalSep().GetChar(0),
@@ -504,10 +504,10 @@ String SwCalc::GetStrResult( double nValue, BOOL )
/******************************************************************************
|*
-|* SwCalcExp* SwCalc::VarLook( const String& )
+|* SwCalcExp* SwCalc::VarLook( const String& )
|*
-|* Erstellung OK 12-02-93 11:04am
-|* Letzte Aenderung JP 15.11.99
+|* Erstellung OK 12-02-93 11:04am
+|* Letzte Aenderung JP 15.11.99
|*
|******************************************************************************/
@@ -520,10 +520,10 @@ SwCalcExp* SwCalc::VarInsert( const String &rStr )
/******************************************************************************
|*
-|* SwCalcExp* SwCalc::VarLook( const String& , USHORT ins )
+|* SwCalcExp* SwCalc::VarLook( const String& , USHORT ins )
|*
-|* Erstellung OK 12-02-93 11:04am
-|* Letzte Aenderung JP 15.11.99
+|* Erstellung OK 12-02-93 11:04am
+|* Letzte Aenderung JP 15.11.99
|*
|******************************************************************************/
SwCalcExp* SwCalc::VarLook( const String& rStr, USHORT ins )
@@ -564,22 +564,22 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, USHORT ins )
else if( !pUFld->IsValid() )
{
// Die aktuellen Werte sichern . . .
- USHORT nOld_ListPor = nListPor;
- SwSbxValue nOld_LastLeft = nLastLeft;
- SwSbxValue nOld_NumberValue = nNumberValue;
- xub_StrLen nOld_CommandPos = nCommandPos;
- SwCalcOper eOld_CurrOper = eCurrOper;
- SwCalcOper eOld_CurrListOper = eCurrListOper;
+ USHORT nOld_ListPor = nListPor;
+ SwSbxValue nOld_LastLeft = nLastLeft;
+ SwSbxValue nOld_NumberValue = nNumberValue;
+ xub_StrLen nOld_CommandPos = nCommandPos;
+ SwCalcOper eOld_CurrOper = eCurrOper;
+ SwCalcOper eOld_CurrListOper = eCurrListOper;
pFndExp->nValue.PutDouble( pUFld->GetValue( *this ) );
// . . . und zurueck damit.
- nListPor = nOld_ListPor;
- nLastLeft = nOld_LastLeft;
- nNumberValue = nOld_NumberValue;
- nCommandPos = nOld_CommandPos;
- eCurrOper = eOld_CurrOper;
- eCurrListOper = eOld_CurrListOper;
+ nListPor = nOld_ListPor;
+ nLastLeft = nOld_LastLeft;
+ nNumberValue = nOld_NumberValue;
+ nCommandPos = nOld_CommandPos;
+ eCurrOper = eOld_CurrOper;
+ eCurrListOper = eOld_CurrListOper;
}
else
pFndExp->nValue.PutDouble( pUFld->GetValue() );
@@ -677,10 +677,10 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, USHORT ins )
/******************************************************************************
|*
-|* BOOL SwCalc::VarChange( const String& rStr, const SwSbxValue nValue )
+|* BOOL SwCalc::VarChange( const String& rStr, const SwSbxValue nValue )
|*
-|* Erstellung OK 12-02-93 11:04am
-|* Letzte Aenderung OK 12-02-93 11:04am
+|* Erstellung OK 12-02-93 11:04am
+|* Letzte Aenderung OK 12-02-93 11:04am
|*
|******************************************************************************/
@@ -710,10 +710,10 @@ void SwCalc::VarChange( const String& rStr, const SwSbxValue& rValue )
/******************************************************************************
|*
-|* BOOL SwCalc::Push( const void* pPtr )
+|* BOOL SwCalc::Push( const void* pPtr )
|*
-|* Erstellung OK 12-02-93 11:05am
-|* Letzte Aenderung OK 12-02-93 11:05am
+|* Erstellung OK 12-02-93 11:05am
+|* Letzte Aenderung OK 12-02-93 11:05am
|*
|******************************************************************************/
@@ -728,10 +728,10 @@ BOOL SwCalc::Push( const VoidPtr pPtr )
/******************************************************************************
|*
-|* void SwCalc::Pop( const void* pPtr )
+|* void SwCalc::Pop( const void* pPtr )
|*
-|* Erstellung OK 12-02-93 11:05am
-|* Letzte Aenderung OK 12-02-93 11:05am
+|* Erstellung OK 12-02-93 11:05am
+|* Letzte Aenderung OK 12-02-93 11:05am
|*
|******************************************************************************/
@@ -745,10 +745,10 @@ void SwCalc::Pop( const VoidPtr )
/******************************************************************************
|*
-|* SwCalcOper SwCalc::GetToken()
+|* SwCalcOper SwCalc::GetToken()
|*
-|* Erstellung OK 12-02-93 11:05am
-|* Letzte Aenderung JP 03.11.95
+|* Erstellung OK 12-02-93 11:05am
+|* Letzte Aenderung JP 03.11.95
|*
|******************************************************************************/
@@ -756,7 +756,7 @@ SwCalcOper SwCalc::GetToken()
{
#if OSL_DEBUG_LEVEL > 1
//JP 25.01.2001: static for switch back to the "old" implementation of the
-// calculator, which don't use the I18N routines.
+// calculator, which don't use the I18N routines.
static int nUseOld = 0;
if( !nUseOld )
{
@@ -792,7 +792,7 @@ if( !nUseOld )
if( sLowerCaseName == sCurrSym )
{
nCommandPos = (xub_StrLen)aRes.EndPos;
- return GetToken(); // also nochmal aufrufen
+ return GetToken(); // also nochmal aufrufen
}
// Operations abfangen
@@ -855,7 +855,7 @@ if( !nUseOld )
case '+':
case '-':
case '(':
- case ')': eCurrOper = SwCalcOper(ch);
+ case ')': eCurrOper = SwCalcOper(ch);
break;
case '=':
@@ -962,7 +962,7 @@ if( !nUseOld )
#if OSL_DEBUG_LEVEL > 1
-#define NextCh( s, n ) (nCommandPos < sCommand.Len() ? sCommand.GetChar( nCommandPos++ ) : 0)
+#define NextCh( s, n ) (nCommandPos < sCommand.Len() ? sCommand.GetChar( nCommandPos++ ) : 0)
}
else
@@ -1003,7 +1003,7 @@ else
case '+':
case '-':
case '(':
- case ')': eCurrOper = SwCalcOper(ch);
+ case ')': eCurrOper = SwCalcOper(ch);
break;
case '=': if( '=' == sCommand.GetChar( nCommandPos ) )
@@ -1042,12 +1042,12 @@ else
eCurrOper = eCurrListOper;
break;
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
case ',':
- case '.': {
+ case '.': {
double nVal;
- --nCommandPos; // auf das 1. Zeichen zurueck
+ --nCommandPos; // auf das 1. Zeichen zurueck
if( Str2Double( sCommand, nCommandPos, nVal, pLclData ))
{
nNumberValue.PutDouble( nVal );
@@ -1062,7 +1062,7 @@ else
}
break;
- case '[': {
+ case '[': {
String aStr;
BOOL bIgnore = FALSE;
do {
@@ -1087,7 +1087,7 @@ else
}
break;
- case '"': {
+ case '"': {
xub_StrLen nStt = nCommandPos;
while( 0 != ( ch = NextCh( sCommand, nCommandPos ) )
&& '"' != ch )
@@ -1101,7 +1101,7 @@ else
}
break;
- default: if( ch && pCharClass->isLetter( sCommand, nCommandPos - 1)
+ default: if( ch && pCharClass->isLetter( sCommand, nCommandPos - 1)
|| '_' == ch )
{
xub_StrLen nStt = nCommandPos-1;
@@ -1120,7 +1120,7 @@ else
// Currency-Symbol abfangen
if( aStr == sCurrSym )
- return GetToken(); // also nochmal aufrufen
+ return GetToken(); // also nochmal aufrufen
// Operations abfangen
_CalcOp* pFnd = ::FindOperator( aStr );
@@ -1160,10 +1160,10 @@ else
/******************************************************************************
|*
-|* SwSbxValue SwCalc::Term()
+|* SwSbxValue SwCalc::Term()
|*
-|* Erstellung OK 12-02-93 11:05am
-|* Letzte Aenderung JP 16.01.96
+|* Erstellung OK 12-02-93 11:05am
+|* Letzte Aenderung JP 16.01.96
|*
|******************************************************************************/
@@ -1178,22 +1178,22 @@ SwSbxValue SwCalc::Term()
switch( eCurrOper )
{
// wir haben kein Bitweises verodern, oder ?
-// case CALC_AND: eSbxOper = SbxAND; break;
-// case CALC_OR: eSbxOper = SbxOR; break;
-// case CALC_XOR: eSbxOper = SbxXOR; break;
- case CALC_AND: {
+// case CALC_AND: eSbxOper = SbxAND; break;
+// case CALC_OR: eSbxOper = SbxOR; break;
+// case CALC_XOR: eSbxOper = SbxXOR; break;
+ case CALC_AND: {
GetToken();
BOOL bB = Prim().GetBool();
left.PutBool( left.GetBool() && bB );
}
break;
- case CALC_OR: {
+ case CALC_OR: {
GetToken();
BOOL bB = Prim().GetBool();
left.PutBool( left.GetBool() || bB );
}
break;
- case CALC_XOR: {
+ case CALC_XOR: {
GetToken();
BOOL bR = Prim().GetBool();
BOOL bL = left.GetBool();
@@ -1201,15 +1201,15 @@ SwSbxValue SwCalc::Term()
}
break;
- case CALC_EQ: nSbxOper = SbxEQ; break;
- case CALC_NEQ: nSbxOper = SbxNE; break;
- case CALC_LEQ: nSbxOper = SbxLE; break;
- case CALC_GEQ: nSbxOper = SbxGE; break;
- case CALC_GRE: nSbxOper = SbxGT; break;
- case CALC_LES: nSbxOper = SbxLT; break;
+ case CALC_EQ: nSbxOper = SbxEQ; break;
+ case CALC_NEQ: nSbxOper = SbxNE; break;
+ case CALC_LEQ: nSbxOper = SbxLE; break;
+ case CALC_GEQ: nSbxOper = SbxGE; break;
+ case CALC_GRE: nSbxOper = SbxGT; break;
+ case CALC_LES: nSbxOper = SbxLT; break;
- case CALC_MUL: nSbxOper = SbxMUL; break;
- case CALC_DIV: nSbxOper = SbxDIV; break;
+ case CALC_MUL: nSbxOper = SbxMUL; break;
+ case CALC_DIV: nSbxOper = SbxDIV; break;
case CALC_MIN_IN:
{
@@ -1285,7 +1285,7 @@ SwSbxValue SwCalc::Term()
bSign = FALSE;
// runden
- double fNum = fVal; // find the exponent
+ double fNum = fVal; // find the exponent
int nExp = 0;
if( fNum > 0 )
{
@@ -1335,7 +1335,7 @@ SwSbxValue SwCalc::Term()
}
break;
*/
- default: return left;
+ default: return left;
}
if( USHRT_MAX != nSbxOper )
@@ -1363,10 +1363,10 @@ SwSbxValue SwCalc::Term()
/******************************************************************************
|*
-|* SwSbxValue SwCalc::Prim()
+|* SwSbxValue SwCalc::Prim()
|*
-|* Erstellung OK 12-02-93 11:05am
-|* Letzte Aenderung JP 03.11.95
+|* Erstellung OK 12-02-93 11:05am
+|* Letzte Aenderung JP 03.11.95
|*
|******************************************************************************/
@@ -1382,14 +1382,14 @@ SwSbxValue SwCalc::Prim()
switch( eCurrOper )
{
- case CALC_SIN: pFnc = &sin; break;
- case CALC_COS: pFnc = &cos; break;
- case CALC_TAN: pFnc = &tan; break;
- case CALC_ATAN: pFnc = &atan; break;
- case CALC_ASIN: pFnc = &asin; bChkTrig = TRUE; break;
- case CALC_ACOS: pFnc = &acos; bChkTrig = TRUE; break;
-
- case CALC_NOT: {
+ case CALC_SIN: pFnc = &sin; break;
+ case CALC_COS: pFnc = &cos; break;
+ case CALC_TAN: pFnc = &tan; break;
+ case CALC_ATAN: pFnc = &atan; break;
+ case CALC_ASIN: pFnc = &asin; bChkTrig = TRUE; break;
+ case CALC_ACOS: pFnc = &acos; bChkTrig = TRUE; break;
+
+ case CALC_NOT: {
GetToken();
nErg = Prim();
if( SbxSTRING == nErg.GetType() )
@@ -1410,7 +1410,7 @@ SwSbxValue SwCalc::Prim()
}
break;
- case CALC_NUMBER: if( GetToken() == CALC_PHD )
+ case CALC_NUMBER: if( GetToken() == CALC_PHD )
{
double aTmp = nNumberValue.GetDouble();
aTmp *= 0.01;
@@ -1426,7 +1426,7 @@ SwSbxValue SwCalc::Prim()
}
break;
- case CALC_NAME: if( GetToken() == CALC_ASSIGN )
+ case CALC_NAME: if( GetToken() == CALC_ASSIGN )
{
SwCalcExp* n = VarInsert( aVarName );
GetToken();
@@ -1439,11 +1439,11 @@ SwSbxValue SwCalc::Prim()
}
break;
- case CALC_MINUS: GetToken();
+ case CALC_MINUS: GetToken();
nErg.PutDouble( -(Prim().GetDouble()) );
break;
- case CALC_LP: {
+ case CALC_LP: {
GetToken();
nErg = Expr();
if( eCurrOper != CALC_RP )
@@ -1456,7 +1456,7 @@ SwSbxValue SwCalc::Prim()
}
break;
- case CALC_MEAN: {
+ case CALC_MEAN: {
nListPor = 1;
GetToken();
nErg = Expr();
@@ -1466,7 +1466,7 @@ SwSbxValue SwCalc::Prim()
}
break;
- case CALC_SQRT: {
+ case CALC_SQRT: {
GetToken();
nErg = Prim();
if( nErg.GetDouble() < 0 )
@@ -1479,14 +1479,14 @@ SwSbxValue SwCalc::Prim()
case CALC_SUM:
case CALC_DATE:
case CALC_MIN:
- case CALC_MAX: GetToken();
+ case CALC_MAX: GetToken();
nErg = Expr();
break;
- case CALC_ENDCALC: nErg.Clear();
+ case CALC_ENDCALC: nErg.Clear();
break;
- default: eError = CALC_SYNTAX;
+ default: eError = CALC_SYNTAX;
break;
}
@@ -1526,7 +1526,7 @@ SwSbxValue SwCalc::Prim()
else
{
nErg.PutDouble( dleft );
-// GetToken();
+// GetToken();
}
}
}
@@ -1536,21 +1536,21 @@ SwSbxValue SwCalc::Prim()
/******************************************************************************
|*
-|* SwSbxValue SwCalc::Expr()
+|* SwSbxValue SwCalc::Expr()
|*
-|* Erstellung OK 12-02-93 11:06am
-|* Letzte Aenderung JP 03.11.95
+|* Erstellung OK 12-02-93 11:06am
+|* Letzte Aenderung JP 03.11.95
|*
|******************************************************************************/
-SwSbxValue SwCalc::Expr()
+SwSbxValue SwCalc::Expr()
{
SwSbxValue left = Term(), right;
nLastLeft = left;
for(;;)
switch(eCurrOper)
{
- case CALC_PLUS: GetToken();
+ case CALC_PLUS: GetToken();
// erzeuge zum addieren auf jedenfall einen
// Double-Wert
left.MakeDouble();
@@ -1559,7 +1559,7 @@ SwSbxValue SwCalc::Expr()
nListPor++;
break;
- case CALC_MINUS: GetToken();
+ case CALC_MINUS: GetToken();
// erzeuge zum addieren auf jedenfall einen
// Double-Wert
left.MakeDouble();
@@ -1567,7 +1567,7 @@ SwSbxValue SwCalc::Expr()
left.Compute( SbxMINUS, right );
break;
- default: return left;
+ default: return left;
}
}
@@ -1631,10 +1631,10 @@ lcl_Str2Double( const String& rCommand, xub_StrLen& rCommandPos, double& rVal,
}
/******************************************************************************
- * Methode : BOOL SwCalc::Str2Double( double& )
- * Beschreibung:
- * Erstellt : OK 07.06.94 12:56
- * Aenderung : JP 27.10.98
+ * Methode : BOOL SwCalc::Str2Double( double& )
+ * Beschreibung:
+ * Erstellt : OK 07.06.94 12:56
+ * Aenderung : JP 27.10.98
******************************************************************************/
bool SwCalc::Str2Double( const String& rCommand, xub_StrLen& rCommandPos,
double& rVal, const LocaleDataWrapper* const pLclData )
@@ -1698,10 +1698,10 @@ BOOL SwCalc::IsValidVarName( const String& rStr,
/******************************************************************************
|*
-|* CTOR DTOR der SwHash classes
+|* CTOR DTOR der SwHash classes
|*
-|* Ersterstellung OK 25.06.93 12:20
-|* Letzte Aenderung OK 25.06.93 12:20
+|* Ersterstellung OK 25.06.93 12:20
+|* Letzte Aenderung OK 25.06.93 12:20
|*
******************************************************************************/
@@ -1775,18 +1775,18 @@ SwSbxValue& SwSbxValue::MakeDouble()
void main()
{
static sal_Char
- sNType0[] = "false", sNType1[] = "true", sNType2[] = "pi",
- sNType3[] = "e", sNType4[] = "tables", sNType5[] = "graf",
- sNType6[] = "ole", sNType7[] = "page", sNType8[] = "para",
- sNType9[] = "word", sNType10[]= "char",
- sNType11[] = "user_company" , sNType12[] = "user_firstname" ,
- sNType13[] = "user_lastname" , sNType14[] = "user_initials",
+ sNType0[] = "false", sNType1[] = "true", sNType2[] = "pi",
+ sNType3[] = "e", sNType4[] = "tables", sNType5[] = "graf",
+ sNType6[] = "ole", sNType7[] = "page", sNType8[] = "para",
+ sNType9[] = "word", sNType10[]= "char",
+ sNType11[] = "user_company" , sNType12[] = "user_firstname" ,
+ sNType13[] = "user_lastname" , sNType14[] = "user_initials",
sNType15[] = "user_street" , sNType16[] = "user_country" ,
sNType17[] = "user_zipcode" , sNType18[] = "user_city" ,
sNType19[] = "user_title" , sNType20[] = "user_position" ,
- sNType21[] = "user_tel_home", sNType22[] = "user_tel_work",
+ sNType21[] = "user_tel_home", sNType22[] = "user_tel_work",
sNType23[] = "user_fax" , sNType24[] = "user_email" ,
- sNType25[] = "user_state", sNType26[] = "graph"
+ sNType25[] = "user_state", sNType26[] = "graph"
;
static const sal_Char* sNTypeTab[ 27 ] =
diff --git a/sw/source/core/bastyp/checkit.cxx b/sw/source/core/bastyp/checkit.cxx
index ec4a3b8e8aed..148e0b6fff98 100644
--- a/sw/source/core/bastyp/checkit.cxx
+++ b/sw/source/core/bastyp/checkit.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index a249a21ec2a6..bff41705d68a 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,19 +30,19 @@
#include "precompiled_sw.hxx"
-#include <stdlib.h> // fuer qsort
+#include <stdlib.h> // fuer qsort
#include <tools/solar.h>
-#include "errhdl.hxx" // fuers ASSERT
+#include "errhdl.hxx" // fuers ASSERT
#include "index.hxx"
-#include "error.h" // fuers ASSERT
+#include "error.h" // fuers ASSERT
#if OSL_DEBUG_LEVEL > 1
int SwIndex::nSerial = 0;
#endif
-TYPEINIT0(SwIndexReg); // rtti
+TYPEINIT0(SwIndexReg); // rtti
#ifdef CHK
@@ -76,12 +76,12 @@ void SwIndexReg::ChkArr()
}
}
-#else // CHK
+#else // CHK
#define IDX_CHK_ARRAY
#define ARR_CHK_ARRAY
-#endif // CHK
+#endif // CHK
@@ -91,7 +91,7 @@ SwIndex::SwIndex(SwIndexReg *const pArr, xub_StrLen const nIdx)
if( !pArray )
{
pArray = SwIndexReg::pEmptyIndexArray;
- nIndex = 0; // steht immer auf 0 !!!
+ nIndex = 0; // steht immer auf 0 !!!
}
if( !pArray->pFirst || !pArray->pLast ) // 1. Index ??
@@ -102,7 +102,7 @@ SwIndex::SwIndex(SwIndexReg *const pArr, xub_StrLen const nIdx)
ChgValue( *pArray->pFirst, nIdx );
#if OSL_DEBUG_LEVEL > 1
- MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
+ MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
#endif
IDX_CHK_ARRAY
}
@@ -114,7 +114,7 @@ SwIndex::SwIndex( const SwIndex& rIdx, short nIdx )
ChgValue( rIdx, rIdx.nIndex + nIdx );
#if OSL_DEBUG_LEVEL > 1
- MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
+ MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
#endif
IDX_CHK_ARRAY
}
@@ -125,7 +125,7 @@ SwIndex::SwIndex( const SwIndex& rIdx )
{
ChgValue( rIdx, rIdx.nIndex );
#if OSL_DEBUG_LEVEL > 1
- MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
+ MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
#endif
IDX_CHK_ARRAY
}
@@ -134,7 +134,7 @@ IDX_CHK_ARRAY
SwIndex& SwIndex::ChgValue( const SwIndex& rIdx, xub_StrLen nNewValue )
{
SwIndex* pFnd = (SwIndex*)&rIdx;
- if( rIdx.nIndex > nNewValue ) // nach vorne versuchen
+ if( rIdx.nIndex > nNewValue ) // nach vorne versuchen
{
SwIndex* pPrv;
while( 0 != ( pPrv = pFnd->pPrev ) && pPrv->nIndex > nNewValue )
@@ -208,7 +208,7 @@ SwIndex& SwIndex::ChgValue( const SwIndex& rIdx, xub_StrLen nNewValue )
pNext = rIdx.pNext;
pPrev->pNext = this;
- if( !pNext ) // im IndexArray als letzes
+ if( !pNext ) // im IndexArray als letzes
pArray->pLast = this;
else
pNext->pPrev = this;
@@ -244,11 +244,11 @@ IDX_CHK_ARRAY
/*************************************************************************
|*
-|* SwIndex & SwIndex::operator=( const SwIndex & aSwIndex )
+|* SwIndex & SwIndex::operator=( const SwIndex & aSwIndex )
|*
-|* Beschreibung
-|* Ersterstellung JP 07.11.90
-|* Letzte Aenderung JP 07.03.94
+|* Beschreibung
+|* Ersterstellung JP 07.11.90
+|* Letzte Aenderung JP 07.03.94
|*
*************************************************************************/
@@ -256,7 +256,7 @@ IDX_CHK_ARRAY
SwIndex& SwIndex::operator=( const SwIndex& rIdx )
{
int bEqual;
- if( rIdx.pArray != pArray ) // im alten abmelden !!
+ if( rIdx.pArray != pArray ) // im alten abmelden !!
{
Remove();
pArray = rIdx.pArray;
@@ -273,11 +273,11 @@ SwIndex& SwIndex::operator=( const SwIndex& rIdx )
/*************************************************************************
|*
-|* SwIndex &SwIndex::Assign
+|* SwIndex &SwIndex::Assign
|*
-|* Beschreibung
-|* Ersterstellung VB 25.03.91
-|* Letzte Aenderung JP 07.03.94
+|* Beschreibung
+|* Ersterstellung VB 25.03.91
+|* Letzte Aenderung JP 07.03.94
|*
*************************************************************************/
@@ -287,10 +287,10 @@ SwIndex& SwIndex::Assign( SwIndexReg* pArr, xub_StrLen nIdx )
if( !pArr )
{
pArr = SwIndexReg::pEmptyIndexArray;
- nIdx = 0; // steht immer auf 0 !!!
+ nIdx = 0; // steht immer auf 0 !!!
}
- if( pArr != pArray ) // im alten abmelden !!
+ if( pArr != pArray ) // im alten abmelden !!
{
Remove();
pArray = pArr;
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 3c76b6effaf4..f94be22941af 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -144,7 +144,7 @@ extern void _FrmFinit();
extern void ClearFEShellTabCols();
/*************************************************************************
-|* einige Bereiche fuer die Set in Collections / Nodes
+|* einige Bereiche fuer die Set in Collections / Nodes
|*************************************************************************/
// AttrSet-Range fuer die 2 Break-Attribute
USHORT __FAR_DATA aBreakSetRange[] = {
@@ -192,12 +192,12 @@ USHORT __FAR_DATA aNoTxtNodeSetRange[] = {
};
USHORT __FAR_DATA aTableSetRange[] = {
- RES_FILL_ORDER, RES_FRM_SIZE,
- RES_LR_SPACE, RES_BREAK,
- RES_BACKGROUND, RES_SHADOW,
- RES_HORI_ORIENT, RES_HORI_ORIENT,
- RES_KEEP, RES_KEEP,
- RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT,
+ RES_FILL_ORDER, RES_FRM_SIZE,
+ RES_LR_SPACE, RES_BREAK,
+ RES_BACKGROUND, RES_SHADOW,
+ RES_HORI_ORIENT, RES_HORI_ORIENT,
+ RES_KEEP, RES_KEEP,
+ RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT,
RES_FRAMEDIR, RES_FRAMEDIR,
// --> collapsing borders FME 2005-05-27 #i29550#
RES_COLLAPSING_BORDERS, RES_COLLAPSING_BORDERS,
@@ -207,22 +207,22 @@ USHORT __FAR_DATA aTableSetRange[] = {
};
USHORT __FAR_DATA aTableLineSetRange[] = {
- RES_FILL_ORDER, RES_FRM_SIZE,
- RES_LR_SPACE, RES_UL_SPACE,
- RES_BACKGROUND, RES_SHADOW,
+ RES_FILL_ORDER, RES_FRM_SIZE,
+ RES_LR_SPACE, RES_UL_SPACE,
+ RES_BACKGROUND, RES_SHADOW,
RES_ROW_SPLIT, RES_ROW_SPLIT,
RES_PROTECT, RES_PROTECT,
- RES_VERT_ORIENT, RES_VERT_ORIENT,
+ RES_VERT_ORIENT, RES_VERT_ORIENT,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
};
USHORT __FAR_DATA aTableBoxSetRange[] = {
- RES_FILL_ORDER, RES_FRM_SIZE,
- RES_LR_SPACE, RES_UL_SPACE,
- RES_BACKGROUND, RES_SHADOW,
- RES_PROTECT, RES_PROTECT,
- RES_VERT_ORIENT, RES_VERT_ORIENT,
+ RES_FILL_ORDER, RES_FRM_SIZE,
+ RES_LR_SPACE, RES_UL_SPACE,
+ RES_BACKGROUND, RES_SHADOW,
+ RES_PROTECT, RES_PROTECT,
+ RES_VERT_ORIENT, RES_VERT_ORIENT,
RES_FRAMEDIR, RES_FRAMEDIR,
RES_BOXATR_BEGIN, RES_BOXATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
@@ -266,46 +266,46 @@ SwDfltAttrTab __FAR_DATA aAttrTab;
SfxItemInfo __FAR_DATA aSlotTab[] =
{
- { SID_ATTR_CHAR_CASEMAP, SFX_ITEM_POOLABLE }, // RES_CHRATR_CASEMAP
- { SID_ATTR_CHAR_CHARSETCOLOR, SFX_ITEM_POOLABLE }, // RES_CHRATR_CHARSETCOLOR
- { SID_ATTR_CHAR_COLOR, SFX_ITEM_POOLABLE }, // RES_CHRATR_COLOR
- { SID_ATTR_CHAR_CONTOUR, SFX_ITEM_POOLABLE }, // RES_CHRATR_CONTOUR
- { SID_ATTR_CHAR_STRIKEOUT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CROSSEDOUT
- { SID_ATTR_CHAR_ESCAPEMENT, SFX_ITEM_POOLABLE }, // RES_CHRATR_ESCAPEMENT
- { SID_ATTR_CHAR_FONT, SFX_ITEM_POOLABLE }, // RES_CHRATR_FONT
- { SID_ATTR_CHAR_FONTHEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_FONTSIZE
- { SID_ATTR_CHAR_KERNING, SFX_ITEM_POOLABLE }, // RES_CHRATR_KERNING
- { SID_ATTR_CHAR_LANGUAGE, SFX_ITEM_POOLABLE }, // RES_CHRATR_LANGUAGE
- { SID_ATTR_CHAR_POSTURE, SFX_ITEM_POOLABLE }, // RES_CHRATR_POSTURE
- { SID_ATTR_CHAR_PROPSIZE, SFX_ITEM_POOLABLE }, // RES_CHRATR_PROPORTIONALFONTSIZE
- { SID_ATTR_CHAR_SHADOWED, SFX_ITEM_POOLABLE }, // RES_CHRATR_SHADOWED
- { SID_ATTR_CHAR_UNDERLINE, SFX_ITEM_POOLABLE }, // RES_CHRATR_UNDERLINE
- { SID_ATTR_CHAR_WEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_WEIGHT
- { SID_ATTR_CHAR_WORDLINEMODE, SFX_ITEM_POOLABLE }, // RES_CHRATR_WORDLINEMODE
- { SID_ATTR_CHAR_AUTOKERN, SFX_ITEM_POOLABLE }, // RES_CHRATR_AUTOKERN
- { SID_ATTR_FLASH, SFX_ITEM_POOLABLE }, // RES_CHRATR_BLINK
- { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_NOLINEBREAK
- { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_NOHYPHEN
- { SID_ATTR_BRUSH_CHAR, SFX_ITEM_POOLABLE }, // RES_CHRATR_BACKGROUND
- { SID_ATTR_CHAR_CJK_FONT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_FONT
+ { SID_ATTR_CHAR_CASEMAP, SFX_ITEM_POOLABLE }, // RES_CHRATR_CASEMAP
+ { SID_ATTR_CHAR_CHARSETCOLOR, SFX_ITEM_POOLABLE }, // RES_CHRATR_CHARSETCOLOR
+ { SID_ATTR_CHAR_COLOR, SFX_ITEM_POOLABLE }, // RES_CHRATR_COLOR
+ { SID_ATTR_CHAR_CONTOUR, SFX_ITEM_POOLABLE }, // RES_CHRATR_CONTOUR
+ { SID_ATTR_CHAR_STRIKEOUT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CROSSEDOUT
+ { SID_ATTR_CHAR_ESCAPEMENT, SFX_ITEM_POOLABLE }, // RES_CHRATR_ESCAPEMENT
+ { SID_ATTR_CHAR_FONT, SFX_ITEM_POOLABLE }, // RES_CHRATR_FONT
+ { SID_ATTR_CHAR_FONTHEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_FONTSIZE
+ { SID_ATTR_CHAR_KERNING, SFX_ITEM_POOLABLE }, // RES_CHRATR_KERNING
+ { SID_ATTR_CHAR_LANGUAGE, SFX_ITEM_POOLABLE }, // RES_CHRATR_LANGUAGE
+ { SID_ATTR_CHAR_POSTURE, SFX_ITEM_POOLABLE }, // RES_CHRATR_POSTURE
+ { SID_ATTR_CHAR_PROPSIZE, SFX_ITEM_POOLABLE }, // RES_CHRATR_PROPORTIONALFONTSIZE
+ { SID_ATTR_CHAR_SHADOWED, SFX_ITEM_POOLABLE }, // RES_CHRATR_SHADOWED
+ { SID_ATTR_CHAR_UNDERLINE, SFX_ITEM_POOLABLE }, // RES_CHRATR_UNDERLINE
+ { SID_ATTR_CHAR_WEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_WEIGHT
+ { SID_ATTR_CHAR_WORDLINEMODE, SFX_ITEM_POOLABLE }, // RES_CHRATR_WORDLINEMODE
+ { SID_ATTR_CHAR_AUTOKERN, SFX_ITEM_POOLABLE }, // RES_CHRATR_AUTOKERN
+ { SID_ATTR_FLASH, SFX_ITEM_POOLABLE }, // RES_CHRATR_BLINK
+ { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_NOLINEBREAK
+ { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_NOHYPHEN
+ { SID_ATTR_BRUSH_CHAR, SFX_ITEM_POOLABLE }, // RES_CHRATR_BACKGROUND
+ { SID_ATTR_CHAR_CJK_FONT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_FONT
{ SID_ATTR_CHAR_CJK_FONTHEIGHT, SFX_ITEM_POOLABLE },// RES_CHRATR_CJK_FONTSIZE
- { SID_ATTR_CHAR_CJK_LANGUAGE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_LANGUAGE
- { SID_ATTR_CHAR_CJK_POSTURE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_POSTURE
- { SID_ATTR_CHAR_CJK_WEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_WEIGHT
- { SID_ATTR_CHAR_CTL_FONT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_FONT
+ { SID_ATTR_CHAR_CJK_LANGUAGE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_LANGUAGE
+ { SID_ATTR_CHAR_CJK_POSTURE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_POSTURE
+ { SID_ATTR_CHAR_CJK_WEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CJK_WEIGHT
+ { SID_ATTR_CHAR_CTL_FONT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_FONT
{ SID_ATTR_CHAR_CTL_FONTHEIGHT, SFX_ITEM_POOLABLE },// RES_CHRATR_CTL_FONTSIZE
- { SID_ATTR_CHAR_CTL_LANGUAGE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_LANGUAGE
- { SID_ATTR_CHAR_CTL_POSTURE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_POSTURE
- { SID_ATTR_CHAR_CTL_WEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_WEIGHT
- { SID_ATTR_CHAR_ROTATED, SFX_ITEM_POOLABLE }, // RES_CHRATR_ROTATE
- { SID_ATTR_CHAR_EMPHASISMARK, SFX_ITEM_POOLABLE }, // RES_CHRATR_EMPHASIS_MARK
- { SID_ATTR_CHAR_TWO_LINES, SFX_ITEM_POOLABLE }, // RES_CHRATR_TWO_LINES
- { SID_ATTR_CHAR_SCALEWIDTH, SFX_ITEM_POOLABLE }, // RES_CHRATR_SCALEW
- { SID_ATTR_CHAR_RELIEF, SFX_ITEM_POOLABLE }, // RES_CHRATR_RELIEF
+ { SID_ATTR_CHAR_CTL_LANGUAGE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_LANGUAGE
+ { SID_ATTR_CHAR_CTL_POSTURE, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_POSTURE
+ { SID_ATTR_CHAR_CTL_WEIGHT, SFX_ITEM_POOLABLE }, // RES_CHRATR_CTL_WEIGHT
+ { SID_ATTR_CHAR_ROTATED, SFX_ITEM_POOLABLE }, // RES_CHRATR_ROTATE
+ { SID_ATTR_CHAR_EMPHASISMARK, SFX_ITEM_POOLABLE }, // RES_CHRATR_EMPHASIS_MARK
+ { SID_ATTR_CHAR_TWO_LINES, SFX_ITEM_POOLABLE }, // RES_CHRATR_TWO_LINES
+ { SID_ATTR_CHAR_SCALEWIDTH, SFX_ITEM_POOLABLE }, // RES_CHRATR_SCALEW
+ { SID_ATTR_CHAR_RELIEF, SFX_ITEM_POOLABLE }, // RES_CHRATR_RELIEF
{ SID_ATTR_CHAR_HIDDEN, SFX_ITEM_POOLABLE }, // RES_CHRATR_HIDDEN
- { SID_ATTR_CHAR_OVERLINE, SFX_ITEM_POOLABLE }, // RES_CHRATR_OVERLINE
- { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_DUMMY1
- { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_DUMMY2
+ { SID_ATTR_CHAR_OVERLINE, SFX_ITEM_POOLABLE }, // RES_CHRATR_OVERLINE
+ { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_DUMMY1
+ { 0, SFX_ITEM_POOLABLE }, // RES_CHRATR_DUMMY2
{ 0, 0 }, // RES_TXTATR_REFMARK
{ 0, 0 }, // RES_TXTATR_TOXMARK
@@ -318,28 +318,28 @@ SfxItemInfo __FAR_DATA aSlotTab[] =
{ 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_UNKNOWN_CONTAINER
{ 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_DUMMY5
- { 0, 0 }, // RES_TXTATR_FIELD
- { 0, 0 }, // RES_TXTATR_FLYCNT
- { 0, 0 }, // RES_TXTATR_FTN
+ { 0, 0 }, // RES_TXTATR_FIELD
+ { 0, 0 }, // RES_TXTATR_FLYCNT
+ { 0, 0 }, // RES_TXTATR_FTN
{ 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_DUMMY4
{ 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_DUMMY3
- { 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_DUMMY1
- { 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_DUMMY2
-
- { SID_ATTR_PARA_LINESPACE, SFX_ITEM_POOLABLE }, // RES_PARATR_LINESPACING
- { SID_ATTR_PARA_ADJUST, SFX_ITEM_POOLABLE }, // RES_PARATR_ADJUST
- { SID_ATTR_PARA_SPLIT, SFX_ITEM_POOLABLE }, // RES_PARATR_SPLIT
- { SID_ATTR_PARA_ORPHANS, SFX_ITEM_POOLABLE }, // RES_PARATR_ORPHANS
- { SID_ATTR_PARA_WIDOWS, SFX_ITEM_POOLABLE }, // RES_PARATR_WIDOWS
- { SID_ATTR_TABSTOP, SFX_ITEM_POOLABLE }, // RES_PARATR_TABSTOP
- { SID_ATTR_PARA_HYPHENZONE, SFX_ITEM_POOLABLE }, // RES_PARATR_HYPHENZONE
- { FN_FORMAT_DROPCAPS, 0 }, // RES_PARATR_DROP
- { SID_ATTR_PARA_REGISTER, SFX_ITEM_POOLABLE }, // RES_PARATR_REGISTER
+ { 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_DUMMY1
+ { 0, SFX_ITEM_POOLABLE }, // RES_TXTATR_DUMMY2
+
+ { SID_ATTR_PARA_LINESPACE, SFX_ITEM_POOLABLE }, // RES_PARATR_LINESPACING
+ { SID_ATTR_PARA_ADJUST, SFX_ITEM_POOLABLE }, // RES_PARATR_ADJUST
+ { SID_ATTR_PARA_SPLIT, SFX_ITEM_POOLABLE }, // RES_PARATR_SPLIT
+ { SID_ATTR_PARA_ORPHANS, SFX_ITEM_POOLABLE }, // RES_PARATR_ORPHANS
+ { SID_ATTR_PARA_WIDOWS, SFX_ITEM_POOLABLE }, // RES_PARATR_WIDOWS
+ { SID_ATTR_TABSTOP, SFX_ITEM_POOLABLE }, // RES_PARATR_TABSTOP
+ { SID_ATTR_PARA_HYPHENZONE, SFX_ITEM_POOLABLE }, // RES_PARATR_HYPHENZONE
+ { FN_FORMAT_DROPCAPS, 0 }, // RES_PARATR_DROP
+ { SID_ATTR_PARA_REGISTER, SFX_ITEM_POOLABLE }, // RES_PARATR_REGISTER
// --> OD 2008-03-04 #refactorlists#
// RES_PARATR_NUMRULE is now poolable
{ SID_ATTR_PARA_NUMRULE, SFX_ITEM_POOLABLE }, // RES_PARATR_NUMRULE
// <--
- { SID_ATTR_PARA_SCRIPTSPACE, SFX_ITEM_POOLABLE }, // RES_PARATR_SCRIPTSPACE
+ { SID_ATTR_PARA_SCRIPTSPACE, SFX_ITEM_POOLABLE }, // RES_PARATR_SCRIPTSPACE
{ SID_ATTR_PARA_HANGPUNCTUATION, SFX_ITEM_POOLABLE },// RES_PARATR_HANGINGPUNCTUATION
{ SID_ATTR_PARA_FORBIDDEN_RULES, SFX_ITEM_POOLABLE },// RES_PARATR_FORBIDDEN_RULES
@@ -357,41 +357,41 @@ SfxItemInfo __FAR_DATA aSlotTab[] =
{ 0, SFX_ITEM_POOLABLE }, // RES_PARATR_LIST_ISCOUNTED
// <--
- { 0, SFX_ITEM_POOLABLE }, // RES_FILL_ORDER
- { 0, SFX_ITEM_POOLABLE }, // RES_FRM_SIZE
- { SID_ATTR_PAGE_PAPERBIN, SFX_ITEM_POOLABLE }, // RES_PAPER_BIN
- { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE }, // RES_LR_SPACE
- { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE }, // RES_UL_SPACE
- { 0, 0 }, // RES_PAGEDESC
- { SID_ATTR_PARA_PAGEBREAK, SFX_ITEM_POOLABLE }, // RES_BREAK
- { 0, 0 }, // RES_CNTNT
- { 0, SFX_ITEM_POOLABLE }, // RES_HEADER
- { 0, SFX_ITEM_POOLABLE }, // RES_FOOTER
- { 0, SFX_ITEM_POOLABLE }, // RES_PRINT
- { FN_OPAQUE, SFX_ITEM_POOLABLE }, // RES_OPAQUE
- { FN_SET_PROTECT, SFX_ITEM_POOLABLE }, // RES_PROTECT
- { FN_SURROUND, SFX_ITEM_POOLABLE }, // RES_SURROUND
- { FN_VERT_ORIENT, SFX_ITEM_POOLABLE }, // RES_VERT_ORIENT
- { FN_HORI_ORIENT, SFX_ITEM_POOLABLE }, // RES_HORI_ORIENT
- { 0, 0 }, // RES_ANCHOR
- { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE }, // RES_BACKGROUND
- { SID_ATTR_BORDER_OUTER, SFX_ITEM_POOLABLE }, // RES_BOX
- { SID_ATTR_BORDER_SHADOW, SFX_ITEM_POOLABLE }, // RES_SHADOW
- { SID_ATTR_MACROITEM, SFX_ITEM_POOLABLE }, // RES_FRMMACRO
- { FN_ATTR_COLUMNS, SFX_ITEM_POOLABLE }, // RES_COL
- { SID_ATTR_PARA_KEEP, SFX_ITEM_POOLABLE }, // RES_KEEP
- { 0, SFX_ITEM_POOLABLE }, // RES_URL
- { 0, SFX_ITEM_POOLABLE }, // RES_EDIT_IN_READONLY
-
- { 0, SFX_ITEM_POOLABLE }, // RES_LAYOUT_SPLIT
- { 0, 0 }, // RES_CHAIN
+ { 0, SFX_ITEM_POOLABLE }, // RES_FILL_ORDER
+ { 0, SFX_ITEM_POOLABLE }, // RES_FRM_SIZE
+ { SID_ATTR_PAGE_PAPERBIN, SFX_ITEM_POOLABLE }, // RES_PAPER_BIN
+ { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE }, // RES_LR_SPACE
+ { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE }, // RES_UL_SPACE
+ { 0, 0 }, // RES_PAGEDESC
+ { SID_ATTR_PARA_PAGEBREAK, SFX_ITEM_POOLABLE }, // RES_BREAK
+ { 0, 0 }, // RES_CNTNT
+ { 0, SFX_ITEM_POOLABLE }, // RES_HEADER
+ { 0, SFX_ITEM_POOLABLE }, // RES_FOOTER
+ { 0, SFX_ITEM_POOLABLE }, // RES_PRINT
+ { FN_OPAQUE, SFX_ITEM_POOLABLE }, // RES_OPAQUE
+ { FN_SET_PROTECT, SFX_ITEM_POOLABLE }, // RES_PROTECT
+ { FN_SURROUND, SFX_ITEM_POOLABLE }, // RES_SURROUND
+ { FN_VERT_ORIENT, SFX_ITEM_POOLABLE }, // RES_VERT_ORIENT
+ { FN_HORI_ORIENT, SFX_ITEM_POOLABLE }, // RES_HORI_ORIENT
+ { 0, 0 }, // RES_ANCHOR
+ { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE }, // RES_BACKGROUND
+ { SID_ATTR_BORDER_OUTER, SFX_ITEM_POOLABLE }, // RES_BOX
+ { SID_ATTR_BORDER_SHADOW, SFX_ITEM_POOLABLE }, // RES_SHADOW
+ { SID_ATTR_MACROITEM, SFX_ITEM_POOLABLE }, // RES_FRMMACRO
+ { FN_ATTR_COLUMNS, SFX_ITEM_POOLABLE }, // RES_COL
+ { SID_ATTR_PARA_KEEP, SFX_ITEM_POOLABLE }, // RES_KEEP
+ { 0, SFX_ITEM_POOLABLE }, // RES_URL
+ { 0, SFX_ITEM_POOLABLE }, // RES_EDIT_IN_READONLY
+
+ { 0, SFX_ITEM_POOLABLE }, // RES_LAYOUT_SPLIT
+ { 0, 0 }, // RES_CHAIN
{ 0, SFX_ITEM_POOLABLE }, // RES_TEXTGRID
{ FN_FORMAT_LINENUMBER, SFX_ITEM_POOLABLE }, // RES_LINENUMBER
- { 0, SFX_ITEM_POOLABLE }, // RES_FTN_AT_TXTEND
- { 0, SFX_ITEM_POOLABLE }, // RES_END_AT_TXTEND
- { 0, SFX_ITEM_POOLABLE }, // RES_COLUMNBALANCE
+ { 0, SFX_ITEM_POOLABLE }, // RES_FTN_AT_TXTEND
+ { 0, SFX_ITEM_POOLABLE }, // RES_END_AT_TXTEND
+ { 0, SFX_ITEM_POOLABLE }, // RES_COLUMNBALANCE
- { SID_ATTR_FRAMEDIRECTION, SFX_ITEM_POOLABLE }, // RES_FRAMEDIR
+ { SID_ATTR_FRAMEDIRECTION, SFX_ITEM_POOLABLE }, // RES_FRAMEDIR
{ SID_ATTR_HDFT_DYNAMIC_SPACING, SFX_ITEM_POOLABLE }, // RES_HEADER_FOOTER_EAT_SPACING
{ FN_TABLE_ROW_SPLIT, SFX_ITEM_POOLABLE }, // RES_ROW_SPLIT
@@ -406,29 +406,29 @@ SfxItemInfo __FAR_DATA aSlotTab[] =
{ 0, SFX_ITEM_POOLABLE }, // RES_FRMATR_STYLE_NAME
{ 0, SFX_ITEM_POOLABLE }, // RES_FRMATR_CONDITIONAL_STYLE_NAME
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_MIRRORGRF
- { SID_ATTR_GRAF_CROP, SFX_ITEM_POOLABLE }, // RES_GRFATR_CROPGRF
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_ROTATION,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_LUMINANCE,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CONTRAST,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CHANNELR,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CHANNELG,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CHANNELB,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_GAMMA,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_INVERT,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_TRANSPARENCY,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY1,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY2,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY3,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY4,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY5,
- { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY6,
-
- { 0, SFX_ITEM_POOLABLE }, // RES_BOXATR_FORMAT
- { 0, 0 }, // RES_BOXATR_FORMULA,
- { 0, SFX_ITEM_POOLABLE }, // RES_BOXATR_VALUE
-
- { 0, SFX_ITEM_POOLABLE } // RES_UNKNOWNATR_CONTAINER
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_MIRRORGRF
+ { SID_ATTR_GRAF_CROP, SFX_ITEM_POOLABLE }, // RES_GRFATR_CROPGRF
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_ROTATION,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_LUMINANCE,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CONTRAST,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CHANNELR,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CHANNELG,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_CHANNELB,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_GAMMA,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_INVERT,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_TRANSPARENCY,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY1,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY2,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY3,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY4,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY5,
+ { 0, SFX_ITEM_POOLABLE }, // RES_GRFATR_DUMMY6,
+
+ { 0, SFX_ITEM_POOLABLE }, // RES_BOXATR_FORMAT
+ { 0, 0 }, // RES_BOXATR_FORMULA,
+ { 0, SFX_ITEM_POOLABLE }, // RES_BOXATR_VALUE
+
+ { 0, SFX_ITEM_POOLABLE } // RES_UNKNOWNATR_CONTAINER
};
@@ -441,13 +441,13 @@ USHORT* SwAttrPool::pVersionMap5 = 0;
USHORT* SwAttrPool::pVersionMap6 = 0;
SwIndexReg* SwIndexReg::pEmptyIndexArray = 0;
-const sal_Char* __FAR_DATA pMarkToTable = "table";
-const sal_Char* __FAR_DATA pMarkToFrame = "frame";
-const sal_Char* __FAR_DATA pMarkToRegion = "region";
-const sal_Char* __FAR_DATA pMarkToText = "text";
-const sal_Char* __FAR_DATA pMarkToOutline = "outline";
-const sal_Char* __FAR_DATA pMarkToGraphic = "graphic";
-const sal_Char* __FAR_DATA pMarkToOLE = "ole";
+const sal_Char* __FAR_DATA pMarkToTable = "table";
+const sal_Char* __FAR_DATA pMarkToFrame = "frame";
+const sal_Char* __FAR_DATA pMarkToRegion = "region";
+const sal_Char* __FAR_DATA pMarkToText = "text";
+const sal_Char* __FAR_DATA pMarkToOutline = "outline";
+const sal_Char* __FAR_DATA pMarkToGraphic = "graphic";
+const sal_Char* __FAR_DATA pMarkToOLE = "ole";
SvPtrarr *pGlobalOLEExcludeList = 0;
@@ -460,7 +460,7 @@ CollatorWrapper* pCollator = 0, *pCaseCollator = 0;
::utl::TransliterationWrapper* pTransWrp = 0;
/******************************************************************************
- * void _InitCore()
+ * void _InitCore()
******************************************************************************/
salhelper::SingletonRef<SwCalendarWrapper>* s_getCalendarWrapper()
{
@@ -665,11 +665,11 @@ void _InitCore()
*(SvxFontItem*)aAttrTab[ RES_CHRATR_CTL_FONT - POOLATTR_BEGIN ] );
// 1. Version - neue Attribute:
- // - RES_CHRATR_BLINK
- // - RES_CHRATR_NOHYPHEN
- // - RES_CHRATR_NOLINEBREAK
- // - RES_PARATR_REGISTER
- // + 2 Dummies fuer die einzelnen "Bereiche"
+ // - RES_CHRATR_BLINK
+ // - RES_CHRATR_NOHYPHEN
+ // - RES_CHRATR_NOLINEBREAK
+ // - RES_PARATR_REGISTER
+ // + 2 Dummies fuer die einzelnen "Bereiche"
SwAttrPool::pVersionMap1 = new USHORT[ 60 ];
USHORT i;
for( i = 1; i <= 17; i++ )
@@ -684,7 +684,7 @@ void _InitCore()
SwAttrPool::pVersionMap1[ i-1 ] = i + 12;
// 2. Version - neue Attribute:
- // 10 Dummies fuer den Frame "Bereich"
+ // 10 Dummies fuer den Frame "Bereich"
SwAttrPool::pVersionMap2 = new USHORT[ 75 ];
for( i = 1; i <= 70; i++ )
SwAttrPool::pVersionMap2[ i-1 ] = i;
@@ -692,8 +692,8 @@ void _InitCore()
SwAttrPool::pVersionMap2[ i-1 ] = i + 10;
// 3. Version - neue Attribute:
- // neue Attribute und Dummies fuer die CJK-Version
- // und neue Grafik-Attribute
+ // neue Attribute und Dummies fuer die CJK-Version
+ // und neue Grafik-Attribute
SwAttrPool::pVersionMap3 = new USHORT[ 86 ];
for( i = 1; i <= 21; i++ )
SwAttrPool::pVersionMap3[ i-1 ] = i;
@@ -752,7 +752,7 @@ void _InitCore()
}
/******************************************************************************
- * void _FinitCore()
+ * void _FinitCore()
******************************************************************************/
diff --git a/sw/source/core/bastyp/ring.cxx b/sw/source/core/bastyp/ring.cxx
index 805a921248ab..be61374bb52b 100644
--- a/sw/source/core/bastyp/ring.cxx
+++ b/sw/source/core/bastyp/ring.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -38,7 +38,7 @@
|*
|* Ring::Ring()
|*
-|* Ersterstellung VB 02.07.91
+|* Ersterstellung VB 02.07.91
|* Letzte Aenderung JP 10.10.97
|*
*************************************************************************/
@@ -60,7 +60,7 @@ Ring::Ring( Ring *pObj )
|*
|* Ring::~Ring()
|*
-|* Ersterstellung VB 02.07.91
+|* Ersterstellung VB 02.07.91
|* Letzte Aenderung JP 10.10.97
|*
*************************************************************************/
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index d7a328df72f1..91ebbf5e16e1 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -37,17 +37,17 @@
SV_IMPL_PTRARR(SwCacheObjArr,SwCacheObj*);
#if OSL_DEBUG_LEVEL > 1
-#define INCREMENT( nVar ) ++nVar
+#define INCREMENT( nVar ) ++nVar
#else
#define INCREMENT( nVar )
#endif
/*************************************************************************
|*
-|* SwCache::Check()
+|* SwCache::Check()
|*
-|* Ersterstellung MA 23. Mar. 94
-|* Letzte Aenderung MA 23. Mar. 94
+|* Ersterstellung MA 23. Mar. 94
+|* Letzte Aenderung MA 23. Mar. 94
|*
|*************************************************************************/
@@ -96,10 +96,10 @@ void SwCache::Check()
/*************************************************************************
|*
-|* SwCache::SwCache(), ~SwCache()
+|* SwCache::SwCache(), ~SwCache()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 15. Mar. 94
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 15. Mar. 94
|*
|*************************************************************************/
@@ -143,31 +143,31 @@ SwCache::~SwCache()
#if OSL_DEBUG_LEVEL > 1
{
ByteString sOut( aName ); sOut += '\n';
- (( sOut += "Anzahl neuer Eintraege: " )
+ (( sOut += "Anzahl neuer Eintraege: " )
+= ByteString::CreateFromInt32( nAppend ))+= '\n';
- (( sOut += "Anzahl Insert auf freie Plaetze: " )
+ (( sOut += "Anzahl Insert auf freie Plaetze: " )
+= ByteString::CreateFromInt32( nInsertFree ))+= '\n';
- (( sOut += "Anzahl Ersetzungen: " )
+ (( sOut += "Anzahl Ersetzungen: " )
+= ByteString::CreateFromInt32( nReplace ))+= '\n';
- (( sOut += "Anzahl Erfolgreicher Get's: " )
+ (( sOut += "Anzahl Erfolgreicher Get's: " )
+= ByteString::CreateFromInt32( nGetSuccess ))+= '\n';
- (( sOut += "Anzahl Fehlgeschlagener Get's: " )
+ (( sOut += "Anzahl Fehlgeschlagener Get's: " )
+= ByteString::CreateFromInt32( nGetFail ))+= '\n';
- (( sOut += "Anzahl Umsortierungen (LRU): " )
+ (( sOut += "Anzahl Umsortierungen (LRU): " )
+= ByteString::CreateFromInt32( nToTop ))+= '\n';
- (( sOut += "Anzahl Loeschungen: " )
+ (( sOut += "Anzahl Loeschungen: " )
+= ByteString::CreateFromInt32( nDelete ))+= '\n';
- (( sOut += "Anzahl Get's ohne Index: " )
+ (( sOut += "Anzahl Get's ohne Index: " )
+= ByteString::CreateFromInt32( nGetSeek ))+= '\n';
- (( sOut += "Anzahl Seek fuer Get ohne Index: " )
+ (( sOut += "Anzahl Seek fuer Get ohne Index: " )
+= ByteString::CreateFromInt32( nAverageSeekCnt ))+= '\n';
- (( sOut += "Anzahl Flush-Aufrufe: " )
+ (( sOut += "Anzahl Flush-Aufrufe: " )
+= ByteString::CreateFromInt32( nFlushCnt ))+= '\n';
- (( sOut += "Anzahl geflush'ter Objekte: " )
+ (( sOut += "Anzahl geflush'ter Objekte: " )
+= ByteString::CreateFromInt32( nFlushedObjects ))+= '\n';
- (( sOut += "Anzahl Cache-Erweiterungen: " )
+ (( sOut += "Anzahl Cache-Erweiterungen: " )
+= ByteString::CreateFromInt32( nIncreaseMax ))+= '\n';
- (( sOut += "Anzahl Cache-Verkleinerungen: " )
+ (( sOut += "Anzahl Cache-Verkleinerungen: " )
+= ByteString::CreateFromInt32( nDecreaseMax ))+= '\n';
DBG_ERROR( sOut.GetBuffer() );
@@ -179,10 +179,10 @@ SwCache::~SwCache()
/*************************************************************************
|*
-|* SwCache::Flush()
+|* SwCache::Flush()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 15. Mar. 94
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 15. Mar. 94
|*
|*************************************************************************/
@@ -207,7 +207,7 @@ void SwCache::Flush( const BYTE )
pObj = pTmp;
}
else
- { pLast->SetNext( pObj );
+ { pLast->SetNext( pObj );
pObj->SetPrev( pLast );
pLast = pObj;
pTmp = pObj->GetNext();
@@ -230,10 +230,10 @@ void SwCache::Flush( const BYTE )
/*************************************************************************
|*
-|* SwCache::ToTop()
+|* SwCache::ToTop()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 24. Apr. 95
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 24. Apr. 95
|*
|*************************************************************************/
@@ -243,13 +243,13 @@ void SwCache::ToTop( SwCacheObj *pObj )
INCREMENT( nToTop );
//Objekt aus der LRU-Kette ausschneiden und am Anfang einfuegen.
- if ( pRealFirst == pObj ) //pFirst wurde vom Aufrufer geprueft!
- { CHECK;
+ if ( pRealFirst == pObj ) //pFirst wurde vom Aufrufer geprueft!
+ { CHECK;
return;
}
if ( !pRealFirst )
- { //Der erste wird eingetragen.
+ { //Der erste wird eingetragen.
OSL_ENSURE( !pFirst && !pLast, "First not first." );
pRealFirst = pFirst = pLast = pObj;
CHECK;
@@ -300,10 +300,10 @@ void SwCache::ToTop( SwCacheObj *pObj )
/*************************************************************************
|*
-|* SwCache::Get()
+|* SwCache::Get()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 22. Aug. 94
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 22. Aug. 94
|*
|*************************************************************************/
@@ -356,10 +356,10 @@ SwCacheObj *SwCache::Get( const void *pOwner, const BOOL bToTop )
/*************************************************************************
|*
-|* SwCache::Delete()
+|* SwCache::Delete()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 15. Mar. 94
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 15. Mar. 94
|*
|*************************************************************************/
@@ -404,7 +404,7 @@ void SwCache::DeleteObj( SwCacheObj *pObj )
{
SwCacheObj *pTmpObj = operator[](i);
if ( !pTmpObj )
- { SwCacheObjArr::Remove( i, 1 );
+ { SwCacheObjArr::Remove( i, 1 );
--i;
}
else
@@ -440,10 +440,10 @@ void SwCache::Delete( const void *pOwner )
/*************************************************************************
|*
-|* SwCache::Insert()
+|* SwCache::Insert()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 20. Sep. 94
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 20. Sep. 94
|*
|*************************************************************************/
@@ -503,11 +503,11 @@ BOOL SwCache::Insert( SwCacheObj *pNew )
pNew->SetCachePos( nPos );
//Anstelle von ToTop, einfach als pFirst einfuegen.
-// ToTop( nPos );
+// ToTop( nPos );
if ( pFirst )
{
if ( pFirst->GetPrev() )
- { pFirst->GetPrev()->SetNext( pNew );
+ { pFirst->GetPrev()->SetNext( pNew );
pNew->SetPrev( pFirst->GetPrev() );
}
pFirst->SetPrev( pNew );
@@ -527,10 +527,10 @@ BOOL SwCache::Insert( SwCacheObj *pNew )
/*************************************************************************
|*
-|* SwCache::SetLRUOfst()
+|* SwCache::SetLRUOfst()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 15. Mar. 94
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 15. Mar. 94
|*
|*************************************************************************/
@@ -554,10 +554,10 @@ void SwCache::SetLRUOfst( const USHORT nOfst )
/*************************************************************************
|*
-|* SwCacheObj::SwCacheObj()
+|* SwCacheObj::SwCacheObj()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 24. Nov. 95
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 24. Nov. 95
|*
|*************************************************************************/
@@ -579,10 +579,10 @@ SwCacheObj::~SwCacheObj()
/*************************************************************************
|*
-|* SwCacheObj::SetLock(), Unlock()
+|* SwCacheObj::SetLock(), Unlock()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 15. Mar. 94
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 15. Mar. 94
|*
|*************************************************************************/
@@ -614,10 +614,10 @@ SwCacheAccess::~SwCacheAccess()
/*************************************************************************
|*
-|* SwCacheAccess::Get()
+|* SwCacheAccess::Get()
|*
-|* Ersterstellung MA 15. Mar. 94
-|* Letzte Aenderung MA 04. Apr. 95
+|* Ersterstellung MA 15. Mar. 94
+|* Letzte Aenderung MA 04. Apr. 95
|*
|*************************************************************************/
@@ -638,10 +638,10 @@ void SwCacheAccess::_Get()
/*************************************************************************
|*
-|* SwCacheAccess::IsAvailable()
+|* SwCacheAccess::IsAvailable()
|*
-|* Ersterstellung MA 23. Mar. 94
-|* Letzte Aenderung MA 23. Mar. 94
+|* Ersterstellung MA 23. Mar. 94
+|* Letzte Aenderung MA 23. Mar. 94
|*
|*************************************************************************/
diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx
index 24a702c9971c..39a30e4d3222 100644
--- a/sw/source/core/bastyp/swrect.cxx
+++ b/sw/source/core/bastyp/swrect.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -39,10 +39,10 @@
/*************************************************************************
|*
-|* SwRect::SwRect()
+|* SwRect::SwRect()
|*
-|* Ersterstellung MA 02. Feb. 93
-|* Letzte Aenderung MA 05. Sep. 93
+|* Ersterstellung MA 02. Feb. 93
+|* Letzte Aenderung MA 05. Sep. 93
|*
|*************************************************************************/
@@ -59,10 +59,10 @@ SwRect::SwRect( const Rectangle &rRect ) :
/*************************************************************************
|*
-|* SwRect::Center()
+|* SwRect::Center()
|*
-|* Ersterstellung MA 27. Jan. 93
-|* Letzte Aenderung MA 27. Jan. 93
+|* Ersterstellung MA 27. Jan. 93
+|* Letzte Aenderung MA 27. Jan. 93
|*
|*************************************************************************/
Point SwRect::Center() const
@@ -80,10 +80,10 @@ Point SwRect::Center() const
/*************************************************************************
|*
-|* SwRect::Union()
+|* SwRect::Union()
|*
-|* Ersterstellung MA 27. Jan. 93
-|* Letzte Aenderung MA 27. Jan. 93
+|* Ersterstellung MA 27. Jan. 93
+|* Letzte Aenderung MA 27. Jan. 93
|*
|*************************************************************************/
@@ -105,10 +105,10 @@ SwRect& SwRect::Union( const SwRect& rRect )
}
/*************************************************************************
|*
-|* SwRect::Intersection(), _Intersection()
+|* SwRect::Intersection(), _Intersection()
|*
-|* Ersterstellung MA 27. Jan. 93
-|* Letzte Aenderung MA 05. Sep. 93
+|* Ersterstellung MA 27. Jan. 93
+|* Letzte Aenderung MA 05. Sep. 93
|*
|*************************************************************************/
@@ -160,10 +160,10 @@ SwRect& SwRect::_Intersection( const SwRect& rRect )
}
/*************************************************************************
|*
-|* SwRect::IsInside()
+|* SwRect::IsInside()
|*
-|* Ersterstellung MA 27. Jan. 93
-|* Letzte Aenderung MA 27. Jan. 93
+|* Ersterstellung MA 27. Jan. 93
+|* Letzte Aenderung MA 27. Jan. 93
|*
|*************************************************************************/
@@ -176,9 +176,9 @@ BOOL SwRect::IsInside( const SwRect& rRect ) const
const long nrRight = rRect.Right();
const long nrBottom= rRect.Bottom();
return (Left() <= rRect.Left()) && (rRect.Left()<= nRight) &&
- (Left() <= nrRight) && (nrRight <= nRight) &&
- (Top() <= rRect.Top()) && (rRect.Top() <= nBottom) &&
- (Top() <= nrBottom) && (nrBottom <= nBottom);
+ (Left() <= nrRight) && (nrRight <= nRight) &&
+ (Top() <= rRect.Top()) && (rRect.Top() <= nBottom) &&
+ (Top() <= nrBottom) && (nrBottom <= nBottom);
}
@@ -204,10 +204,10 @@ BOOL SwRect::IsNear( const Point& rPoint, long nTolerance ) const
/*************************************************************************
|*
-|* SwRect::IsOver()
+|* SwRect::IsOver()
|*
-|* Ersterstellung MA 25. Feb. 94
-|* Letzte Aenderung MA 27. Jun. 96
+|* Ersterstellung MA 25. Feb. 94
+|* Letzte Aenderung MA 27. Jun. 96
|*
|*************************************************************************/
@@ -215,7 +215,7 @@ BOOL SwRect::IsNear( const Point& rPoint, long nTolerance ) const
BOOL SwRect::IsOver( const SwRect& rRect ) const
{
- return (Top() <= rRect.Bottom())
+ return (Top() <= rRect.Bottom())
&& (Left() <= rRect.Right())
&& (Right() >= rRect.Left())
&& (Bottom()>= rRect.Top()) ? TRUE : FALSE;
@@ -223,10 +223,10 @@ BOOL SwRect::IsOver( const SwRect& rRect ) const
/*************************************************************************
|*
-|* SwRect::Justify()
+|* SwRect::Justify()
|*
-|* Ersterstellung MA 10. Oct. 94
-|* Letzte Aenderung MA 23. Oct. 96
+|* Ersterstellung MA 10. Oct. 94
+|* Letzte Aenderung MA 23. Oct. 96
|*
|*************************************************************************/
@@ -319,7 +319,7 @@ void SwRect::SetLowerLeftCorner( const Point& rNew )
#if OSL_DEBUG_LEVEL > 1
/*************************************************************************
- * operator<<( ostream&, SwRect&)
+ * operator<<( ostream&, SwRect&)
*************************************************************************/
diff --git a/sw/source/core/bastyp/swregion.cxx b/sw/source/core/bastyp/swregion.cxx
index fea6620d1b45..b0b4931d0938 100644
--- a/sw/source/core/bastyp/swregion.cxx
+++ b/sw/source/core/bastyp/swregion.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -42,10 +42,10 @@ SV_IMPL_VARARR( SwRects, SwRect );
/*************************************************************************
|*
-|* SwRegionRects::SwRegionRects()
+|* SwRegionRects::SwRegionRects()
|*
-|* Ersterstellung MA 28. Oct. 92
-|* Letzte Aenderung MA 01. Feb. 93
+|* Ersterstellung MA 28. Oct. 92
+|* Letzte Aenderung MA 01. Feb. 93
|*
|*************************************************************************/
@@ -58,7 +58,7 @@ SwRegionRects::SwRegionRects( const SwRect &rStartRect, USHORT nInit,
}
/*************************************************************************
- * inline InsertRect()
+ * inline InsertRect()
*
* InsertRect() wird nur von operator-=() gerufen.
* Wenn bDel == TRUE ist, dann wird das Rect an der Position nPos mit
@@ -80,15 +80,15 @@ inline void SwRegionRects::InsertRect( const SwRect &rRect, const USHORT nPos,
/*************************************************************************
|*
-|* SwRegionRects::operator-=()
+|* SwRegionRects::operator-=()
|*
-|* Beschreibung Alle Ueberschneidungen der Rechtecke, die sich
-|* gerade im Array befinden, mit dem uebergebenen Rechteck werden
-|* entfernt.
-|* Dazu muessen die vorhandenen Rechtecke entweder aufgeteilt oder
-|* geloescht werden.
-|* Ersterstellung MA 28. Oct. 92
-|* Letzte Aenderung MA 09. Sep. 93
+|* Beschreibung Alle Ueberschneidungen der Rechtecke, die sich
+|* gerade im Array befinden, mit dem uebergebenen Rechteck werden
+|* entfernt.
+|* Dazu muessen die vorhandenen Rechtecke entweder aufgeteilt oder
+|* geloescht werden.
+|* Ersterstellung MA 28. Oct. 92
+|* Letzte Aenderung MA 09. Sep. 93
|*
|*************************************************************************/
@@ -141,8 +141,8 @@ void SwRegionRects::operator-=( const SwRect &rRect )
if( bDel )
{
Remove( i );
- --i; //Damit wir keinen uebergehen.
- --nMax; //Damit wir keinen zuviel verarbeiten.
+ --i; //Damit wir keinen uebergehen.
+ --nMax; //Damit wir keinen zuviel verarbeiten.
}
}
}
@@ -150,7 +150,7 @@ void SwRegionRects::operator-=( const SwRect &rRect )
}
/*************************************************************************
- * SwRegionRects::Invert()
+ * SwRegionRects::Invert()
*
* Bezugspunkt ist aOrigin, das Original-SRectangle.
* Aus Loechern werden Flaechen, aus Flaechen werden Loecher.
@@ -193,11 +193,11 @@ void SwRegionRects::Invert()
}
/*************************************************************************
|*
-|* SwRegionRects::Compress()
+|* SwRegionRects::Compress()
|*
-|* Beschreibung Zusammenfassen von benachbarten Rechtecken.
-|* Ersterstellung MA 16. Apr. 93
-|* Letzte Aenderung MA 21. Apr. 93
+|* Beschreibung Zusammenfassen von benachbarten Rechtecken.
+|* Ersterstellung MA 16. Apr. 93
+|* Letzte Aenderung MA 21. Apr. 93
|*
|*************************************************************************/
inline SwTwips CalcArea( const SwRect &rRect )
@@ -235,7 +235,7 @@ void SwRegionRects::Compress( BOOL bFuzzy )
//moeglichst wenig einzelne Paints zu haben darf die Flaeche
//der Union ruhig ein bischen groesser sein
//( 9622 * 141.5 = 1361513 ~= ein virtel Zentimeter ueber die
- // Breite einer DINA4 Seite)
+ // Breite einer DINA4 Seite)
const long nFuzzy = bFuzzy ? 1361513 : 0;
SwRect aUnion( *(pData + i) );aUnion.Union( *(pData + j) );
SwRect aInter( *(pData + i) );aInter.Intersection( *(pData + j));
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index 25c934b7a2f2..ce0a56d6d747 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -57,9 +57,9 @@
using namespace com::sun::star;
-ByteString aEmptyByteStr; // Konstante Strings
-String aEmptyStr; // Konstante Strings
-String aDotStr('.'); // Konstante Strings
+ByteString aEmptyByteStr; // Konstante Strings
+String aEmptyStr; // Konstante Strings
+String aDotStr('.'); // Konstante Strings
IMPL_FIXEDMEMPOOL_NEWDEL( SwAttrSet, 25, 25 )
IMPL_FIXEDMEMPOOL_NEWDEL( SwStartNode, 20, 20 )
@@ -75,16 +75,16 @@ IMPL_FIXEDMEMPOOL_NEWDEL( SwpHints, 25, 25 )
IMPL_FIXEDMEMPOOL_NEWDEL( SwFntObj, 50, 50 )
IMPL_FIXEDMEMPOOL_NEWDEL( SwFontObj, 50, 50 )
IMPL_FIXEDMEMPOOL_NEWDEL( SwBorderAttrs, 100, 100 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwCellFrm, 50, 50 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwRowFrm, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwColumnFrm, 40, 40 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwSectionFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTabFrm, 10, 10 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrm, 20, 20 )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtFrm, 50, 50 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwCellFrm, 50, 50 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwRowFrm, 10, 10 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwColumnFrm, 40, 40 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwSectionFrm, 20, 20 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTabFrm, 10, 10 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrm, 20, 20 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrm, 20, 20 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrm, 20, 20 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrm, 20, 20 )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtFrm, 50, 50 )
IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFmt, 10, 10 )
IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFmt, 10, 10 )
IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFmt, 50, 50 )
diff --git a/sw/source/core/bastyp/tabcol.cxx b/sw/source/core/bastyp/tabcol.cxx
index a7117d13ce56..b87ad1fe2fdd 100644
--- a/sw/source/core/bastyp/tabcol.cxx
+++ b/sw/source/core/bastyp/tabcol.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
#include "tabcol.hxx"
-#include <errhdl.hxx> // fuer Create-Methoden
+#include <errhdl.hxx> // fuer Create-Methoden
SwTabCols::SwTabCols( USHORT nSize ) :
@@ -73,8 +73,8 @@ SwTabCols::SwTabCols( const SwTabCols& rCpy ) :
SwTabCols &SwTabCols::operator=( const SwTabCols& rCpy )
{
nLeftMin = rCpy.GetLeftMin();
- nLeft = rCpy.GetLeft();
- nRight = rCpy.GetRight();
+ nLeft = rCpy.GetLeft();
+ nRight = rCpy.GetRight();
nRightMax= rCpy.GetRightMax();
bLastRowAllowedToChange = rCpy.IsLastRowAllowedToChange();
@@ -89,8 +89,8 @@ BOOL SwTabCols::operator==( const SwTabCols& rCmp ) const
USHORT i;
if ( !(nLeftMin == rCmp.GetLeftMin() &&
- nLeft == rCmp.GetLeft() &&
- nRight == rCmp.GetRight() &&
+ nLeft == rCmp.GetLeft() &&
+ nRight == rCmp.GetRight() &&
nRightMax== rCmp.GetRightMax()&&
bLastRowAllowedToChange== rCmp.IsLastRowAllowedToChange() &&
Count()== rCmp.Count()) )
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 23:15:47 +0000