[Libreoffice-commits] core.git: 3 commits - sw/source
Philipp Riemer
ruderphilipp at gmail.com
Mon Jun 10 13:01:55 PDT 2013
sw/source/core/fields/authfld.cxx | 11 -
sw/source/core/fields/cellfml.cxx | 290 ++++++++++++++-------------------
sw/source/core/fields/chpfld.cxx | 25 --
sw/source/core/fields/dbfld.cxx | 149 +++-------------
sw/source/core/fields/ddefld.cxx | 50 ++---
sw/source/core/fields/ddetbl.cxx | 53 ++----
sw/source/core/fields/docufld.cxx | 247 ++++++++++------------------
sw/source/core/fields/expfld.cxx | 133 ++++-----------
sw/source/core/fields/fldbas.cxx | 139 +++++----------
sw/source/core/fields/flddat.cxx | 8
sw/source/core/fields/flddropdown.cxx | 3
sw/source/core/fields/fldlst.cxx | 61 ++----
sw/source/core/fields/macrofld.cxx | 29 ---
sw/source/core/fields/postithelper.cxx | 1
sw/source/core/fields/reffld.cxx | 51 ++---
sw/source/core/fields/scrptfld.cxx | 19 --
sw/source/core/fields/tblcalc.cxx | 27 ---
sw/source/core/fields/textapi.cxx | 13 -
sw/source/core/fields/usrfld.cxx | 35 +--
19 files changed, 466 insertions(+), 878 deletions(-)
New commits:
commit cef5c5dcb103e57be302957c530387dbbb042393
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Mon Jun 10 21:58:09 2013 +0200
cleanup of existing code in sw/source/core/fields
- code formatting
- fixed alignment/spacing
- removal of commented out pieces
Change-Id: I3fc2be67edcad8e394966f1678fbbeca4537ff47
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index 795cabe..e469c57 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -128,7 +128,8 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, sal_Bool bSrchNum)
for( xub_StrLen i = 0; i < sTitle.Len(); ++i )
if( ' ' > sTitle.GetChar( i ) )
sTitle.Erase( i--, 1 );
- }else
+ }
+ else
{
//End
SwDoc* pDoc = (SwDoc*)rTxtNd.GetDoc();
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index 647c2d2..3154c61 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -50,12 +50,7 @@ SwDDETable::SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType, sal_Bool bUpd
const SwNode& rNd = *GetTabSortBoxes()[0]->GetSttNd();
if( rNd.GetNodes().IsDocNodes() )
{
- // mba: swclient refactoring - this code shouldn't have done anything!
- // the ModifyLock Flag is evaluated in SwModify only, though it was accessible via SwClient
- // This has been fixed now
-// aDepend.LockModify();
pDDEType->IncRefCnt();
-// aDepend.UnlockModify();
// update box content only if update flag is set (false in import)
if (bUpdate)
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 3017c24..891e72c 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1061,11 +1061,13 @@ String SwDocInfoField::Expand() const
{
if ( ( nSubType & 0xFF ) == DI_CUSTOM )
{
- // custom properties currently need special treatment
- // we don't have a secure way to detect "real" custom properties in Word Import of text fields
- // so we treat *every* unknown property as a custom property, even the "built-in" section in Word's document summary information stream
- // as these properties have not been inserted when the document summary information was imported, we do it here
- // this approach is still a lot better than the old one to import such fields as "user fields" and simple text
+ // custom properties currently need special treatment
+ // We don't have a secure way to detect "real" custom properties in Word import of text
+ // fields, so we treat *every* unknown property as a custom property, even the "built-in"
+ // section in Word's document summary information stream as these properties have not been
+ // inserted when the document summary information was imported, we do it here.
+ // This approach is still a lot better than the old one to import such fields as
+ // "user fields" and simple text
SwDocShell* pDocShell = GetDoc()->GetDocShell();
if( !pDocShell )
return aContent;
@@ -1763,7 +1765,7 @@ void SwPostItField::SetPar2(const OUString& rStr)
/// get the PostIt's text
OUString SwPostItField::GetPar2() const
{
- return sTxt;
+ return sTxt;
}
const OUString& SwPostItField::GetInitials() const
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 3a2fa3e..6927a78 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -184,8 +184,6 @@ 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 );
}
// do not break yet, might be as well in Header/Footer/Footnote/Fly
@@ -852,12 +850,14 @@ void SwGetExpField::SetValue( const double& rAny )
sExpand = ((SwValueFieldType*)GetTyp())->ExpandValue( rAny, GetFormat(),
GetLanguage());
}
-/* --------------------------------------------------
- Description: Find the index of the reference text
- following the current field
- nHint: search starting position after the current
- field (or 0 if default)
- --------------------------------------------------*/
+
+/** Find the index of the reference text following the current field
+ *
+ * @param rFmt
+ * @param rDoc
+ * @param nHint search starting position after the current field (or 0 if default)
+ * @return
+ */
xub_StrLen SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc, unsigned nHint)
{
//
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index aa71ff3..2bd1b73 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -112,7 +112,6 @@ std::vector<String>* SwFieldType::pFldNames = 0;
/* RES_COMBINED_CHARS */ TYP_COMBINED_CHARS,
/* RES_DROPDOWN */ TYP_DROPDOWN
};
- // ????? TYP_USRINPFLD,
const String& SwFieldType::GetTypeStr(sal_uInt16 nTypeId)
{
diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index 3fd75d6..6f6517a 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -70,7 +70,7 @@ String SwDropDownField::Expand() const
if ( aIt != aValues.end())
sSelect = *aIt;
}
- //if still no list value is available a default text of 10 spaces is to be set
+ // if still no list value is available a default text of 10 spaces is to be set
if(!sSelect.Len())
sSelect.AppendAscii ( RTL_CONSTASCII_STRINGPARAM (" "));
return sSelect;
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
index 604376c..a073a84 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -197,7 +197,7 @@ bool SwMacroField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
return true;
}
-// create an internally used macro name from the library and macro name parts
+/// create an internally used macro name from the library and macro name parts
void SwMacroField::CreateMacroString(
OUString& rMacro,
const String& rMacroName,
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 5360de7..19743c5 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -742,7 +742,7 @@ void SwGetRefField::ConvertProgrammaticToUIName()
{
SwDoc* pDoc = ((SwGetRefFieldType*)GetTyp())->GetDoc();
const String& rPar1 = GetPar1();
- //don't convert when the name points to an existing field type
+ // don't convert when the name points to an existing field type
if(!pDoc->GetFldType(RES_SETEXPFLD, rPar1, false))
{
sal_uInt16 nPoolId = SwStyleNameMapper::GetPoolIdFromProgName( rPar1, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL );
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index 525ad94..0b3a9544 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -37,10 +37,14 @@ 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 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 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() );
commit 39f4f7d95391c5396a1fc92d48cb400c06db68b4
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Mon Jun 10 21:57:16 2013 +0200
fdo#62475 - remove visual noise in sw/source/core/fields
Change-Id: I4b14dbb652375f4c6f52ba2fb127e98d6798e07f
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index b262251..fb2e3b3 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -44,14 +44,13 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
-
SwAuthEntry::SwAuthEntry(const SwAuthEntry& rCopy)
: nRefCount(0)
{
for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++)
aAuthFields[i] = rCopy.aAuthFields[i];
}
-// --------------------------------------------------------
+
sal_Bool SwAuthEntry::operator==(const SwAuthEntry& rComp)
{
for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++)
@@ -59,7 +58,7 @@ sal_Bool SwAuthEntry::operator==(const SwAuthEntry& rComp)
return sal_False;
return sal_True;
}
-// --------------------------------------------------------
+
SwAuthorityFieldType::SwAuthorityFieldType(SwDoc* pDoc)
: SwFieldType( RES_AUTHORITY ),
m_pDoc(pDoc),
@@ -223,9 +222,7 @@ bool SwAuthorityFieldType::ChangeEntryContent(const SwAuthEntry* pNewEntry)
return bChanged;
}
-/*-------------------------------------------------------------------------
- appends a new entry (if new) and returns the array position
- -----------------------------------------------------------------------*/
+/// appends a new entry (if new) and returns the array position
sal_uInt16 SwAuthorityFieldType::AppendField( const SwAuthEntry& rInsert )
{
sal_uInt16 nRet = 0;
@@ -656,7 +653,7 @@ static sal_Int16 lcl_Find(const OUString& rFieldName)
return i;
return -1;
}
-//----------------------------------------------------------------------------
+
bool SwAuthorityField::PutValue( const Any& rAny, sal_uInt16 /*nWhichId*/ )
{
if(!GetTyp() || !((SwAuthorityFieldType*)GetTyp())->GetEntryByHandle(m_nHandle))
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index c89e0c1..239402e 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -42,7 +42,6 @@
const sal_Unicode cRelTrenner = ',';
const sal_Unicode cRelKennung = ''; // CTRL-R
-
const sal_uInt16 cMAXSTACKSIZE = 50;
static const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox );
@@ -212,7 +211,6 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
if( pNumFmtr->IsNumberFormat( sTxt, nFmtIndex, aNum ))
nRet = aNum;
}
-
// ?? otherwise it is an error
} while( false );
@@ -229,7 +227,6 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
return nRet;
}
-
// structure needed for calculation of tables
SwTblCalcPara::SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable )
@@ -281,7 +278,6 @@ sal_Bool SwTblCalcPara::CalcWithStackOverflow()
return !rCalc.IsCalcError();
}
-
SwTableFormula::SwTableFormula( const String& rFormel )
: sFormel( rFormel )
{
@@ -417,7 +413,6 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 );
}
-
void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, String& rNewStr,
String& rFirstBox, String* pLastBox, void* pPara ) const
{
@@ -580,7 +575,6 @@ void SwTableFormula::ToRelBoxNm( const SwTable* pTbl )
eNmType = REL_NAME;
}
-
String SwTableFormula::ScanString( FnScanFormel fnFormel, const SwTable& rTbl,
void* pPara ) const
{
@@ -1002,7 +996,6 @@ bool SwTableFormula::HasValidBoxes() const
return bRet;
}
-
sal_uInt16 SwTableFormula::GetLnPosInTbl( const SwTable& rTbl, const SwTableBox* pBox )
{
sal_uInt16 nRet = USHRT_MAX;
@@ -1060,7 +1053,6 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr,
}
else
(rNewStr += sTblNm ) += '.'; // keep table name
-
}
}
if( pTblNmBox == pLastBox )
@@ -1176,5 +1168,4 @@ void SwTableFormula::ToSplitMergeBoxNm( SwTableFmlUpdate& rTblUpd )
eNmType = INTRNL_NAME;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index 0b974bc..795cabe 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -36,7 +36,6 @@ SwChapterFieldType::SwChapterFieldType()
{
}
-
SwFieldType* SwChapterFieldType::Copy() const
{
return new SwChapterFieldType();
@@ -48,7 +47,6 @@ SwChapterField::SwChapterField(SwChapterFieldType* pTyp, sal_uInt32 nFmt)
: SwField(pTyp, nFmt), nLevel( 0 )
{}
-
String SwChapterField::Expand() const
{
String sStr( sNumber );
@@ -68,7 +66,6 @@ String SwChapterField::Expand() const
return sStr;
}
-
SwField* SwChapterField::Copy() const
{
SwChapterField *pTmp =
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index 372bcbd..f3e8111 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <float.h>
#include <sfx2/app.hxx>
#include <svl/zforlist.hxx>
@@ -69,11 +68,10 @@ SwDBFieldType::SwDBFieldType(SwDoc* pDocPtr, const String& rNam, const SwDBData&
}
sName += GetColumnName();
}
-//------------------------------------------------------------------------------
+
SwDBFieldType::~SwDBFieldType()
{
}
-//------------------------------------------------------------------------------
SwFieldType* SwDBFieldType::Copy() const
{
@@ -81,14 +79,11 @@ SwFieldType* SwDBFieldType::Copy() const
return pTmp;
}
-//------------------------------------------------------------------------------
const OUString& SwDBFieldType::GetName() const
{
return sName;
}
-//------------------------------------------------------------------------------
-
void SwDBFieldType::ReleaseRef()
{
OSL_ENSURE(nRefCnt > 0, "RefCount < 0!");
@@ -184,16 +179,12 @@ SwDBField::SwDBField(SwDBFieldType* pTyp, sal_uLong nFmt)
InitContent();
}
-//------------------------------------------------------------------------------
-
SwDBField::~SwDBField()
{
if (GetTyp())
((SwDBFieldType*)GetTyp())->ReleaseRef();
}
-//------------------------------------------------------------------------------
-
void SwDBField::InitContent()
{
if (!IsInitialized())
@@ -204,8 +195,6 @@ void SwDBField::InitContent()
}
}
-//------------------------------------------------------------------------------
-
void SwDBField::InitContent(const String& rExpansion)
{
if (rExpansion.Len() > 2)
@@ -225,8 +214,6 @@ void SwDBField::InitContent(const String& rExpansion)
SetExpansion( rExpansion );
}
-//------------------------------------------------------------------------------
-
String SwDBField::Expand() const
{
String sRet;
@@ -236,8 +223,6 @@ String SwDBField::Expand() const
return sRet;
}
-//------------------------------------------------------------------------------
-
SwField* SwDBField::Copy() const
{
SwDBField *pTmp = new SwDBField((SwDBFieldType*)GetTyp(), GetFormat());
@@ -268,8 +253,6 @@ String SwDBField::GetFieldName() const
return lcl_DBTrennConv(sContent);
}
-//------------------------------------------------------------------------------
-
void SwDBField::ChgValue( double d, bool bVal )
{
bValidValue = bVal;
@@ -395,7 +378,6 @@ bool SwDBField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
OSL_FAIL("illegal property");
}
return true;
-
}
bool SwDBField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
@@ -466,8 +448,6 @@ SwDBNameInfField::SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, s
{
}
-//------------------------------------------------------------------------------
-
SwDBData SwDBNameInfField::GetDBData(SwDoc* pDoc)
{
SwDBData aRet;
@@ -483,8 +463,6 @@ void SwDBNameInfField::SetDBData(const SwDBData & rDBData)
aDBData = rDBData;
}
-//------------------------------------------------------------------------------
-
String SwDBNameInfField::GetFieldName() const
{
String sStr( SwField::GetFieldName() );
@@ -572,8 +550,6 @@ SwDBNextSetFieldType::SwDBNextSetFieldType()
{
}
-//------------------------------------------------------------------------------
-
SwFieldType* SwDBNextSetFieldType::Copy() const
{
SwDBNextSetFieldType* pTmp = new SwDBNextSetFieldType();
@@ -589,15 +565,11 @@ SwDBNextSetField::SwDBNextSetField(SwDBNextSetFieldType* pTyp,
SwDBNameInfField(pTyp, rDBData), aCond(rCond), bCondValid(true)
{}
-//------------------------------------------------------------------------------
-
String SwDBNextSetField::Expand() const
{
return aEmptyStr;
}
-//------------------------------------------------------------------------------
-
SwField* SwDBNextSetField::Copy() const
{
SwDBNextSetField *pTmp = new SwDBNextSetField((SwDBNextSetFieldType*)GetTyp(),
@@ -606,7 +578,6 @@ SwField* SwDBNextSetField::Copy() const
pTmp->bCondValid = bCondValid;
return pTmp;
}
-//------------------------------------------------------------------------------
void SwDBNextSetField::Evaluate(SwDoc* pDoc)
{
@@ -665,8 +636,6 @@ SwDBNumSetFieldType::SwDBNumSetFieldType() :
{
}
-//------------------------------------------------------------------------------
-
SwFieldType* SwDBNumSetFieldType::Copy() const
{
SwDBNumSetFieldType* pTmp = new SwDBNumSetFieldType();
@@ -685,15 +654,11 @@ SwDBNumSetField::SwDBNumSetField(SwDBNumSetFieldType* pTyp,
bCondValid(true)
{}
-//------------------------------------------------------------------------------
-
String SwDBNumSetField::Expand() const
{
return aEmptyStr;
}
-//------------------------------------------------------------------------------
-
SwField* SwDBNumSetField::Copy() const
{
SwDBNumSetField *pTmp = new SwDBNumSetField((SwDBNumSetFieldType*)GetTyp(),
@@ -784,7 +749,6 @@ SwDBNameFieldType::SwDBNameFieldType(SwDoc* pDocument)
{
pDoc = pDocument;
}
-//------------------------------------------------------------------------------
String SwDBNameFieldType::Expand(sal_uLong ) const
{
@@ -794,7 +758,6 @@ String SwDBNameFieldType::Expand(sal_uLong ) const
sRet += (String)aData.sCommand;
return sRet;
}
-//------------------------------------------------------------------------------
SwFieldType* SwDBNameFieldType::Copy() const
{
@@ -802,16 +765,12 @@ SwFieldType* SwDBNameFieldType::Copy() const
return pTmp;
}
-//------------------------------------------------------------------------------
-
// name of the connected database
SwDBNameField::SwDBNameField(SwDBNameFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFmt)
: SwDBNameInfField(pTyp, rDBData, nFmt)
{}
-//------------------------------------------------------------------------------
-
String SwDBNameField::Expand() const
{
String sRet;
@@ -820,8 +779,6 @@ String SwDBNameField::Expand() const
return sRet;
}
-//------------------------------------------------------------------------------
-
SwField* SwDBNameField::Copy() const
{
SwDBNameField *pTmp = new SwDBNameField((SwDBNameFieldType*)GetTyp(), GetDBData());
@@ -848,16 +805,12 @@ SwDBSetNumberFieldType::SwDBSetNumberFieldType()
{
}
-//------------------------------------------------------------------------------
-
SwFieldType* SwDBSetNumberFieldType::Copy() const
{
SwDBSetNumberFieldType *pTmp = new SwDBSetNumberFieldType;
return pTmp;
}
-//------------------------------------------------------------------------------
-
// set-number of the connected database
SwDBSetNumberField::SwDBSetNumberField(SwDBSetNumberFieldType* pTyp,
@@ -866,8 +819,6 @@ SwDBSetNumberField::SwDBSetNumberField(SwDBSetNumberFieldType* pTyp,
: SwDBNameInfField(pTyp, rDBData, nFmt), nNumber(0)
{}
-//------------------------------------------------------------------------------
-
String SwDBSetNumberField::Expand() const
{
if(0 !=(GetSubType() & nsSwExtendedSubType::SUB_INVISIBLE) || nNumber == 0)
@@ -876,8 +827,6 @@ String SwDBSetNumberField::Expand() const
return FormatNumber((sal_uInt16)nNumber, GetFormat());
}
-//------------------------------------------------------------------------------
-
void SwDBSetNumberField::Evaluate(SwDoc* pDoc)
{
SwNewDBMgr* pMgr = pDoc->GetNewDBMgr();
@@ -889,9 +838,6 @@ void SwDBSetNumberField::Evaluate(SwDoc* pDoc)
nNumber = pMgr->GetSelectedRecordId();
}
-
-//------------------------------------------------------------------------------
-
SwField* SwDBSetNumberField::Copy() const
{
SwDBSetNumberField *pTmp =
@@ -943,5 +889,4 @@ bool SwDBSetNumberField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
return bRet;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 8c2fdee..1ec6035 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <comphelper/string.hxx>
#include <sfx2/linkmgr.hxx>
#include <doc.hxx>
@@ -54,7 +53,6 @@ public:
xub_StrLen nEnd = STRING_NOTFOUND ) const;
};
-
::sfx2::SvBaseLink::UpdateResult SwIntrnlRefLink::DataChanged( const String& rMimeType,
const uno::Any & rValue )
{
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index 063cced..647c2d2 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <comphelper/string.hxx>
#include <frmfmt.hxx>
#include <doc.hxx>
@@ -181,5 +180,4 @@ sal_Bool SwDDETable::NoDDETable()
return sal_True;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index c9455cb..3017c24 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <textapi.hxx>
#include <hintids.hxx>
@@ -1043,7 +1042,6 @@ SwDocInfoField::SwDocInfoField(SwDocInfoFieldType* pTyp, sal_uInt16 nSub, const
aContent = rValue;
}
-
template<class T>
static double lcl_TimeToDouble( const T& rTime )
{
@@ -1560,8 +1558,6 @@ bool SwHiddenTxtField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
return true;
}
-//------------------------------------------------------------------------------
-
String SwHiddenTxtField::GetColumnName(const String& rName)
{
sal_uInt16 nPos = rName.Search(DB_DELIM);
@@ -1575,8 +1571,6 @@ String SwHiddenTxtField::GetColumnName(const String& rName)
return rName;
}
-//------------------------------------------------------------------------------
-
String SwHiddenTxtField::GetDBName(const String& rName, SwDoc *pDoc)
{
sal_uInt16 nPos = rName.Search(DB_DELIM);
@@ -1695,7 +1689,6 @@ SwPostItField::SwPostItField( SwPostItFieldType* pT,
{
}
-
SwPostItField::~SwPostItField()
{
if ( m_pTextObject )
@@ -1740,7 +1733,6 @@ String SwPostItField::GetDescription() const
return SW_RES(STR_NOTE);
}
-
SwField* SwPostItField::Copy() const
{
SwPostItField* pRet = new SwPostItField( (SwPostItFieldType*)GetTyp(), sAuthor, sTxt, sInitials, sName,
@@ -2056,7 +2048,6 @@ bool SwExtUserField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
}
return true;
}
-//-------------------------------------------------------------------------
// field type for relative page numbers
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index df352e3..3a2fa3e 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <hintids.hxx>
#include <unotools/collatorwrapper.hxx>
#include <unotools/charclass.hxx>
@@ -58,7 +57,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
-//-----------------------------------------------------------------------------
static sal_Int16 lcl_SubTypeToAPI(sal_uInt16 nSubType)
{
sal_Int16 nRet = 0;
@@ -79,7 +77,7 @@ static sal_Int16 lcl_SubTypeToAPI(sal_uInt16 nSubType)
}
return nRet;
}
-//-----------------------------------------------------------------------------
+
static sal_Int32 lcl_APIToSubType(const uno::Any& rAny)
{
sal_Int16 nVal = 0;
@@ -98,8 +96,6 @@ static sal_Int32 lcl_APIToSubType(const uno::Any& rAny)
return nSet;
}
-//-----------------------------------------------------------------------------
-
void ReplacePoint( String& rTmpName, bool bWithCommandType )
{
// replace first and last (if bWithCommandType: last two) dot
@@ -589,7 +585,6 @@ sal_uInt16 SwSetExpFieldType::GetSeqFldList( SwSeqFldList& rList )
return rList.Count();
}
-
void SwSetExpFieldType::SetChapter( SwSetExpField& rFld, const SwNode& rNd )
{
const SwTxtNode* pTxtNd = rNd.FindOutlineNodeOfLevel( nLevel );
@@ -1245,6 +1240,4 @@ bool SwSetExpField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
return true;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index f9467ad..aa71ff3 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <float.h>
#include <rtl/math.hxx>
#include <svl/zforlist.hxx>
@@ -115,8 +114,6 @@ std::vector<String>* SwFieldType::pFldNames = 0;
};
// ????? TYP_USRINPFLD,
-
-
const String& SwFieldType::GetTypeStr(sal_uInt16 nTypeId)
{
if( !pFldNames )
@@ -282,6 +279,7 @@ bool SwField::QueryValue( uno::Any& rVal, sal_uInt16 nWhichId ) const
}
return true;
}
+
bool SwField::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId )
{
switch( nWhichId )
diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
index fc57a48..4b17cb7 100644
--- a/sw/source/core/fields/flddat.cxx
+++ b/sw/source/core/fields/flddat.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/datetime.hxx>
#include <svl/zforlist.hxx>
#include <com/sun/star/util/DateTime.hpp>
diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index 417f5e6..3fd75d6 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <flddropdown.hxx>
#include <algorithm>
diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx
index 01ea812..c094cd5 100644
--- a/sw/source/core/fields/fldlst.cxx
+++ b/sw/source/core/fields/fldlst.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "switerator.hxx"
#include "editsh.hxx"
#include "doc.hxx"
@@ -200,5 +199,4 @@ void SwInputFieldList::RemoveUnselectedFlds()
pSrtLst = pNewLst;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
index a4e641a..604376c 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <hintids.hxx>
#include <doc.hxx>
#include <docufld.hxx>
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index 1937cee..7d9b83e 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <postithelper.hxx>
#include <PostItMgr.hxx>
#include <AnnotationWin.hxx>
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index e81c4c8..5360de7 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -90,7 +90,6 @@ static void lcl_GetLayTree( const SwFrm* pFrm, std::vector<const SwFrm*>& rArr )
}
}
-
bool IsFrameBehind( const SwTxtNode& rMyNd, sal_uInt16 nMySttPos,
const SwTxtNode& rBehindNd, sal_uInt16 nSttPos )
{
@@ -243,6 +242,7 @@ const SwTxtNode* SwGetRefField::GetReferencedTxtNode() const
sal_uInt16 nDummy = USHRT_MAX;
return SwGetRefFieldType::FindAnchor( pDoc, sSetRefName, nSubType, nSeqNo, &nDummy );
}
+
// #i85090#
String SwGetRefField::GetExpandedTxtOfReferencedTxtNode() const
{
@@ -257,7 +257,6 @@ String SwGetRefField::Expand() const
return sTxt;
}
-
String SwGetRefField::GetFieldName() const
{
if ( GetTyp()->GetName().getLength() > 0 || sSetRefName.getLength() > 0 )
@@ -587,7 +586,6 @@ void SwGetRefField::SetPar1( const OUString& rName )
sSetRefName = rName;
}
-
OUString SwGetRefField::GetPar2() const
{
return Expand();
@@ -774,13 +772,11 @@ SwGetRefFieldType::SwGetRefFieldType( SwDoc* pDc )
: SwFieldType( RES_GETREFFLD ), pDoc( pDc )
{}
-
SwFieldType* SwGetRefFieldType::Copy() const
{
return new SwGetRefFieldType( pDoc );
}
-
void SwGetRefFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
{
// update to all GetReference fields
@@ -917,7 +913,6 @@ SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const String& rRefMark,
return pTxtNd;
}
-
struct _RefIdsMap
{
private:
@@ -1078,7 +1073,6 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld,
}
}
-
void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
{
if( &rDestDoc != pDoc )
diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx
index e1af894..48b3676 100644
--- a/sw/source/core/fields/scrptfld.cxx
+++ b/sw/source/core/fields/scrptfld.cxx
@@ -72,7 +72,6 @@ void SwScriptField::SetPar2( const OUString& rStr )
sCode = rStr;
}
-
OUString SwScriptField::GetPar2() const
{
return sCode;
diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx
index 19cc755..3b18763 100644
--- a/sw/source/core/fields/tblcalc.cxx
+++ b/sw/source/core/fields/tblcalc.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <switerator.hxx>
#include <cntfrm.hxx>
#include <doc.hxx>
@@ -31,19 +30,15 @@
using namespace ::com::sun::star;
-
SwTblFieldType::SwTblFieldType(SwDoc* pDocPtr)
: SwValueFieldType( pDocPtr, RES_TABLEFLD )
{}
-
SwFieldType* SwTblFieldType::Copy() const
{
return new SwTblFieldType(GetDoc());
}
-
-
void SwTblField::CalcField( SwTblCalcPara& rCalcPara )
{
if( rCalcPara.rCalc.IsCalcError() ) // stop if there is already an error set
@@ -56,8 +51,6 @@ void SwTblField::CalcField( SwTblCalcPara& rCalcPara )
ChgValid( !rCalcPara.IsStackOverFlow() ); // is the value again valid?
}
-
-
SwTblField::SwTblField( SwTblFieldType* pInitType, const String& rFormel,
sal_uInt16 nType, sal_uLong nFmt )
: SwValueField( pInitType, nFmt ), SwTableFormula( rFormel ),
@@ -66,7 +59,6 @@ SwTblField::SwTblField( SwTblFieldType* pInitType, const String& rFormel,
sExpand = OUString('0');
}
-
SwField* SwTblField::Copy() const
{
SwTblField* pTmp = new SwTblField( (SwTblFieldType*)GetTyp(),
@@ -78,7 +70,6 @@ SwField* SwTblField::Copy() const
return pTmp;
}
-
String SwTblField::GetFieldName() const
{
String aStr(GetTyp()->GetName());
@@ -159,7 +150,6 @@ OUString SwTblField::GetPar2() const
return SwTableFormula::GetFormula();
}
-
void SwTblField::SetPar2(const OUString& rStr)
{
SetFormula( rStr );
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index fdc145a..525ad94 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <textapi.hxx>
#include <doc.hxx>
#include <docsh.hxx>
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index 969891d..4cd42e7 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
@@ -32,7 +31,6 @@
#include <dpage.hxx>
#include <unofldmid.h>
-
using namespace ::com::sun::star;
// Userfields
@@ -339,6 +337,4 @@ bool SwUserFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
return true;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 9d055aed9f4b97b5186ea1da67a6d3e92b9839f4
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Mon Jun 10 21:54:04 2013 +0200
fdo#39468: Translate German comments in sw/source/core/fields
Change-Id: I8a0f4749c01010a9d0e9baf23db09e1fa63c1d55
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 1eb50c9..c89e0c1 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -52,26 +52,22 @@ static String lcl_BoxNmToRel( const SwTable&, const SwTableNode&,
const String& , const String& , bool );
-/*************************************************************************
-|*
-|* 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 ?)
-|*
-|*************************************************************************/
-
+/** Get value of this box.
+ *
+ * The value is comes from the first TextNode. If it starts with a number/
+ * formula then calculate it, if it starts with a field then get the value.
+ * All other conditions return 0 (and an error?).
+ */
double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
{
double nRet = 0;
if( rCalcPara.rCalc.IsCalcError() )
- return nRet; // schon ein Fehler in der Berechnung
+ return nRet; // stop if there is already an error set
- rCalcPara.rCalc.SetCalcError( CALC_SYNTAX ); // default immer Fehler
+ rCalcPara.rCalc.SetCalcError( CALC_SYNTAX ); // default: error
- // keine Content Box ?
+ // no content box?
if( !pSttNd )
return nRet;
@@ -80,28 +76,27 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
rCalcPara.SetLastTblBox( this );
- // wird eine Rekursion erzeugt ?
+ // Does it create a recursion?
SwTableBox* pBox = (SwTableBox*)this;
if( rCalcPara.pBoxStk->find( pBox ) != rCalcPara.pBoxStk->end() )
- return nRet; // steht schon auf dem Stack: FEHLER
+ return nRet; // already on the stack: error
- // bei dieser Box nochmal aufsetzen
+ // re-start with this box
rCalcPara.SetLastTblBox( this );
- 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
+ rCalcPara.pBoxStk->insert( pBox ); // add
+ do { // Middle-Check-Loop, so that we can jump from here. Used so that the box pointer
+ // will be removed from stack at the end.
SwDoc* pDoc = GetFrmFmt()->GetDoc();
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == GetFrmFmt()->GetItemState(
RES_BOXATR_FORMULA, sal_False, &pItem ) )
{
- rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
+ rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // reset status
if( !((SwTblBoxFormula*)pItem)->IsValid() )
{
- // dann berechnen
+ // calculate
const SwTable* pTmp = rCalcPara.pTbl;
rCalcPara.pTbl = &pBox->GetSttNd()->FindTableNode()->GetTable();
((SwTblBoxFormula*)pItem)->Calc( rCalcPara, nRet );
@@ -125,7 +120,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
else if( SFX_ITEM_SET == pBox->GetFrmFmt()->GetItemState(
RES_BOXATR_VALUE, sal_False, &pItem ) )
{
- rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
+ rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // reset status
nRet = ((SwTblBoxValue*)pItem)->GetValue();
break;
}
@@ -140,8 +135,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
( ' ' == rTxt.GetChar( nSttPos ) || '\t' == rTxt.GetChar( nSttPos ) ) )
++nSttPos;
- // beginnt an erster Position ein "RechenFeld", dann erfrage den Wert
- // von diesem
+ // if there is a calculation field at position 1, get the value of it
sal_Unicode const Char = rTxt.GetChar(nSttPos);
if ( nSttPos < rTxt.Len() &&
( CH_TXTATR_BREAKWORD == Char || CH_TXTATR_INWORD == Char ) )
@@ -152,7 +146,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
if( !pTxtFld )
break;
- rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
+ rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // reset status
const SwField* pFld = pTxtFld->GetFld().GetFld();
switch( pFld->GetTyp()->Which() )
@@ -166,9 +160,9 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
case RES_TABLEFLD:
{
SwTblField* pTblFld = (SwTblField*)pFld;
- if( !pTblFld->IsValid() ) // ist der Wert gueltig ??
+ if( !pTblFld->IsValid() )
{
- // die richtige Tabelle mitgeben!
+ // use the right table!
const SwTable* pTmp = rCalcPara.pTbl;
rCalcPara.pTbl = &pTxtNd->FindTableNode()->GetTable();
pTblFld->CalcField( rCalcPara );
@@ -183,8 +177,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
break;
case RES_JUMPEDITFLD:
- //JP 14.09.98: Bug 56112 - der Platzhalter kann nie einen
- // gueltigen Inhalt haben!
+ //JP 14.09.98: Bug 56112 - placeholder never have the right content!
nRet = 0;
break;
@@ -195,8 +188,8 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
}
else
{
- // Ergebnis ist 0 und kein Fehler!
- rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // wieder zuruecksetzen
+ // result is 0 but no error!
+ rCalcPara.rCalc.SetCalcError( CALC_NOERR ); // reset status
double aNum;
String sTxt( rTxt.Copy( nSttPos ) );
@@ -206,7 +199,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
if( NUMBERFORMAT_TEXT == nFmtIndex )
nFmtIndex = 0;
- // JP 22.04.98: Bug 49659 - Sonderbehandlung fuer Prozent
+ // JP 22.04.98: Bug 49659 - special treatment for percentages
else if( sTxt.Len() &&
NUMBERFORMAT_PERCENT == pNumFmtr->GetType( nFmtIndex ))
{
@@ -220,24 +213,24 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
nRet = aNum;
}
-// ?? sonst ist das ein Fehler
+ // ?? otherwise it is an error
} while( false );
if( !rCalcPara.IsStackOverFlow() )
{
- rCalcPara.pBoxStk->erase( pBox ); // raus aus dem Stack
+ rCalcPara.pBoxStk->erase( pBox ); // remove from stack
rCalcPara.DecStackCnt();
}
- //JP 12.01.99: mit Fehlererkennung, Bug 60794
+ //JP 12.01.99: error detection, Bug 60794
if( DBL_MAX == nRet )
- rCalcPara.rCalc.SetCalcError( CALC_SYNTAX ); // Fehler setzen
+ rCalcPara.rCalc.SetCalcError( CALC_SYNTAX ); // set error
return nRet;
}
-// Struktur, die zum TabelleRechnen benoetigt wird
+// structure needed for calculation of tables
SwTblCalcPara::SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable )
: pLastTblBox( 0 ), nStackCnt( 0 ), nMaxSize( cMAXSTACKSIZE ),
@@ -253,9 +246,7 @@ SwTblCalcPara::~SwTblCalcPara()
sal_Bool SwTblCalcPara::CalcWithStackOverflow()
{
- // falls ein StackUeberlauf erkannt wurde, sollte mit
- // der letzten Box noch mal aufgesetzt werden. Irgend
- // ein Weg sollte dann
+ // If a stack overflow was detected, redo with last box.
sal_uInt16 nSaveMaxSize = nMaxSize;
nMaxSize = cMAXSTACKSIZE - 5;
@@ -271,9 +262,9 @@ sal_Bool SwTblCalcPara::CalcWithStackOverflow()
pBox->GetValue( *this );
} while( IsStackOverFlow() );
- nMaxSize = cMAXSTACKSIZE - 3; // es muss mind. 1 Stufe tiefer gehen!
+ nMaxSize = cMAXSTACKSIZE - 3; // decrease at least one level
- // falls Rekursionen erkannt wurden
+ // if recursion was detected
nStackCnt = 0;
rCalc.SetCalcError( CALC_NOERR );
pBoxStk->clear();
@@ -306,32 +297,31 @@ void SwTableFormula::_MakeFormula( 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() ) // istop if there is already an error set
return;
SwTableBox* pSttBox, *pEndBox = 0;
- rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
- // ein Bereich in dieser Klammer ?
+ rFirstBox.Erase(0,1); // erase label of this box
+ // a region in this area?
if( pLastBox )
{
pEndBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(pLastBox->ToInt64()));
- // ist das ueberhaupt ein gueltiger Pointer ??
+ // Is it actually a valid pointer?
if( rTbl.GetTabSortBoxes().find( pEndBox ) == rTbl.GetTabSortBoxes().end() )
pEndBox = 0;
rFirstBox.Erase( 0, pLastBox->Len()+1 );
}
pSttBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(rFirstBox.ToInt64()));
- // ist das ueberhaupt ein gueltiger Pointer ??
+ // Is it actually a valid pointer?
if( rTbl.GetTabSortBoxes().find( pSttBox ) == rTbl.GetTabSortBoxes().end() )
pSttBox = 0;
rNewStr += ' ';
- if( pEndBox && pSttBox ) // Bereich ?
+ if( pEndBox && pSttBox ) // area?
{
- // hole ueber das Layout alle "selectierten" Boxen und berechne
- // deren Werte
+ // get all selected boxes via layout and calculate their values
SwSelBoxes aBoxes;
GetBoxes( *pSttBox, *pEndBox, aBoxes );
@@ -352,10 +342,10 @@ void SwTableFormula::_MakeFormula( const SwTable& rTbl, String& rNewStr,
}
rNewStr += ')';
}
- else if( pSttBox && !pLastBox ) // nur die StartBox ?
+ else if( pSttBox && !pLastBox ) // only the StartBox?
{
- //JP 12.01.99: und keine EndBox in der Formel!
- // Berechne den Wert der Box
+ // JP 12.01.99: and no EndBox in the formula!
+ // calculate the value of the box
if ( pSttBox->getRowSpan() >= 1 )
{
rNewStr += pCalcPara->rCalc.GetStrResult(
@@ -363,20 +353,20 @@ void SwTableFormula::_MakeFormula( const SwTable& rTbl, String& rNewStr,
}
}
else
- pCalcPara->rCalc.SetCalcError( CALC_SYNTAX ); // Fehler setzen
+ pCalcPara->rCalc.SetCalcError( CALC_SYNTAX ); // set error
rNewStr += ' ';
}
void SwTableFormula::RelNmsToBoxNms( const SwTable& rTbl, String& rNewStr,
String& rFirstBox, String* pLastBox, void* pPara ) const
{
- // relativen Namen zu Box-Namen (externe Darstellung)
+ // relative name w.r.t. box name (external presentation)
SwNode* pNd = (SwNode*)pPara;
OSL_ENSURE( pNd, "Feld steht in keinem TextNode" );
const SwTableBox *pRelBox, *pBox = (SwTableBox *)rTbl.GetTblBox(
pNd->FindTableBoxStartNode()->GetIndex() );
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // get label for the box
rFirstBox.Erase(0,1);
if( pLastBox )
{
@@ -393,20 +383,20 @@ void SwTableFormula::RelNmsToBoxNms( const SwTable& rTbl, String& rNewStr,
else
rNewStr.AppendAscii("A1");
- // Kennung fuer Box erhalten
+ // get label for the box
rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 );
}
void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
String& rFirstBox, String* pLastBox, void* pPara ) const
{
- // relativen Namen zu Box-Pointern (interne Darstellung)
+ // relative name w.r.t. box name (internal presentation)
SwNode* pNd = (SwNode*)pPara;
- OSL_ENSURE( pNd, "Feld steht in keinem Node" );
+ OSL_ENSURE( pNd, "Field not placed in any Node" );
const SwTableBox *pRelBox, *pBox = (SwTableBox*)rTbl.GetTblBox(
pNd->FindTableBoxStartNode()->GetIndex() );
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // get label for the box
rFirstBox.Erase(0,1);
if( pLastBox )
{
@@ -423,7 +413,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
else
rNewStr += '0';
- // Kennung fuer Box erhalten
+ // get label for the box
rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 );
}
@@ -431,9 +421,9 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, String& rNewStr,
String& rFirstBox, String* pLastBox, void* pPara ) const
{
- // Box-Namen (externe Darstellung) zu relativen Namen
+ // box name (external presentation) w.r.t. relative name
SwNode* pNd = (SwNode*)pPara;
- OSL_ENSURE( pNd, "Feld steht in keinem Node" );
+ OSL_ENSURE( pNd, "Field not placed in any Node" );
const SwTableNode* pTblNd = pNd->FindTableNode();
String sRefBoxNm;
@@ -441,11 +431,11 @@ void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, String& rNewStr,
{
const SwTableBox *pBox = rTbl.GetTblBox(
pNd->FindTableBoxStartNode()->GetIndex() );
- OSL_ENSURE( pBox, "Feld steht in keiner Tabelle" );
+ OSL_ENSURE( pBox, "Field not placed in any Table" );
sRefBoxNm = pBox->GetName();
}
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // get label for the box
rFirstBox.Erase(0,1);
if( pLastBox )
{
@@ -458,7 +448,7 @@ void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, String& rNewStr,
rNewStr += lcl_BoxNmToRel( rTbl, *pTblNd, sRefBoxNm, rFirstBox,
eNmType == EXTRNL_NAME );
- // Kennung fuer Box erhalten
+ // get label for the box
rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 );
}
@@ -466,16 +456,16 @@ void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, String& rNewStr,
void SwTableFormula::PtrToBoxNms( const SwTable& rTbl, String& rNewStr,
String& rFirstBox, String* pLastBox, void* ) const
{
- // ein Bereich in dieser Klammer ?
+ // area in these parentheses?
SwTableBox* pBox;
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // get label for the box
rFirstBox.Erase(0,1);
if( pLastBox )
{
pBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(pLastBox->ToInt64()));
- // ist das ueberhaupt ein gueltiger Pointer ??
+ // Is it actually a valid pointer?
if( rTbl.GetTabSortBoxes().find( pBox ) != rTbl.GetTabSortBoxes().end() )
rNewStr += pBox->GetName();
else
@@ -485,23 +475,23 @@ void SwTableFormula::PtrToBoxNms( const SwTable& rTbl, String& rNewStr,
}
pBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(rFirstBox.ToInt64()));
- // ist das ueberhaupt ein gueltiger Pointer ??
+ // Is it actually a valid pointer?
if( rTbl.GetTabSortBoxes().find( pBox ) != rTbl.GetTabSortBoxes().end() )
rNewStr += pBox->GetName();
else
rNewStr += '?';
- // Kennung fuer Box erhalten
+ // get label for the box
rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 );
}
void SwTableFormula::BoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
String& rFirstBox, String* pLastBox, void* ) const
{
- // ein Bereich in dieser Klammer ?
+ // area in these parentheses?
const SwTableBox* pBox;
- rNewStr += rFirstBox.Copy(0,1); // Kennung fuer Box erhalten
+ rNewStr += rFirstBox.Copy(0,1); // get label for the box
rFirstBox.Erase(0,1);
if( pLastBox )
{
@@ -514,11 +504,11 @@ void SwTableFormula::BoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
pBox = rTbl.GetTblBox( rFirstBox );
rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox));
- // Kennung fuer Box erhalten
+ // get label for the box
rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 );
}
- // erzeuge die externe (fuer UI) Formel
+/// create external formula (for UI)
void SwTableFormula::PtrToBoxNm( const SwTable* pTbl )
{
const SwNode* pNd = 0;
@@ -543,7 +533,7 @@ void SwTableFormula::PtrToBoxNm( const SwTable* pTbl )
eNmType = EXTRNL_NAME;
}
- // erzeuge die interne (in CORE) Formel
+/// create internal formula (in CORE)
void SwTableFormula::BoxNmToPtr( const SwTable* pTbl )
{
const SwNode* pNd = 0;
@@ -568,7 +558,7 @@ void SwTableFormula::BoxNmToPtr( const SwTable* pTbl )
eNmType = INTRNL_NAME;
}
- // erzeuge die relative (fuers Kopieren) Formel
+/// create relative formula (for copy)
void SwTableFormula::ToRelBoxNm( const SwTable* pTbl )
{
const SwNode* pNd = 0;
@@ -598,8 +588,7 @@ String SwTableFormula::ScanString( FnScanFormel fnFormel, const SwTable& rTbl,
sal_uInt16 nFml = 0, nStt = 0, nEnd = 0, nTrenner;
do {
- // falls der Formel ein Name vorangestellt ist, diese Tabelle
- // benutzen !!
+ // If the formula is preceded by a name, use this table!
const SwTable* pTbl = &rTbl;
nStt = sFormel.Search( '<', nFml );
@@ -615,18 +604,18 @@ String SwTableFormula::ScanString( FnScanFormel fnFormel, const SwTable& rTbl,
}
if( STRING_NOTFOUND == nStt || STRING_NOTFOUND == nEnd )
{
- // den Rest setzen und beenden
+ // set the rest and finish
aStr.Insert( sFormel, nFml, sFormel.Len() - nFml );
break;
}
- aStr.Insert( sFormel, nFml, nStt - nFml ); // Anfang schreiben
+ aStr.Insert( sFormel, nFml, nStt - nFml ); // write beginning
if( fnFormel != 0 )
{
- // ist ein TabellenName vorangestellt ??
- // JP 16.02.99: SplitMergeBoxNm behandeln den Namen selbst
- // JP 22.02.99: der CAST muss fuer den Linux-Compiler sein
- // JP 28.06.99: rel. BoxName have no preceding tablename!
+ // Is a table name preceded?
+ // JP 16.02.99: SplitMergeBoxNm take care of the name themself
+ // JP 22.02.99: Linux compiler needs cast
+ // JP 28.06.99: rel. BoxName has no preceding tablename!
if( fnFormel != (FnScanFormel)&SwTableFormula::_SplitMergeBoxNm &&
1 < sFormel.Len() && cRelKennung != sFormel.GetChar( 1 ) &&
STRING_NOTFOUND != ( nTrenner = sFormel.Search( '.', nStt ))
@@ -634,39 +623,37 @@ String SwTableFormula::ScanString( FnScanFormel fnFormel, const SwTable& rTbl,
{
String sTblNm( sFormel.Copy( nStt, nEnd - nStt ));
- // falls im Namen schon die Punkte enthalten sind,
- // treten diese immer paarig auf!!! (A1.1.1 !!)
+ // If there are dots in the name, than these appear in pairs (e.g. A1.1.1)!
if( (comphelper::string::getTokenCount(sTblNm, '.') - 1) & 1 )
{
sTblNm.Erase( nTrenner - nStt );
- // beim Bauen der Formel ist der TabellenName unerwuenscht
- //JP 22.02.99: der CAST muss fuer den Linux-Compiler sein
+ // when creating a formula the table name is unwanted
if( fnFormel != (FnScanFormel)&SwTableFormula::_MakeFormula )
aStr += sTblNm;
nStt = nTrenner;
- sTblNm.Erase( 0, 1 ); // Trenner loeschen
+ sTblNm.Erase( 0, 1 ); // delete separator
if( sTblNm != rTbl.GetFrmFmt()->GetName() )
{
- // dann suchen wir uns mal unsere Tabelle:
+ // then search for table
const SwTable* pFnd = FindTable(
*rTbl.GetFrmFmt()->GetDoc(),
sTblNm );
if( pFnd )
pTbl = pFnd;
// ??
- OSL_ENSURE( pFnd, "Tabelle nicht gefunden, was nun?" );
+ OSL_ENSURE( pFnd, "No table found. What now?" );
}
}
}
String sBox( sFormel.Copy( nStt, nEnd - nStt + 1 ));
- // ein Bereich in dieser Klammer ?
+ // area in these parentheses?
if( STRING_NOTFOUND != ( nTrenner = sFormel.Search( ':', nStt ))
&& nTrenner < nEnd )
{
- // ohne die Anfangsklammer
+ // without opening parenthesis
String aFirstBox( sFormel.Copy( nStt+1, nTrenner - nStt - 1 ));
(this->*fnFormel)( *pTbl, aStr, sBox, &aFirstBox, pPara );
}
@@ -686,8 +673,7 @@ const SwTable* SwTableFormula::FindTable( SwDoc& rDoc, const String& rNm ) const
for( sal_uInt16 nFmtCnt = rTblFmts.size(); nFmtCnt; )
{
SwFrmFmt* pFmt = rTblFmts[ --nFmtCnt ];
- // falls wir von Sw3Writer gerufen werden, dann ist dem
- // FormatNamen eine Nummer anhaengig
+ // if we are called from Sw3Writer, a number is dependent on the format name
SwTableBox* pFBox;
if( COMPARE_EQUAL == rNm.CompareTo( pFmt->GetName(),
pFmt->GetName().Search( 0x0a ) ) &&
@@ -696,7 +682,7 @@ const SwTable* SwTableFormula::FindTable( SwDoc& rDoc, const String& rNm ) const
pFBox->GetSttNd() &&
pFBox->GetSttNd()->GetNodes().IsDocNodes() )
{
- // eine Tabelle im normalen NodesArr
+ // a table in the normal NodesArr
pRet = pTmpTbl;
break;
}
@@ -708,8 +694,8 @@ static 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 !!
+ OSL_ENSURE( pCNd, "Box has no TextNode" );
+ Point aPt; // get the first frame of the layout - table headline
return pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, NULL, sal_False );
}
@@ -734,12 +720,12 @@ static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
const SwTableBox* pRefBox,
const String& rGetName )
{
- // hole die Line
+ // get line
const SwTableBox* pBox = 0;
String sGetName( rGetName );
- // ist es denn wirklich eine relative Angabe??
- if( cRelKennung == sGetName.GetChar(0) ) // ja, ...
+ // Is it really a relative value?
+ if( cRelKennung == sGetName.GetChar(0) ) // yes
{
if( !pRefBox )
return 0;
@@ -750,7 +736,7 @@ static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
const SwTableBoxes* pBoxes;
const SwTableLine* pLine;
- // bestimme erst mal die Start-Werte der Box:
+ // determine starting values of the box,...
pBox = (SwTableBox*)pRefBox;
pLine = pBox->GetUpper();
while( pLine->GetUpper() )
@@ -773,7 +759,7 @@ static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
pLine = (*pLines)[ sal_uInt16(nLineOffset) ];
- // dann suche die Box
+ // ... then serach the box
pBoxes = &pLine->GetTabBoxes();
if( nBoxOffset >= long(pBoxes->size()) )
return 0;
@@ -788,12 +774,12 @@ static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
nSttLine = SwTable::_GetBoxNum( sGetName );
- // bestimme die Line
+ // determine line
if( !nSttLine || nSttLine > pLines->size() )
break;
pLine = (*pLines)[ nSttLine-1 ];
- // bestimme die Box
+ // determine box
pBoxes = &pLine->GetTabBoxes();
if( nSttBox >= pBoxes->size() )
break;
@@ -803,14 +789,14 @@ static const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
if( pBox )
{
if( !pBox->GetSttNd() )
- // "herunterfallen lassen" bis zur ersten Box
+ // "bubble up" to first box
while( !pBox->GetTabLines().empty() )
pBox = pBox->GetTabLines().front()->GetTabBoxes().front();
}
}
else
{
- // sonst ist es eine absolute externe Darstellung:
+ // otherwise it is an absolute external presentation
pBox = rTbl.GetTblBox( sGetName );
}
return pBox;
@@ -824,15 +810,14 @@ static String lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
String sTmp( rGetStr );
if( !bExtrnlNm )
{
- // in die Externe Darstellung umwandeln.
+ // convert into external presentation
SwTableBox* pBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(sTmp.ToInt64()));
if( rTbl.GetTabSortBoxes().find( pBox ) == rTbl.GetTabSortBoxes().end() )
return OUString('?');
sTmp = pBox->GetName();
}
- // sollte die es eine Tabellen uebergreifende Formel sein, dann behalte
- // die externe Darstellung bei:
+ // If the formula is spanning over a table then keep external presentation
if( &rTbl == &rTblNd.GetTable() )
{
long nBox = SwTable::_GetBoxNum( sTmp, sal_True );
@@ -840,7 +825,7 @@ static 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: add rest from box name
sTmp = cRelKennung;
sTmp += OUString::number( nBox );
@@ -875,32 +860,31 @@ void SwTableFormula::_GetFmlBoxes( const SwTable& rTbl, String& ,
SwSelBoxes* pBoxes = (SwSelBoxes*)pPara;
SwTableBox* pSttBox, *pEndBox = 0;
- rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
- // ein Bereich in dieser Klammer ?
+ rFirstBox.Erase(0,1); // delete box label
+ // area in these parentheses?
if( pLastBox )
{
pEndBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(pLastBox->ToInt64()));
- // ist das ueberhaupt ein gueltiger Pointer ??
+ // Is it actually a valid pointer?
if( rTbl.GetTabSortBoxes().find( pEndBox ) == rTbl.GetTabSortBoxes().end() )
pEndBox = 0;
rFirstBox.Erase( 0, pLastBox->Len()+1 );
}
pSttBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(rFirstBox.ToInt64()));
- // ist das ueberhaupt ein gueltiger Pointer ??
+ // Is it actually a valid pointer?
if( rTbl.GetTabSortBoxes().find( pSttBox ) == rTbl.GetTabSortBoxes().end() )
pSttBox = 0;
- if( pEndBox && pSttBox ) // Bereich ?
+ if( pEndBox && pSttBox ) // area?
{
- // ueber das Layout alle "selectierten" Boxen und berechne
- // deren Werte
+ // get all selected boxes via layout and calculate their values
SwSelBoxes aBoxes;
GetBoxes( *pSttBox, *pEndBox, aBoxes );
pBoxes->insert( aBoxes );
}
- else if( pSttBox ) // nur die StartBox ?
+ else if( pSttBox ) // only the StartBox?
pBoxes->insert( pSttBox );
}
@@ -908,7 +892,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
const SwTableBox& rEndBox,
SwSelBoxes& rBoxes ) const
{
- // hole ueber das Layout alle "selektierten" Boxen
+ // get all selected boxes via layout
const SwLayoutFrm *pStt, *pEnd;
const SwFrm* pFrm = lcl_GetBoxFrm( rSttBox );
pStt = pFrm ? pFrm->GetUpper() : 0;
@@ -920,7 +904,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
const SwTable* pTbl = pStt->FindTabFrm()->GetTable();
- // filter die Kopfzeilen-Boxen heraus:
+ // filter headline boxes
if( pTbl->GetRowsToRepeat() > 0 )
{
do { // middle-check loop
@@ -929,23 +913,23 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
pLine = pLine->GetUpper()->GetUpper();
if( pTbl->IsHeadline( *pLine ) )
- break; // Headline mit im Bereich !
+ break; // headline in this area!
- // vielleicht ist ja Start und Ende vertauscht
+ // maybe start and end are swapped
pLine = rEndBox.GetUpper();
while ( pLine->GetUpper() )
pLine = pLine->GetUpper()->GetUpper();
if( pTbl->IsHeadline( *pLine ) )
- break; // Headline mit im Bereich !
+ break; // headline in this area!
const SwTabFrm *pTable = pStt->FindTabFrm();
const SwTabFrm *pEndTable = pEnd->FindTabFrm();
- if( pTable == pEndTable ) // keine gespl. Tabelle
+ if( pTable == pEndTable ) // no split table
break;
- // dann mal die Tabellenkoepfe raus:
+ // then remove table headers
for (size_t n = 0; n < rBoxes.size(); ++n)
{
pLine = rBoxes[n]->GetUpper();
@@ -959,17 +943,17 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
}
}
- // sind alle Boxen gueltig, auf die sich die Formel bezieht?
+/// Are all boxes valid that are referenced by the formula?
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 ) // wrong is wrong
{
SwTableBox* pSttBox = 0, *pEndBox = 0;
rFirstBox.Erase(0,1); // Kennung fuer Box loeschen
- // ein Bereich in dieser Klammer ?
+ // area in this parenthesis?
if( pLastBox )
rFirstBox.Erase( 0, pLastBox->Len()+1 );
@@ -1000,7 +984,7 @@ void SwTableFormula::_HasValidBoxes( const SwTable& rTbl, String& ,
break;
}
- // sind das gueltige Pointer ?
+ // Are these valid pointers?
if( ( pLastBox &&
( !pEndBox || rTbl.GetTabSortBoxes().find( pEndBox ) == rTbl.GetTabSortBoxes().end() ) ) ||
( !pSttBox || rTbl.GetTabSortBoxes().find( pSttBox ) == rTbl.GetTabSortBoxes().end() ) )
@@ -1037,7 +1021,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); // get label for the box
rFirstBox.Erase(0,1);
String sTblNm;
@@ -1048,12 +1032,11 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr,
sal_uInt16 nLastBoxLen = pTblNmBox->Len();
sal_uInt16 nTrenner = pTblNmBox->Search( '.' );
if( STRING_NOTFOUND != nTrenner &&
- // falls im Namen schon die Punkte enthalten sind,
- // treten diese immer paarig auf!!! (A1.1.1 !!)
+ // If there are dots in the name, than these appear in pairs (e.g. A1.1.1)!
(comphelper::string::getTokenCount(*pTblNmBox, '.') - 1) & 1 )
{
sTblNm = pTblNmBox->Copy( 0, nTrenner );
- pTblNmBox->Erase( 0, nTrenner + 1);// den Punkt entfernen
+ pTblNmBox->Erase( 0, nTrenner + 1); // remove dot
const SwTable* pFnd = FindTable( *rTbl.GetFrmFmt()->GetDoc(), sTblNm );
if( pFnd )
pTbl = pFnd;
@@ -1064,19 +1047,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 ) // not the current one
(rNewStr += rTblUpd.pTbl->GetFrmFmt()->GetName() )
- += '.'; // den neuen Tabellen Namen setzen
+ += '.'; // set new table name
rTblUpd.bModified = sal_True;
}
else if( pFnd != rTblUpd.pTbl ||
( rTblUpd.pTbl != &rTbl && &rTbl != rTblUpd.DATA.pDelTbl))
- (rNewStr += sTblNm ) += '.'; // den Tabellen Namen behalten
+ (rNewStr += sTblNm ) += '.'; // keep table name
else
rTblUpd.bModified = sal_True;
}
else
- (rNewStr += sTblNm ) += '.'; // den Tabellen Namen behalten
+ (rNewStr += sTblNm ) += '.'; // keep table name
}
}
@@ -1117,12 +1100,12 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr,
if( TBL_SPLITTBL == rTblUpd.eFlags )
{
- // wo liegen die Boxen, in der "alten" oder in der neuen Tabelle?
+ // Where are the boxes - in the old or in the new table?
bool bInNewTbl = false;
if( pLastBox )
{
- // das ist die "erste" Box in der Selektion. Die bestimmt ob die
- // Formel in der alten oder neuen Tabelle steht.
+ // It is the "first" box in this selection. It determines if the formula is placed in
+ // the new or the old table.
sal_uInt16 nEndLnPos = SwTableFormula::GetLnPosInTbl( *pTbl, pEndBox ),
nSttLnPos = SwTableFormula::GetLnPosInTbl( *pTbl, pSttBox );
@@ -1130,14 +1113,13 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr,
((rTblUpd.nSplitLine <= nSttLnPos) ==
(rTblUpd.nSplitLine <= nEndLnPos)) )
{
- // bleiben in der gleichen Tabelle
+ // stay in same table
bInNewTbl = rTblUpd.nSplitLine <= nEndLnPos &&
pTbl == rTblUpd.pTbl;
}
else
{
- // das ist aufjedenfall eine ungueltige Formel, also fuers
- // Undo auf Modified setzen
+ // this is definitely an invalid formula, also mark as modified for Undo
rTblUpd.bModified = sal_True;
if( pEndBox )
bInNewTbl = USHRT_MAX != nEndLnPos &&
@@ -1148,13 +1130,13 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr,
else
{
sal_uInt16 nSttLnPos = SwTableFormula::GetLnPosInTbl( *pTbl, pSttBox );
- // dann landet das Teil in der neuen Tabelle?
+ // Put it in the new table?
bInNewTbl = USHRT_MAX != nSttLnPos &&
rTblUpd.nSplitLine <= nSttLnPos &&
pTbl == rTblUpd.pTbl;
}
- // wenn die Formel selbst in der neuen Tabellen landet
+ // formula goes into new table
if( rTblUpd.bBehindSplitLine )
{
if( !bInNewTbl )
@@ -1180,8 +1162,7 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr,
+= rFirstBox.GetChar( rFirstBox.Len() - 1 );
}
- // erzeuge die externe Formel, beachte aber das die Formel
- // in einer gesplitteten/gemergten Tabelle landet
+/// Create external formula but remember that the formula is placed in a split/merged table
void SwTableFormula::ToSplitMergeBoxNm( SwTableFmlUpdate& rTblUpd )
{
const SwTable* pTbl;
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index 955fb71..0b974bc 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -20,19 +20,16 @@
#include <com/sun/star/text/ChapterFormat.hpp>
#include <doc.hxx>
#include <frame.hxx> // SwChapterFieldType::ChangeExpansion()
-#include <pam.hxx> // fuer GetBodyTxtNode
+#include <pam.hxx> // for GetBodyTxtNode
#include <ndtxt.hxx>
#include <chpfld.hxx>
-#include <expfld.hxx> // fuer GetBodyTxtNode
+#include <expfld.hxx> // for GetBodyTxtNode
#include <unofldmid.h>
#include <numrule.hxx>
using namespace ::com::sun::star;
-/*--------------------------------------------------------------------
- Beschreibung: SwChapterFieldType
- --------------------------------------------------------------------*/
-
+// SwChapterFieldType
SwChapterFieldType::SwChapterFieldType()
: SwFieldType( RES_CHAPTERFLD )
@@ -45,11 +42,7 @@ SwFieldType* SwChapterFieldType::Copy() const
return new SwChapterFieldType();
}
-
-/*--------------------------------------------------------------------
- Beschreibung: Kapittelfeld
- --------------------------------------------------------------------*/
-
+// chapter field
SwChapterField::SwChapterField(SwChapterFieldType* pTyp, sal_uInt32 nFmt)
: SwField(pTyp, nFmt), nLevel( 0 )
@@ -94,7 +87,7 @@ void SwChapterField::ChangeExpansion(const SwFrm* pFrm,
const SwCntntNode* pCntntNode,
sal_Bool bSrchNum )
{
- OSL_ENSURE( pFrm, "in welchem Frame stehe ich denn?" );
+ OSL_ENSURE( pFrm, "In which frame am I?" );
SwDoc* pDoc = (SwDoc*)pCntntNode->GetDoc();
const SwTxtNode* pTxtNode = dynamic_cast<const SwTxtNode*>(pCntntNode);
@@ -175,7 +168,7 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, sal_Bool bSrchNum)
} while( true );
}
- // nur die Nummer besorgen, ohne Pre-/Post-fixstrings
+ // get the number without Pre-/Post-fixstrings
if ( pTxtNd->IsOutline() )
{
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index 017ce71..372bcbd 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -43,10 +43,7 @@
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star;
-/*--------------------------------------------------------------------
- Beschreibung: Datenbanktrenner durch Punkte fuer Anzeige ersetzen
- --------------------------------------------------------------------*/
-
+/// replace database separator by dots for display
static String lcl_DBTrennConv(const String& aContent)
{
String sTmp(aContent);
@@ -57,9 +54,7 @@ static String lcl_DBTrennConv(const String& aContent)
return sTmp;
}
-/*--------------------------------------------------------------------
- Beschreibung: DatenbankFeldTyp
- --------------------------------------------------------------------*/
+// database field type
SwDBFieldType::SwDBFieldType(SwDoc* pDocPtr, const String& rNam, const SwDBData& rDBData ) :
SwValueFieldType( pDocPtr, RES_DBFLD ),
@@ -96,7 +91,7 @@ const OUString& SwDBFieldType::GetName() const
void SwDBFieldType::ReleaseRef()
{
- OSL_ENSURE(nRefCnt > 0, "RefCount kleiner 0!");
+ OSL_ENSURE(nRefCnt > 0, "RefCount < 0!");
if (--nRefCnt <= 0)
{
@@ -153,7 +148,7 @@ bool SwDBFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
SwFmtFld* pFld = aIter.First();
while(pFld)
{
- // Feld im Undo?
+ // field in Undo?
SwTxtFld *pTxtFld = pFld->GetTxtFld();
if(pTxtFld && pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
{
@@ -174,9 +169,8 @@ bool SwDBFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
}
return true;
}
-/*--------------------------------------------------------------------
- Beschreibung: SwDBField
- --------------------------------------------------------------------*/
+
+// database field
SwDBField::SwDBField(SwDBFieldType* pTyp, sal_uLong nFmt)
: SwValueField(pTyp, nFmt),
@@ -295,15 +289,12 @@ SwFieldType* SwDBField::ChgTyp( SwFieldType* pNewType )
return pOld;
}
-/*--------------------------------------------------------------------
- Beschreibung: Aktuellen Field-Value holen und chachen
- --------------------------------------------------------------------*/
-
+/// get current field value and cache it
void SwDBField::Evaluate()
{
SwNewDBMgr* pMgr = GetDoc()->GetNewDBMgr();
- // erstmal loeschen
+ // first delete
bValidValue = false;
double nValue = DBL_MAX;
const SwDBData& aTmpData = GetDBData();
@@ -313,7 +304,7 @@ void SwDBField::Evaluate()
sal_uInt32 nFmt;
- // Passenden Spaltennamen suchen
+ // search corresponding column name
String aColNm( ((SwDBFieldType*)GetTyp())->GetColumnName() );
SvNumberFormatter* pDocFormatter = GetDoc()->GetNumberFormatter();
@@ -348,21 +339,18 @@ 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; // because of bug #60339 not for all strings
}
else
{
- // Bei Strings sal_True wenn Laenge > 0 sonst sal_False
+ // if string length > 0 then true, else false
SetValue(aContent.isEmpty() ? 0 : 1);
}
}
bInitialized = true;
}
-/*--------------------------------------------------------------------
- Beschreibung: Namen erfragen
- --------------------------------------------------------------------*/
-
+/// get name
const OUString& SwDBField::GetPar1() const
{
return ((const SwDBFieldType*)GetTyp())->GetName();
@@ -469,9 +457,7 @@ bool SwDBField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
return true;
}
-/*--------------------------------------------------------------------
- Beschreibung: Basisklasse fuer alle weiteren Datenbankfelder
- --------------------------------------------------------------------*/
+// base class for all further database fields
SwDBNameInfField::SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFmt) :
SwField(pTyp, nFmt),
@@ -579,9 +565,7 @@ void SwDBNameInfField::SetSubType(sal_uInt16 nType)
nSubType = nType;
}
-/*--------------------------------------------------------------------
- Beschreibung: NaechsterDatensatz
- --------------------------------------------------------------------*/
+// next dataset
SwDBNextSetFieldType::SwDBNextSetFieldType()
: SwFieldType( RES_DBNEXTSETFLD )
@@ -595,9 +579,8 @@ SwFieldType* SwDBNextSetFieldType::Copy() const
SwDBNextSetFieldType* pTmp = new SwDBNextSetFieldType();
return pTmp;
}
-/*--------------------------------------------------------------------
- Beschreibung: SwDBSetField
- --------------------------------------------------------------------*/
+
+// SwDBSetField
SwDBNextSetField::SwDBNextSetField(SwDBNextSetFieldType* pTyp,
const String& rCond,
@@ -635,15 +618,13 @@ void SwDBNextSetField::Evaluate(SwDoc* pDoc)
pMgr->ToNextRecord(rData.sDataSource, rData.sCommand);
}
-/*--------------------------------------------------------------------
- Beschreibung: Bedingung
- --------------------------------------------------------------------*/
-
+/// get condition
const OUString& SwDBNextSetField::GetPar1() const
{
return aCond;
}
+/// set condition
void SwDBNextSetField::SetPar1(const OUString& rStr)
{
aCond = rStr;
@@ -677,9 +658,7 @@ bool SwDBNextSetField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
return bRet;
}
-/*--------------------------------------------------------------------
- Beschreibung: Datensatz mit bestimmter ID
- --------------------------------------------------------------------*/
+// dataset with certain ID
SwDBNumSetFieldType::SwDBNumSetFieldType() :
SwFieldType( RES_DBNUMSETFLD )
@@ -694,9 +673,7 @@ SwFieldType* SwDBNumSetFieldType::Copy() const
return pTmp;
}
-/*--------------------------------------------------------------------
- Beschreibung: SwDBSetField
- --------------------------------------------------------------------*/
+// SwDBNumSetField
SwDBNumSetField::SwDBNumSetField(SwDBNumSetFieldType* pTyp,
const String& rCond,
@@ -738,29 +715,25 @@ void SwDBNumSetField::Evaluate(SwDoc* pDoc)
}
}
-/*--------------------------------------------------------------------
- Beschreibung: LogDBName
- --------------------------------------------------------------------*/
-
+/// get LogDBName
const OUString& SwDBNumSetField::GetPar1() const
{
return aCond;
}
+/// set LogDBName
void SwDBNumSetField::SetPar1(const OUString& rStr)
{
aCond = rStr;
}
-/*--------------------------------------------------------------------
- Beschreibung: Bedingung
- --------------------------------------------------------------------*/
-
+/// get condition
OUString SwDBNumSetField::GetPar2() const
{
return aPar2;
}
+/// set condition
void SwDBNumSetField::SetPar2(const OUString& rStr)
{
aPar2 = rStr;
@@ -804,9 +777,7 @@ bool SwDBNumSetField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
return bRet;
}
-/*--------------------------------------------------------------------
- Beschreibung: SwDBNameFieldType
- --------------------------------------------------------------------*/
+// SwDBNameFieldType
SwDBNameFieldType::SwDBNameFieldType(SwDoc* pDocument)
: SwFieldType( RES_DBNAMEFLD )
@@ -833,9 +804,7 @@ SwFieldType* SwDBNameFieldType::Copy() const
//------------------------------------------------------------------------------
-/*--------------------------------------------------------------------
- Beschreibung: Name der angedockten DB
- --------------------------------------------------------------------*/
+// name of the connected database
SwDBNameField::SwDBNameField(SwDBNameFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFmt)
: SwDBNameInfField(pTyp, rDBData, nFmt)
@@ -871,9 +840,8 @@ bool SwDBNameField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
{
return SwDBNameInfField::PutValue(rAny, nWhichId );
}
-/*--------------------------------------------------------------------
- Beschreibung: SwDBNameFieldType
- --------------------------------------------------------------------*/
+
+// SwDBSetNumberFieldType
SwDBSetNumberFieldType::SwDBSetNumberFieldType()
: SwFieldType( RES_DBSETNUMBERFLD )
@@ -890,9 +858,7 @@ SwFieldType* SwDBSetNumberFieldType::Copy() const
//------------------------------------------------------------------------------
-/*--------------------------------------------------------------------
- Beschreibung: SetNumber der angedockten DB
- --------------------------------------------------------------------*/
+// set-number of the connected database
SwDBSetNumberField::SwDBSetNumberField(SwDBSetNumberFieldType* pTyp,
const SwDBData& rDBData,
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index a6d048e..8c2fdee 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -36,10 +36,6 @@ using namespace ::com::sun::star;
#define DDE_TXT_ENCODING osl_getThreadTextEncoding()
-/*--------------------------------------------------------------------
- Beschreibung: Globale Variablen
- --------------------------------------------------------------------*/
-
class SwIntrnlRefLink : public SwBaseLink
{
SwDDEFieldType& rFldType;
@@ -72,7 +68,7 @@ public:
String sStr( (sal_Char*)aSeq.getConstArray(), static_cast<xub_StrLen>(aSeq.getLength()),
DDE_TXT_ENCODING );
- // CR-LF am Ende entfernen, ist ueberfluessig!
+ // remove not needed CR-LF at the end
xub_StrLen n = sStr.Len();
while( n && 0 == sStr.GetChar( n-1 ) )
--n;
@@ -86,35 +82,34 @@ public:
sStr.Erase( n );
rFldType.SetExpansion( sStr );
- // erst Expansion setzen! (sonst wird das Flag geloescht!)
+ // set Expansion first! (otherwise this flag will be deleted)
rFldType.SetCRLFDelFlag( bDel );
}
break;
- // weitere Formate ...
+ // other formats
default:
return SUCCESS;
}
- OSL_ENSURE( rFldType.GetDoc(), "Kein pDoc" );
+ OSL_ENSURE( rFldType.GetDoc(), "no pDoc" );
- // keine Abhaengigen mehr?
+ // no dependencies left?
if( rFldType.GetDepends() && !rFldType.IsModifyLocked() && !ChkNoDataFlag() )
{
ViewShell* pSh;
SwEditShell* pESh = rFldType.GetDoc()->GetEditShell( &pSh );
- // dann suchen wir uns mal alle Felder. Wird kein gueltiges
- // gefunden, dann Disconnecten wir uns!
+ // Search for fields. If no valid found, disconnect.
SwMsgPoolItem aUpdateDDE( RES_UPDATEDDETBL );
int bCallModify = sal_False;
rFldType.LockModify();
SwClientIter aIter( rFldType ); // TODO
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // Could we jump to beginning?
do {
- // eine DDE-Tabelle oder ein DDE-FeldAttribut im Text
+ // a DDE table or a DDE field attribute in the text
if( !pLast->IsA( TYPE( SwFmtFld ) ) ||
((SwFmtFld*)pLast)->GetTxtFld() )
{
@@ -151,7 +146,7 @@ void SwIntrnlRefLink::Closed()
{
if( rFldType.GetDoc() && !rFldType.GetDoc()->IsInDtor() )
{
- // Advise verabschiedet sich, alle Felder in Text umwandeln ?
+ // advise goes, convert all fields into text?
ViewShell* pSh;
SwEditShell* pESh = rFldType.GetDoc()->GetEditShell( &pSh );
if( pESh )
@@ -172,13 +167,13 @@ void SwIntrnlRefLink::Closed()
const SwNode* SwIntrnlRefLink::GetAnchor() const
{
- // hier sollte irgend ein Anchor aus dem normalen Nodes-Array reichen
+ // here, any anchor of the normal NodesArray should be sufficient
const SwNode* pNd = 0;
SwClientIter aIter( rFldType ); // TODO
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // Could we jump to beginning?
do {
- // eine DDE-Tabelle oder ein DDE-FeldAttribut im Text
+ // a DDE table or a DDE field attribute in the text
if( !pLast->IsA( TYPE( SwFmtFld ) ))
{
SwDepend* pDep = (SwDepend*)pLast;
@@ -199,13 +194,13 @@ const SwNode* SwIntrnlRefLink::GetAnchor() const
sal_Bool SwIntrnlRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd,
xub_StrLen nStt, xub_StrLen nEnd ) const
{
- // hier sollte irgend ein Anchor aus dem normalen Nodes-Array reichen
+ // here, any anchor of the normal NodesArray should be sufficient
SwNodes* pNds = &rFldType.GetDoc()->GetNodes();
SwClientIter aIter( rFldType ); // TODO
SwClient * pLast = aIter.GoStart();
- if( pLast ) // konnte zum Anfang gesprungen werden ??
+ if( pLast ) // Could we jump to beginning?
do {
- // eine DDE-Tabelle oder ein DDE-FeldAttribut im Text
+ // a DDE table or a DDE field attribute in the text
if( !pLast->IsA( TYPE( SwFmtFld ) ))
{
SwDepend* pDep = (SwDepend*)pLast;
@@ -288,7 +283,7 @@ void SwDDEFieldType::SetDoc( SwDoc* pNewDoc )
if( pDoc && refLink.Is() )
{
- OSL_ENSURE( !nRefCnt, "wie kommen die Referenzen rueber?" );
+ OSL_ENSURE( !nRefCnt, "How do we get the references?" );
pDoc->GetLinkManager().Remove( refLink );
}
@@ -406,24 +401,19 @@ SwField* SwDDEField::Copy() const
return new SwDDEField((SwDDEFieldType*)GetTyp());
}
-/*--------------------------------------------------------------------
- Beschreibung: Parameter des Typen erfragen
- Name
- --------------------------------------------------------------------*/
+/// get field type name
const OUString& SwDDEField::GetPar1() const
{
return ((const SwDDEFieldType*)GetTyp())->GetName();
}
-/*--------------------------------------------------------------------
- Beschreibung: Parameter des Typen erfragen
- Commando
- --------------------------------------------------------------------*/
+/// get field type command
OUString SwDDEField::GetPar2() const
{
return ((const SwDDEFieldType*)GetTyp())->GetCmd();
}
+/// set field type command
void SwDDEField::SetPar2(const OUString& rStr)
{
((SwDDEFieldType*)GetTyp())->SetCmd(rStr);
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index 33b0cdd..063cced 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -25,7 +25,7 @@
#include <ndtxt.hxx>
#include <swtable.hxx>
#include <swddetbl.hxx>
-#include <ddefld.hxx> // fuer den FieldType
+#include <ddefld.hxx> // for FieldType
#include <ndindex.hxx>
#include <fldupde.hxx>
#include <swtblfmt.hxx>
@@ -33,18 +33,17 @@
TYPEINIT1( SwDDETable, SwTable );
- // Constructor movet alle Lines/Boxen aus der SwTable zu sich.
- // Die SwTable ist danach Leer und muss geloescht werden.
-SwDDETable::SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType,
- sal_Bool bUpdate )
+/// Ctor moves all lines/boxes from a SwTable into itself.
+/// Afterwards the SwTable is empty and must be deleted.
+SwDDETable::SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType, sal_Bool bUpdate )
: SwTable( rTable ), aDepend( this, pDDEType )
{
- // Kopiere/move die Daten der Tabelle
+ // copy the table data
m_TabSortContentBoxes.insert(rTable.GetTabSortBoxes());
rTable.GetTabSortBoxes().clear();
aLines.insert( aLines.begin(),
- rTable.GetTabLines().begin(), rTable.GetTabLines().end() ); // move die Lines
+ rTable.GetTabLines().begin(), rTable.GetTabLines().end() ); // move lines
rTable.GetTabLines().clear();
if( !aLines.empty() )
@@ -59,7 +58,6 @@ SwDDETable::SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType,
pDDEType->IncRefCnt();
// aDepend.UnlockModify();
- // Setzen der Werte in die einzelnen Boxen
// update box content only if update flag is set (false in import)
if (bUpdate)
ChangeContent();
@@ -75,7 +73,7 @@ SwDDETable::~SwDDETable()
GetTabSortBoxes()[0]->GetSttNd()->GetNodes().IsDocNodes() )
pFldTyp->DecRefCnt();
- // sind wir der letzte Abhaengige vom "geloeschten Feld" dann loesche dieses
+ // If it is the last dependant of the "deleted field" than delete it finally
if( pFldTyp->IsDeleted() && pFldTyp->IsLastDepend() )
{
pFldTyp->Remove( &aDepend );
@@ -101,16 +99,16 @@ void SwDDETable::SwClientNotify( const SwModify&, const SfxHint& rHint )
void SwDDETable::ChangeContent()
{
- OSL_ENSURE( GetFrmFmt(), "Kein FrameFormat" );
+ OSL_ENSURE( GetFrmFmt(), "No FrameFormat" );
- // Stehen wir im richtigen NodesArray (Wegen UNDO)
+ // Is this the correct NodesArray? (because of UNDO)
if( aLines.empty() )
return;
- OSL_ENSURE( !GetTabSortBoxes().empty(), "Tabelle ohne Inhalt?" );
+ OSL_ENSURE( !GetTabSortBoxes().empty(), "Table without content?" );
if( !GetTabSortBoxes()[0]->GetSttNd()->GetNodes().IsDocNodes() )
return;
- // zugriff auf den DDEFldType
+ // access to DDEFldType
SwDDEFieldType* pDDEType = (SwDDEFieldType*)aDepend.GetRegisteredIn();
String aExpand = comphelper::string::remove(pDDEType->GetExpansion(), '\r');
@@ -122,10 +120,10 @@ void SwDDETable::ChangeContent()
for( sal_uInt16 i = 0; i < pLine->GetTabBoxes().size(); ++i )
{
SwTableBox* pBox = pLine->GetTabBoxes()[ i ];
- OSL_ENSURE( pBox->GetSttIdx(), "keine InhaltsBox" );
+ OSL_ENSURE( pBox->GetSttIdx(), "no content box" );
SwNodeIndex aNdIdx( *pBox->GetSttNd(), 1 );
SwTxtNode* pTxtNode = aNdIdx.GetNode().GetTxtNode();
- OSL_ENSURE( pTxtNode, "Kein Node" );
+ OSL_ENSURE( pTxtNode, "No Node" );
SwIndex aCntIdx( pTxtNode, 0 );
pTxtNode->EraseText( aCntIdx );
pTxtNode->InsertText( aLine.GetToken( i, '\t' ), aCntIdx );
@@ -150,35 +148,35 @@ SwDDEFieldType* SwDDETable::GetDDEFldType()
sal_Bool SwDDETable::NoDDETable()
{
- // suche den TabellenNode
- OSL_ENSURE( GetFrmFmt(), "Kein FrameFormat" );
+ // search table node
+ OSL_ENSURE( GetFrmFmt(), "No FrameFormat" );
SwDoc* pDoc = GetFrmFmt()->GetDoc();
- // Stehen wir im richtigen NodesArray (Wegen UNDO)
+ // Is this the correct NodesArray? (because of UNDO)
if( aLines.empty() )
return sal_False;
- OSL_ENSURE( !GetTabSortBoxes().empty(), "Tabelle ohne Inhalt?" );
+ OSL_ENSURE( !GetTabSortBoxes().empty(), "Table without content?" );
SwNode* pNd = (SwNode*)GetTabSortBoxes()[0]->GetSttNd();
if( !pNd->GetNodes().IsDocNodes() )
return sal_False;
SwTableNode* pTblNd = pNd->FindTableNode();
- OSL_ENSURE( pTblNd, "wo steht denn die Tabelle ?");
+ OSL_ENSURE( pTblNd, "Where is the table?");
SwTable* pNewTbl = new SwTable( *this );
- // Kopiere/move die Daten der Tabelle
- pNewTbl->GetTabSortBoxes().insert( GetTabSortBoxes() ); // move die Inh. Boxen
+ // copy the table data
+ pNewTbl->GetTabSortBoxes().insert( GetTabSortBoxes() ); // move content boxes
GetTabSortBoxes().clear();
pNewTbl->GetTabLines().insert( pNewTbl->GetTabLines().begin(),
- GetTabLines().begin(), GetTabLines().end() ); // move die Lines
+ GetTabLines().begin(), GetTabLines().end() ); // move lines
GetTabLines().clear();
if( pDoc->GetCurrentViewShell() ) //swmod 071108//swmod 071225
((SwDDEFieldType*)aDepend.GetRegisteredIn())->DecRefCnt();
- pTblNd->SetNewTable( pNewTbl ); // setze die Tabelle
+ pTblNd->SetNewTable( pNewTbl ); // replace table
return sal_True;
}
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index a7aa86a..c9455cb 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -100,9 +100,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace nsSwDocInfoSubType;
-/*--------------------------------------------------------------------
- Beschreibung: SwPageNumberFieldType
- --------------------------------------------------------------------*/
+// SwPageNumberFieldType
SwPageNumberFieldType::SwPageNumberFieldType()
: SwFieldType( RES_PAGENUMBERFLD ),
@@ -137,10 +135,6 @@ SwFieldType* SwPageNumberFieldType::Copy() const
return pTmp;
}
-/*--------------------------------------------------------------------
- Beschreibung: Verschiedene Expandierung
- --------------------------------------------------------------------*/
-
void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc,
sal_Bool bVirt,
const sal_Int16* pNumFmt )
@@ -151,8 +145,7 @@ void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc,
bVirtuell = false;
if( bVirt )
{
- // dann muss das Flag ueberprueft werden, denn das Layout setzt
- // es NIE zurueck
+ // check the flag since the layout NEVER sets it back
const SfxItemPool &rPool = pDoc->GetAttrPool();
const SwFmtPageDesc *pDesc;
sal_uInt32 nMaxItems = rPool.GetItemCount2( RES_PAGEDESC );
@@ -176,9 +169,7 @@ void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc,
}
}
-/*--------------------------------------------------------------------
- Beschreibung: SwPageNumberField
- --------------------------------------------------------------------*/
+// SwPageNumberField
SwPageNumberField::SwPageNumberField(SwPageNumberFieldType* pTyp,
sal_uInt16 nSub, sal_uInt32 nFmt, short nOff,
@@ -325,9 +316,7 @@ bool SwPageNumberField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
}
return bRet;
}
-/*--------------------------------------------------------------------
- Beschreibung: SwAuthorFieldType
- --------------------------------------------------------------------*/
+// SwAuthorFieldType
SwAuthorFieldType::SwAuthorFieldType()
: SwFieldType( RES_AUTHORFLD )
@@ -350,9 +339,7 @@ SwFieldType* SwAuthorFieldType::Copy() const
return new SwAuthorFieldType;
}
-/*--------------------------------------------------------------------
- Beschreibung: SwAuthorField
- --------------------------------------------------------------------*/
+// SwAuthorField
SwAuthorField::SwAuthorField(SwAuthorFieldType* pTyp, sal_uInt32 nFmt)
: SwField(pTyp, nFmt)
@@ -427,9 +414,7 @@ bool SwAuthorField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
return true;
}
-/*--------------------------------------------------------------------
- Beschreibung: SwFileNameFieldType
- --------------------------------------------------------------------*/
+// SwFileNameFieldType
SwFileNameFieldType::SwFileNameFieldType(SwDoc *pDocument)
: SwFieldType( RES_FILENAMEFLD )
@@ -491,9 +476,8 @@ SwFieldType* SwFileNameFieldType::Copy() const
SwFieldType *pTmp = new SwFileNameFieldType(pDoc);
return pTmp;
}
-/*--------------------------------------------------------------------
- Beschreibung: SwFileNameField
- --------------------------------------------------------------------*/
+
+// SwFileNameField
SwFileNameField::SwFileNameField(SwFileNameFieldType* pTyp, sal_uInt32 nFmt)
: SwField(pTyp, nFmt)
@@ -605,9 +589,8 @@ bool SwFileNameField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
}
return true;
}
-/*--------------------------------------------------------------------
- Beschreibung: SwTemplNameFieldType
- --------------------------------------------------------------------*/
+
+// SwTemplNameFieldType
SwTemplNameFieldType::SwTemplNameFieldType(SwDoc *pDocument)
: SwFieldType( RES_TEMPLNAMEFLD )
@@ -669,9 +652,7 @@ SwFieldType* SwTemplNameFieldType::Copy() const
SwFieldType *pTmp = new SwTemplNameFieldType(pDoc);
return pTmp;
}
-/*--------------------------------------------------------------------
- Beschreibung: SwTemplNameField
- --------------------------------------------------------------------*/
+// SwTemplNameField
SwTemplNameField::SwTemplNameField(SwTemplNameFieldType* pTyp, sal_uInt32 nFmt)
: SwField(pTyp, nFmt)
@@ -752,9 +733,8 @@ bool SwTemplNameField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
}
return true;
}
-/*--------------------------------------------------------------------
- Beschreibung: SwDocStatFieldType
- --------------------------------------------------------------------*/
+
+// SwDocStatFieldType
SwDocStatFieldType::SwDocStatFieldType(SwDoc* pDocument)
: SwFieldType( RES_DOCSTATFLD ), nNumberingType( SVX_NUM_ARABIC )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list