summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-07-28 00:47:22 +0200
committerMichael Stahl <mstahl@redhat.com>2012-07-28 00:48:22 +0200
commitbcee196287027b4fde406eec73e10f93dcd8ddd8 (patch)
tree6e097d8bd3268b3d74bb84e0aa7b154cf55e4e42 /filter
parentce66ded6fe2a291301c8e075be67347211d4309d (diff)
SvxMSDffManager::CheckTxBxStoryChain: translate comments
Change-Id: I24643236d0beda0e91576119ed42d296d7dfdd71
Diffstat (limited to 'filter')
-rw-r--r--filter/source/msfilter/msdffimp.cxx21
1 files changed, 9 insertions, 12 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 01ccaca71476..cd44fd9e7074 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5903,8 +5903,7 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL )
void SvxMSDffManager::CheckTxBxStoryChain()
{
m_pShapeInfosById.reset(new SvxMSDffShapeInfos_ById);
- // altes Info-Array ueberarbeiten
- // (ist sortiert nach nTxBxComp)
+ // mangle old Info array, sorted by nTxBxComp
sal_uLong nChain = ULONG_MAX;
sal_Bool bSetReplaceFALSE = sal_False;
for (SvxMSDffShapeInfos_ByTxBxComp::iterator iter =
@@ -5916,21 +5915,21 @@ void SvxMSDffManager::CheckTxBxStoryChain()
if( pObj->nTxBxComp )
{
pObj->bLastBoxInChain = sal_False;
- // Gruppenwechsel ?
+ // group change?
// #156763#
// the text id also contains an internal drawing container id
// to distinguish between text id of drawing objects in different
// drawing containers.
if( nChain != pObj->nTxBxComp )
{
- // voriger war letzter seiner Gruppe
+ // previous was last of its group
if (iter != m_pShapeInfosByTxBxComp->begin())
{
SvxMSDffShapeInfos_ByTxBxComp::iterator prev(iter);
--prev;
(*prev)->bLastBoxInChain = true;
}
- // Merker und Hilfs-Flag zuruecksetzen
+ // reset mark and helper flag
mark = iter;
nChain = pObj->nTxBxComp;
bSetReplaceFALSE = !pObj->bReplaceByFly;
@@ -5938,10 +5937,9 @@ void SvxMSDffManager::CheckTxBxStoryChain()
else
if( !pObj->bReplaceByFly )
{
- // Objekt, das NICHT durch Rahmen ersetzt werden darf ?
- // Hilfs-Flag setzen
+ // object that must NOT be replaced by frame?
bSetReplaceFALSE = sal_True;
- // ggfs Flag in Anfang der Gruppe austragen
+ // maybe reset flags in start of group
for (SvxMSDffShapeInfos_ByTxBxComp::iterator itemp = mark;
itemp != iter; ++itemp)
{
@@ -5954,17 +5952,16 @@ void SvxMSDffManager::CheckTxBxStoryChain()
pObj->bReplaceByFly = sal_False;
}
}
- // alle Shape-Info-Objekte in pShapeInfos umkopieren
- // (aber nach nShapeId sortieren)
+ // copy all Shape Info objects to m_pShapeInfosById, sorted by nShapeId
pObj->nTxBxComp = pObj->nTxBxComp & 0xFFFF0000;
m_pShapeInfosById->insert( pObj );
}
- // voriger war letzter seiner Gruppe
+ // last one was last of its group
if (!m_pShapeInfosByTxBxComp->empty())
{
(*m_pShapeInfosByTxBxComp->rbegin())->bLastBoxInChain = true;
}
- // urspruengliches Array freigeben, ohne Objekte zu zerstoeren
+ // free original array but don't free its elements
m_pShapeInfosByTxBxComp.reset();
}