summaryrefslogtreecommitdiff
path: root/sw/source/core/fields
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/fields')
-rw-r--r--sw/source/core/fields/authfld.cxx34
-rw-r--r--sw/source/core/fields/cellfml.cxx102
-rw-r--r--sw/source/core/fields/chpfld.cxx24
-rw-r--r--sw/source/core/fields/dbfld.cxx20
-rw-r--r--sw/source/core/fields/ddefld.cxx16
-rw-r--r--sw/source/core/fields/ddetbl.cxx6
-rw-r--r--sw/source/core/fields/docufld.cxx114
-rw-r--r--sw/source/core/fields/expfld.cxx54
-rw-r--r--sw/source/core/fields/fldbas.cxx94
-rw-r--r--sw/source/core/fields/flddat.cxx2
-rw-r--r--sw/source/core/fields/flddropdown.cxx2
-rw-r--r--sw/source/core/fields/fldlst.cxx8
-rw-r--r--sw/source/core/fields/macrofld.cxx4
-rw-r--r--sw/source/core/fields/postithelper.cxx8
-rw-r--r--sw/source/core/fields/reffld.cxx46
-rw-r--r--sw/source/core/fields/scrptfld.cxx2
-rw-r--r--sw/source/core/fields/tblcalc.cxx14
-rw-r--r--sw/source/core/fields/textapi.cxx24
-rw-r--r--sw/source/core/fields/usrfld.cxx20
19 files changed, 297 insertions, 297 deletions
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 31ebf2f3415c..fad66215488a 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.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
@@ -84,7 +84,7 @@ SwAuthEntry::SwAuthEntry(const SwAuthEntry& rCopy)
aAuthFields[i] = rCopy.aAuthFields[i];
}
// --------------------------------------------------------
-BOOL SwAuthEntry::operator==(const SwAuthEntry& rComp)
+BOOL SwAuthEntry::operator==(const SwAuthEntry& rComp)
{
for(USHORT i = 0; i < AUTH_FIELD_END; i++)
if(aAuthFields[i] != rComp.aAuthFields[i])
@@ -131,7 +131,7 @@ SwAuthorityFieldType::SwAuthorityFieldType( const SwAuthorityFieldType& rFType)
--------------------------------------------------*/
SwAuthorityFieldType::~SwAuthorityFieldType()
{
-// DBG_ASSERT(!m_pDataArr->Count(), "Array is not empty");
+// DBG_ASSERT(!m_pDataArr->Count(), "Array is not empty");
m_pSortKeyArr->DeleteAndDestroy(0, m_pSortKeyArr->Count());
delete m_pSortKeyArr;
delete m_pSequArr;
@@ -140,14 +140,14 @@ SwAuthorityFieldType::~SwAuthorityFieldType()
/*-- 14.09.99 16:22:09---------------------------------------------------
-----------------------------------------------------------------------*/
-SwFieldType* SwAuthorityFieldType::Copy() const
+SwFieldType* SwAuthorityFieldType::Copy() const
{
return new SwAuthorityFieldType(m_pDoc);
}
/* -----------------17.09.99 13:43-------------------
--------------------------------------------------*/
-void SwAuthorityFieldType::RemoveField(long nHandle)
+void SwAuthorityFieldType::RemoveField(long nHandle)
{
#if OSL_DEBUG_LEVEL > 1
BOOL bRemoved = FALSE;
@@ -178,7 +178,7 @@ void SwAuthorityFieldType::RemoveField(long nHandle)
/* -----------------17.09.99 13:43-------------------
--------------------------------------------------*/
-long SwAuthorityFieldType::AddField(const String& rFieldContents)
+long SwAuthorityFieldType::AddField(const String& rFieldContents)
{
long nRet = 0;
SwAuthEntry* pEntry = new SwAuthEntry;
@@ -232,7 +232,7 @@ BOOL SwAuthorityFieldType::AddField(long nHandle)
/* -----------------17.09.99 14:52-------------------
--------------------------------------------------*/
-const SwAuthEntry* SwAuthorityFieldType::GetEntryByHandle(long nHandle) const
+const SwAuthEntry* SwAuthorityFieldType::GetEntryByHandle(long nHandle) const
{
const SwAuthEntry* pRet = 0;
for(USHORT j = 0; j < m_pDataArr->Count(); j++)
@@ -264,7 +264,7 @@ void SwAuthorityFieldType::GetAllEntryIdentifiers(
/* -----------------21.09.99 13:34-------------------
--------------------------------------------------*/
-const SwAuthEntry* SwAuthorityFieldType::GetEntryByIdentifier(
+const SwAuthEntry* SwAuthorityFieldType::GetEntryByIdentifier(
const String& rIdentifier)const
{
const SwAuthEntry* pRet = 0;
@@ -301,10 +301,10 @@ bool SwAuthorityFieldType::ChangeEntryContent(const SwAuthEntry* pNewEntry)
return bChanged;
}
/*-- 11.10.99 08:49:22---------------------------------------------------
- Description: appends a new entry (if new) and returns the array position
+ Description: appends a new entry (if new) and returns the array position
-----------------------------------------------------------------------*/
-USHORT SwAuthorityFieldType::AppendField( const SwAuthEntry& rInsert )
+USHORT SwAuthorityFieldType::AppendField( const SwAuthEntry& rInsert )
{
USHORT nRet = 0;
for( nRet = 0; nRet < m_pDataArr->Count(); ++nRet )
@@ -327,7 +327,7 @@ USHORT SwAuthorityFieldType::AppendField( const SwAuthEntry& rInsert )
/*-- 11.10.99 08:49:24---------------------------------------------------
-----------------------------------------------------------------------*/
-long SwAuthorityFieldType::GetHandle(USHORT nPos)
+long SwAuthorityFieldType::GetHandle(USHORT nPos)
{
long nRet = 0;
if( nPos < m_pDataArr->Count() )
@@ -340,7 +340,7 @@ long SwAuthorityFieldType::GetHandle(USHORT nPos)
/* -----------------19.10.99 13:46-------------------
--------------------------------------------------*/
-USHORT SwAuthorityFieldType::GetSequencePos(long nHandle)
+USHORT SwAuthorityFieldType::GetSequencePos(long nHandle)
{
//find the field in a sorted array of handles,
#if OSL_DEBUG_LEVEL > 1
@@ -479,7 +479,7 @@ bool SwAuthorityFieldType::QueryValue( Any& rVal, USHORT nWhichId ) const
sProp2( C2U(SW_PROP_NAME_STR(UNO_NAME_IS_SORT_ASCENDING)));
for(sal_uInt16 i = 0; i < m_pSortKeyArr->Count(); i++)
{
- const SwTOXSortKey* pKey = (*m_pSortKeyArr)[i];
+ const SwTOXSortKey* pKey = (*m_pSortKeyArr)[i];
pValues[i].realloc(2);
PropertyValue* pValue = pValues[i].getArray();
pValue[0].Name = sProp1;
@@ -640,7 +640,7 @@ SwAuthorityField::~SwAuthorityField()
/*-- 14.09.99 16:20:59---------------------------------------------------
-----------------------------------------------------------------------*/
-String SwAuthorityField::Expand() const
+String SwAuthorityField::Expand() const
{
SwAuthorityFieldType* pAuthType = (SwAuthorityFieldType*)GetTyp();
String sRet;
@@ -651,7 +651,7 @@ String SwAuthorityField::Expand() const
{
if(!pAuthType->GetDoc()->IsExpFldsLocked())
m_nTempSequencePos = pAuthType->GetSequencePos( m_nHandle );
- if( m_nTempSequencePos >= 0 )
+ if( m_nTempSequencePos >= 0 )
sRet += String::CreateFromInt32( m_nTempSequencePos );
}
else
@@ -676,7 +676,7 @@ SwField* SwAuthorityField::Copy() const
/* -----------------21.09.99 12:55-------------------
--------------------------------------------------*/
-const String& SwAuthorityField::GetFieldText(ToxAuthorityField eField) const
+const String& SwAuthorityField::GetFieldText(ToxAuthorityField eField) const
{
SwAuthorityFieldType* pAuthType = (SwAuthorityFieldType*)GetTyp();
const SwAuthEntry* pEntry = pAuthType->GetEntryByHandle( m_nHandle );
@@ -685,7 +685,7 @@ const String& SwAuthorityField::GetFieldText(ToxAuthorityField eField) const
/* -----------------21.09.99 14:57-------------------
--------------------------------------------------*/
-void SwAuthorityField::SetPar1(const String& rStr)
+void SwAuthorityField::SetPar1(const String& rStr)
{
SwAuthorityFieldType* pInitType = (SwAuthorityFieldType* )GetTyp();
pInitType->RemoveField(m_nHandle);
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 28b4ae00a0bc..3ed664f0e14f 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.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
@@ -53,7 +53,7 @@
#include <ndindex.hxx>
const sal_Unicode cRelTrenner = ',';
-const sal_Unicode cRelKennung = ''; // CTRL-R
+const sal_Unicode cRelKennung = ''; // CTRL-R
const USHORT cMAXSTACKSIZE = 50;
@@ -66,14 +66,14 @@ String lcl_BoxNmToRel( const SwTable&, const SwTableNode&,
/*************************************************************************
|*
-|* double SwTableBox::GetValue() const
-|* gebe den Wert dieser Box zurueck. Der Wert ergibt sich aus dem 1.
-|* TextNode. Beginnt dieser mit einer Zahl/Formel, so berechne diese;
-|* oder mit einem Feld, dann hole den Wert.
-|* Alle anderen Bedingungen returnen einen Fehler (oder 0 ?)
+|* double SwTableBox::GetValue() const
+|* gebe den Wert dieser Box zurueck. Der Wert ergibt sich aus dem 1.
+|* TextNode. Beginnt dieser mit einer Zahl/Formel, so berechne diese;
+|* oder mit einem Feld, dann hole den Wert.
+|* Alle anderen Bedingungen returnen einen Fehler (oder 0 ?)
|*
-|* Ersterstellung JP 30. Jun. 93
-|* Letzte Aenderung JP 30. Jun. 93
+|* Ersterstellung JP 30. Jun. 93
+|* Letzte Aenderung JP 30. Jun. 93
|*
|*************************************************************************/
@@ -82,9 +82,9 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
double nRet = 0;
if( rCalcPara.rCalc.IsCalcError() )
- return nRet; // schon ein Fehler in der Berechnung
+ return nRet; // schon ein Fehler in der Berechnung
- rCalcPara.rCalc.SetCalcError( CALC_SYNTAX ); // default immer Fehler
+ rCalcPara.rCalc.SetCalcError( CALC_SYNTAX ); // default immer Fehler
// keine Content Box ?
if( !pSttNd )
@@ -98,13 +98,13 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
// wird eine Rekursion erzeugt ?
SwTableBox* pBox = (SwTableBox*)this;
if( rCalcPara.pBoxStk->Seek_Entry( pBox ))
- return nRet; // steht schon auf dem Stack: FEHLER
+ return nRet; // steht schon auf dem Stack: FEHLER
// bei dieser Box nochmal aufsetzen
rCalcPara.SetLastTblBox( this );
- rCalcPara.pBoxStk->Insert( pBox ); // eintragen
- do { // Middle-Check-Loop, damit aus dieser gesprungen werden kann
+ rCalcPara.pBoxStk->Insert( pBox ); // eintragen
+ do { // Middle-Check-Loop, damit aus dieser gesprungen werden kann
// hier aufgespannt, damit am Ende der Box-Pointer aus dem
// Stack ausgetragen wird
SwDoc* pDoc = GetFrmFmt()->GetDoc();
@@ -113,7 +113,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
if( SFX_ITEM_SET == GetFrmFmt()->GetItemState(
RES_BOXATR_FORMULA, FALSE, &pItem ) )
{
- rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
+ rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
if( !((SwTblBoxFormula*)pItem)->IsValid() )
{
// dann berechnen
@@ -140,7 +140,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
else if( SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
RES_BOXATR_VALUE, FALSE, &pItem ) )
{
- rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
+ rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
nRet = ((SwTblBoxValue*)pItem)->GetValue();
break;
}
@@ -167,7 +167,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
if( !pTxtFld )
break;
- rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
+ rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
const SwField* pFld = pTxtFld->GetFld().GetFld();
switch( pFld->GetTyp()->Which() )
@@ -181,7 +181,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
case RES_TABLEFLD:
{
SwTblField* pTblFld = (SwTblField*)pFld;
- if( !pTblFld->IsValid() ) // ist der Wert gueltig ??
+ if( !pTblFld->IsValid() ) // ist der Wert gueltig ??
{
// die richtige Tabelle mitgeben!
const SwTable* pTmp = rCalcPara.pTbl;
@@ -199,7 +199,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
case RES_JUMPEDITFLD:
//JP 14.09.98: Bug 56112 - der Platzhalter kann nie einen
- // gueltigen Inhalt haben!
+ // gueltigen Inhalt haben!
nRet = 0;
break;
@@ -211,7 +211,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
else
{
// Ergebnis ist 0 und kein Fehler!
- rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
+ rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
double aNum;
String sTxt( rTxt.Copy( nSttPos ) );
@@ -240,13 +240,13 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
if( !rCalcPara.IsStackOverFlow() )
{
- rCalcPara.pBoxStk->Remove( pBox ); // raus aus dem Stack
+ rCalcPara.pBoxStk->Remove( pBox ); // raus aus dem Stack
rCalcPara.DecStackCnt();
}
//JP 12.01.99: mit Fehlererkennung, Bug 60794
if( DBL_MAX == nRet )
- rCalcPara.rCalc.SetCalcError( CALC_SYNTAX ); // Fehler setzen
+ rCalcPara.rCalc.SetCalcError( CALC_SYNTAX ); // Fehler setzen
return nRet;
}
@@ -287,7 +287,7 @@ bool SwTblCalcPara::CalcWithStackOverflow()
pBox->GetValue( *this );
} while( IsStackOverFlow() );
- nMaxSize = cMAXSTACKSIZE - 3; // es muss mind. 1 Stufe tiefer gehen!
+ nMaxSize = cMAXSTACKSIZE - 3; // es muss mind. 1 Stufe tiefer gehen!
// falls Rekursionen erkannt wurden
nStackCnt = 0;
@@ -323,12 +323,12 @@ void SwTableFormula::_MakeFormel( const SwTable& rTbl, String& rNewStr,
String& rFirstBox, String* pLastBox, void* pPara ) const
{
SwTblCalcPara* pCalcPara = (SwTblCalcPara*)pPara;
- if( pCalcPara->rCalc.IsCalcError() ) // ist schon Fehler gesetzt ?
+ if( pCalcPara->rCalc.IsCalcError() ) // ist schon Fehler gesetzt ?
return;
SwTableBox* pSttBox, *pEndBox = 0;
- rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
+ rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
// ein Bereich in dieser Klammer ?
if( pLastBox )
{
@@ -345,7 +345,7 @@ void SwTableFormula::_MakeFormel( const SwTable& rTbl, String& rNewStr,
pSttBox = 0;
rNewStr += ' ';
- if( pEndBox && pSttBox ) // Bereich ?
+ if( pEndBox && pSttBox ) // Bereich ?
{
// hole ueber das Layout alle "selectierten" Boxen und berechne
// deren Werte
@@ -369,7 +369,7 @@ void SwTableFormula::_MakeFormel( const SwTable& rTbl, String& rNewStr,
}
rNewStr += ')';
}
- else if( pSttBox && !pLastBox ) // nur die StartBox ?
+ else if( pSttBox && !pLastBox ) // nur die StartBox ?
{
//JP 12.01.99: und keine EndBox in der Formel!
// Berechne den Wert der Box
@@ -380,7 +380,7 @@ void SwTableFormula::_MakeFormel( const SwTable& rTbl, String& rNewStr,
}
}
else
- pCalcPara->rCalc.SetCalcError( CALC_SYNTAX ); // Fehler setzen
+ pCalcPara->rCalc.SetCalcError( CALC_SYNTAX ); // Fehler setzen
rNewStr += ' ';
}
@@ -393,7 +393,7 @@ void SwTableFormula::RelNmsToBoxNms( const SwTable& rTbl, String& rNewStr,
const SwTableBox *pRelBox, *pBox = (SwTableBox *)rTbl.GetTblBox(
pNd->FindTableBoxStartNode()->GetIndex() );
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
rFirstBox.Erase(0,1);
if( pLastBox )
{
@@ -423,7 +423,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
const SwTableBox *pRelBox, *pBox = (SwTableBox*)rTbl.GetTblBox(
pNd->FindTableBoxStartNode()->GetIndex() );
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
rFirstBox.Erase(0,1);
if( pLastBox )
{
@@ -462,7 +462,7 @@ void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, String& rNewStr,
sRefBoxNm = pBox->GetName();
}
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
rFirstBox.Erase(0,1);
if( pLastBox )
{
@@ -486,7 +486,7 @@ void SwTableFormula::PtrToBoxNms( const SwTable& rTbl, String& rNewStr,
// ein Bereich in dieser Klammer ?
SwTableBox* pBox;
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
rFirstBox.Erase(0,1);
if( pLastBox )
{
@@ -518,7 +518,7 @@ void SwTableFormula::BoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
// ein Bereich in dieser Klammer ?
const SwTableBox* pBox;
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
rFirstBox.Erase(0,1);
if( pLastBox )
{
@@ -636,7 +636,7 @@ String SwTableFormula::ScanString( FnScanFormel fnFormel, const SwTable& rTbl,
aStr.Insert( sFormel, nFml, sFormel.Len() - nFml );
break;
}
- aStr.Insert( sFormel, nFml, nStt - nFml ); // Anfang schreiben
+ aStr.Insert( sFormel, nFml, nStt - nFml ); // Anfang schreiben
if( fnFormel != NULL )
{
@@ -663,7 +663,7 @@ String SwTableFormula::ScanString( FnScanFormel fnFormel, const SwTable& rTbl,
aStr += sTblNm;
nStt = nTrenner;
- sTblNm.Erase( 0, 1 ); // Trenner loeschen
+ sTblNm.Erase( 0, 1 ); // Trenner loeschen
if( sTblNm != rTbl.GetFrmFmt()->GetName() )
{
// dann suchen wir uns mal unsere Tabelle:
@@ -742,7 +742,7 @@ const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox )
SwNodeIndex aIdx( *rBox.GetSttNd() );
SwCntntNode* pCNd = aIdx.GetNodes().GoNext( &aIdx );
OSL_ENSURE( pCNd, "Box hat keinen TextNode" );
- Point aPt; // den im Layout 1. Frame returnen - Tab.Kopfzeile !!
+ Point aPt; // den im Layout 1. Frame returnen - Tab.Kopfzeile !!
return pCNd->GetFrm( &aPt, NULL, FALSE );
}
@@ -772,7 +772,7 @@ const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
String sGetName( rGetName );
// ist es denn wirklich eine relative Angabe??
- if( cRelKennung == sGetName.GetChar(0) ) // ja, ...
+ if( cRelKennung == sGetName.GetChar(0) ) // ja, ...
{
if( !pRefBox )
return 0;
@@ -873,7 +873,7 @@ String lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
long nLine = SwTable::_GetBoxNum( sTmp );
nLine -= SwTable::_GetBoxNum( sCpy );
- sCpy = sTmp; //JP 01.11.95: den Rest aus dem BoxNamen anhaengen
+ sCpy = sTmp; //JP 01.11.95: den Rest aus dem BoxNamen anhaengen
sTmp = cRelKennung;
sTmp += String::CreateFromInt32( nBox );
@@ -910,7 +910,7 @@ void SwTableFormula::_GetFmlBoxes( const SwTable& rTbl, String& ,
SwSelBoxes* pBoxes = (SwSelBoxes*)pPara;
SwTableBox* pSttBox, *pEndBox = 0;
- rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
+ rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
// ein Bereich in dieser Klammer ?
if( pLastBox )
{
@@ -927,7 +927,7 @@ void SwTableFormula::_GetFmlBoxes( const SwTable& rTbl, String& ,
if( !rTbl.GetTabSortBoxes().Seek_Entry( pSttBox ))
pSttBox = 0;
- if( pEndBox && pSttBox ) // Bereich ?
+ if( pEndBox && pSttBox ) // Bereich ?
{
// ueber das Layout alle "selectierten" Boxen und berechne
// deren Werte
@@ -935,7 +935,7 @@ void SwTableFormula::_GetFmlBoxes( const SwTable& rTbl, String& ,
GetBoxes( *pSttBox, *pEndBox, aBoxes );
pBoxes->Insert( &aBoxes );
}
- else if( pSttBox ) // nur die StartBox ?
+ else if( pSttBox ) // nur die StartBox ?
pBoxes->Insert( pSttBox );
}
@@ -949,7 +949,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
pStt = pFrm ? pFrm->GetUpper() : 0;
pEnd = ( 0 != (pFrm = lcl_GetBoxFrm( rEndBox ))) ? pFrm->GetUpper() : 0;
if( !pStt || !pEnd )
- return ; // no valid selection
+ return ; // no valid selection
GetTblSel( pStt, pEnd, rBoxes, 0 );
@@ -958,7 +958,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
// filter die Kopfzeilen-Boxen heraus:
if( pTbl->GetRowsToRepeat() > 0 )
{
- do { // middle-check loop
+ do { // middle-check loop
const SwTableLine* pLine = rSttBox.GetUpper();
while( pLine->GetUpper() )
pLine = pLine->GetUpper()->GetUpper();
@@ -972,7 +972,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
pLine = pLine->GetUpper()->GetUpper();
if( pTbl->IsHeadline( *pLine ) )
- break; // Headline mit im Bereich !
+ break; // Headline mit im Bereich !
const SwTabFrm *pTable = pStt->FindTabFrm();
const SwTabFrm *pEndTable = pEnd->FindTabFrm();
@@ -999,10 +999,10 @@ void SwTableFormula::_HasValidBoxes( const SwTable& rTbl, String& ,
String& rFirstBox, String* pLastBox, void* pPara ) const
{
bool* pBValid = (bool*)pPara;
- if( *pBValid ) // einmal falsch, immer falsch
+ if( *pBValid ) // einmal falsch, immer falsch
{
SwTableBox* pSttBox = 0, *pEndBox = 0;
- rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
+ rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
// ein Bereich in dieser Klammer ?
if( pLastBox )
@@ -1072,7 +1072,7 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr,
{
SwTableFmlUpdate& rTblUpd = *(SwTableFmlUpdate*)pPara;
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
rFirstBox.Erase(0,1);
String sTblNm;
@@ -1099,19 +1099,19 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr,
{
if( pFnd == rTblUpd.DATA.pDelTbl )
{
- if( rTblUpd.pTbl != &rTbl ) // es ist nicht die akt.
+ if( rTblUpd.pTbl != &rTbl ) // es ist nicht die akt.
(rNewStr += rTblUpd.pTbl->GetFrmFmt()->GetName() )
- += '.'; // den neuen Tabellen Namen setzen
+ += '.'; // den neuen Tabellen Namen setzen
rTblUpd.bModified = TRUE;
}
else if( pFnd != rTblUpd.pTbl ||
( rTblUpd.pTbl != &rTbl && &rTbl != rTblUpd.DATA.pDelTbl))
- (rNewStr += sTblNm ) += '.'; // den Tabellen Namen behalten
+ (rNewStr += sTblNm ) += '.'; // den Tabellen Namen behalten
else
rTblUpd.bModified = TRUE;
}
else
- (rNewStr += sTblNm ) += '.'; // den Tabellen Namen behalten
+ (rNewStr += sTblNm ) += '.'; // den Tabellen Namen behalten
}
}
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index a4f04e30367a..8bf00d8b14b2 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.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,11 +32,11 @@
#include <com/sun/star/text/ChapterFormat.hpp>
#include <doc.hxx>
-#include <frame.hxx> // SwChapterFieldType::ChangeExpansion()
-#include <pam.hxx> // fuer GetBodyTxtNode
+#include <frame.hxx> // SwChapterFieldType::ChangeExpansion()
+#include <pam.hxx> // fuer GetBodyTxtNode
#include <ndtxt.hxx>
#include <chpfld.hxx>
-#include <expfld.hxx> // fuer GetBodyTxtNode
+#include <expfld.hxx> // fuer GetBodyTxtNode
#include <unofldmid.h>
#include <numrule.hxx>
@@ -74,7 +74,7 @@ String SwChapterField::Expand() const
String sStr( sNumber );
switch( GetFormat() )
{
- case CF_TITLE: sStr = sTitle; break;
+ case CF_TITLE: sStr = sTitle; break;
case CF_NUMBER:
case CF_NUM_TITLE: sStr.Insert( sPre, 0 );
@@ -83,7 +83,7 @@ String SwChapterField::Expand() const
sStr += sTitle;
break;
- case CF_NUM_NOPREPST_TITLE: sStr += sTitle; break;
+ case CF_NUM_NOPREPST_TITLE: sStr += sTitle; break;
}
return sStr;
}
@@ -156,12 +156,12 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, sal_Bool bSrchNum)
// --> OD 2008-04-02 #refactorlists#
// nLevel = GetRealLevel( pONd->GetTxtColl()->
// GetOutlineLevel() );
- // OSL_ENSURE( pONd->GetOutlineLevel() >= 0 && pONd->GetOutlineLevel() < MAXLEVEL, //#outline level,zhaojianwei
+ // OSL_ENSURE( pONd->GetOutlineLevel() >= 0 && pONd->GetOutlineLevel() < MAXLEVEL, //#outline level,zhaojianwei
// "<SwChapterField::ChangeExpansion(..)> - outline node with inconsistent outline level. Serious defect -> please inform OD." );
//nLevel = static_cast<BYTE>(pONd->GetOutlineLevel());
OSL_ENSURE( pONd->GetAttrOutlineLevel() >= 0 && pONd->GetAttrOutlineLevel() <= MAXLEVEL,
"<SwChapterField::ChangeExpansion(..)> - outline node with inconsistent outline level. Serious defect -> please inform OD." );
- nLevel = static_cast<BYTE>(pONd->GetAttrOutlineLevel()); //<-end,zhaojianwei
+ nLevel = static_cast<BYTE>(pONd->GetAttrOutlineLevel()); //<-end,zhaojianwei
// <--
if( nPrevLvl < nLevel )
@@ -241,7 +241,7 @@ bool SwChapterField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
sal_Int16 nRet;
switch( GetFormat() )
{
- case CF_NUMBER: nRet = text::ChapterFormat::NUMBER; break;
+ case CF_NUMBER: nRet = text::ChapterFormat::NUMBER; break;
case CF_TITLE: nRet = text::ChapterFormat::NAME; break;
case CF_NUMBER_NOPREPST:
nRet = text::ChapterFormat::DIGIT;
@@ -250,7 +250,7 @@ bool SwChapterField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
nRet = text::ChapterFormat::NO_PREFIX_SUFFIX;
break;
case CF_NUM_TITLE:
- default: nRet = text::ChapterFormat::NAME_NUMBER;
+ default: nRet = text::ChapterFormat::NAME_NUMBER;
}
rAny <<= nRet;
}
@@ -286,7 +286,7 @@ bool SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId )
rAny >>= nVal;
switch( nVal )
{
- case text::ChapterFormat::NAME: SetFormat(CF_TITLE); break;
+ case text::ChapterFormat::NAME: SetFormat(CF_TITLE); break;
case text::ChapterFormat::NUMBER: SetFormat(CF_NUMBER); break;
case text::ChapterFormat::NO_PREFIX_SUFFIX:
SetFormat(CF_NUM_NOPREPST_TITLE);
@@ -295,7 +295,7 @@ bool SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId )
SetFormat(CF_NUMBER_NOPREPST);
break;
//case text::ChapterFormat::NAME_NUMBER:
- default: SetFormat(CF_NUM_TITLE);
+ default: SetFormat(CF_NUM_TITLE);
}
}
break;
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index a23dbd21e66f..22008b09af5e 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.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
@@ -199,7 +199,7 @@ bool SwDBFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
--------------------------------------------------------------------*/
SwDBField::SwDBField(SwDBFieldType* pTyp, ULONG nFmt)
- : SwValueField(pTyp, nFmt),
+ : SwValueField(pTyp, nFmt),
nSubType(0),
bIsInBodyTxt(TRUE),
bValidValue(FALSE),
@@ -267,11 +267,11 @@ String SwDBField::Expand() const
SwField* SwDBField::Copy() const
{
SwDBField *pTmp = new SwDBField((SwDBFieldType*)GetTyp(), GetFormat());
- pTmp->aContent = aContent;
- pTmp->bIsInBodyTxt = bIsInBodyTxt;
- pTmp->bValidValue = bValidValue;
- pTmp->bInitialized = bInitialized;
- pTmp->nSubType = nSubType;
+ pTmp->aContent = aContent;
+ pTmp->bIsInBodyTxt = bIsInBodyTxt;
+ pTmp->bValidValue = bValidValue;
+ pTmp->bInitialized = bInitialized;
+ pTmp->nSubType = nSubType;
pTmp->SetValue(GetValue());
pTmp->sFieldCode = sFieldCode;
@@ -356,7 +356,7 @@ void SwDBField::Evaluate()
if( DBL_MAX != nValue )
{
sal_Int32 nColumnType = pMgr->GetColumnType(aTmpData.sDataSource, aTmpData.sCommand, aColNm);
- if( DataType::DATE == nColumnType || DataType::TIME == nColumnType ||
+ if( DataType::DATE == nColumnType || DataType::TIME == nColumnType ||
DataType::TIMESTAMP == nColumnType)
{
@@ -379,7 +379,7 @@ void SwDBField::Evaluate()
SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
if (nFmt && nFmt != SAL_MAX_UINT32 && !pFormatter->IsTextFormat(nFmt))
- bValidValue = TRUE; // Wegen Bug #60339 nicht mehr bei allen Strings
+ bValidValue = TRUE; // Wegen Bug #60339 nicht mehr bei allen Strings
}
else
{
@@ -810,7 +810,7 @@ void SwDBNumSetField::Evaluate(SwDoc* pDoc)
if( bCondValid && pMgr && pMgr->IsInMerge() &&
pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, sal_True))
- { // Bedingug OK -> aktuellen Set einstellen
+ { // Bedingug OK -> aktuellen Set einstellen
pMgr->ToRecordId(Max((USHORT)aPar2.ToInt32(), USHORT(1))-1);
}
}
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index dde46bd3ea01..1765ce7dd997 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.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
@@ -47,7 +47,7 @@
using rtl::OUString;
using namespace ::com::sun::star;
-#define DDE_TXT_ENCODING gsl_getSystemTextEncoding()
+#define DDE_TXT_ENCODING gsl_getSystemTextEncoding()
/*--------------------------------------------------------------------
Beschreibung: Globale Variablen
@@ -83,7 +83,7 @@ void SwIntrnlRefLink::DataChanged( const String& rMimeType,
uno::Sequence< sal_Int8 > aSeq;
rValue >>= aSeq;
String sStr( (sal_Char*)aSeq.getConstArray(), static_cast<xub_StrLen>(aSeq.getLength()),
- DDE_TXT_ENCODING );
+ DDE_TXT_ENCODING );
// CR-LF am Ende entfernen, ist ueberfluessig!
xub_StrLen n = sStr.Len();
@@ -125,7 +125,7 @@ void SwIntrnlRefLink::DataChanged( const String& rMimeType,
SwClientIter aIter( rFldType );
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // konnte zum Anfang gesprungen werden ??
do {
// eine DDE-Tabelle oder ein DDE-FeldAttribut im Text
if( !pLast->IsA( TYPE( SwFmtFld ) ) ||
@@ -187,7 +187,7 @@ const SwNode* SwIntrnlRefLink::GetAnchor() const
const SwNode* pNd = 0;
SwClientIter aIter( rFldType );
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // konnte zum Anfang gesprungen werden ??
do {
// eine DDE-Tabelle oder ein DDE-FeldAttribut im Text
if( !pLast->IsA( TYPE( SwFmtFld ) ))
@@ -214,7 +214,7 @@ BOOL SwIntrnlRefLink::IsInRange( ULONG nSttNd, ULONG nEndNd,
SwNodes* pNds = &rFldType.GetDoc()->GetNodes();
SwClientIter aIter( rFldType );
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // konnte zum Anfang gesprungen werden ??
do {
// eine DDE-Tabelle oder ein DDE-FeldAttribut im Text
if( !pLast->IsA( TYPE( SwFmtFld ) ))
@@ -400,8 +400,8 @@ SwDDEField::SwDDEField( SwDDEFieldType* pInitType )
SwDDEField::~SwDDEField()
{
- if( GetTyp()->IsLastDepend() ) // der Letzte mach das
- ((SwDDEFieldType*)GetTyp())->Disconnect(); // Licht aus
+ if( GetTyp()->IsLastDepend() ) // der Letzte mach das
+ ((SwDDEFieldType*)GetTyp())->Disconnect(); // Licht aus
}
String SwDDEField::Expand() const
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index b7ed6b0dcaa3..799a57e31ebc 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.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
@@ -36,7 +36,7 @@
#include <ndtxt.hxx>
#include <swtable.hxx>
#include <swddetbl.hxx>
-#include <ddefld.hxx> // fuer den FieldType
+#include <ddefld.hxx> // fuer den FieldType
#include <ndindex.hxx>
#include <fldupde.hxx>
#include <swtblfmt.hxx>
@@ -55,7 +55,7 @@ SwDDETable::SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType,
rTable.GetTabSortBoxes().Count() ); // move die Inh. Boxen
rTable.GetTabSortBoxes().Remove( (USHORT)0, rTable.GetTabSortBoxes().Count() );
- aLines.Insert( &rTable.GetTabLines(),0 ); // move die Lines
+ aLines.Insert( &rTable.GetTabLines(),0 ); // move die Lines
rTable.GetTabLines().Remove( 0, rTable.GetTabLines().Count() );
if( aLines.Count() )
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index a8b3e981a22f..fecd9dc810ee 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.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
@@ -84,9 +84,9 @@
#include <pagedesc.hxx>
#include <fmtpdsc.hxx>
#include <doc.hxx>
-#include <rootfrm.hxx> // AuthorField
-#include <pagefrm.hxx> //
-#include <cntfrm.hxx> //
+#include <rootfrm.hxx> // AuthorField
+#include <pagefrm.hxx> //
+#include <cntfrm.hxx> //
#include <pam.hxx>
#include <viewsh.hxx>
#include <dbmgr.hxx>
@@ -105,7 +105,7 @@
#include <editeng/outliner.hxx>
#include <editeng/outlobj.hxx>
-#define URL_DECODE INetURLObject::DECODE_UNAMBIGUOUS
+#define URL_DECODE INetURLObject::DECODE_UNAMBIGUOUS
using ::rtl::OUString;
using namespace ::com::sun::star;
@@ -144,8 +144,8 @@ SwFieldType* SwPageNumberFieldType::Copy() const
{
SwPageNumberFieldType *pTmp = new SwPageNumberFieldType();
- pTmp->nNum = nNum;
- pTmp->nMax = nMax;
+ pTmp->nNum = nNum;
+ pTmp->nMax = nMax;
pTmp->nNumberingType = nNumberingType;
pTmp->bVirtuell = bVirtuell;
@@ -551,7 +551,7 @@ bool SwFileNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
case FF_NAME:
nRet = text::FilenameDisplayFormat::NAME_AND_EXT;
break;
- default: nRet = text::FilenameDisplayFormat::FULL;
+ default: nRet = text::FilenameDisplayFormat::FULL;
}
rAny <<= nRet;
}
@@ -582,8 +582,8 @@ bool SwFileNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
case FIELD_PROP_FORMAT:
{
//JP 24.10.2001: int32 because in UnoField.cxx a putvalue is
- // called with a int32 value! But normally we need
- // here only a int16
+ // called with a int32 value! But normally we need
+ // here only a int16
sal_Int32 nType = 0;
rAny >>= nType;
BOOL bFixed = IsFixed();
@@ -598,7 +598,7 @@ bool SwFileNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
case text::FilenameDisplayFormat::NAME_AND_EXT:
nType = FF_NAME;
break;
- default: nType = FF_PATHNAME;
+ default: nType = FF_PATHNAME;
}
if(bFixed)
nType |= FF_FIXED;
@@ -718,12 +718,12 @@ bool SwTemplNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
sal_Int16 nRet;
switch( GetFormat() )
{
- case FF_PATH: nRet = text::FilenameDisplayFormat::PATH; break;
+ case FF_PATH: nRet = text::FilenameDisplayFormat::PATH; break;
case FF_NAME_NOEXT: nRet = text::FilenameDisplayFormat::NAME; break;
- case FF_NAME: nRet = text::FilenameDisplayFormat::NAME_AND_EXT; break;
- case FF_UI_RANGE: nRet = text::TemplateDisplayFormat::AREA; break;
+ case FF_NAME: nRet = text::FilenameDisplayFormat::NAME_AND_EXT; break;
+ case FF_UI_RANGE: nRet = text::TemplateDisplayFormat::AREA; break;
case FF_UI_NAME: nRet = text::TemplateDisplayFormat::TITLE; break;
- default: nRet = text::FilenameDisplayFormat::FULL;
+ default: nRet = text::FilenameDisplayFormat::FULL;
}
rAny <<= nRet;
@@ -744,8 +744,8 @@ bool SwTemplNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
case FIELD_PROP_FORMAT:
{
//JP 24.10.2001: int32 because in UnoField.cxx a putvalue is
- // called with a int32 value! But normally we need
- // here only a int16
+ // called with a int32 value! But normally we need
+ // here only a int16
sal_Int32 nType = 0;
rAny >>= nType;
switch( nType )
@@ -759,13 +759,13 @@ bool SwTemplNameField::PutValue( const uno::Any& rAny, USHORT nWhichId )
case text::FilenameDisplayFormat::NAME_AND_EXT:
SetFormat(FF_NAME);
break;
- case text::TemplateDisplayFormat::AREA :
+ case text::TemplateDisplayFormat::AREA :
SetFormat(FF_UI_RANGE);
break;
case text::TemplateDisplayFormat::TITLE :
SetFormat(FF_UI_NAME);
break;
- default: SetFormat(FF_PATHNAME);
+ default: SetFormat(FF_PATHNAME);
}
}
break;
@@ -798,7 +798,7 @@ String SwDocStatFieldType::Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const
case DS_CHAR: nVal = rDStat.nChar; break;
case DS_PAGE:
if( pDoc->GetRootFrm() )
- ((SwDocStat &)rDStat).nPage = pDoc->GetRootFrm()->GetPageNum();
+ ((SwDocStat &)rDStat).nPage = pDoc->GetRootFrm()->GetPageNum();
nVal = rDStat.nPage;
if( SVX_NUM_PAGEDESC == nFmt )
nFmt = (sal_uInt32)nNumberingType;
@@ -954,17 +954,17 @@ String SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
DBG_ASSERT(xDocProps.is(), "Doc has no DocumentProperties");
sal_uInt16 nExtSub = nSub & 0xff00;
- nSub &= 0xff; // ExtendedSubTypes nicht beachten
+ nSub &= 0xff; // ExtendedSubTypes nicht beachten
switch(nSub)
{
- case DI_TITEL: aStr = xDocProps->getTitle(); break;
- case DI_THEMA: aStr = xDocProps->getSubject(); break;
- case DI_KEYS: aStr = ::comphelper::string::convertCommaSeparated(
+ case DI_TITEL: aStr = xDocProps->getTitle(); break;
+ case DI_THEMA: aStr = xDocProps->getSubject(); break;
+ case DI_KEYS: aStr = ::comphelper::string::convertCommaSeparated(
xDocProps->getKeywords());
break;
- case DI_COMMENT:aStr = xDocProps->getDescription(); break;
- case DI_DOCNO: aStr = String::CreateFromInt32(
+ case DI_COMMENT:aStr = xDocProps->getDescription(); break;
+ case DI_DOCNO: aStr = String::CreateFromInt32(
xDocProps->getEditingCycles() );
break;
case DI_EDIT:
@@ -1011,7 +1011,7 @@ String SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
Time aT(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.HundredthSeconds);
DateTime aDate(aD,aT);
if( nSub == DI_CREATE )
- ; // das wars schon!!
+ ; // das wars schon!!
else if( nSub == DI_CHANGE )
{
aName = xDocProps->getModifiedBy();
@@ -1154,7 +1154,7 @@ String SwDocInfoField::Expand() const
util::Date aDate;
util::DateTime aDateTime;
util::Duration aDuration;
- if( aAny >>= aDate)
+ if( aAny >>= aDate)
{
SvNumberFormatter* pFormatter = pDocShell->GetDoc()->GetNumberFormatter();
Date* pNullDate = pFormatter->GetNullDate();
@@ -1381,17 +1381,17 @@ void SwHiddenTxtFieldType::SetHiddenFlag( sal_Bool bSetHidden )
if( bHidden != bSetHidden )
{
bHidden = bSetHidden;
- UpdateFlds(); // alle HiddenText benachrichtigen
+ UpdateFlds(); // alle HiddenText benachrichtigen
}
}
/* ---------------------------------------------------------------------------
---------------------------------------------------------------------------*/
SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType,
- sal_Bool bConditional,
- const String& rCond,
- const String& rStr,
- sal_Bool bHidden,
+ sal_Bool bConditional,
+ const String& rCond,
+ const String& rStr,
+ sal_Bool bHidden,
sal_uInt16 nSub) :
SwField( pFldType ), aCond(rCond), nSubType(nSub),
bCanToggle(bConditional), bIsHidden(bHidden), bValid(sal_False)
@@ -1425,7 +1425,7 @@ SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType,
: SwField( pFldType ), aTRUETxt(rTrue), aFALSETxt(rFalse), aCond(rCond), nSubType(nSub),
bIsHidden(sal_True), bValid(sal_False)
{
- bCanToggle = aCond.Len() > 0;
+ bCanToggle = aCond.Len() > 0;
}
/* ---------------------------------------------------------------------------
@@ -1433,7 +1433,7 @@ SwHiddenTxtField::SwHiddenTxtField( SwHiddenTxtFieldType* pFldType,
String SwHiddenTxtField::Expand() const
{
// Type: !Hidden -> immer anzeigen
- // Hide -> Werte die Bedingung aus
+ // Hide -> Werte die Bedingung aus
if( TYP_CONDTXTFLD == nSubType )
{
@@ -1471,12 +1471,12 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
sTmpName = aFALSETxt;
// OS 21.08.97: #42943# Datenbankausdruecke muessen sich von
-// einfachem Text unterscheiden. also wird der einfache Text
-// bevorzugt in Anfuehrungszeichen gesetzt.
-// Sind diese vorhanden werden umschliessende entfernt.
-// Wenn nicht, dann wird auf die Tauglichkeit als Datenbankname
-// geprueft. Nur wenn zwei oder mehr Punkte vorhanden sind und kein
-// Anfuehrungszeichen enthalten ist, gehen wir von einer DB aus.
+// einfachem Text unterscheiden. also wird der einfache Text
+// bevorzugt in Anfuehrungszeichen gesetzt.
+// Sind diese vorhanden werden umschliessende entfernt.
+// Wenn nicht, dann wird auf die Tauglichkeit als Datenbankname
+// geprueft. Nur wenn zwei oder mehr Punkte vorhanden sind und kein
+// Anfuehrungszeichen enthalten ist, gehen wir von einer DB aus.
if(sTmpName.Len() > 1 && sTmpName.GetChar(0) == '\"' &&
sTmpName.GetChar((sTmpName.Len() - 1))== '\"')
{
@@ -1488,7 +1488,7 @@ void SwHiddenTxtField::Evaluate(SwDoc* pDoc)
{
::ReplacePoint(sTmpName);
if(sTmpName.GetChar(0) == '[' && sTmpName.GetChar(sTmpName.Len()-1) == ']')
- { // Eckige Klammern entfernen
+ { // Eckige Klammern entfernen
sTmpName.Erase(0, 1);
sTmpName.Erase(sTmpName.Len()-1, 1);
}
@@ -1547,10 +1547,10 @@ SwField* SwHiddenTxtField::Copy() const
new SwHiddenTxtField((SwHiddenTxtFieldType*)GetTyp(), aCond,
aTRUETxt, aFALSETxt);
pFld->bIsHidden = bIsHidden;
- pFld->bValid = bValid;
- pFld->aContent = aContent;
+ pFld->bValid = bValid;
+ pFld->aContent = aContent;
pFld->SetFormat(GetFormat());
- pFld->nSubType = nSubType;
+ pFld->nSubType = nSubType;
return pFld;
}
@@ -2070,7 +2070,7 @@ String SwExtUserFieldType::Expand(sal_uInt16 nSub, sal_uInt32 ) const
case EU_STATE: nRet = USER_OPT_STATE; break;
case EU_FATHERSNAME: nRet = USER_OPT_FATHERSNAME; break;
case EU_APARTMENT: nRet = USER_OPT_APARTMENT; break;
- default: OSL_ENSURE( !this, "Field unknown");
+ default: OSL_ENSURE( !this, "Field unknown");
}
if( USHRT_MAX != nRet )
{
@@ -2407,7 +2407,7 @@ void SwRefPageGetFieldType::UpdateField( SwTxtFld* pTxtFld,
const SwCntntFrm* pRefFrm = pRefTxtFld->GetTxtNode().GetFrm( &aPt, 0, sal_False );
const SwPageFrm* pPgFrm = 0;
sal_uInt16 nDiff = ( pFrm && pRefFrm )
- ? (pPgFrm = pFrm->FindPageFrm())->GetPhyPageNum() -
+ ? (pPgFrm = pFrm->FindPageFrm())->GetPhyPageNum() -
pRefFrm->FindPageFrm()->GetPhyPageNum() + 1
: 1;
@@ -2491,7 +2491,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
aTmpLst.Seek_Entry( &aEndFld, &nLast );
if( !nLast-- )
- return ; // es gibt kein entsprechendes Set - Feld vor mir
+ return ; // es gibt kein entsprechendes Set - Feld vor mir
const SwTxtFld* pRefTxtFld = aTmpLst[ nLast ]->GetFld();
const SwRefPageSetField* pSetFld =
@@ -2587,7 +2587,7 @@ SwCharFmt* SwJumpEditFieldType::GetCharFmt()
// noch nicht registriert ?
if( !aDep.GetRegisteredIn() )
- pFmt->Add( &aDep ); // anmelden
+ pFmt->Add( &aDep ); // anmelden
return pFmt;
}
@@ -2664,8 +2664,8 @@ bool SwJumpEditField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
case JE_FMT_TABLE: nRet = text::PlaceholderType::TABLE; break;
case JE_FMT_FRAME: nRet = text::PlaceholderType::TEXTFRAME; break;
case JE_FMT_GRAPHIC:nRet = text::PlaceholderType::GRAPHIC; break;
- case JE_FMT_OLE: nRet = text::PlaceholderType::OBJECT; break;
-// case JE_FMT_TEXT:
+ case JE_FMT_OLE: nRet = text::PlaceholderType::OBJECT; break;
+// case JE_FMT_TEXT:
default:
nRet = text::PlaceholderType::TEXT; break;
}
@@ -2693,17 +2693,17 @@ bool SwJumpEditField::PutValue( const uno::Any& rAny, USHORT nWhichId )
case FIELD_PROP_USHORT1:
{
//JP 24.10.2001: int32 because in UnoField.cxx a putvalue is
- // called with a int32 value! But normally we need
- // here only a int16
+ // called with a int32 value! But normally we need
+ // here only a int16
sal_Int32 nSet = 0;
rAny >>= nSet;
switch( nSet )
{
- case text::PlaceholderType::TEXT : SetFormat(JE_FMT_TEXT); break;
- case text::PlaceholderType::TABLE : SetFormat(JE_FMT_TABLE); break;
+ case text::PlaceholderType::TEXT : SetFormat(JE_FMT_TEXT); break;
+ case text::PlaceholderType::TABLE : SetFormat(JE_FMT_TABLE); break;
case text::PlaceholderType::TEXTFRAME: SetFormat(JE_FMT_FRAME); break;
case text::PlaceholderType::GRAPHIC : SetFormat(JE_FMT_GRAPHIC); break;
- case text::PlaceholderType::OBJECT : SetFormat(JE_FMT_OLE); break;
+ case text::PlaceholderType::OBJECT : SetFormat(JE_FMT_OLE); break;
}
}
break;
@@ -2743,7 +2743,7 @@ SwCombinedCharField::SwCombinedCharField( SwCombinedCharFieldType* pFTyp,
{
}
-String SwCombinedCharField::Expand() const
+String SwCombinedCharField::Expand() const
{
return sCharacters;
}
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index da60c16d2993..3bd4a3d463f7 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.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
@@ -77,10 +77,10 @@ sal_Int16 lcl_SubTypeToAPI(USHORT nSubType)
sal_Int16 nRet = 0;
switch(nSubType)
{
- case nsSwGetSetExpType::GSE_EXPR : nRet = SetVariableType::VAR /*0*/; break;
- case nsSwGetSetExpType::GSE_SEQ : nRet = SetVariableType::SEQUENCE /*1*/; break;
- case nsSwGetSetExpType::GSE_FORMULA : nRet = SetVariableType::FORMULA /*2*/; break;
- case nsSwGetSetExpType::GSE_STRING : nRet = SetVariableType::STRING /*3*/; break;
+ case nsSwGetSetExpType::GSE_EXPR : nRet = SetVariableType::VAR /*0*/; break;
+ case nsSwGetSetExpType::GSE_SEQ : nRet = SetVariableType::SEQUENCE /*1*/; break;
+ case nsSwGetSetExpType::GSE_FORMULA : nRet = SetVariableType::FORMULA /*2*/; break;
+ case nsSwGetSetExpType::GSE_STRING : nRet = SetVariableType::STRING /*3*/; break;
}
return nRet;
}
@@ -92,10 +92,10 @@ sal_Int32 lcl_APIToSubType(const uno::Any& rAny)
sal_Int32 nSet = 0;
switch(nVal)
{
- case SetVariableType::VAR: nSet = nsSwGetSetExpType::GSE_EXPR; break;
+ case SetVariableType::VAR: nSet = nsSwGetSetExpType::GSE_EXPR; break;
case SetVariableType::SEQUENCE: nSet = nsSwGetSetExpType::GSE_SEQ; break;
case SetVariableType::FORMULA: nSet = nsSwGetSetExpType::GSE_FORMULA; break;
- case SetVariableType::STRING: nSet = nsSwGetSetExpType::GSE_STRING; break;
+ case SetVariableType::STRING: nSet = nsSwGetSetExpType::GSE_STRING; break;
default:
DBG_ERROR("wrong value");
nSet = -1;
@@ -195,7 +195,7 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
const_cast<SwTxtNode*>(pTxtNode)->MakeStartIndex(
&rPos.nContent );
// oder doch besser das Ende vom (Anker-)TextNode nehmen ??
-// ((SwTxtNode*)pTxtNode)->MakeEndIndex( &rPos.nContent );
+// ((SwTxtNode*)pTxtNode)->MakeEndIndex( &rPos.nContent );
}
// noch nicht abbrechen, kann ja auch noch im
@@ -248,7 +248,7 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
else
{
Point aPt( pLayout->Frm().Pos() );
- aPt.Y()++; // aus dem Header raus
+ aPt.Y()++; // aus dem Header raus
pCntFrm = pPgFrm->GetCntntPos( aPt, FALSE, TRUE, FALSE );
pTxtNode = GetFirstTxtNode( rDoc, rPos, pCntFrm, aPt );
}
@@ -258,7 +258,7 @@ const SwTxtNode* GetBodyTxtNode( const SwDoc& rDoc, SwPosition& rPos,
pLayout = pLayout->GetUpper();
continue;
}
- break; // gefunden und beende die Schleife
+ break; // gefunden und beende die Schleife
}
return pTxtNode;
}
@@ -326,8 +326,8 @@ SwField* SwGetExpField::Copy() const
GetFormula(), nSubType, GetFormat());
pTmp->SetLanguage(GetLanguage());
pTmp->SwValueField::SetValue(GetValue());
- pTmp->sExpand = sExpand;
- pTmp->bIsInBodyTxt = bIsInBodyTxt;
+ pTmp->sExpand = sExpand;
+ pTmp->bIsInBodyTxt = bIsInBodyTxt;
pTmp->SetAutomaticLanguage(IsAutomaticLanguage());
if( bLateInitialization )
pTmp->SetLateInitialization();
@@ -337,7 +337,7 @@ SwField* SwGetExpField::Copy() const
void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld )
{
- if( bIsInBodyTxt ) // nur Felder in Footer, Header, FootNote, Flys
+ if( bIsInBodyTxt ) // nur Felder in Footer, Header, FootNote, Flys
return;
OSL_ENSURE( !rFrm.IsInDocBody(), "Flag ist nicht richtig, Frame steht im DocBody" );
@@ -356,7 +356,7 @@ void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld )
//
if(!pTxtNode)
return;
- // #i82544#
+ // #i82544#
if( bLateInitialization )
{
SwFieldType* pSetExpFld = rDoc.GetFldType(RES_SETEXPFLD, GetFormula(), sal_False);
@@ -368,7 +368,7 @@ void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld )
SetSubType( nsSwGetSetExpType::GSE_STRING );
}
}
-
+
_SetGetExpFld aEndFld( aPos.nNode, &rFld, &aPos.nContent );
if(GetSubType() & nsSwGetSetExpType::GSE_STRING)
{
@@ -376,7 +376,7 @@ void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld )
USHORT nSize;
rDoc.FldsToExpand( ppHashTbl, nSize, aEndFld );
LookString( ppHashTbl, nSize, GetFormula(), sExpand );
- ::DeleteHashTable( ppHashTbl, nSize ); // HashTabelle loeschen
+ ::DeleteHashTable( ppHashTbl, nSize ); // HashTabelle loeschen
}
else
{
@@ -516,7 +516,7 @@ SwSetExpFieldType::SwSetExpFieldType( SwDoc* pDc, const String& rName, USHORT nT
bDeleted( FALSE )
{
if( ( nsSwGetSetExpType::GSE_SEQ | nsSwGetSetExpType::GSE_STRING ) & nType )
- EnableFormat(FALSE); // Numberformatter nicht einsetzen
+ EnableFormat(FALSE); // Numberformatter nicht einsetzen
}
SwFieldType* SwSetExpFieldType::Copy() const
@@ -536,7 +536,7 @@ const String& SwSetExpFieldType::GetName() const
void SwSetExpFieldType::Modify( SfxPoolItem*, SfxPoolItem* )
{
- return; // nicht weiter expandieren
+ return; // nicht weiter expandieren
}
void SwSetExpFieldType::SetSeqFormat(ULONG nFmt)
@@ -584,12 +584,12 @@ extern void InsertSort( SvUShorts& rArr, USHORT nIdx, USHORT* pInsPos = 0 );
{
for( n = 0; n < aArr.Count(); ++n )
if( aArr[ n ] > nNum )
- return nNum; // nicht vorhanden -> also benutzen
+ return nNum; // nicht vorhanden -> also benutzen
else if( aArr[ n ] == nNum )
- break; // schon vorhanden -> neue erzeugen
+ break; // schon vorhanden -> neue erzeugen
if( n == aArr.Count() )
- return nNum; // nicht vorhanden -> also benutzen
+ return nNum; // nicht vorhanden -> also benutzen
}
// alle Nummern entsprechend geflag, also bestimme die richtige Nummer
@@ -696,7 +696,7 @@ bool SwSetExpFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId )
{
String sTmp;
if( ::GetString( rAny, sTmp ).Len() )
-// SetDelimiter( sTmp.GetChar( 0 ));
+// SetDelimiter( sTmp.GetChar( 0 ));
SetDelimiter( sTmp );
else
SetDelimiter(String::CreateFromAscii( " "));
@@ -822,7 +822,7 @@ String SwSetExpField::Expand() const
{
String aStr;
if (nSubType & nsSwExtendedSubType::SUB_CMD)
- { // Der CommandString ist gefragt
+ { // Der CommandString ist gefragt
aStr = GetTyp()->GetName();
aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " = " ));
aStr += GetFormula();
@@ -871,12 +871,12 @@ SwField* SwSetExpField::Copy() const
SwSetExpField *pTmp = new SwSetExpField((SwSetExpFieldType*)GetTyp(),
GetFormula(), GetFormat());
pTmp->SwValueField::SetValue(GetValue());
- pTmp->sExpand = sExpand;
+ pTmp->sExpand = sExpand;
pTmp->SetAutomaticLanguage(IsAutomaticLanguage());
pTmp->SetLanguage(GetLanguage());
- pTmp->aPText = aPText;
- pTmp->bInput = bInput;
- pTmp->nSeqNo = nSeqNo;
+ pTmp->aPText = aPText;
+ pTmp->bInput = bInput;
+ pTmp->nSeqNo = nSeqNo;
pTmp->SetSubType(GetSubType());
return pTmp;
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 2b9e538eb817..761f3a53ff27 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.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,7 +64,7 @@ using namespace nsSwDocInfoSubType;
USHORT lcl_GetLanguageOfFormat( USHORT nLng, ULONG nFmt,
const SvNumberFormatter& rFormatter )
{
- if( nLng == LANGUAGE_NONE ) // wegen Bug #60010
+ if( nLng == LANGUAGE_NONE ) // wegen Bug #60010
nLng = LANGUAGE_SYSTEM;
else if( nLng == ::GetAppLanguage() )
switch( rFormatter.GetIndexTableOffset( nFmt ))
@@ -90,45 +90,45 @@ SvStringsDtor* SwFieldType::pFldNames = 0;
DBG_NAME(SwFieldType)
USHORT __FAR_DATA aTypeTab[] = {
- /* RES_DBFLD */ TYP_DBFLD,
- /* RES_USERFLD */ TYP_USERFLD,
- /* RES_FILENAMEFLD */ TYP_FILENAMEFLD,
- /* RES_DBNAMEFLD */ TYP_DBNAMEFLD,
- /* RES_DATEFLD */ TYP_DATEFLD,
- /* RES_TIMEFLD */ TYP_TIMEFLD,
- /* RES_PAGENUMBERFLD */ TYP_PAGENUMBERFLD, // dynamisch
- /* RES_AUTHORFLD */ TYP_AUTHORFLD,
- /* RES_CHAPTERFLD */ TYP_CHAPTERFLD,
- /* RES_DOCSTATFLD */ TYP_DOCSTATFLD,
- /* RES_GETEXPFLD */ TYP_GETFLD, // dynamisch
- /* RES_SETEXPFLD */ TYP_SETFLD, // dynamisch
- /* RES_GETREFFLD */ TYP_GETREFFLD,
- /* RES_HIDDENTXTFLD */ TYP_HIDDENTXTFLD,
- /* RES_POSTITFLD */ TYP_POSTITFLD,
- /* RES_FIXDATEFLD */ TYP_FIXDATEFLD,
- /* RES_FIXTIMEFLD */ TYP_FIXTIMEFLD,
- /* RES_REGFLD */ 0, // alt
- /* RES_VARREGFLD */ 0, // alt
- /* RES_SETREFFLD */ TYP_SETREFFLD,
- /* RES_INPUTFLD */ TYP_INPUTFLD,
- /* RES_MACROFLD */ TYP_MACROFLD,
- /* RES_DDEFLD */ TYP_DDEFLD,
- /* RES_TABLEFLD */ TYP_FORMELFLD,
- /* RES_HIDDENPARAFLD */ TYP_HIDDENPARAFLD,
- /* RES_DOCINFOFLD */ TYP_DOCINFOFLD,
- /* RES_TEMPLNAMEFLD */ TYP_TEMPLNAMEFLD,
- /* RES_DBNEXTSETFLD */ TYP_DBNEXTSETFLD,
- /* RES_DBNUMSETFLD */ TYP_DBNUMSETFLD,
- /* RES_DBSETNUMBERFLD */ TYP_DBSETNUMBERFLD,
- /* RES_EXTUSERFLD */ TYP_EXTUSERFLD,
- /* RES_REFPAGESETFLD */ TYP_SETREFPAGEFLD,
- /* RES_REFPAGEGETFLD */ TYP_GETREFPAGEFLD,
- /* RES_INTERNETFLD */ TYP_INTERNETFLD,
- /* RES_JUMPEDITFLD */ TYP_JUMPEDITFLD,
- /* RES_SCRIPTFLD */ TYP_SCRIPTFLD,
- /* RES_DATETIMEFLD */ 0, // dynamisch
- /* RES_AUTHORITY */ TYP_AUTHORITY,
- /* RES_COMBINED_CHARS */ TYP_COMBINED_CHARS,
+ /* RES_DBFLD */ TYP_DBFLD,
+ /* RES_USERFLD */ TYP_USERFLD,
+ /* RES_FILENAMEFLD */ TYP_FILENAMEFLD,
+ /* RES_DBNAMEFLD */ TYP_DBNAMEFLD,
+ /* RES_DATEFLD */ TYP_DATEFLD,
+ /* RES_TIMEFLD */ TYP_TIMEFLD,
+ /* RES_PAGENUMBERFLD */ TYP_PAGENUMBERFLD, // dynamisch
+ /* RES_AUTHORFLD */ TYP_AUTHORFLD,
+ /* RES_CHAPTERFLD */ TYP_CHAPTERFLD,
+ /* RES_DOCSTATFLD */ TYP_DOCSTATFLD,
+ /* RES_GETEXPFLD */ TYP_GETFLD, // dynamisch
+ /* RES_SETEXPFLD */ TYP_SETFLD, // dynamisch
+ /* RES_GETREFFLD */ TYP_GETREFFLD,
+ /* RES_HIDDENTXTFLD */ TYP_HIDDENTXTFLD,
+ /* RES_POSTITFLD */ TYP_POSTITFLD,
+ /* RES_FIXDATEFLD */ TYP_FIXDATEFLD,
+ /* RES_FIXTIMEFLD */ TYP_FIXTIMEFLD,
+ /* RES_REGFLD */ 0, // alt
+ /* RES_VARREGFLD */ 0, // alt
+ /* RES_SETREFFLD */ TYP_SETREFFLD,
+ /* RES_INPUTFLD */ TYP_INPUTFLD,
+ /* RES_MACROFLD */ TYP_MACROFLD,
+ /* RES_DDEFLD */ TYP_DDEFLD,
+ /* RES_TABLEFLD */ TYP_FORMELFLD,
+ /* RES_HIDDENPARAFLD */ TYP_HIDDENPARAFLD,
+ /* RES_DOCINFOFLD */ TYP_DOCINFOFLD,
+ /* RES_TEMPLNAMEFLD */ TYP_TEMPLNAMEFLD,
+ /* RES_DBNEXTSETFLD */ TYP_DBNEXTSETFLD,
+ /* RES_DBNUMSETFLD */ TYP_DBNUMSETFLD,
+ /* RES_DBSETNUMBERFLD */ TYP_DBSETNUMBERFLD,
+ /* RES_EXTUSERFLD */ TYP_EXTUSERFLD,
+ /* RES_REFPAGESETFLD */ TYP_SETREFPAGEFLD,
+ /* RES_REFPAGEGETFLD */ TYP_GETREFPAGEFLD,
+ /* RES_INTERNETFLD */ TYP_INTERNETFLD,
+ /* RES_JUMPEDITFLD */ TYP_JUMPEDITFLD,
+ /* RES_SCRIPTFLD */ TYP_SCRIPTFLD,
+ /* RES_DATETIMEFLD */ 0, // dynamisch
+ /* RES_AUTHORITY */ TYP_AUTHORITY,
+ /* RES_COMBINED_CHARS */ TYP_COMBINED_CHARS,
/* RES_DROPDOWN */ TYP_DROPDOWN
};
// ????? TYP_USRINPFLD,
@@ -183,7 +183,7 @@ bool SwFieldType::PutValue( const uno::Any& , USHORT )
}
/*--------------------------------------------------------------------
- Beschreibung: Basisklasse aller Felder
+ Beschreibung: Basisklasse aller Felder
Felder referenzieren einen Feldtyp
Felder sind n-mal vorhanden, Feldtypen nur einmal
--------------------------------------------------------------------*/
@@ -355,7 +355,7 @@ bool SwField::PutValue( const uno::Any& rVal, USHORT nWhichId )
/*--------------------------------------------------------------------
- Beschreibung: neuen Typ setzen
+ Beschreibung: neuen Typ setzen
(wird fuer das Kopieren zwischen Dokumenten benutzt)
muss immer vom gleichen Typ sein.
--------------------------------------------------------------------*/
@@ -490,7 +490,7 @@ SwValueFieldType::SwValueFieldType( const SwValueFieldType& rTyp )
String SwValueFieldType::ExpandValue( const double& rVal,
sal_uInt32 nFmt, USHORT nLng) const
{
- if (rVal >= DBL_MAX) // FehlerString fuer Calculator
+ if (rVal >= DBL_MAX) // FehlerString fuer Calculator
return ViewShell::GetShellRes()->aCalc_Error;
String sExpand;
@@ -562,10 +562,10 @@ void SwValueFieldType::DoubleToString( String &rValue, const double &rVal,
SvNumberFormatter* pFormatter = pDoc->GetNumberFormatter();
// wegen Bug #60010
- if( nLng == LANGUAGE_NONE ) // wegen Bug #60010
+ if( nLng == LANGUAGE_NONE ) // wegen Bug #60010
nLng = LANGUAGE_SYSTEM;
- pFormatter->ChangeIntl( nLng ); // Separator in der richtigen Sprache besorgen
+ pFormatter->ChangeIntl( nLng ); // Separator in der richtigen Sprache besorgen
rValue = ::rtl::math::doubleToUString( rVal, rtl_math_StringFormat_F, 12,
pFormatter->GetDecSep(), true );
}
@@ -591,7 +591,7 @@ SwValueField::~SwValueField()
{
}
/*--------------------------------------------------------------------
- Beschreibung: neuen Typ setzen
+ Beschreibung: neuen Typ setzen
(wird fuer das Kopieren zwischen Dokumenten benutzt)
muss immer vom gleichen Typ sein.
--------------------------------------------------------------------*/
diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
index 6bc6bc5421d4..e8968d852414 100644
--- a/sw/source/core/fields/flddat.cxx
+++ b/sw/source/core/fields/flddat.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/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index 3e8edeea5b68..81b7cb26299d 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.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/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx
index 6f704a34a25b..d6827dddd96a 100644
--- a/sw/source/core/fields/fldlst.cxx
+++ b/sw/source/core/fields/fldlst.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,7 +71,7 @@ SwInputFieldList::SwInputFieldList( SwEditShell* pShell, BOOL bBuildTmpLst )
{
const SwTxtFld* pTxtFld = pFld->GetTxtFld();
- // nur InputFields und interaktive SetExpFlds bearbeiten
+ // nur InputFields und interaktive SetExpFlds bearbeiten
// and DropDown fields
if( !pTxtFld || ( RES_SETEXPFLD == nType &&
!((SwSetExpField*)pFld->GetFld())->GetInputFlag()))
@@ -168,7 +168,7 @@ USHORT SwInputFieldList::BuildSortLst()
{
const SwTxtFld* pTxtFld = pFld->GetTxtFld();
- // nur InputFields und interaktive SetExpFlds bearbeiten
+ // nur InputFields und interaktive SetExpFlds bearbeiten
if( !pTxtFld || ( RES_SETEXPFLD == nType &&
!((SwSetExpField*)pFld->GetFld())->GetInputFlag()))
continue;
@@ -204,7 +204,7 @@ USHORT SwInputFieldList::BuildSortLst()
void SwInputFieldList::RemoveUnselectedFlds()
{
- _SetGetExpFlds* pNewLst = new _SetGetExpFlds();
+ _SetGetExpFlds* pNewLst = new _SetGetExpFlds();
FOREACHPAM_START(pSh)
{
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
index 5aef3045b2f7..998aeae04563 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.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,7 +69,7 @@ SwMacroField::SwMacroField(SwMacroFieldType* pInitType,
}
String SwMacroField::Expand() const
-{ // Button malen anstatt von
+{ // Button malen anstatt von
return aText ;
}
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index 63cdb337f526..8e00fabf590a 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -91,7 +91,7 @@ SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos( std::vector< SwLa
{
SwLayoutStatus aRet = INVISIBLE;
const SwTxtNode* pTxtNode = rPos.nNode.GetNode().GetTxtNode();
- SwCntntNode* pNode = rPos.nNode.GetNode().GetCntntNode(); // getfirstcontentnode // getnext...
+ SwCntntNode* pNode = rPos.nNode.GetNode().GetCntntNode(); // getfirstcontentnode // getnext...
if( !pNode )
return aRet;
SwClientIter aIter( *pNode );
@@ -180,12 +180,12 @@ SwPosition SwAnnotationItem::GetAnchorPosition() const
//if( pFld )
//{
SwTxtNode* pTNd = pFld->GetpTxtNode();
- // if( pTNd )
- // {
+ // if( pTNd )
+ // {
SwPosition aPos( *pTNd );
aPos.nContent.Assign( pTNd, *pFld->GetStart() );
return aPos;
- // }
+ // }
//}
}
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 0a2f5710bf2a..213ab9e24c57 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.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
@@ -83,7 +83,7 @@ void lcl_GetLayTree( const SwFrm* pFrm, SvPtrarr& rArr )
{
while( pFrm )
{
- if( pFrm->IsBodyFrm() ) // soll uns nicht weiter interessieren
+ if( pFrm->IsBodyFrm() ) // soll uns nicht weiter interessieren
pFrm = pFrm->GetUpper();
else
{
@@ -181,7 +181,7 @@ BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
pRefFrm = (const SwFrm*)aRefArr[ nRefCnt - 1 ];
}
- if( pRefFrm ) // als Flag missbrauchen
+ if( pRefFrm ) // als Flag missbrauchen
{
if( bVert )
{
@@ -368,12 +368,12 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
sTxt = pFtnIdx->GetFtn().GetViewNumStr( *pDoc );
break;
}
- nStt = nEnd; // kein Bereich, der String ist fertig
+ nStt = nEnd; // kein Bereich, der String ist fertig
}
break;
}
- if( nStt != nEnd ) // ein Bereich?
+ if( nStt != nEnd ) // ein Bereich?
{
sTxt = pTxtNd->GetExpandTxt( nStt, nEnd - nStt );
@@ -593,14 +593,14 @@ bool SwGetRefField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const
sal_Int16 nPart = 0;
switch(GetFormat())
{
- case REF_PAGE : nPart = ReferenceFieldPart::PAGE ; break;
- case REF_CHAPTER : nPart = ReferenceFieldPart::CHAPTER ; break;
- case REF_CONTENT : nPart = ReferenceFieldPart::TEXT ; break;
- case REF_UPDOWN : nPart = ReferenceFieldPart::UP_DOWN ; break;
- case REF_PAGE_PGDESC: nPart = ReferenceFieldPart::PAGE_DESC ; break;
- case REF_ONLYNUMBER : nPart = ReferenceFieldPart::CATEGORY_AND_NUMBER ; break;
- case REF_ONLYCAPTION: nPart = ReferenceFieldPart::ONLY_CAPTION ; break;
- case REF_ONLYSEQNO : nPart = ReferenceFieldPart::ONLY_SEQUENCE_NUMBER; break;
+ case REF_PAGE : nPart = ReferenceFieldPart::PAGE ; break;
+ case REF_CHAPTER : nPart = ReferenceFieldPart::CHAPTER ; break;
+ case REF_CONTENT : nPart = ReferenceFieldPart::TEXT ; break;
+ case REF_UPDOWN : nPart = ReferenceFieldPart::UP_DOWN ; break;
+ case REF_PAGE_PGDESC: nPart = ReferenceFieldPart::PAGE_DESC ; break;
+ case REF_ONLYNUMBER : nPart = ReferenceFieldPart::CATEGORY_AND_NUMBER ; break;
+ case REF_ONLYCAPTION: nPart = ReferenceFieldPart::ONLY_CAPTION ; break;
+ case REF_ONLYSEQNO : nPart = ReferenceFieldPart::ONLY_SEQUENCE_NUMBER; break;
// --> OD 2007-09-06 #i81002#
case REF_NUMBER: nPart = ReferenceFieldPart::NUMBER; break;
case REF_NUMBER_NO_CONTEXT: nPart = ReferenceFieldPart::NUMBER_NO_CONTEXT; break;
@@ -669,13 +669,13 @@ bool SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId )
rAny >>= nPart;
switch(nPart)
{
- case ReferenceFieldPart::PAGE: nPart = REF_PAGE; break;
- case ReferenceFieldPart::CHAPTER: nPart = REF_CHAPTER; break;
- case ReferenceFieldPart::TEXT: nPart = REF_CONTENT; break;
- case ReferenceFieldPart::UP_DOWN: nPart = REF_UPDOWN; break;
- case ReferenceFieldPart::PAGE_DESC: nPart = REF_PAGE_PGDESC; break;
- case ReferenceFieldPart::CATEGORY_AND_NUMBER: nPart = REF_ONLYNUMBER; break;
- case ReferenceFieldPart::ONLY_CAPTION: nPart = REF_ONLYCAPTION; break;
+ case ReferenceFieldPart::PAGE: nPart = REF_PAGE; break;
+ case ReferenceFieldPart::CHAPTER: nPart = REF_CHAPTER; break;
+ case ReferenceFieldPart::TEXT: nPart = REF_CONTENT; break;
+ case ReferenceFieldPart::UP_DOWN: nPart = REF_UPDOWN; break;
+ case ReferenceFieldPart::PAGE_DESC: nPart = REF_PAGE_PGDESC; break;
+ case ReferenceFieldPart::CATEGORY_AND_NUMBER: nPart = REF_ONLYNUMBER; break;
+ case ReferenceFieldPart::ONLY_CAPTION: nPart = REF_ONLYCAPTION; break;
case ReferenceFieldPart::ONLY_SEQUENCE_NUMBER : nPart = REF_ONLYSEQNO; break;
// --> OD 2007-09-06 #i81002#
case ReferenceFieldPart::NUMBER: nPart = REF_NUMBER; break;
@@ -702,9 +702,9 @@ bool SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId )
ConvertProgrammaticToUIName();
}
break;
- case ReferenceFieldSource::BOOKMARK : nSubType = REF_BOOKMARK ; break;
- case ReferenceFieldSource::FOOTNOTE : nSubType = REF_FOOTNOTE ; break;
- case ReferenceFieldSource::ENDNOTE : nSubType = REF_ENDNOTE ; break;
+ case ReferenceFieldSource::BOOKMARK : nSubType = REF_BOOKMARK ; break;
+ case ReferenceFieldSource::FOOTNOTE : nSubType = REF_FOOTNOTE ; break;
+ case ReferenceFieldSource::ENDNOTE : nSubType = REF_ENDNOTE ; break;
}
}
break;
diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx
index 9d5e808d985a..c77e8bf0e414 100644
--- a/sw/source/core/fields/scrptfld.cxx
+++ b/sw/source/core/fields/scrptfld.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/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx
index 5ffe9084ba7b..2761ff3a1860 100644
--- a/sw/source/core/fields/tblcalc.cxx
+++ b/sw/source/core/fields/tblcalc.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,12 +32,12 @@
#include <cntfrm.hxx>
#include <doc.hxx>
-#include <pam.hxx> // fuer GetBodyTxtNode
+#include <pam.hxx> // fuer GetBodyTxtNode
#include <ndtxt.hxx>
#include <fmtfld.hxx>
#include <txtfld.hxx>
#include <expfld.hxx>
-#include <docfld.hxx> // fuer _SetGetExpFld
+#include <docfld.hxx> // fuer _SetGetExpFld
#include <unofldmid.h>
using namespace ::com::sun::star;
@@ -58,14 +58,14 @@ SwFieldType* SwTblFieldType::Copy() const
void SwTblField::CalcField( SwTblCalcPara& rCalcPara )
{
- if( rCalcPara.rCalc.IsCalcError() ) // ist schon Fehler gesetzt ?
+ if( rCalcPara.rCalc.IsCalcError() ) // ist schon Fehler gesetzt ?
return;
// erzeuge aus den BoxNamen die Pointer
BoxNmToPtr( rCalcPara.pTbl );
String sFml( MakeFormel( rCalcPara ));
SetValue( rCalcPara.rCalc.Calculate( sFml ).GetDouble() );
- ChgValid( !rCalcPara.IsStackOverFlow() ); // ist der Wert wieder gueltig?
+ ChgValid( !rCalcPara.IsStackOverFlow() ); // ist der Wert wieder gueltig?
}
@@ -82,7 +82,7 @@ SwField* SwTblField::Copy() const
{
SwTblField* pTmp = new SwTblField( (SwTblFieldType*)GetTyp(),
SwTableFormula::GetFormula(), nSubType, GetFormat() );
- pTmp->sExpand = sExpand;
+ pTmp->sExpand = sExpand;
pTmp->SwValueField::SetValue(GetValue());
pTmp->SwTableFormula::operator=( *this );
pTmp->SetAutomaticLanguage(IsAutomaticLanguage());
@@ -116,7 +116,7 @@ const SwNode* SwTblField::GetNodeOfFormula() const
SwClientIter aIter( *GetTyp() );
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // konnte zum Anfang gesprungen werden ??
do {
const SwFmtFld* pFmtFld = (SwFmtFld*)pLast;
if( this == pFmtFld->GetFld() )
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index 09d2ddc20fae..f94562b56adc 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.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
@@ -49,13 +49,13 @@ static const SvxItemPropertySet* ImplGetSvxTextPortionPropertySet()
SVX_UNOEDIT_FONT_PROPERTIES,
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
- {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ {MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
+ {MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{0,0,0,0,0,0}
};
- static SvxItemPropertySet aSvxTextPortionPropertySet( aSvxTextPortionPropertyMap, EditEngine::GetGlobalItemPool() );
+ static SvxItemPropertySet aSvxTextPortionPropertySet( aSvxTextPortionPropertyMap, EditEngine::GetGlobalItemPool() );
return &aSvxTextPortionPropertySet;
}
@@ -71,14 +71,14 @@ SwTextAPIObject::~SwTextAPIObject() throw()
delete pSource;
}
-struct SwTextAPIEditSource_Impl
+struct SwTextAPIEditSource_Impl
{
// needed for "internal" refcounting
- SfxItemPool* mpPool;
- SwDoc* mpDoc;
- Outliner* mpOutliner;
- SvxOutlinerForwarder* mpTextForwarder;
- sal_Int32 mnRef;
+ SfxItemPool* mpPool;
+ SwDoc* mpDoc;
+ Outliner* mpOutliner;
+ SvxOutlinerForwarder* mpTextForwarder;
+ sal_Int32 mnRef;
};
SwTextAPIEditSource::SwTextAPIEditSource( const SwTextAPIEditSource& rSource )
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index c267b03d52d0..1d4046e1a28b 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.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
@@ -74,7 +74,7 @@ SwField* SwUserField::Copy() const
String SwUserField::GetCntnt(sal_Bool bName) const
{
if ( bName )
- { String aStr(SwFieldType::GetTypeStr(TYP_USERFLD));
+ { String aStr(SwFieldType::GetTypeStr(TYP_USERFLD));
aStr += ' ';
aStr += GetTyp()->GetName();
aStr.AppendAscii(" = ");
@@ -200,7 +200,7 @@ SwUserFieldType::SwUserFieldType( SwDoc* pDocPtr, const String& aNam )
aName = aNam;
if (nType & nsSwGetSetExpType::GSE_STRING)
- EnableFormat(sal_False); // Numberformatter nicht einsetzen
+ EnableFormat(sal_False); // Numberformatter nicht einsetzen
}
String SwUserFieldType::Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng)
@@ -212,7 +212,7 @@ String SwUserFieldType::Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16
aStr = ExpandValue(nValue, nFmt, nLng);
}
else
- EnableFormat(sal_False); // Numberformatter nicht einsetzen
+ EnableFormat(sal_False); // Numberformatter nicht einsetzen
return aStr;
}
@@ -220,11 +220,11 @@ String SwUserFieldType::Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16
SwFieldType* SwUserFieldType::Copy() const
{
SwUserFieldType *pTmp = new SwUserFieldType( GetDoc(), aName );
- pTmp->aContent = aContent;
- pTmp->nType = nType;
- pTmp->bValidValue = bValidValue;
- pTmp->nValue = nValue;
- pTmp->bDeleted = bDeleted;
+ pTmp->aContent = aContent;
+ pTmp->nType = nType;
+ pTmp->bValidValue = bValidValue;
+ pTmp->nValue = nValue;
+ pTmp->bDeleted = bDeleted;
return pTmp;
}
@@ -303,7 +303,7 @@ void SwUserFieldType::SetContent( const String& rStr, sal_uInt32 nFmt )
sal_Bool bModified = GetDoc()->IsModified();
GetDoc()->SetModified();
- if( !bModified ) // Bug 57028
+ if( !bModified ) // Bug 57028
GetDoc()->SetUndoNoResetModified();
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 21:09:11 +0000