summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorStefan Knorr (astron) <heinzlesspam@gmail.com>2012-01-14 14:05:10 +0100
committerStefan Knorr (astron) <heinzlesspam@gmail.com>2012-01-14 20:49:06 +0100
commitdf8dfbd6563e2d35bc4d8563d7ddaa779e4c2fe3 (patch)
tree146ef015c9fc7c66aa973eaef9edf35bb7ad4a4a /sw
parente4938058e2cc21c705507c365c46f9bfb9ac828c (diff)
Remove a few left-over FIXME's from comment translations
See also: 5513e24eeaca20a12aac338a722fc9ba81c7c833
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/doc/docnew.cxx17
1 files changed, 8 insertions, 9 deletions
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 1ba11b876ee6..21194b148fe3 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -390,7 +390,7 @@ SwDoc::SwDoc()
// Set to "Empty Page"
pEmptyPageFmt->SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE ) );
- // Set BodyFmt for "Column Setting" Spalten Einstellen. FIXME: WHAT?
+ // Set BodyFmt for columns
pColumnContFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT ) );
_InitFieldTypes();
@@ -560,12 +560,12 @@ SwDoc::~SwDoc()
pSpzFrmFmtTbl->ForEach( &lcl_DelFmtIndizes, this );
((SwFrmFmts&)*pSectionFmtTbl).ForEach( &lcl_DelFmtIndizes, this );
- // The Formats that come hereafter are depended on the
- // DefaultFormats.
- // FIXME: What?
- // FIXME: Erst nach dem Loeschen der FmtIndizes weil der Inhalt von
- // FIXME: Kopf-/Fussbereichen geloescht wird. Wenn dort noch Indizes von Flys
- // FIXME: angemeldet sind gibts was an die Ohren.
+ // The formattings that come hereafter depend on the default formattings.
+ // [Destroy] these only after destroying the FmtIndices, because the content
+ // of headers/footers has to be deleted as well. If in the headers/footers
+ // there are still Flys registered at that point, we have a problem.
+ // (This comment might have been translated incorrectly. Blame the bad
+ // German original)
aPageDescs.DeleteAndDestroy( 0, aPageDescs.Count() );
// Delete content selections.
@@ -627,7 +627,7 @@ SwDoc::~SwDoc()
DELETEZ( pLinkMgr );
// Clear the Tables before deleting them, or we crash due to
- // FIXME: Def-Abhängigen
+ // definition dependencies.
// We also convert the arrays (due to includes) to pointers.
delete pFrmFmtTbl;
delete pSpzFrmFmtTbl;
@@ -727,7 +727,6 @@ void SwDoc::SetDocShell( SwDocShell* pDSh )
}
pLinkMgr->SetPersist( pDocShell );
- // Bug 55570 - Set the DocShell pointer also in the DrawModel
if( pDrawModel )
{
((SwDrawDocument*)pDrawModel)->SetObjectShell( pDocShell );