summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Weissenbacher <p.weissenbacher@gmail.com>2012-06-07 13:33:49 +0200
committerPhilipp Weissenbacher <p.weissenbacher@gmail.com>2012-06-12 14:52:24 +0200
commit5836cd33b60c574489fe0b46a671db76d3ca547b (patch)
treed4b25b412a922499e24be948355cad21b27d2b07
parent8bee7215898d8784eb20bc43af1df3ed815288a6 (diff)
Translate German comments
Change-Id: I96606cc97afb4fab6af45b116c265b1b3c584e00
-rw-r--r--sw/source/core/tox/tox.cxx30
-rw-r--r--sw/source/core/tox/toxhlp.cxx12
-rw-r--r--sw/source/core/tox/txmsrt.cxx70
3 files changed, 54 insertions, 58 deletions
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 06a3ef85153c..373143543f75 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -155,7 +155,7 @@ SwFormTokens lcl_GetAuthPattern(sal_uInt16 nTypeId)
return aRet;
}
/*--------------------------------------------------------------------
- Beschreibung: Verzeichnis-Markierungen D/Ctor
+ TOX dtor and ctor
--------------------------------------------------------------------*/
@@ -211,7 +211,7 @@ void SwTOXMark::RegisterToTOXType( SwTOXType& rMark )
int SwTOXMark::operator==( const SfxPoolItem& rAttr ) const
{
- OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+ OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "Attributes are not the same" );
return GetRegisteredIn() == ((SwTOXMark&)rAttr).GetRegisteredIn();
}
@@ -246,7 +246,7 @@ String SwTOXMark::GetText() const
else if( pTxtAttr && pTxtAttr->GetpTxtNd() )
{
xub_StrLen* pEndIdx = pTxtAttr->GetEnd();
- OSL_ENSURE( pEndIdx, "TOXMark ohne Mark!!");
+ OSL_ENSURE( pEndIdx, "TOXMark without mark!");
if( pEndIdx )
{
const xub_StrLen nStt = *pTxtAttr->GetStart();
@@ -269,7 +269,7 @@ void SwTOXMark::InsertTOXMarks( SwTOXMarks& aMarks, const SwTOXType& rType )
}
/*--------------------------------------------------------------------
- Beschreibung: Typen von Verzeichnissen verwalten
+ Manage types of TOX
--------------------------------------------------------------------*/
SwTOXType::SwTOXType( TOXTypes eTyp, const String& rName )
@@ -288,7 +288,7 @@ SwTOXType::SwTOXType(const SwTOXType& rCopy)
}
/*--------------------------------------------------------------------
- Beschreibung: Formen bearbeiten
+ Edit forms
--------------------------------------------------------------------*/
SwForm::SwForm( TOXTypes eTyp ) // #i21237#
@@ -300,10 +300,10 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
bGenerateTabPos = sal_False;
bIsRelTabPos = sal_True;
- // Inhaltsverzeichnis hat entsprechend Anzahl Headlines + Ueberschrift
- // Benutzer hat 10 Ebenen + Ueberschrift
- // Stichwort hat 3 Ebenen + Ueberschrift + Trenner
- // indexes of tables, objects illustrations and authorities consist of a heading and one level
+ // The table of contents has a certain number of headlines + headings
+ // The user has 10 levels + headings
+ // Keyword has 3 levels + headings Ueberschrift + seperator
+ // Indexes of tables, object illustrations and authorities consist of a heading and one level
sal_uInt16 nPoolId;
switch( eType )
@@ -316,7 +316,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
case TOX_TABLES : nPoolId = STR_POOLCOLL_TOX_TABLESH; break;
case TOX_AUTHORITIES : nPoolId = STR_POOLCOLL_TOX_AUTHORITIESH; break;
default:
- OSL_ENSURE( !this, "ungueltiger TOXTyp");
+ OSL_ENSURE( !this, "invalid TOXTyp");
return ;
}
@@ -371,7 +371,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
}
}
else
- for( sal_uInt16 i = 1; i < GetFormMax(); ++i, ++nPoolId ) // Nr 0 ist der Titel
+ for( sal_uInt16 i = 1; i < GetFormMax(); ++i, ++nPoolId ) // Number 0 is the title
{
if(TOX_AUTHORITIES == eType)
SetPattern(i, lcl_GetAuthPattern(i));
@@ -510,7 +510,7 @@ void SwForm::AdjustTabStops(SwDoc& rDoc, sal_Bool bInsertNewTapStops) // #i21237
}
}
/*--------------------------------------------------------------------
- Beschreibung: Ctor TOXBase
+ Ctor TOXBase
--------------------------------------------------------------------*/
@@ -597,7 +597,7 @@ SwTOXBase& SwTOXBase::CopyTOXBase( SwDoc* pDoc, const SwTOXBase& rSource )
}
/*--------------------------------------------------------------------
- Beschreibung: Verzeichnisspezifische Funktionen
+ TOX specific functions
--------------------------------------------------------------------*/
SwTOXBase::~SwTOXBase()
@@ -703,7 +703,7 @@ String SwFormToken::GetString() const
else if(TOKEN_CHAPTER_INFO == eTokenType)
{
sRet += String::CreateFromInt32( nChapterFormat );
-//add maximum permetted level
+ // add maximum permitted level
sRet += ',';
sRet += String::CreateFromInt32( nOutlineLevel );
}
@@ -723,7 +723,7 @@ String SwFormToken::GetString() const
else if(TOKEN_ENTRY_NO == eTokenType)
{
sRet += String::CreateFromInt32( nChapterFormat );
-//add maximum permitted level
+ // add maximum permitted level
sRet += ',';
sRet += String::CreateFromInt32( nOutlineLevel );
}
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index 970cb291463b..e1a314084b3c 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -60,7 +60,7 @@ IndexEntrySupplierWrapper::IndexEntrySupplierWrapper()
)
{
#if OSL_DEBUG_LEVEL > 0
- rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("IndexEntrySupplierWrapper: Exception caught\n"));
+ rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("IndexEntrySupplierWrapper: Caught exception\n"));
aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
OSL_FAIL( aMsg.getStr() );
#endif
@@ -86,7 +86,7 @@ String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt,
)
{
#if OSL_DEBUG_LEVEL > 0
- rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("getIndexKey: Exception caught\n"));
+ rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("getIndexKey: Caught exception\n"));
aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
OSL_FAIL( aMsg.getStr() );
#endif
@@ -107,7 +107,7 @@ String IndexEntrySupplierWrapper::GetFollowingText( sal_Bool bMorePages ) const
)
{
#if OSL_DEBUG_LEVEL > 0
- rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("getIndexFollowPageWord: Exception caught\n"));
+ rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("getIndexFollowPageWord: Caught exception\n"));
aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
OSL_FAIL( aMsg.getStr() );
#endif
@@ -130,7 +130,7 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const ::com::sun::star::lang::Local
)
{
#if OSL_DEBUG_LEVEL > 0
- rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("getAlgorithmList: Exception caught\n"));
+ rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("getAlgorithmList: Caught exception\n"));
aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
OSL_FAIL( aMsg.getStr() );
#endif
@@ -153,7 +153,7 @@ sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
)
{
#if OSL_DEBUG_LEVEL > 0
- rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("loadAlgorithm: Exception caught\n"));
+ rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("loadAlgorithm: Caught exception\n"));
aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
OSL_FAIL( aMsg.getStr() );
#endif
@@ -179,7 +179,7 @@ sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
)
{
#if OSL_DEBUG_LEVEL > 0
- rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("compareIndexEntry: Exception caught\n"));
+ rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("compareIndexEntry: Caught exception\n"));
aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
OSL_FAIL( aMsg.getStr() );
#endif
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index e6f18c1bcae8..a515b1665987 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -59,7 +59,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using ::rtl::OUString;
/*--------------------------------------------------------------------
- Beschreibung: Strings initialisieren
+ Initialize strings
--------------------------------------------------------------------*/
sal_uInt16 SwTOXSortTabBase::nOpt = 0;
@@ -140,7 +140,7 @@ String SwTOXInternational::GetFollowingText( sal_Bool bMorePages ) const
}
/*--------------------------------------------------------------------
- Beschreibung: SortierElement fuer Verzeichniseintraege
+ SortElement for TOX entries
--------------------------------------------------------------------*/
@@ -170,11 +170,11 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd,
case TOX_SORT_CONTENT:
case TOX_SORT_PARA:
case TOX_SORT_TABLE:
- // falls sie in Sonderbereichen stehen, sollte man die
- // Position im Body besorgen
+ // If they are in a special areas, we should get the position at the
+ // body
if( nPos < pNd->GetNodes().GetEndOfExtras().GetIndex() )
{
- // dann die "Anker" (Body) Position holen.
+ // Then get the 'anchor' (body) position
Point aPt;
const SwCntntFrm* pFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), &aPt, 0, sal_False );
if( pFrm )
@@ -226,8 +226,8 @@ sal_Bool SwTOXSortTabBase::operator==( const SwTOXSortTabBase& rCmp )
if( bRet )
{
- // beide Pointer vorhanden -> vergleiche Text
- // beide Pointer nicht vorhanden -> vergleiche AlternativText
+ // Both pointers exist -> compare text
+ // else -> compare AlternativeText
const xub_StrLen *pEnd = pTxtMark->GetEnd(),
*pEndCmp = rCmp.pTxtMark->GetEnd();
@@ -282,8 +282,8 @@ sal_Bool SwTOXSortTabBase::operator<( const SwTOXSortTabBase& rCmp )
String sOtherTxtReading;
rCmp.GetTxt( sOtherTxt, sOtherTxtReading );
- // beide Pointer vorhanden -> vergleiche Text
- // beide Pointer nicht vorhanden -> vergleiche AlternativText
+ // Both pointers exist -> compare text
+ // else -> compare AlternativeText
if( ( pEnd && pEndCmp ) || ( !pEnd && !pEndCmp ) )
pTOXIntl->IsEqual( sMyTxt, sMyTxtReading, GetLocale(),
sOtherTxt, sOtherTxtReading, rCmp.GetLocale() );
@@ -303,7 +303,7 @@ sal_Bool SwTOXSortTabBase::operator<( const SwTOXSortTabBase& rCmp )
}
/*--------------------------------------------------------------------
- Beschreibung: sortierter Stichworteintrag
+ Sorted keyword entry
--------------------------------------------------------------------*/
@@ -320,7 +320,7 @@ SwTOXIndex::SwTOXIndex( const SwTxtNode& rNd,
}
//
-// Stichworte vergleichen. Bezieht sich nur auf den Text
+// Compare keywords. Only relates to the text.
//
@@ -328,11 +328,11 @@ sal_Bool SwTOXIndex::operator==( const SwTOXSortTabBase& rCmpBase )
{
SwTOXIndex& rCmp = (SwTOXIndex&)rCmpBase;
- // In Abhaengigkeit von den Optionen Grosskleinschreibung beachten
+ // Respect case taking dependencies into account
if(GetLevel() != rCmp.GetLevel() || nKeyLevel != rCmp.nKeyLevel)
return sal_False;
- OSL_ENSURE(pTxtMark, "pTxtMark == 0, Kein Stichwort");
+ OSL_ENSURE(pTxtMark, "pTxtMark == 0, No keyword");
String sMyTxt;
String sMyTxtReading;
@@ -345,7 +345,7 @@ sal_Bool SwTOXIndex::operator==( const SwTOXSortTabBase& rCmpBase )
sal_Bool bRet = pTOXIntl->IsEqual( sMyTxt, sMyTxtReading, GetLocale(),
sOtherTxt, sOtherTxtReading, rCmp.GetLocale() );
- // Wenn nicht zusammengefasst wird muss die Pos aus gewertet werden
+ // If we don't summarize we need to evaluate the Pos
if(bRet && !(GetOptions() & nsSwTOIOptions::TOI_SAME_ENTRY))
bRet = nPos == rCmp.nPos;
@@ -353,13 +353,13 @@ sal_Bool SwTOXIndex::operator==( const SwTOXSortTabBase& rCmpBase )
}
//
-// kleiner haengt nur vom Text ab
+// operator, only depends on the text
sal_Bool SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase )
{
SwTOXIndex& rCmp = (SwTOXIndex&)rCmpBase;
- OSL_ENSURE(pTxtMark, "pTxtMark == 0, Kein Stichwort");
+ OSL_ENSURE(pTxtMark, "pTxtMark == 0, No keyword");
String sMyTxt;
String sMyTxtReading;
@@ -373,7 +373,7 @@ sal_Bool SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase )
pTOXIntl->IsLess( sMyTxt, sMyTxtReading, GetLocale(),
sOtherTxt, sOtherTxtReading, rCmp.GetLocale() );
- // Wenn nicht zusammengefasst wird muss die Pos aus gewertet werden
+ // If we don't summarize we need to evaluate the Pos
if( !bRet && !(GetOptions() & nsSwTOIOptions::TOI_SAME_ENTRY) )
{
bRet = pTOXIntl->IsEqual( sMyTxt, sMyTxtReading, GetLocale(),
@@ -385,11 +385,11 @@ sal_Bool SwTOXIndex::operator<( const SwTOXSortTabBase& rCmpBase )
}
//
-// Das Stichwort selbst
+// The keyword itself
void SwTOXIndex::GetText_Impl( String& rTxt, String& rTxtReading ) const
{
- OSL_ENSURE(pTxtMark, "pTxtMark == 0, Kein Stichwort");
+ OSL_ENSURE(pTxtMark, "pTxtMark == 0, No keyword");
const SwTOXMark& rTOXMark = pTxtMark->GetTOXMark();
switch(nKeyLevel)
{
@@ -447,7 +447,7 @@ void SwTOXIndex::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16 )
sal_uInt16 SwTOXIndex::GetLevel() const
{
- OSL_ENSURE(pTxtMark, "pTxtMark == 0, Kein Stichwort");
+ OSL_ENSURE(pTxtMark, "pTxtMark == 0, No keyword");
sal_uInt16 nForm = FORM_PRIMARY_KEY;
@@ -462,7 +462,7 @@ sal_uInt16 SwTOXIndex::GetLevel() const
}
/*--------------------------------------------------------------------
- Beschreibung: Schluessel und Trennzeichen
+ Key and separator
--------------------------------------------------------------------*/
@@ -522,7 +522,7 @@ void SwTOXCustom::GetText_Impl( String& rTxt, String &rTxtReading ) const
/*--------------------------------------------------------------------
- Beschreibung: sortierter Inhaltsverz. Eintrag
+ Sorts the TOX entries
--------------------------------------------------------------------*/
@@ -533,8 +533,7 @@ SwTOXContent::SwTOXContent( const SwTxtNode& rNd, const SwTxtTOXMark* pMark,
}
-// Der Text des Inhalts
-//
+// The content's text
void SwTOXContent::GetText_Impl( String& rTxt, String& rTxtReading ) const
{
@@ -567,7 +566,7 @@ void SwTOXContent::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, sal_uInt16
}
//
-// Die Ebene fuer Anzeige
+// The level for displaying it
//
@@ -577,14 +576,11 @@ sal_uInt16 SwTOXContent::GetLevel() const
}
/*--------------------------------------------------------------------
- Beschreibung: Verzeichnis aus Absaetzen zusammengesammelt
+ TOX assembled from paragraphs
+ Watch out for OLE/graphics when sorting!
+ The position must not come from the document, but from the "anchor"!
--------------------------------------------------------------------*/
-// bei Sortierung von OLE/Grafiken aufpassen !!!
-// Die Position darf nicht die im Dokument,
-// sondern muss die vom "Henkel" sein !!
-
-
SwTOXPara::SwTOXPara( const SwCntntNode& rNd, SwTOXElement eT, sal_uInt16 nLevel )
: SwTOXSortTabBase( TOX_SORT_PARA, &rNd, 0, 0 ),
eType( eT ),
@@ -615,13 +611,13 @@ void SwTOXPara::GetText_Impl( String& rTxt, String& ) const
case nsSwTOXElement::TOX_GRAPHIC:
case nsSwTOXElement::TOX_FRAME:
{
- // suche das FlyFormat, dort steht der Object/Grafik-Name
+ // Find the FlyFormat; the object/graphic name is there
SwFrmFmt* pFly = pNd->GetFlyFmt();
if( pFly )
rTxt = pFly->GetName();
else
{
- OSL_ENSURE( !this, "Grafik/Object ohne Namen" );
+ OSL_ENSURE( !this, "Graphic/object without name" );
sal_uInt16 nId = nsSwTOXElement::TOX_OLE == eType
? STR_OBJECT_DEFNAME
: nsSwTOXElement::TOX_GRAPHIC == eType
@@ -662,7 +658,7 @@ sal_uInt16 SwTOXPara::GetLevel() const
if( nsSwTOXElement::TOX_OUTLINELEVEL == eType && pNd->GetTxtNode() )
{
- const int nTmp = ((SwTxtNode*)pNd)->GetAttrOutlineLevel();//#outline level,zhaojianwei????
+ const int nTmp = ((SwTxtNode*)pNd)->GetAttrOutlineLevel();
if(nTmp != 0 )
nRet = static_cast<sal_uInt16>(nTmp);
}
@@ -695,7 +691,7 @@ String SwTOXPara::GetURL() const
case nsSwTOXElement::TOX_GRAPHIC:
case nsSwTOXElement::TOX_FRAME:
{
- // suche das FlyFormat, dort steht der Object/Grafik-Name
+ // Find the FlyFormat; the object/graphic name is there
SwFrmFmt* pFly = pNd->GetFlyFmt();
if( pFly )
{
@@ -720,7 +716,7 @@ String SwTOXPara::GetURL() const
/*--------------------------------------------------------------------
- Beschreibung: Tabelle
+ Table
--------------------------------------------------------------------*/
@@ -740,7 +736,7 @@ void SwTOXTable::GetText_Impl( String& rTxt, String& ) const
}
else
{
- OSL_ENSURE( !this, "Wo ist meine Tabelle geblieben?" );
+ OSL_ENSURE( !this, "Where's my table?" );
rTxt = SW_RESSTR( STR_TABLE_DEFNAME );
}
}