[Libreoffice-commits] .: 3 commits - sw/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Mon Jan 31 03:21:46 PST 2011
sw/source/core/access/acccontext.cxx | 36 +-----
sw/source/core/access/acccontext.hxx | 48 +--------
sw/source/core/access/accdoc.cxx | 6 -
sw/source/core/access/accdoc.hxx | 2
sw/source/core/access/accframe.cxx | 6 -
sw/source/core/access/accframe.hxx | 3
sw/source/core/access/accfrmobj.hxx | 5
sw/source/core/access/accnotextframe.cxx | 12 --
sw/source/core/access/accnotextframe.hxx | 7 -
sw/source/core/access/accpara.cxx | 112 +++++++--------------
sw/source/core/access/accpara.hxx | 44 ++------
sw/source/core/access/accportions.cxx | 8 -
sw/source/core/access/accportions.hxx | 2
sw/source/core/access/accselectionhelper.cxx | 2
sw/source/core/access/accselectionhelper.hxx | 2
sw/source/core/access/acctable.cxx | 92 +++++------------
sw/source/core/access/acctable.hxx | 11 --
sw/source/core/access/acctextframe.cxx | 13 --
sw/source/core/access/acctextframe.hxx | 5
sw/source/core/access/textmarkuphelper.cxx | 10 -
sw/source/core/access/textmarkuphelper.hxx | 11 --
sw/source/core/bastyp/calc.cxx | 4
sw/source/core/crsr/swcrsr.cxx | 2
sw/source/core/doc/docdesc.cxx | 4
sw/source/core/doc/docnew.cxx | 4
sw/source/core/doc/docredln.cxx | 5
sw/source/core/doc/notxtfrm.cxx | 18 +--
sw/source/filter/ascii/parasc.cxx | 12 --
sw/source/filter/basflt/fltini.cxx | 6 -
sw/source/filter/basflt/shellio.cxx | 22 +---
sw/source/filter/html/css1atr.cxx | 4
sw/source/filter/html/htmlatr.cxx | 8 -
sw/source/filter/html/htmlbas.cxx | 2
sw/source/filter/html/htmlcss1.cxx | 1
sw/source/filter/html/htmldraw.cxx | 12 +-
sw/source/filter/html/htmlfly.cxx | 3
sw/source/filter/html/htmlform.cxx | 5
sw/source/filter/html/htmlgrin.cxx | 2
sw/source/filter/html/htmlnum.cxx | 19 +--
sw/source/filter/html/htmlplug.cxx | 2
sw/source/filter/html/htmltab.cxx | 15 +-
sw/source/filter/html/htmltabw.cxx | 2
sw/source/filter/html/svxcss1.cxx | 1
sw/source/filter/html/swhtml.cxx | 23 ++--
sw/source/filter/html/wrthtml.cxx | 1
sw/source/filter/inc/fltini.hxx | 1
sw/source/filter/inc/fltshell.hxx | 2
sw/source/filter/rtf/rtffld.cxx | 4
sw/source/filter/rtf/rtffly.cxx | 53 ++++------
sw/source/filter/rtf/rtfnum.cxx | 18 +--
sw/source/filter/rtf/rtftbl.cxx | 11 --
sw/source/filter/rtf/swparrtf.cxx | 45 +++-----
sw/source/filter/rtf/swparrtf.hxx | 4
sw/source/filter/writer/wrtswtbl.cxx | 3
sw/source/filter/ww8/docxattributeoutput.cxx | 2
sw/source/filter/ww8/escher.hxx | 6 -
sw/source/filter/ww8/fields.cxx | 3
sw/source/filter/ww8/rtfattributeoutput.cxx | 3
sw/source/filter/ww8/rtfexport.cxx | 3
sw/source/filter/ww8/writerhelper.cxx | 25 +---
sw/source/filter/ww8/writerhelper.hxx | 10 -
sw/source/filter/ww8/writerwordglue.cxx | 1
sw/source/filter/ww8/wrtw8esh.cxx | 43 ++------
sw/source/filter/ww8/wrtw8nds.cxx | 26 +---
sw/source/filter/ww8/wrtw8num.cxx | 33 ++----
sw/source/filter/ww8/wrtw8sty.cxx | 5
sw/source/filter/ww8/wrtww8.cxx | 17 +--
sw/source/filter/ww8/wrtww8.hxx | 8 -
sw/source/filter/ww8/wrtww8gr.cxx | 7 -
sw/source/filter/ww8/ww8atr.cxx | 59 +++--------
sw/source/filter/ww8/ww8graf.cxx | 96 +++++++-----------
sw/source/filter/ww8/ww8graf.hxx | 9 -
sw/source/filter/ww8/ww8graf2.cxx | 20 +--
sw/source/filter/ww8/ww8par.cxx | 126 ++++++++----------------
sw/source/filter/ww8/ww8par.hxx | 22 +---
sw/source/filter/ww8/ww8par2.cxx | 102 +++++++------------
sw/source/filter/ww8/ww8par2.hxx | 1
sw/source/filter/ww8/ww8par3.cxx | 70 ++++---------
sw/source/filter/ww8/ww8par4.cxx | 1
sw/source/filter/ww8/ww8par5.cxx | 58 ++++-------
sw/source/filter/ww8/ww8par6.cxx | 103 +++++++------------
sw/source/filter/ww8/ww8scan.cxx | 17 +--
sw/source/filter/ww8/ww8scan.hxx | 11 --
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 2
sw/source/filter/xml/swxml.cxx | 38 ++-----
sw/source/filter/xml/wrtxml.cxx | 4
sw/source/filter/xml/xmlexp.cxx | 20 +--
sw/source/filter/xml/xmlexp.hxx | 3
sw/source/filter/xml/xmlfmt.cxx | 4
sw/source/filter/xml/xmlfmte.cxx | 3
sw/source/filter/xml/xmlimp.cxx | 46 ++------
sw/source/filter/xml/xmlimp.hxx | 3
sw/source/filter/xml/xmliteme.cxx | 1
sw/source/filter/xml/xmlitemi.cxx | 1
sw/source/filter/xml/xmltble.cxx | 8 -
sw/source/filter/xml/xmltbli.cxx | 27 +----
sw/source/filter/xml/xmltext.cxx | 2
sw/source/filter/xml/xmltexte.cxx | 4
sw/source/filter/xml/xmltexti.cxx | 4
99 files changed, 657 insertions(+), 1155 deletions(-)
New commits:
commit 9b2007e17002b0e1f251cf41f898fbd08a0b3501
Author: shirahara <luixxiul at gmail.com>
Date: Sat Jan 29 18:12:26 2011 +0900
easyhacks: remove bogus comments
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 00bd963..0c37188 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -721,8 +721,8 @@ void SwCalc::Pop( const VoidPtr )
SwCalcOper SwCalc::GetToken()
{
#if OSL_DEBUG_LEVEL > 1
-//JP 25.01.2001: static for switch back to the "old" implementation of the
-// calculator, which don't use the I18N routines.
+//static for switch back to the "old" implementation of the
+//calculator, which don't use the I18N routines.
static int nUseOld = 0;
if( !nUseOld )
{
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 3842154..afdcc92 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2045,7 +2045,7 @@ BOOL SwCursor::GotoTblBox( const String& rName )
BOOL SwCursor::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
{
- //JP 28.8.2001: for optimization test something before
+ //for optimization test something before
const SwNode* pNd = &GetPoint()->nNode.GetNode();
bool bShortCut = false;
if ( fnWhichPara == fnParaCurr )
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index f8379e1..674e740 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -94,8 +94,8 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
//Raender haben eine defaultmaessige Mindestgroesse.
//wenn der Drucker einen groesseren Rand vorgibt, so
//ist mir dass auch recht.
- // MIB 06/25/2002, #99397#: The HTML page desc had A4 as page size
- // always. This has been changed to take the page size from the printer.
+ // The HTML page desc had A4 as page size always.
+ // This has been changed to take the page size from the printer.
// Unfortunately, the margins of the HTML page desc are smaller than
// the margins used here in general, so one extra case is required.
// In the long term, this needs to be changed to always keep the
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index dc11d47..81bf466 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -874,8 +874,8 @@ SwModify* SwDoc::GetUnoCallBack() const
return pUnoCallBack;
}
-/*-----------------28.5.2001 10:06------------------
- * SwDoc:
+
+/** SwDoc:
* Reading and writing of the layout cache.
*--------------------------------------------------*/
void SwDoc::ReadLayoutCache( SvStream& rStream )
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 6567351..d422972 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -3122,9 +3122,8 @@ BOOL SwRedline::HasValidRange() const
* pMkNd = &GetMark()->nNode.GetNode();
if( pPtNd->StartOfSectionNode() == pMkNd->StartOfSectionNode() &&
!pPtNd->StartOfSectionNode()->IsTableNode() &&
- // JP 18.5.2001: Bug 87222 - invalid if points on the end of content
- // DVO 25.03.2002: #96530# end-of-content only invalid if no content
- // index exists
+ // invalid if points on the end of content
+ // end-of-content only invalid if no content index exists
( pPtNd != pMkNd || GetContentIdx() != NULL ||
pPtNd != &pPtNd->GetNodes().GetEndOfContent() )
)
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 62a036b..af7ca81 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -323,7 +323,7 @@ void SwNoTxtFrm::Paint( const SwRect &rRect, const SwPrtOptions * /*pPrintData*/
if ( bClip )
pOut->IntersectClipRegion( aPaintArea.SVRect() );
- /// OD 25.09.2002 #99739# - delete unused 3rd parameter
+ /// delete unused 3rd parameter
PaintPicture( pOut, aGrfArea );
}
else
@@ -378,9 +378,8 @@ void lcl_CalcRect( Point& rPt, Size& rDim, USHORT nMirror )
void SwNoTxtFrm::GetGrfArea( SwRect &rRect, SwRect* pOrigRect,
BOOL ) const
{
- // JP 23.01.2001: currently only used for scaling, cropping and mirroring
- // the contour of graphics!
- // all other is handled by the GraphicObject
+ //currently only used for scaling, cropping and mirroring the contour of graphics!
+ //all other is handled by the GraphicObject
//In rRect wird das sichbare Rechteck der Grafik gesteckt.
//In pOrigRect werden Pos+Size der Gesamtgrafik gesteck.
@@ -731,7 +730,7 @@ void SwNoTxtFrm::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
else if ( pSh->VisArea().IsOver( aRect ) &&
OUTDEV_WINDOW == pSh->GetOut()->GetOutDevType() )
{
- // OD 27.11.2002 #105519# - invalidate instead of painting
+ //invalidate instead of painting
pSh->GetWin()->Invalidate( aRect.SVRect() );
}
@@ -784,9 +783,9 @@ void lcl_correctlyAlignRect( SwRect& rAlignedGrfArea, const SwRect& rInArea, Out
// Ausgabe der Grafik. Hier wird entweder eine QuickDraw-Bmp oder
// eine Grafik vorausgesetzt. Ist nichts davon vorhanden, wird
// eine Ersatzdarstellung ausgegeben.
-/// OD 25.09.2002 #99739# - delete unused 3rd parameter.
-/// OD 25.09.2002 #99739# - use aligned rectangle for drawing graphic.
-/// OD 25.09.2002 #99739# - pixel-align coordinations for drawing graphic.
+/// delete unused 3rd parameter.
+/// use aligned rectangle for drawing graphic.
+/// pixel-align coordinations for drawing graphic.
void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) const
{
ViewShell* pShell = GetShell();
@@ -800,7 +799,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
const bool bIsChart = pOLENd && ChartPrettyPainter::IsChart( pOLENd->GetOLEObj().GetObject() );
- /// OD 25.09.2002 #99739# - calculate aligned rectangle from parameter <rGrfArea>.
+ /// calculate aligned rectangle from parameter <rGrfArea>.
/// Use aligned rectangle <aAlignedGrfArea> instead of <rGrfArea> in
/// the following code.
SwRect aAlignedGrfArea = rGrfArea;
@@ -808,7 +807,6 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
if( !bIsChart )
{
- /// OD 25.09.2002 #99739#
/// Because for drawing a graphic left-top-corner and size coordinations are
/// used, these coordinations have to be determined on pixel level.
::SwAlignGrfRect( &aAlignedGrfArea, *pOut );
commit 776170221a36b416e0f7bb872dcf56f1dec95edb
Author: shirahara <luixxiul at gmail.com>
Date: Sun Jan 30 01:46:46 2011 +0900
Remove comments; sw/source/filter
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 3dcaf53..06c4a6d 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -86,9 +86,8 @@ ULONG AsciiReader::Read( SwDoc &rDoc, const String&, SwPaM &rPam, const String &
return ERR_SWG_READ_ERROR;
}
- //JP 18.01.96: Alle Ueberschriften sind normalerweise ohne
- // Kapitelnummer. Darum hier explizit abschalten
- // weil das Default jetzt wieder auf AN ist.
+ // Alle Ueberschriften sind normalerweise ohne Kapitelnummer.
+ // Darum hier explizit abschalten weil das Default jetzt wieder auf AN ist.
if( !bInsertMode )
Reader::SetNoOutlineNum( rDoc );
@@ -336,7 +335,6 @@ ULONG SwASCIIParser::ReadChars()
break; // aus der WHILE-Schleife heraus
/*
- #98380#
If there was some unconverted bytes on the last cycle then they
were put at the beginning of the array, so total bytes available
to convert this cycle includes them. If we found 0 following bytes
@@ -395,7 +393,7 @@ ULONG SwASCIIParser::ReadChars()
pLastStt = ++pStt;
cLastCR = 0;
nLineLen = 0;
- // JP 03.04.96: das letze am Ende nehmen wir nicht
+ // das letze am Ende nehmen wir nicht
if( !rInput.IsEof() || !(pEnd == pStt ||
( !*pEnd && pEnd == pStt+1 ) ) )
pDoc->SplitNode( *pPam->GetPoint(), false );
@@ -412,7 +410,7 @@ ULONG SwASCIIParser::ReadChars()
*pStt = 0;
++pStt;
- // JP 03.04.96: das letze am Ende nehmen wir nicht
+ // das letze am Ende nehmen wir nicht
if( !rInput.IsEof() || pEnd != pStt )
bSplitNode = true;
}
@@ -438,7 +436,7 @@ ULONG SwASCIIParser::ReadChars()
else
bChkSplit = true;
- // JP 03.04.96: das letze am Ende nehmen wir nicht
+ // das letze am Ende nehmen wir nicht
if( bChkSplit && ( !rInput.IsEof() || pEnd != pStt ))
bSplitNode = true;
}
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 44aeb4c..bc8a7c6 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -446,7 +446,7 @@ void SwRelNumRuleSpaces::SetOultineRelSpaces( const SwNodeIndex& rStt,
void SwRelNumRuleSpaces::SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule )
{
BOOL bOutlineRule = OUTLINE_RULE == rRule.GetRuleType();
- // #128056# correction of refactoring done by cws swnumtree:
+ // correction of refactoring done by cws swnumtree:
// - assure a correct level for retrieving numbering format.
BYTE nLvl = 0;
if ( rNd.GetActualListLevel() >= 0 && rNd.GetActualListLevel() < MAXLEVEL )
@@ -469,11 +469,9 @@ void SwRelNumRuleSpaces::SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule )
if( 0 < rLR.GetTxtFirstLineOfst() )
nParaLeft += rLR.GetTxtFirstLineOfst();
else if( nParaLeft >= nLeft )
- // #82963#/#82962#: set correct paragraph indent
+ // set correct paragraph indent
nParaLeft -= nLeft;
else
- //#83154#, Don't think any of the older #80856# bugfix code is
- //relevent anymore.
nParaLeft = rLR.GetTxtLeft()+rLR.GetTxtFirstLineOfst();
aLR.SetTxtLeft( nParaLeft );
}
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 8ff6a16..7e745a8 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -59,13 +59,10 @@
#include <docsh.hxx>
#include <redline.hxx>
#include <swerror.h>
-
#include <paratr.hxx>
-// --> OD 2007-03-30 #i73788#
+// #i73788#
#include <pausethreadstarting.hxx>
-// <--
-
using namespace ::com::sun::star;
@@ -371,7 +368,7 @@ ULONG SwReader::Read( const Reader& rOptions )
{
delete pPam; // ein neues aufgemacht.
- // --> FME 2005-02-25 #i42634# Moved common code of SwReader::Read() and
+ // #i42634# Moved common code of SwReader::Read() and
// SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks():
// ATM still with Update
pDoc->UpdateLinks( TRUE );
@@ -389,7 +386,7 @@ ULONG SwReader::Read( const Reader& rOptions )
if( pCrsr ) // das Doc ist jetzt modifiziert
pDoc->SetModified();
- // --> OD 2005-02-11 #i38810# - If links have been updated, the document
+ // #i38810# - If links have been updated, the document
// have to be modified. During update of links the OLE link at the document
// isn't set. Thus, the document's modified state has to be set again after
// the OLE link is restored - see above <pDoc->SetOle2Link( aOLELink )>.
@@ -502,7 +499,7 @@ SwDoc* Reader::GetTemplateDoc()
ClearTemplate();
OSL_ENSURE( !pTemplate, "Who holds the template doc?" );
- // #95605#: If the writer module is not installed,
+ // If the writer module is not installed,
// we cannot create a SwDocShell. We could create a
// SwWebDocShell however, because this exists always
// for the help.
@@ -633,7 +630,7 @@ void Reader::SetFltName( const String& )
void Reader::SetNoOutlineNum( SwDoc& /*rDoc*/ )
{
- // JP 10.03.96: jetzt wieder keine Nummerierung in den Vorlagen
+ // jetzt wieder keine Nummerierung in den Vorlagen
}
@@ -778,9 +775,8 @@ SwWriter::SwWriter(SfxMedium& rMedium, SwDoc &rDocument)
ULONG SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName )
{
- // --> OD 2007-03-30 #i73788#
+ // #i73788#
SwPauseThreadStarting aPauseThreadStarting;
- // <--
BOOL bHasMark = FALSE;
SwPaM * pPam;
@@ -872,7 +868,7 @@ ULONG SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName )
// falls der Standart PageDesc. immer noch auf initalen Werten steht
// (wenn z.B. kein Drucker gesetzt wurde) dann setze jetzt auf DIN A4
- // --> OD 2004-11-17 #i37248# - Modifications are only allowed at a new document.
+ // #i37248# - Modifications are only allowed at a new document.
// <pOutDoc> contains a new document, if <pDoc> is set - see above.
if ( pDoc && !pOutDoc->getPrinter( false ) )
// <--
@@ -943,10 +939,8 @@ ULONG SwWriter::Write( WriterRef& rxWriter, const String* pRealFileName )
if ( !IsError( nError ) && !pDoc )
{
rDoc.ResetModified();
- // --> OD 2005-02-11 #i38810# - reset also flag, that indicates
- // updated links
+ // #i38810# - reset also flag, that indicates updated links
rDoc.SetLinksUpdated( sal_False );
- // <-
}
}
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 7b020e0..35dd165 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2345,7 +2345,6 @@ static BOOL OutCSS1_FrmFmtBrush( SwHTMLWriter& rWrt,
const SvxBrushItem& rBrushItem )
{
BOOL bWritten = FALSE;
- /// OD 02.09.2002 #99657#
/// output brush of frame format, if its background color is not "no fill"/"auto fill"
/// or it has a background graphic.
if( rBrushItem.GetColor() != COL_TRANSPARENT ||
@@ -2901,7 +2900,7 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
- // #60393#: Netscape4 hat massive Probleme mit den Zellenhoehen
+ // Netscape4 hat massive Probleme mit den Zellenhoehen
// wenn der Zeilenabstand innerhalb einer Tabelle geaendert wird
// und die Breite der Tabelle nicht automatisch berechnet wird
// (also wenn eine WIDTH-Option vorhanden ist).
@@ -3388,7 +3387,6 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
// Erstmal die Farbe holen
BOOL bColor = FALSE;
- /// OD 02.09.2002 #99657#
/// set <bTransparent> to TRUE, if color is "no fill"/"auto fill"
BOOL bTransparent = (rColor.GetColor() == COL_TRANSPARENT);
Color aColor;
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index e3a1dc7..3ac51bd 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -627,7 +627,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
if( bNumbered )
{
nBulletGrfLvl = nLvl; // nur veruebergehend!!!
- // --> OD 2005-11-15 #i57919#
+ // #i57919#
// correction of re-factoring done by cws swnumtree:
// - <nNumStart> has to contain the restart value, if the
// numbering is restarted at this text node. Value <USHRT_MAX>
@@ -900,7 +900,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
else
{
rHWrt.nDfltTopMargin = pFmtInfo->nTopMargin;
- // #60393#: Wenn im letzten Absatz einer Tabelle der
+ // Wenn im letzten Absatz einer Tabelle der
// untere Absatz-Abstand veraendert wird, vertut sich
// Netscape total. Deshalb exportieren wir hier erstmal
// nichts, indem wir den Abstand aus dem Absatz als Default
@@ -947,7 +947,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
rHWrt.IsHTMLMode( HTMLMODE_NO_CONTROL_CENTERING ) &&
rHWrt.HasControls() )
{
- // #64687#: The align=... attribute does behave strange in netscape
+ // The align=... attribute does behave strange in netscape
// if there are controls in a paragraph, because the control and
// all text behind the control does not recognize this attribute.
ByteString sOut( '<' );
@@ -2413,7 +2413,7 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
xub_StrLen nOffset = 0;
String aOutlineTxt;
String aFullText;
- // --> OD 2006-06-12 #b6435904#
+
// export numbering string as plain text only for the outline numbering,
// because the outline numbering isn't exported as a numbering - see <SwHTMLNumRuleInfo::Set(..)>
if ( pNd->IsOutline() &&
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 0c8131d..0f6495c 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -282,7 +282,7 @@ void SwHTMLWriter::OutBasic()
BasicManager *pBasicMan = pDoc->GetDocShell()->GetBasicManager();
OSL_ENSURE( pBasicMan, "Wo ist der Basic-Manager?" );
- //JP 17.07.96: Bug 29538 - nur das DocumentBasic schreiben
+ // nur das DocumentBasic schreiben
if( !pBasicMan || pBasicMan == SFX_APP()->GetBasicManager() )
{
SFX_APP()->LeaveBasicCall();
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 1eafdf9..e8c7c85 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -848,7 +848,6 @@ BOOL SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
const SvxBrushItem *pBrushItem =
(const SvxBrushItem *)pItem;
- /// OD 02.09.2002 #99657#
/// Body has a background color, if it is not "no fill"/"auto fill"
if( pBrushItem->GetColor() != COL_TRANSPARENT )
bBodyBGColorSet = TRUE;
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx
index e8ad309..e572ff3 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -104,8 +104,8 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
sal_Bool bHidden )
{
// always on top of text.
- // OD 02.07.2003 #108784# but in invisible layer. <ConnectToLayout> will
- // move the object to the visible layer.
+ // but in invisible layer. <ConnectToLayout> will move the object
+ // to the visible layer.
pNewDrawObj->SetLayer( pDoc->GetInvisibleHeavenId() );
SfxItemSet aFrmSet( pDoc->GetAttrPool(),
@@ -196,7 +196,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
{
aAnchor.SetType( FLY_AT_PAGE );
}
- // OD 2004-04-13 #i26791# - direct positioning for <SwDoc::Insert(..)>
+ // #i26791# - direct positioning for <SwDoc::Insert(..)>
pNewDrawObj->SetRelativePos( Point(rCSS1PropInfo.nLeft + nLeftSpace,
rCSS1PropInfo.nTop + nUpperSpace) );
aFrmSet.Put( SwFmtSurround(SURROUND_THROUGHT) );
@@ -207,7 +207,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
aAnchor.SetType( FLY_AT_PARA );
aFrmSet.Put( SwFmtSurround(bHidden ? SURROUND_THROUGHT
: SURROUND_RIGHT) );
- // OD 2004-04-13 #i26791# - direct positioning for <SwDoc::Insert(..)>
+ // #i26791# - direct positioning for <SwDoc::Insert(..)>
pNewDrawObj->SetRelativePos( Point(nLeftSpace, nUpperSpace) );
}
else if( text::VertOrientation::NONE != eVertOri )
@@ -387,9 +387,9 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
}
// Ein DrawTxtobj anlegen
- // --> OD 2005-08-08 #i52858# - method name changed
+ // #i52858# - method name changed
SdrModel* pModel = pDoc->GetOrCreateDrawModel();
- // <--
+
SdrPage* pPg = pModel->GetPage( 0 );
pMarquee = SdrObjFactory::MakeNewObject( SdrInventor,
OBJ_TEXT, pPg, pModel );
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index dd1d305..9b9dc08 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -280,7 +280,6 @@ USHORT SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
if( bEmpty )
{
const SvxBrushItem& rBrush = rFrmFmt.GetBackground();
- /// OD 02.09.2002 #99657#
/// background is not empty, if it has a background graphic
/// or its background color is not "no fill"/"auto fill".
if( GPOS_NONE != rBrush.GetGraphicPos() ||
@@ -788,7 +787,7 @@ void SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
break;
default:
- // #67508#: If a frame is centered, it gets left aligned. This
+ // If a frame is centered, it gets left aligned. This
// should be taken into account here, too.
{
switch( eSurround )
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index c6380f4..ddfc1aa 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -1055,11 +1055,9 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
xPropSetInfo->hasPropertyByName( sPropName ) )
{
const Color &rColor = ((const SvxBrushItem *)pItem)->GetColor();
- /// OD 02.09.2002 #99657#
/// copy color, if color is not "no fill"/"auto fill"
if( rColor.GetColor() != COL_TRANSPARENT )
{
- /// OD 02.09.2002 #99657#
/// copy complete color with transparency
aTmp <<= static_cast<sal_Int32>(rColor.GetColor());
rFCompPropSet->setPropertyValue( sPropName, aTmp );
@@ -1652,7 +1650,6 @@ void SwHTMLParser::InsertInput()
// ALIGN fuer alle Controls auszuwerten ist keine so gute Idee,
// solange Absatz-gebundene Controls die Hoehe von Tabellen-Zellen
// nicht beeinflussen
- // (#64110#, http://www.telekom.de/katalog-online/onlineshop.html)
eVertOri = text::VertOrientation::TOP;
eHoriOri = text::HoriOrientation::NONE;
}
@@ -1764,7 +1761,7 @@ void SwHTMLParser::InsertInput()
aTmp <<= OUString();
xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Label")),
aTmp );
- // #53559#: Beim RadioButton darf die DefaultChecked-Property
+ // Beim RadioButton darf die DefaultChecked-Property
// erst gesetzt werden, wenn das Control angelegt und ein
// activateTabOrder gerufen wurde, weil es sonst noch zu der
// vorhergehenden Gruppe gehoert.
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index cad9f38..2925eb6 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -1383,7 +1383,7 @@ void SwHTMLParser::StripTrailingPara()
OSL_ENSURE(!this, "Hoppla, wo ist mein Vorgaenger-Node");
return;
}
- // --> OD 2007-09-27 #i81002# - refactoring
+ // #i81002# - refactoring
// Do not directly manipulate member of <SwBookmark>
{
SwPosition aNewPos(*pNd);
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 592df23..82efb14 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -82,8 +82,7 @@ void SwHTMLNumRuleInfo::Set( const SwTxtNode& rTxtNd )
pNumRule = const_cast<SwNumRule*>(pTxtNdNumRule);
nDeep = static_cast< sal_uInt16 >(pNumRule ? rTxtNd.GetActualListLevel() + 1 : 0);
bNumbered = rTxtNd.IsCountedInList();
- // --> OD 2005-11-16 #i57919#
- // correction of refactoring done by cws swnumtree:
+ // #i57919# - correction of refactoring done by cws swnumtree:
// <bRestart> has to be set to <true>, if numbering is restarted at this
// text node and the start value equals <USHRT_MAX>.
// Start value <USHRT_MAX> indicates, that at this text node the numbering
@@ -147,8 +146,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
// so macht. Dadurch wurd immer auch eine 9pt-Schrift
// eingestellt, was in Netscape nicht der Fall ist. Bisher hat
// das noch niemanden gestoert.
- // --> OD 2008-06-03 #i63395#
- // Only apply user defined default bullet font
+ // #i63395# - Only apply user defined default bullet font
if ( numfunc::IsDefBulletFontUserDefined() )
{
aNumFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
@@ -350,8 +348,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
if( !aPropInfo.bRightMargin )
aItemSet.ClearItem( RES_LR_SPACE );
- // --> OD 2008-06-26 #i89812#
- // Perform change to list style before calling <DoPositioning(..)>,
+ // #i89812# - Perform change to list style before calling <DoPositioning(..)>,
// because <DoPositioning(..)> may open a new context and thus may
// clear the <SwHTMLNumRuleInfo> instance hold by local variable <rInfo>.
if( bChangeNumFmt )
@@ -432,8 +429,7 @@ void SwHTMLParser::EndNumBulList( int nToken )
? pRefNumFmt->GetNumberingType() : style::NumberingType::CHAR_SPECIAL);
if( SVX_NUM_CHAR_SPECIAL == aNumFmt.GetNumberingType() )
{
- // --> OD 2008-06-03 #i63395#
- // Only apply user defined default bullet font
+ // #i63395# - Only apply user defined default bullet font
if ( numfunc::IsDefBulletFontUserDefined() )
{
aNumFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
@@ -542,8 +538,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
SwNumRule aNumRule( aNumRuleName,
SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
SwNumFmt aNumFmt( aNumRule.Get( 0 ) );
- // --> OD 2008-06-03 #i63395#
- // Only apply user defined default bullet font
+ // #i63395# - Only apply user defined default bullet font
if ( numfunc::IsDefBulletFontUserDefined() )
{
aNumFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
@@ -576,7 +571,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
pTxtNode->SetCountedInList( bCountedInList );
}
// <--
- // --> OD 2005-11-15 #i57919#
+ // #i57919#
// correction of refactoring done by cws swnumtree
// - <nStart> contains the start value, if the numbering has to be restarted
// at this text node. Value <USHRT_MAX> indicates, that numbering isn't
@@ -880,7 +875,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
sal_uInt16 nStartVal = rNumFmt.GetStart();
if( bStartValue && 1 == nStartVal && i == rInfo.GetDepth()-1 )
{
- // --> OD 2005-11-02 #i51089 - TUNING#
+ // #i51089 - TUNING#
if ( rWrt.pCurPam->GetNode()->GetTxtNode()->GetNum() )
{
nStartVal = static_cast< sal_uInt16 >( rWrt.pCurPam->GetNode()
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index a3b8fb4..46c0343 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -416,7 +416,7 @@ void SwHTMLParser::InsertEmbed()
INetURLObject(sBaseURL), aURL,
URIHelper::GetMaybeFileHdl()) );
- // #109761# do not insert plugin if it has neither URL nor type
+ // do not insert plugin if it has neither URL nor type
bool bHasType = aType.Len() != 0;
if( !bHasURL && !bHasType )
return;
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 5b752d4..faf2d5e 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1546,8 +1546,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
if( bSet )
{
- // fix #30588#: BorderDist nicht mehr Bestandteil
- // einer Zelle mit fixer Breite
+ // BorderDist nicht mehr Bestandteil einer Zelle mit fixer Breite
sal_uInt16 nBDist = static_cast< sal_uInt16 >(
(2*nCellPadding <= nInnerFrmWidth) ? nCellPadding
: (nInnerFrmWidth / 2) );
@@ -1568,8 +1567,7 @@ void HTMLTable::FixFrameFmt( SwTableBox *pBox,
else
pFrmFmt->ResetFmtAttr( RES_BACKGROUND );
- // fix #41003#: Format nur setzten, wenn es auch einen Value
- // gibt oder die Box leer ist.
+ // Format nur setzten, wenn es auch einen Value gibt oder die Box leer ist.
if( bHasNumFmt && (bHasValue || IsBoxEmpty(pBox)) )
{
sal_Bool bLock = pFrmFmt->GetDoc()->GetNumberFormatter()
@@ -2362,10 +2360,9 @@ inline void HTMLTable::CloseColGroup( sal_uInt16 nSpan, sal_uInt16 _nWidth,
void HTMLTable::InsertCol( sal_uInt16 nSpan, sal_uInt16 nColWidth, sal_Bool bRelWidth,
SvxAdjust eAdjust, sal_Int16 eVertOrient )
{
- // --> OD, MIB 2004-11-08 #i35143# - no columns, if rows already exist.
+ // #i35143# - no columns, if rows already exist.
if ( nRows > 0 )
return;
- // <--
sal_uInt16 i;
@@ -4620,7 +4617,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
delete pSaveStruct;
}
- // wir stehen jetzt (wahrscheinlich) vor <TBODY>,... oder </TABLE>
+ // now we stand (perhaps) in front of <TBODY>,... or </TABLE>
}
struct _TblColGrpSaveStruct : public SwPendingStackData
@@ -5522,9 +5519,9 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
eJumpTo = JUMPTO_NONE;
}
- // fix #37886#: Wenn Import abgebrochen wurde kein erneutes Show
+ // Wenn Import abgebrochen wurde kein erneutes Show
// aufrufen, weil die ViewShell schon geloescht wurde!
- // fix #41669#: Genuegt nicht. Auch im ACCEPTING_STATE darf
+ // Genuegt nicht. Auch im ACCEPTING_STATE darf
// kein Show aufgerufen werden, weil sonst waehrend des
// Reschedules der Parser zerstoert wird, wenn noch ein
// DataAvailable-Link kommt. Deshalb: Nur im WORKING-State.
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index e6f82b6..dafb188 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -154,7 +154,6 @@ sal_Bool SwHTMLWrtTable::HasTabBackground( const SwTableBox& rBox,
const SvxBrushItem& rBrushItem =
rBox.GetFrmFmt()->GetBackground();
- /// OD 02.09.2002 #99657#
/// The table box has a background, if its background color is not "no fill"/
/// "auto fill" or it has a background graphic.
bRet = rBrushItem.GetColor() != COL_TRANSPARENT ||
@@ -185,7 +184,6 @@ sal_Bool SwHTMLWrtTable::HasTabBackground( const SwTableLine& rLine,
sal_Bool bRet = sal_False;
const SvxBrushItem& rBrushItem = rLine.GetFrmFmt()->GetBackground();
- /// OD 02.09.2002 #99657#
/// The table line has a background, if its background color is not "no fill"/
/// "auto fill" or it has a background graphic.
bRet = rBrushItem.GetColor() != COL_TRANSPARENT ||
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index cc236c2..c4f0f5b 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -1731,7 +1731,6 @@ static void ParseCSS1_line_height( const CSS1Expression *pExpr,
nHeight = rParser.GetMinFixLineSpace();
SvxLineSpacingItem aLSItem( nHeight, aItemIds.nLineSpacing );
aLSItem.SetLineHeight( nHeight );
- // --> OD 2006-07-26 #138463#
// interpret <line-height> attribute as minimum line height
aLSItem.GetLineSpaceRule() = SVX_LINE_SPACE_MIN;
// <--
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 3bec5a5..8e5cf69 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -168,9 +168,8 @@ String HTMLReader::GetTemplateName() const
sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM("html") );
String sTemplateWithoutExt( sTemplate );
#ifndef MAC_WITHOUT_EXT
- // --> OD 2005-01-26 - first search for OpenDocument Writer/Web template
+ // first search for OpenDocument Writer/Web template
sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(".oth") );
- // <--
#endif
SvtPathOptions aPathOpt;
@@ -182,7 +181,7 @@ String HTMLReader::GetTemplateName() const
{
// 6.0 (extension .stw)
sTemplate = sTemplateWithoutExt;
- // --> OD 2005-01-26 - no OpenDocument Writer/Web template found.
+ // no OpenDocument Writer/Web template found.
// search for OpenOffice.org Writer/Web template
sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM(".stw") );
// <--
@@ -298,7 +297,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
nSBModuleCnt( 0 ),
nMissingImgMaps( 0 ),
nParaCnt( 5 ),
- // --> OD 2007-10-26 #i83625#
+ // #i83625#
nContextStMin( 0 ),
nContextStAttrMin( 0 ),
// <--
@@ -456,7 +455,7 @@ SwHTMLParser::~SwHTMLParser()
if ( pDoc->GetDocShell()->IsLoading() )
{
- // --> OD 2006-11-07 #i59688#
+ // #i59688#
pDoc->GetDocShell()->LoadingFinished();
}
}
@@ -509,7 +508,7 @@ IMPL_LINK( SwHTMLParser, AsyncCallback, void*, /*pVoid*/ )
{
nEventId=0;
- // --> FME 2005-08-18 #i47907# If the document has already been destructed,
+ // #i47907# - If the document has already been destructed,
// the parser should be aware of this:
if( ( pDoc->GetDocShell() && pDoc->GetDocShell()->IsAbortingImport() )
|| 1 == pDoc->getReferenceCount() )
@@ -540,7 +539,7 @@ SvParserState SwHTMLParser::CallParser()
pPam->Move( fnMoveBackward );
- // #106634# split any redline over the insertion point
+ // split any redline over the insertion point
aInsertionRangePam.SetMark();
*aInsertionRangePam.GetPoint() = *pPam->GetPoint();
aInsertionRangePam.Move( fnMoveBackward );
@@ -1234,7 +1233,7 @@ void SwHTMLParser::NextToken( int nToken )
}
else if( aUnknownToken.Len() )
{
- // Fix i#59064 : Paste content of unknown tags.
+ // Paste content of unknown tags.
if (aToken.Len() > 0)
{
if( !bDocInitalized )
@@ -1966,7 +1965,7 @@ void SwHTMLParser::NextToken( int nToken )
if( ( aToken.Len() > 5 ) && ( ! bIgnoreHTMLComments ) )
{
// als Post-It einfuegen
- // MIB 8.12.2000: If there are no space characters right behind
+ // If there are no space characters right behind
// the <!-- and on front of the -->, leave the comment untouched.
if( ' ' == aToken.GetChar( 3 ) &&
' ' == aToken.GetChar( aToken.Len()-3 ) )
@@ -2243,7 +2242,7 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum )
// darf es auch nicht in die Prev-Liste eines ausseren
// Attributs eingetragen werden, denn dieses wird ja
// erstmal nicht gesetzt. Das fuehrt zu verschiebenungen,
- // wenn Felder ins Rennen kommen (siehe #51020#)
+ // wenn Felder ins Rennen kommen
if( !pNext || bWholePara )
{
USHORT nTmp = pSetAttr->bInsAtStart ? 0
@@ -2608,7 +2607,7 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable,
BOOL bSetAttr;
if( bChkEnd )
{
- // fix #42192#: Zechen-Attribute mit Ende moeglich frueh,
+ // Zechen-Attribute mit Ende moeglich frueh,
// also noch im aktuellen Absatz setzen (wegen JavaScript
// und diversen Chats). das darf man aber nicht fuer Attribute,
// die ueber den ganzen Absatz aufgspannt werden sollen, weil
@@ -4439,7 +4438,7 @@ BOOL SwHTMLParser::HasCurrentParaFlys( BOOL bNoSurroundOnly,
}
else
{
- // fix #42282#: Wenn Rahmen mit Umlauf gesucht sind,
+ // Wenn Rahmen mit Umlauf gesucht sind,
// auch keine mit Durchlauf beachten. Dabei handelt es
// sich (noch) um HIDDEN-Controls, und denen weicht man
// besser auch nicht aus.
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 9e065c2..97abf58 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -1131,7 +1131,6 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem,
String& rEmbGrfNm, sal_Bool bGraphic )
{
const Color &rBackColor = pBrushItem->GetColor();
- /// OD 02.09.2002 #99657#
/// check, if background color is not "no fill"/"auto fill", instead of
/// only checking, if transparency is not set.
if( rBackColor.GetColor() != COL_TRANSPARENT )
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index e1a0e56..84cf315 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -73,7 +73,6 @@ public:
void GetWW8Writer( const String&, const String&, WriterRef& );
-// JP 17.03.99 - 63049
// Umsetzen der LRSpaces im aktuell importierten Doc. Die Fremd-Filter
// liefern immer absolute Werte fuer die Ebenen einer NumRule. Wir
// verarbeiten jetzt aber relative Werte bezogen auf das LR-Space-Item.
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 7851d15..a3b4bf3 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -401,7 +401,7 @@ public:
void Reset()
{
- // --> OD 2007-01-25 #i73790# - method renamed
+ // #i73790# - method renamed
pColl->ResetAllFmtAttr();
// <--
pColl->SetAuto(FALSE); // nach Empfehlung JP
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index a6fc730..1479a3a 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -482,7 +482,7 @@ int SwRTFParser::MakeFieldInst( String& rFieldStr )
aSaveStr.SearchAndReplaceAscii( "AM", aEmptyStr );
aSaveStr.SearchAndReplaceAscii( "PM", aEmptyStr );
- // #117892# M.M. Put the word date and time formatter stuff in a common area
+ // Put the word date and time formatter stuff in a common area
// and get the rtf filter to use it
SwField *pFld = 0;
short nNumFmtType = NUMBERFORMAT_UNDEFINED;
@@ -1091,7 +1091,7 @@ void SwRTFParser::ReadField()
{
if(nRet == RTFFLD_PAGEREF)
{
- // #17371 Nasty hack to get a pageref within a hyperlink working
+ // Nasty hack to get a pageref within a hyperlink working
sNestedFieldStr = sFieldStr;
}
diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx
index 1a2eb5f..4cc0fcc 100644
--- a/sw/source/filter/rtf/rtffly.cxx
+++ b/sw/source/filter/rtf/rtffly.cxx
@@ -65,15 +65,12 @@
#include <deque>
#include <map>
#include <utility>
-// --> OD 2004-06-30 #i27767#
+// #i27767#
#include <fmtwrapinfluenceonobjpos.hxx>
// <--
#include <editeng/brshitem.hxx>
#include <fmtfollowtextflow.hxx>
-// --> OD, FLR 2006-02-16 #131205#
#include "dcontact.hxx"
-// <--
-
using namespace ::com::sun::star;
@@ -244,10 +241,9 @@ void SwRTFParser::SetFlysInDoc()
- //JP 21.09.98: wenn ein DropCap ist, dann Text im Node belassen, am
- // Absatz das Absatz Attribut setzen. Ggfs noch die
- // FontSize zuruecksetzen, damit das DropCap nicht zu
- // gro? wird.
+ // wenn ein DropCap ist, dann Text im Node belassen,
+ // am Absatz das Absatz Attribut setzen. Ggfs noch die FontSize zuruecksetzen,
+ // damit das DropCap nicht zu gross wird.
if( pFlySave->nDropAnchor )
{
SwTxtNode* pSttNd = pFlySave->nSttNd.GetNode().GetTxtNode();
@@ -411,7 +407,7 @@ void SwRTFParser::SetFlysInDoc()
// border or backgorund, then put it to the frame
// Not in our own RTF-Format!
// <<<<< DOES NOT MAKE SENSE TO ME (flr)
- // #102781#. Added support for transparent frames.
+ // Added support for transparent frames.
if( pSttNd->GetIndex() + 1 != pSttNd->EndOfSectionIndex() &&
!bSwPageDesc )
{
@@ -441,7 +437,7 @@ void SwRTFParser::SetFlysInDoc()
aTmpSet.Put(aBrush, RES_BACKGROUND);
}
}
- // #117914# Topic 6.
+ // Topic 6.
pFlySave->aFlySet.Put( aTmpSet );
if( pSrcNd && pSrcNd->HasSwAttrSet() )
{
@@ -455,10 +451,10 @@ void SwRTFParser::SetFlysInDoc()
if (FLY_AS_CHAR != rAnchor.GetAnchorId())
{
// korrigiere noch den Absatz, ist immer der vorhergehende !
- // JP 20.09.95: wenn es diesen gibt! (DocAnfang!)
+ // wenn es diesen gibt! (DocAnfang!)
- //JP 02.08.99: that is wrong. The anchor is ever the NEXT!
- //JP 05.08.99: there are an Bug in the ExportFilter which will
+ // that is wrong. The anchor is ever the NEXT!
+ // there are an Bug in the ExportFilter which will
// be fixed in the Version 517 - by SWG-Export
// the fly will be after the paragraph - but in RTF
// the flys will be before the paragraph.
@@ -494,9 +490,9 @@ void SwRTFParser::SetFlysInDoc()
for (myIter aIter = rDeque.begin(); aIter != aEnd; ++aIter)
{
aIter->second.SetAnchor(&aPos);
- // --> OD 2004-06-30 #i27767# - push on front to keep order
- // of objects for the correct object positioning
- //aPrevFmts[pCurrentAnchor].push_back(*aIter);
+ // #i27767# - push on front to keep order of objects
+ // for the correct object positioning
+ // aPrevFmts[pCurrentAnchor].push_back(*aIter);
aPrevFmts[pCurrentAnchor].push_front(*aIter);
}
rDeque.clear();
@@ -504,7 +500,6 @@ void SwRTFParser::SetFlysInDoc()
}
}
- // --> OD, FLR 2006-02-16 #131205#
// Create draw contact object, which also creates a <SdrObject> instance,
// in order to set the order number.
// The order number is assumed to be the order of the text flow.
@@ -559,12 +554,12 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
InsertPara();
// RTF-Defaults setzen:
- // --> OD 2004-06-24 #i27767#
+ // #i27767#
SwFmtAnchor aAnchor( FLY_AT_PARA );
-
SwFmtHoriOrient aHori( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME );
SwFmtVertOrient aVert( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME );
// <--
+
SvxFrameDirectionItem aFrmDir( FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR );
USHORT nCols = USHRT_MAX, nColSpace = USHRT_MAX, nAktCol = 0;
@@ -851,7 +846,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
}
break;
-// JP 26.09.94: die Bindung an die Spalte gibt es nicht mehr !!
+// die Bindung an die Spalte gibt es nicht mehr !!
// case RTF_FLY_COLUMN:
}
break;
@@ -951,8 +946,8 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
pSet->Put( aHori );
pSet->Put( aVert );
- // --> OD 2004-06-30 #i27767# - set wrapping style influence
- // --> OD 2004-10-18 #i35017# - constant name has changed
+ // #i27767# - set wrapping style influence
+ // #i35017# - constant name has changed
pSet->Put( SwFmtWrapInfluenceOnObjPos(
text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ));
// <--
@@ -1020,9 +1015,8 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
}
}
aFlyArr.Insert( pFlySave, nFlyArrCnt++ );
- // --> OD 2008-12-22 #i83368# - reset
+ // #i83368# - reset
mbReadCellWhileReadSwFly = false;
- // <--
}
}
@@ -1038,7 +1032,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
if( !IsPardTokenRead() )
{
- // #102781#. Added support for transparent frames.
+ // Added support for transparent frames.
if (nToken == RTF_CBPAT && nFlyArrCnt > 0)
{
USHORT _index=USHORT(nTokenValue);
@@ -1234,10 +1228,8 @@ void SwRTFParser::InsPicture( const String& rGrfNm, const Graphic* pGrf,
// kennzeichen fuer Swg-Dokumente:
// (dann ist das FlyFmt fuer die Grafik!)
SwGrfNode * pGrfNd;
- // --> OD 2008-12-22 #i83368#
- // Assure that graphic node is enclosed by fly frame node.
+ // #i83368# - Assure that graphic node is enclosed by fly frame node.
if ( bReadSwFly && !mbReadCellWhileReadSwFly )
- // <--
{
// erzeuge nur einen normalen GrafikNode und ersetze diesen gegen
// den vorhandenen Textnode
@@ -1342,7 +1334,7 @@ void SwRTFParser::_SetPictureSize( const SwNoTxtNode& rNd,
else
{
// von 100TH_MM nach TWIP umrechenen!
- // #117879# when \picwgoal resp \pichgoal are present, then use them.
+ // When \picwgoal resp \pichgoal are present, then use them.
// The values of \picwgoal and \picwgoal are already given in twips.
aSize.Width() = (pPicType->nGoalWidth?pPicType->nGoalWidth:(pPicType->nWidth*144)/254);
aSize.Height() = (pPicType->nGoalHeight?pPicType->nGoalHeight:(pPicType->nHeight*144)/254);
@@ -1375,8 +1367,7 @@ void SwRTFParser::_SetPictureSize( const SwNoTxtNode& rNd,
}
}
- //JP 8.11.2001: bug 94450 - if no size exist, then the size is set by
- // the swapin of the graphic.
+ // if no size exist, then the size is set by the swapin of the graphic.
SwGrfNode* pGrfNd;
if( !aSize.Width() && !aSize.Height() &&
0 != (pGrfNd = (SwGrfNode*)rNd.GetGrfNode() ) && pGrfNd->IsGrfLink() )
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index 9b6921a..aace179 100644
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ b/sw/source/filter/rtf/rtfnum.cxx
@@ -346,10 +346,10 @@ void SwRTFParser::ReadListTable()
RTL_CONSTASCII_STRINGPARAM( RTF_NUMRULE_NAME " 1" )));
aEntry.nListDocPos = pDoc->MakeNumRule( sTmp, 0, FALSE, SvxNumberFormat::LABEL_ALIGNMENT );
pCurRule = pDoc->GetNumRuleTbl()[ aEntry.nListDocPos ];
- // --> OD 2008-07-08 #i91400#
+ // #i91400#
pCurRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, FALSE ),
*pDoc );
- // <--
+
pCurRule->SetAutoRule( FALSE );
nNumLvl = (BYTE)-1;
}
@@ -361,15 +361,14 @@ void SwRTFParser::ReadListTable()
case RTF_LISTRESTARTHDN:
break;
case RTF_LISTNAME:
- if (nNextCh=='}') break; // #118989# empty listnames
+ if (nNextCh=='}') break; // empty listnames
if( RTF_TEXTTOKEN == GetNextToken() )
{
String sTmp( DelCharAtEnd( aToken, ';' ));
if( sTmp.Len() && !pDoc->FindNumRulePtr( sTmp ))
{
- // --> OD 2008-07-08 #i91400#
+ // #i91400#
pCurRule->SetName( sTmp, *pDoc );
- // <--
}
}
SkipGroup();
@@ -548,10 +547,10 @@ void SwRTFParser::ReadListOverrideTable()
RTL_CONSTASCII_STRINGPARAM( RTF_NUMRULE_NAME " 1" )));
aEntry.nListDocPos = pDoc->MakeNumRule( sTmp, pRule );
pRule = pDoc->GetNumRuleTbl()[ aEntry.nListDocPos ];
- // --> OD 2008-07-08 #i91400#
+ // #i91400#
pRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, FALSE ),
*pDoc );
- // <--
+
pRule->SetAutoRule( FALSE );
nNumLvl = (BYTE)-1;
aListArr.Insert( aEntry, aListArr.Count() );
@@ -602,7 +601,6 @@ void SwRTFParser::ReadListOverrideTable()
const SwNumRule *pNumRule = 0;
SvxRTFStyleType* pStyle = GetStyleTbl().First();
do {
- // #151213#
if ( MAXLEVEL > pStyle->nOutlineNo )
{
pColl = aTxtCollTbl.Get( (USHORT)GetStyleTbl().GetCurKey() );
@@ -803,9 +801,9 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
aEntry.nListNo = nListNo;
aListArr.Insert( aEntry, aListArr.Count() );
pCurRule = pDoc->GetNumRuleTbl()[ aEntry.nListDocPos ];
- // --> OD 2008-07-08 #i91400#
+ // #i91400#
pCurRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, FALSE ), *pDoc );
- // <--
+
pCurRule->SetAutoRule( FALSE );
pCurRule->SetContinusNum( bContinus );
}
diff --git a/sw/source/filter/rtf/rtftbl.cxx b/sw/source/filter/rtf/rtftbl.cxx
index d21b521..4b8266f 100644
--- a/sw/source/filter/rtf/rtftbl.cxx
+++ b/sw/source/filter/rtf/rtftbl.cxx
@@ -315,9 +315,9 @@ void SwRTFParser::ReadTable( int nToken )
else
pFmt = aBoxFmts[ aBoxFmts.Count()-1 ];
- // --> OD 2007-01-25 #i73790# - method renamed
+ // #i73790# - method renamed
pBoxFmt->ResetAllFmtAttr();
- // <--
+
nSize += pFmt->GetFrmSize().GetWidth();
}
else
@@ -372,7 +372,6 @@ void SwRTFParser::ReadTable( int nToken )
case RTF_TRQC: eAdjust = text::HoriOrientation::CENTER; break;
// mit text::VertOrientation::TOP kommt der Dialog nicht klar!
- // Bug #65126#
case RTF_CLVERTALT: eVerOrient = text::VertOrientation::NONE; break;
case RTF_CLVERTALC: eVerOrient = text::VertOrientation::CENTER; break;
@@ -583,7 +582,7 @@ void SwRTFParser::ReadTable( int nToken )
bNewTbl = FALSE;
{
- // JP 13.08.98: TabellenUmrandungen optimieren - Bug 53525
+ //TabellenUmrandungen optimieren
void* p = pFmt;
aTblFmts.Insert( p, aTblFmts.Count() );
}
@@ -650,7 +649,7 @@ void SwRTFParser::ReadTable( int nToken )
pDoc->InsertTable(
SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 0 ),
*pPam->GetPoint(), 1, 1, eAdjust, 0, 0, FALSE, FALSE );
- bContainsTablePara=true; //#117881#
+ bContainsTablePara=true;
pTableNode = pTable ? pTable->GetTableNode() : 0;
if (pTableNode)
@@ -683,7 +682,7 @@ void SwRTFParser::ReadTable( int nToken )
pOldTblNd = pTableNode;
{
- // JP 13.08.98: TabellenUmrandungen optimieren - Bug 53525
+ // TabellenUmrandungen optimieren
void* p = pFmt;
aTblFmts.Insert( p, aTblFmts.Count() );
}
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index c24524d..d3721d6 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -140,7 +140,7 @@ ULONG RtfReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, const S
return ERR_SWG_READ_ERROR;
}
- //JP 18.01.96: Alle Ueberschriften sind normalerweise ohne
+ // Alle Ueberschriften sind normalerweise ohne
// Kapitelnummer. Darum hier explizit abschalten
// weil das Default jetzt wieder auf AN ist.
if( !bInsertMode )
@@ -214,9 +214,8 @@ SwRTFParser::SwRTFParser(SwDoc* pD,
nInsTblRow(USHRT_MAX),
nNewNumSectDef(USHRT_MAX),
nRowsToRepeat(0),
- // --> OD 2008-12-22 #i83368#
- mbReadCellWhileReadSwFly( false ),
- // <--
+ mbReadCellWhileReadSwFly( false ), // #i83368#
+
bTrowdRead(0),
nReadFlyDepth(0),
nZOrder(0)
@@ -297,8 +296,8 @@ void SwRTFParser::Continue( int nToken )
pDoc->set(IDocumentSettingAccess::USE_FORMER_OBJECT_POS, false);
pDoc->set(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING, false);
pDoc->set(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION, true);
- pDoc->set(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT, false); // --> FME 2005-08-11 #i53199#
- // --> FME 2006-02-10 #131283#
+ pDoc->set(IDocumentSettingAccess::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT, false); // #i53199#
+
pDoc->set(IDocumentSettingAccess::TABLE_ROW_KEEP, true);
pDoc->set(IDocumentSettingAccess::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION, true);
pDoc->set(IDocumentSettingAccess::INVERT_BORDER_SPACING, true);
@@ -323,7 +322,7 @@ void SwRTFParser::Continue( int nToken )
pPam->Move( fnMoveBackward );
- // #106634# split any redline over the insertion point
+ // split any redline over the insertion point
aInsertionRangePam.SetMark();
*aInsertionRangePam.GetPoint() = *pPam->GetPoint();
aInsertionRangePam.Move( fnMoveBackward );
@@ -414,8 +413,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() )
// den letzen Bereich wieder zumachen
if( pRegionEndIdx )
{
- // JP 06.01.00: Task 71411 - the last section in WW are not a
- // balanced Section.
+ // the last section in WW are not a balanced Section.
if( !GetVersionNo() )
{
SwSectionNode* pSectNd = pRegionEndIdx->GetNode().
@@ -454,8 +452,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() )
SwNode* pTmp = pDoc->GetNodes()[ nNodeIdx -1 ];
if( pTmp->IsCntntNode() && !pTmp->FindTableNode() )
{
- // --> FME 2006-02-15 #131200# Do not delete the paragraph
- // if it has anchored objects:
+ // Do not delete the paragraph if it has anchored objects:
bool bAnchoredObjs = false;
const SwSpzFrmFmts* pFrmFmts = pDoc->GetSpzFrmFmts();
if ( pFrmFmts && pFrmFmts->Count() )
@@ -1178,7 +1175,7 @@ void SwRTFParser::ReadShpTxt(String& s)
}
/*
- * #127429#. Very basic support for the "Buchhalternase".
+ * Very basic support for the "Buchhalternase".
*/
void SwRTFParser::ReadDrawingObject()
{
@@ -1259,7 +1256,7 @@ void SwRTFParser::ReadDrawingObject()
text::RelOrientation::FRAME_RIGHT, // im rechten Absatzrand
text::RelOrientation::PAGE_FRAME, // Seite inkl. Raender, bei seitengeb. identisch mit text::RelOrientation::FRAME
text::RelOrientation::PAGE_PRINT_AREA, // Seite ohne Raender, bei seitengeb. identisch mit text::RelOrientation::PRTAREA
- // OD 11.11.2003 #i22341#
+ // #i22341#
text::RelOrientation::TEXT_LINE, // vertical relative to top of text line, only for to-character
// anchored objects.
@@ -1742,9 +1739,7 @@ void SwRTFParser::NextToken( int nToken )
ReadSectControls( nToken );
break;
case RTF_CELL:
- // --> OD 2008-12-22 #i83368#
- mbReadCellWhileReadSwFly = bReadSwFly;
- // <--
+ mbReadCellWhileReadSwFly = bReadSwFly; // #i83368#
if (CantUseTables())
InsertPara();
else
@@ -2854,7 +2849,7 @@ void SwRTFParser::ReadSectControls( int nToken )
{
case RTF_SECT:
bNewSection = true;
- bForceNewTable = true; // #117882#
+ bForceNewTable = true;
break;
case RTF_SECTD: {
//Reset to page defaults
@@ -3125,8 +3120,8 @@ void SwRTFParser::ReadSectControls( int nToken )
if (bNewSection || maSegments.empty())
{
- AttrGroupEnd(); //#106493#
- if(!bContainsPara && !bContainsTablePara) //#117881#: bContainsTablePara is set in rtftbl.cxx
+ AttrGroupEnd();
+ if(!bContainsPara && !bContainsTablePara) // bContainsTablePara is set in rtftbl.cxx
pDoc->AppendTxtNode(*pPam->GetPoint());
bContainsPara = false;
bContainsTablePara = false;
@@ -3164,7 +3159,7 @@ void SwRTFParser::LeaveEnvironment()
void SwRTFParser::SkipPageDescTbl()
{
- // M.M. #117907# I have to use this glorified SkipGroup because the
+ // I have to use this glorified SkipGroup because the
// SvParser SkipGroup uses nNextCh which is not set correctly <groan>
int nNumOpenBrakets = 1;
@@ -3867,9 +3862,7 @@ SwTxtFmtColl* SwRTFParser::MakeColl(const String& rName, USHORT nPos,
rbCollExist = aResult.second;
if (IsNewDoc() && rbCollExist)
{
- // --> OD 2007-01-25 #i73790# - method renamed
- pColl->ResetAllFmtAttr();
- // <--
+ pColl->ResetAllFmtAttr(); // #i73790# - method renamed
rbCollExist = false;
}
@@ -3905,9 +3898,7 @@ SwCharFmt* SwRTFParser::MakeCharFmt(const String& rName, USHORT nPos,
rbCollExist = aResult.second;
if (IsNewDoc() && rbCollExist)
{
- // --> OD 2007-01-25 #i73790# - method renamed
- pFmt->ResetAllFmtAttr();
- // <--
+ pFmt->ResetAllFmtAttr(); // #i73790# - method renamed
rbCollExist = false;
}
return pFmt;
@@ -4192,7 +4183,7 @@ void SwRTFParser::UnknownAttrToken( int nToken, SfxItemSet* pSet )
{
// wir sind in der Style-Definitions - Phase. Der Name
// wird dann spaeter umgesetzt
- //#117891# pSet->Put( SwNumRuleItem( String::CreateFromInt32( nTokenValue )));
+ // pSet->Put( SwNumRuleItem( String::CreateFromInt32( nTokenValue )));
}
}
diff --git a/sw/source/filter/rtf/swparrtf.hxx b/sw/source/filter/rtf/swparrtf.hxx
index a6947b1..049bef4 100644
--- a/sw/source/filter/rtf/swparrtf.hxx
+++ b/sw/source/filter/rtf/swparrtf.hxx
@@ -324,9 +324,7 @@ class SwRTFParser : public SvxRTFParser
bool bSwPageDesc;
bool bReadSwFly; // lese Swg-Fly (wichtig fuer Bitmaps!)
- // --> OD 2008-12-22 #i83368#
- bool mbReadCellWhileReadSwFly;
- // <--
+ bool mbReadCellWhileReadSwFly; // #i83368#
bool mbReadNoTbl; // verhinder Tabelle in Tabelle/FootNote
bool mbIsFootnote;
bool bFootnoteAutoNum; // automatische Numerierung ?
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index d355813..ed12dcb 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -127,10 +127,9 @@ long SwWriteTable::GetLineHeight( const SwTableLine *pLine )
return nHeight;
// Wenn kein Layout gefunden wurde, gehen wir von festen Hoehen aus.
- // --> FME 2007-3-26 #i60390# in some cases we still want to continue
+ // #i60390# - in some cases we still want to continue
// to use the layout heights even if one of the rows has a height of 0
// ('hidden' rows)
- // <--
bUseLayoutHeights = bLayoutAvailable; /*FALSE;*/
#if OSL_DEBUG_LEVEL > 1
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index b437376..bd7d98a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -256,7 +256,7 @@ void DocxAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointe
const SwTableLines& rLines = pTable->GetTabLines( );
USHORT nLinesCount = rLines.Count( );
// HACK
- // fdo#30860 - msoffice seems to have an internal limitation of 63 columns for tables
+ // msoffice seems to have an internal limitation of 63 columns for tables
// and refuses to load .docx with more, even though the spec seems to allow that;
// so simply if there are more columns, don't close the last one msoffice will handle
// and merge the contents of the remaining ones into it (since we don't close the cell
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index 163763b..9d5ace7 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -33,7 +33,7 @@
const sal_uInt32 nInlineHack = 0x00010001;
class SwFrmFmt;
-// --> OD 2005-01-06 #i30669#
+// #i30669#
class SwFmtHoriOrient;
class SwFmtVertOrient;
// <--
@@ -47,7 +47,7 @@ public:
/** method to perform conversion of positioning attributes with the help
of corresponding layout information
- OD 2005-01-06 #i30669#
+ #i30669#
Because most of the Writer object positions doesn't correspond to the
object positions in WW8, this method converts the positioning
attributes. For this conversion the corresponding layout information
@@ -57,8 +57,6 @@ public:
object positions are already treated special in method <WriteData(..)>.
Usage of method: Used by method <SetAnchoring(..)>, nothing else
- @author OD
-
@param _iorHoriOri
input/output parameter - containing the current horizontal position
attributes, which are converted by this method.
diff --git a/sw/source/filter/ww8/fields.cxx b/sw/source/filter/ww8/fields.cxx
index fa99b3a..55b3b86 100644
--- a/sw/source/filter/ww8/fields.cxx
+++ b/sw/source/filter/ww8/fields.cxx
@@ -40,8 +40,7 @@ namespace ww
const char *GetEnglishFieldName(eField eIndex) throw()
{
//0 Signifies the field names I can't find.
- // --> OD 2005-06-08 #i43956#
- // field <eFOOTREF> = 5 should be mapped to "REF"
+ // #i43956# - field <eFOOTREF> = 5 should be mapped to "REF"
static const char *aFieldNames[] =
{
/* 0*/ 0,
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 51e3878..01eaf3a 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3227,8 +3227,7 @@ static OString ExportPICT( const SwFlyFrmFmt* pFlyFrmFmt, const Size &rOrig, con
long nXCroppedSize = rOrig.Width()-(rCr.GetLeft() + rCr.GetRight());
long nYCroppedSize = rOrig.Height()-(rCr.GetTop() + rCr.GetBottom());
- /* #127543#: Graphic with a zero height or width, typically copied from webpages, caused
- crashes. */
+ /* Graphic with a zero height or width, typically copied from webpages, caused crashes. */
if( !nXCroppedSize )
nXCroppedSize = 100;
if( !nYCroppedSize )
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index efcbe47..0e58e80 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -547,8 +547,7 @@ void RtfExport::ExportDocument_Impl()
// size and empty margins of the page
if( pDoc->GetPageDescCnt() )
{
- //JP 06.04.99: Bug 64361 - Seeking the first SwFmtPageDesc. If
- // no set, the default is valid
+ // Seeking the first SwFmtPageDesc. If no set, the default is valid
const SwFmtPageDesc* pSttPgDsc = 0;
{
const SwNode& rSttNd = *pDoc->GetNodes()[
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 0ba7481..58f9cfe 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -95,15 +95,15 @@ namespace
return res;
}
- // --> OD 2009-02-04 #i98791# - adjust sorting
- //Utility to sort SwTxtFmtColl's by their assigned outline style list level
+ // #i98791# - adjust sorting
+ // Utility to sort SwTxtFmtColl's by their assigned outline style list level
class outlinecmp : public
std::binary_function<const SwTxtFmtColl*, const SwTxtFmtColl*, bool>
{
public:
bool operator()(const SwTxtFmtColl *pA, const SwTxtFmtColl *pB) const
{
- // --> OD 2009-02-04 #i98791#
+ // #i98791#
bool bResult( false );
const bool bIsAAssignedToOutlineStyle( pA->IsAssignedToListLevelOfOutlineStyle() );
const bool bIsBAssignedToOutlineStyle( pB->IsAssignedToListLevelOfOutlineStyle() );
@@ -180,14 +180,11 @@ namespace sw
: mpFlyFrm(&rFmt),
maPos(rPos),
maSize(),
- // --> OD 2007-04-19 #i43447#
- maLayoutSize(),
- // <--
+ maLayoutSize(), // #i43447#
meWriterType(eTxtBox),
mpStartFrameContent(0),
- // --> OD 2007-04-19 #i43447# - move to initialization list
+ // #i43447# - move to initialization list
mbIsInline( (rFmt.GetAnchor().GetAnchorId() == FLY_AS_CHAR) )
- // <--
{
switch (rFmt.Which())
{
@@ -197,7 +194,7 @@ namespace sw
SwNodeIndex aIdx(*pIdx, 1);
const SwNode &rNd = aIdx.GetNode();
using sw::util::GetSwappedInSize;
- // --> OD 2007-04-19 #i43447# - determine layout size
+ // #i43447# - determine layout size
{
SwRect aLayRect( rFmt.FindLayoutRect() );
Rectangle aRect( aLayRect.SVRect() );
@@ -222,8 +219,7 @@ namespace sw
break;
default:
meWriterType = eTxtBox;
- // --> OD 2007-04-19 #i43447#
- // Size equals layout size for text boxes
+ // #i43447# - Size equals layout size for text boxes
maSize = maLayoutSize;
// <--
break;
@@ -437,15 +433,13 @@ namespace sw
std::swap(mnFormLayer, rOther.mnFormLayer);
}
- // --> OD 2004-12-13 #i38889# - by default put objects into the invisible
- // layers.
+ // #i38889# - by default put objects into the invisible layers.
SetLayer::SetLayer(const SwDoc &rDoc)
: mnHeavenLayer(rDoc.GetInvisibleHeavenId()),
mnHellLayer(rDoc.GetInvisibleHellId()),
mnFormLayer(rDoc.GetInvisibleControlsId())
{
}
- // <--
SetLayer::SetLayer(const SetLayer& rOther) throw()
: mnHeavenLayer(rOther.mnHeavenLayer),
@@ -554,12 +548,11 @@ namespace sw
return pFmt;
}
- // --> OD 2009-02-04 #i98791# - adjust sorting algorithm
+ // #i98791# - adjust sorting algorithm
void SortByAssignedOutlineStyleListLevel(ParaStyles &rStyles)
{
std::sort(rStyles.begin(), rStyles.end(), outlinecmp());
}
- // <--
/*
Utility to extract flyfmts from a document, potentially from a
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 3cdd0c4..6f82f69 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -115,12 +115,11 @@ namespace sw
const SwFrmFmt* mpFlyFrm;
SwPosition maPos;
Size maSize;
- // --> OD 2007-04-19 #i43447#
- // Size of the frame in the layout.
+ // #i43447# - Size of the frame in the layout.
// Especially needed for graphics, whose layout size can differ from its
// size, because it is scaled into its environment.
Size maLayoutSize;
- // <--
+
WriterSource meWriterType;
const SwNode *mpStartFrameContent;
bool mbIsInline;
@@ -201,8 +200,7 @@ namespace sw
/** The layout size of the contained element
- OD 2007-04-19 #i43447#
- Needed for graphics, which are scaled into its environment
+ #i43447# - Needed for graphics, which are scaled into its environment
@return layout size
*/
@@ -563,7 +561,7 @@ namespace sw
e.g. given Normal/Heading1/Heading2/.../Heading10 at their default
assigned outline style list levels of body level/level 1/level 2/.../level 10
- OD 2009-02-04 #i98791#
+ #i98791#
adjust the sorting algorithm due to introduced outline level attribute
@param rStyles
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 3e1905c..77bb96f 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -64,7 +64,6 @@ namespace myImplHelpers
SwTwips CalcHdFtDist(const SwFrmFmt& rFmt, sal_uInt16 nSpacing)
{
/*
- #98506#
The normal case for reexporting word docs is to have dynamic spacing,
as this is word's only setting, and the reason for the existance of the
dynamic spacing features. If we have dynamic spacing active then we can
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 599ac41..7184458 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -77,9 +77,7 @@
#include <fmtsrnd.hxx>
#include <fmtornt.hxx>
#include <fmtfsize.hxx>
-// --> OD 2005-01-06 #i30669#
-#include <fmtfollowtextflow.hxx>
-// <--
+#include <fmtfollowtextflow.hxx> // #i30669#
#include <dcontact.hxx>
#include <frmfmt.hxx>
#include <fmtcntnt.hxx>
@@ -101,9 +99,7 @@
#include "writerwordglue.hxx"
#include "wrtww8.hxx"
#include "escher.hxx"
-// --> OD 2007-07-24 #148096#
#include <ndtxt.hxx>
-// <--
#include "WW8FFData.hxx"
using namespace com::sun::star;
@@ -111,7 +107,7 @@ using namespace sw::util;
using namespace sw::types;
using namespace nsFieldFlags;
-//#110185# get a part fix for this type of element
+// get a part fix for this type of element
bool WW8Export::MiserableFormFieldExportHack(const SwFrmFmt& rFrmFmt)
{
OSL_ENSURE(bWrtWW8, "Not allowed");
@@ -169,7 +165,6 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet)
rtl::OUString sHelp;
{
- // --> OD 2010-05-14 #160026#
// property "Help" does not exist and due to the no-existence an exception is thrown.
try
{
@@ -485,7 +480,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
Rectangle aRect;
SwFmtVertOrient rVOr = rFmt.GetVertOrient();
SwFmtHoriOrient rHOr = rFmt.GetHoriOrient();
- // --> OD 2005-01-06 #i30669# - convert the positioning attributes.
+ // #i30669# - convert the positioning attributes.
// Most positions are converted, if layout information exists.
const bool bPosConverted =
WinwordAnchoring::ConvertPosition( rHOr, rVOr, rFmt );
@@ -501,7 +496,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
aRect.SetSize( rFmt.GetFrmSize().GetSize() );
else
{
- // --> FME 2007-06-20 #i56090# Do not only consider the first client
+ // #i56090# Do not only consider the first client
// Note that we actually would have to find the maximum size of the
// frame format clients. However, this already should work in most cases.
const SwRect aSizeRect(rFmt.FindLayoutRect());
@@ -521,8 +516,8 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
}
}
- // --> OD 2005-01-06 #i30669# - use converted position, if conversion
- // is performed. Unify position determination of Writer fly frames
+ // #i30669# - use converted position, if conversion is performed.
+ // Unify position determination of Writer fly frames
// and drawing objects.
if ( bPosConverted )
{
@@ -534,7 +529,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
aObjPos = aRect.TopLeft();
if (text::VertOrientation::NONE == rVOr.GetVertOrient())
{
- // CMC, OD 24.11.2003 #i22673#
+ // #i22673#
sal_Int16 eOri = rVOr.GetRelationOrient();
if (eOri == text::RelOrientation::CHAR || eOri == text::RelOrientation::TEXT_LINE)
aObjPos.Y() = -rVOr.GetPos();
@@ -2031,7 +2026,7 @@ void SwEscherEx::FinishEscher()
/** method to perform conversion of positioning attributes with the help
of corresponding layout information
- OD 2005-01-06 #i30669#
+ #i30669#
Because most of the Writer object positions doesn't correspond to the
object positions in WW8, this method converts the positioning
attributes. For this conversion the corresponding layout information
@@ -2040,8 +2035,6 @@ void SwEscherEx::FinishEscher()
No conversion is performed for as-character anchored objects. Whose
object positions are already treated special in method <WriteData(..)>.
- @author OD
-
@param _iorHoriOri
input/output parameter - containing the current horizontal position
attributes, which are converted by this method.
@@ -2087,7 +2080,6 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
// be determined. --> no conversion
return false;
}
- // --> OD 2006-09-26 #141404#
// no conversion for anchored drawing object, which aren't attached to an
// anchor frame.
// This is the case for drawing objects, which are anchored inside a page
@@ -2105,7 +2097,6 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
// at page areas have to be converted, if it's set.
const bool bFollowTextFlow = _rFrmFmt.GetFollowTextFlow().GetValue();
- // --> OD 2007-07-24 #148096#
// check, if horizontal and vertical position have to be converted due to
// the fact, that the object is anchored at a paragraph, which has a "column
// break before" attribute
@@ -2140,7 +2131,6 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
}
// determine conversion type due to the position relation
- // --> OD 2007-07-24 #148096#
if ( bConvDueToAnchoredAtColBreakPara )
{
eHoriConv = CONV2PG;
@@ -2198,7 +2188,7 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
if ( eHoriConv == CONV2PG )
{
_iorHoriOri.SetRelationOrient( text::RelOrientation::PAGE_FRAME );
- // --> OD 2005-01-27 #i33818#
+ // #i33818#
bool bRelToTableCell( false );
aPos = pAnchoredObj->GetRelPosToPageFrm( bFollowTextFlow,
bRelToTableCell );
@@ -2247,7 +2237,6 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
}
// determine conversion type due to the position relation
- // --> OD 2007-07-24 #148096#
if ( bConvDueToAnchoredAtColBreakPara )
{
eVertConv = CONV2PG;
@@ -2302,7 +2291,7 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
"<WinwordAnchoring::ConvertPosition(..)> - unknown vertical relation" );
}
}
- // <--
+
if ( eVertConv != NO_CONV )
{
_iorVertOri.SetVertOrient( text::VertOrientation::NONE );
@@ -2312,7 +2301,7 @@ bool WinwordAnchoring::ConvertPosition( SwFmtHoriOrient& _iorHoriOri,
if ( eVertConv == CONV2PG )
{
_iorVertOri.SetRelationOrient( text::RelOrientation::PAGE_FRAME );
- // --> OD 2005-01-27 #i33818#
+ // #i33818#
bool bRelToTableCell( false );
aPos = pAnchoredObj->GetRelPosToPageFrm( bFollowTextFlow,
bRelToTableCell );
@@ -2352,14 +2341,12 @@ void WinwordAnchoring::SetAnchoring(const SwFrmFmt& rFmt)
SwFmtHoriOrient rHoriOri = rFmt.GetHoriOrient();
SwFmtVertOrient rVertOri = rFmt.GetVertOrient();
- // --> OD 2005-01-06 #i30669# - convert the positioning attributes.
+ // #i30669# - convert the positioning attributes.
// Most positions are converted, if layout information exists.
const bool bPosConverted = ConvertPosition( rHoriOri, rVertOri, rFmt );
- // <--
const sal_Int16 eHOri = rHoriOri.GetHoriOrient();
- // CMC, OD 24.11.2003 #i22673#
- const sal_Int16 eVOri = rVertOri.GetVertOrient();
+ const sal_Int16 eVOri = rVertOri.GetVertOrient(); // #i22673#
const sal_Int16 eHRel = rHoriOri.GetRelationOrient();
const sal_Int16 eVRel = rVertOri.GetRelationOrient();
@@ -2389,7 +2376,7 @@ void WinwordAnchoring::SetAnchoring(const SwFrmFmt& rFmt)
}
// vertical Adjustment
- // CMC, OD 24.11.2003 #i22673#
+ // #i22673#
// When adjustment is vertically relative to line or to char
// bottom becomes top and vice versa
const bool bVertSwap = !bPosConverted &&
@@ -2471,7 +2458,7 @@ void WinwordAnchoring::SetAnchoring(const SwFrmFmt& rFmt)
mnYRelTo = 2;
break;
case text::RelOrientation::CHAR:
- case text::RelOrientation::TEXT_LINE: // CMC, OD 24.11.2003 #i22673# - vertical alignment at top of line
+ case text::RelOrientation::TEXT_LINE: // #i22673# - vertical alignment at top of line
case text::RelOrientation::PAGE_LEFT: //nonsense
case text::RelOrientation::PAGE_RIGHT: //nonsense
case text::RelOrientation::FRAME_LEFT: //nonsense
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 8d6cd56..addb3ed 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2055,13 +2055,13 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
{
pTmpSet = new SfxItemSet( rNode.GetSwAttrSet() );
SvxULSpaceItem aUL( *(SvxULSpaceItem*)pItem );
- // OD, MMAHER 2004-03-01 #i25901#- consider compatibility option
+ // #i25901#- consider compatibility option
if (!pDoc->get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES))
{
if( !(ND_HAS_PREV_LAYNODE & nPrvNxtNd ))
aUL.SetUpper( 0 );
}
- // OD, MMAHER 2004-03-01 #i25901# - consider compatibility option
+ // #i25901# - consider compatibility option
if (!pDoc->get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS))
{
if( !(ND_HAS_NEXT_LAYNODE & nPrvNxtNd ))
@@ -2089,7 +2089,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
pTmpSet = new SfxItemSet( rNode.GetSwAttrSet() );
SvxLRSpaceItem aLR(ItemGet<SvxLRSpaceItem>(*pTmpSet, RES_LR_SPACE));
- // --> OD 2008-06-03 #i86652#
+ // #i86652#
if ( pFmt->GetPositionAndSpaceMode() ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -2099,7 +2099,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
if( rNode.IsNumbered() && rNode.IsCountedInList() )
{
- // --> OD 2008-06-03 #i86652#
+ // #i86652#
if ( pFmt->GetPositionAndSpaceMode() ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -2110,7 +2110,6 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
}
// <--
- // --> OD 2009-03-09 #100020#
// correct fix for issue i94187
if (SFX_ITEM_SET !=
pTmpSet->GetItemState(RES_PARATR_NUMRULE, false) )
@@ -2134,7 +2133,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
else
pTmpSet->ClearItem(RES_PARATR_NUMRULE);
- // --> OD 2008-06-03 #i86652#
+ // #i86652#
if ( pFmt->GetPositionAndSpaceMode() ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -2168,7 +2167,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
pTmpSet->Put(SvxFrameDirectionItem(FRMDIR_HORI_RIGHT_TOP, RES_FRAMEDIR));
}
- // --> OD 2005-10-18 #126238# - move code for handling of numbered,
+ // move code for handling of numbered,
// but not counted paragraphs to this place. Otherwise, the paragraph
// isn't exported as numbered, but not counted, if no other attribute
// is found in <pTmpSet>
@@ -2197,7 +2196,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
// new left margin = old left + label space
const SwNumRule* pRule = rNode.GetNumRule();
const SwNumFmt& rNumFmt = pRule->Get( static_cast< USHORT >(rNode.GetActualListLevel()) );
- // --> OD 2008-06-03 #i86652#
+ // #i86652#
if ( rNumFmt.GetPositionAndSpaceMode() ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -2220,7 +2219,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
}
}
- // --> OD 2007-04-24 #i75457#
+ // #i75457#
// Export page break after attribute from paragraph style.
// If page break attribute at the text node exist, an existing page
// break after at the paragraph style hasn't got to be considered.
@@ -2248,7 +2247,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
}
}
- // --> FME 2007-05-30 #i76520# Emulate non-splitting tables
+ // #i76520# Emulate non-splitting tables
if ( bOutTable )
{
const SwTableNode* pTableNode = rNode.FindTableNode();
@@ -2535,7 +2534,6 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point
bUseEscher = true;
/*
- #110185#
A special case for converting some inline form controls to form fields
when in winword 8+ mode
*/
@@ -2580,11 +2578,7 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point
Point aOffset;
if ( m_rWW8Export.mpParentFrame )
{
- /*
- #90804#
- Munge flys in fly into absolutely positioned elements for
- word 6
- */
+ /* Munge flys in fly into absolutely positioned elements for word 6 */
const SwTxtNode* pParTxtNode = rAnch.GetCntntAnchor()->nNode.GetNode().GetTxtNode();
const SwRect aPageRect = pParTxtNode->FindPageFrmRect( FALSE, 0, FALSE );
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 90f1ad9..113c5e7 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -92,8 +92,8 @@ USHORT MSWordExportBase::GetId( const SwNumRule& rNumRule )
{
pUsedNumTbl = new SwNumRuleTbl;
pUsedNumTbl->Insert( &pDoc->GetNumRuleTbl(), 0 );
- // --> OD 2005-10-17 #126238# - Check, if the outline rule is
- // already inserted into <pUsedNumTbl>. If yes, do not insert it again.
+ // Check, if the outline rule is already inserted into <pUsedNumTbl>.
+ // If yes, do not insert it again.
bool bOutlineRuleAdded( false );
for ( USHORT n = pUsedNumTbl->Count(); n; )
{
@@ -120,8 +120,7 @@ USHORT MSWordExportBase::GetId( const SwNumRule& rNumRule )
USHORT nRet = pUsedNumTbl->GetPos(p);
//Is this list now duplicated into a new list which we should use
- // --> OD 2007-05-30 #i77812#
- // perform 'deep' search in duplication map
+ // #i77812# - perform 'deep' search in duplication map
::std::map<USHORT,USHORT>::const_iterator aResult = aRuleDuplicates.end();
do {
aResult = aRuleDuplicates.find(nRet);
@@ -328,7 +327,7 @@ void MSWordExportBase::AbstractNumberingDefinitions()
const SwNumFmt& rFmt = rRule.Get( nLvl );
BYTE nFollow = 0;
- // --> OD 2008-06-03 #i86652#
+ // #i86652#
if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
nFollow = 2; // ixchFollow: 0 - tab, 1 - blank, 2 - nothing
@@ -390,17 +389,15 @@ void MSWordExportBase::AbstractNumberingDefinitions()
if ( sw::util::IsStarSymbol( sFontName ) )
SubstituteBullet( sNumStr, eChrSet, sFontName );
- // --> OD 2008-06-03 #i86652#
+ // #i86652#
if ( rFmt.GetPositionAndSpaceMode() ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- // --> OD 2007-07-23 #148661#
// <nFollow = 2>, if minimum label width equals 0 and
// minimum distance between label and text equals 0
nFollow = ( rFmt.GetFirstLineOffset() == 0 &&
rFmt.GetCharTextDistance() == 0 )
? 2 : 0; // ixchFollow: 0 - tab, 1 - blank, 2 - nothing
- // <--
}
// <--
}
@@ -409,8 +406,8 @@ void MSWordExportBase::AbstractNumberingDefinitions()
if (SVX_NUM_NUMBER_NONE != rFmt.GetNumberingType())
{
BYTE* pLvlPos = aNumLvlPos;
- // --> OD 2005-10-17 #126238# - the numbering string
- // has to be restrict to the level currently working on.
+ // the numbering string has to be restrict
+ // to the level currently working on.
sNumStr = rRule.MakeNumString(aNumVector, false, true, nLvl);
// <--
@@ -426,17 +423,15 @@ void MSWordExportBase::AbstractNumberingDefinitions()
sNumStr.SetChar( nFnd, (char)i );
}
}
- // --> OD 2008-06-03 #i86652#
+ // #i86652#
if ( rFmt.GetPositionAndSpaceMode() ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- // --> OD 2007-07-23 #148661#
// <nFollow = 2>, if minimum label width equals 0 and
// minimum distance between label and text equals 0
nFollow = ( rFmt.GetFirstLineOffset() == 0 &&
rFmt.GetCharTextDistance() == 0 )
? 2 : 0; // ixchFollow: 0 - tab, 1 - blank, 2 - nothing
- // <--
}
// <--
}
@@ -478,7 +473,7 @@ void MSWordExportBase::AbstractNumberingDefinitions()
sal_Int16 nFirstLineIndex = 0;
sal_Int16 nListTabPos = 0;
- // --> OD 2008-06-03 #i86652#
+ // #i86652#
if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
nIndentAt = nListTabPos = rFmt.GetAbsLSpace();
@@ -634,7 +629,7 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, BYTE*& rpCh,
break;
}
- // --> OD 2008-06-03 #i86652#
+ // #i86652#
if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
if (GetWordFirstLineOffset(rFmt) < 0)
@@ -645,11 +640,9 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, BYTE*& rpCh,
if (1 < rCharLen)
{
- // --> #b6440955#
const Font& rFont = rFmt.GetBulletFont()
? *rFmt.GetBulletFont()
: numfunc::GetDefBulletFont();
- // <--
String sNumStr = rFmt.GetBulletChar();
rtl_TextEncoding eChrSet = rFont.GetCharSet();
String sFontName = rFont.GetName();
@@ -693,7 +686,7 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, BYTE*& rpCh,
ShortToSVBT16(nFontId, rAnlv.ftc);
ByteToSVBT8( 1, rAnlv.cbTextBefore );
}
- // --> OD 2008-06-03 #i86652#
+ // #i86652#
if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
ShortToSVBT16( -GetWordFirstLineOffset(rFmt), rAnlv.dxaIndent );
@@ -838,7 +831,7 @@ void WW8Export::BuildAnlvBase(WW8_ANLV& rAnlv, BYTE*& rpCh,
}
ShortToSVBT16( rFmt.GetStart(), rAnlv.iStartAt );
- // --> OD 2008-06-03 #i86652#
+ // #i86652#
if ( rFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
ShortToSVBT16( -GetWordFirstLineOffset(rFmt), rAnlv.dxaIndent );
@@ -900,7 +893,7 @@ bool WW8Export::Out_SwNum(const SwTxtNode* pNd)
bool bRet = true;
SwNumFmt aFmt(pRul->Get(nSwLevel));
- // --> OD 2008-06-03 #i86652#
+ // #i86652#
if ( aFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
const SvxLRSpaceItem& rLR = ItemGet<SvxLRSpaceItem>(*pNd, RES_LR_SPACE);
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 073041c..0f8bc81 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1562,11 +1562,10 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
// und raus damit ins WW-File
const SfxItemSet* pOldI = pISet;
pISet = &aSet;
- // --> OD 2007-06-12 #TESTING#
+
// Switch off test on default item values, if page description
// set (value of <bOutPgDscSet>) isn't written.
AttrOutput().OutputStyleItemSet( aSet, true, bOutPgDscSet );
- // <--
//Cannot export as normal page framedir, as continous sections
//cannot contain any grid settings like proper sections
@@ -2009,7 +2008,6 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, BYTE nTTyp,
rWrt.WriteSpecialText( pNdIdx->GetIndex() + 1,
pNdIdx->GetNode().EndOfSectionIndex(),
nTTyp );
- // --> OD 2008-08-07 #156757#
{
SwNodeIndex aContentIdx = *pNdIdx;
++aContentIdx;
@@ -2034,7 +2032,6 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, BYTE nTTyp,
}
}
}
- // <--
}
// CR at end of one textbox text ( otherwise WW gpft :-( )
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index c8fe531..c22c912 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2643,7 +2643,7 @@ void WW8Export::WriteFkpPlcUsw()
if (pEscher || pDoc->ContainsMSVBasic())
{
/*
- #82587# Everytime MS 2000 creates an escher stream there is always
+ Everytime MS 2000 creates an escher stream there is always
an ObjectPool dir (even if empty). It turns out that if a copy of
MS 2000 is used to open a document that contains escher graphics
exported from StarOffice without this empty dir then *if* that
@@ -2658,10 +2658,7 @@ void WW8Export::WriteFkpPlcUsw()
the existence of an ObjectPool dir is necessary for triggering
some magic. cmc
*/
- /*
- #10570# Similiarly having msvbasic storage seems to also trigger
- creating this stream
- */
+ /* Similiarly having msvbasic storage seems to also trigger creating this stream */
GetWriter().GetStorage().OpenSotStorage(CREATE_CONST_ASC(SL::aObjectPool),
STREAM_READWRITE | STREAM_SHARE_DENYALL);
}
@@ -2694,8 +2691,8 @@ void WW8Export::WriteFkpPlcUsw()
// Write SttbfAssoc
WW8SttbAssoc * pSttbfAssoc = dynamic_cast<WW8SttbAssoc *>
(pDoc->getExternalData(::sw::STTBF_ASSOC).get());
- // --> OD 2009-10-19 #i106057#
- if ( pSttbfAssoc )
+
+ if ( pSttbfAssoc ) // #i106057#
// <--
{
::std::vector<String> aStrings;
@@ -2916,10 +2913,8 @@ void MSWordExportBase::ExportDocument( bool bWriteAll )
if ( !pOCXExp )
pOCXExp = new SwMSConvertControls( pDoc->GetDocShell(), pCurPam );
- // --> OD 2007-10-08 #i81405#
- // Collect anchored objects before changing the redline mode.
+ // #i81405# - Collect anchored objects before changing the redline mode.
maFrames = GetFrames( *pDoc, bWriteAll? NULL : pOrigPam );
- // <--
mnRedlineMode = pDoc->GetRedlineMode();
if ( pDoc->GetRedlineTbl().Count() )
@@ -3270,7 +3265,7 @@ void WW8Export::PrepareStorage()
ULONG SwWW8Writer::WriteStorage()
{
- // #i34818# #120099# - update layout (if present), for SwWriteTable
+ // #i34818# - update layout (if present), for SwWriteTable
ViewShell* pViewShell = NULL;
pDoc->GetEditShell( &pViewShell );
if( pViewShell != NULL )
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 945f40e..c1c1a7e 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -519,7 +519,7 @@ public:
HdFtPlcDrawObj *pHFSdrObjs; // Draw-/Fly-Objects in header or footer
SwEscherEx* pEscher; // escher export class
- // --> OD 2007-04-19 #i43447# - removed
+ // #i43447# - removed
// SwTwips nFlyWidth, nFlyHeight; // Fuer Anpassung Graphic
// <--
@@ -1037,7 +1037,7 @@ public:
virtual void SectionBreaksAndFrames( const SwTxtNode& rNode );
/// Helper method for OutputSectionBreaks() and OutputFollowPageDesc().
- // OD 2007-05-29 #i76300#
+ // #i76300#
virtual void PrepareNewPageDesc( const SfxItemSet* pSet,
const SwNode& rNd,
const SwFmtPageDesc* pNewPgDescFmt = 0,
@@ -1050,10 +1050,8 @@ public:
WW8_BRC TranslateBorderLine(const SvxBorderLine& pLine,
USHORT nDist, bool bShadow);
- // --> OD 2007-06-04 #i77805#
- // new return value indicates, if an inherited outline numbering is suppressed
+ // #i77805# - new return value indicates, if an inherited outline numbering is suppressed
virtual bool DisallowInheritingOutlineNumbering(const SwFmt &rFmt);
- // <--
unsigned int GetHdFtIndex() const { return mnHdFtIndex; }
void SetHdFtIndex(unsigned int nHdFtIndex) { mnHdFtIndex = nHdFtIndex; }
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index afd27c6..91c075c 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -410,7 +410,7 @@ void WW8Export::OutGrf(const sw::Frame &rFrame)
pChpPlc->AppendFkpEntry( Strm().Tell(), pO->Count(), pO->GetData() );
pO->Remove( 0, pO->Count() ); // leeren
- // --> OD 2007-06-06 #i29408#
+ // #i29408#
// linked, as-character anchored graphics have to be exported as fields.
const SwGrfNode* pGrfNd = rFrame.IsInline() && rFrame.GetContent()
? rFrame.GetContent()->GetGrfNode() : 0;
@@ -496,7 +496,7 @@ void WW8Export::OutGrf(const sw::Frame &rFrame)
Set_UInt8( pArr, nAttrMagicIdx++ );
pChpPlc->AppendFkpEntry( Strm().Tell(), static_cast< short >(pArr - aArr), aArr );
- // --> OD 2007-04-23 #i75464#
+ // #i75464#
// Check, if graphic isn't exported as-character anchored.
// Otherwise, an additional paragraph is exported for a graphic, which is
// forced to be treated as inline, because it's anchored inside another frame.
@@ -518,7 +518,7 @@ void WW8Export::OutGrf(const sw::Frame &rFrame)
pPapPlc->AppendFkpEntry( Strm().Tell(), pO->Count(), pO->GetData() );
pO->Remove( 0, pO->Count() ); // leeren
}
- // --> OD 2007-06-06 #i29408#
+ // #i29408#
// linked, as-character anchored graphics have to be exported as fields.
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list