diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:25:01 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:25:01 +0200 |
commit | 002c16ce95fa6e384e7541b6e656b9058dd9b459 (patch) | |
tree | c713903d39a6fa16db64fcf311b7b09a09528cfa /sw/source/filter/rtf/rtftbl.cxx | |
parent | 870bf01177cda3e80d200b785040e0ebe248b263 (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 884b525da5856cbd2c4a382e73327d8c59a91acc (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:09 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit b59804d94e107c5227532aa3511d4fad1dd15436
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Mar 18 17:47:27 2011 +0100
Related: fdo#32553/fdo#31792 nsure correct odt mimetype and pdf export filter
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sw/source/ui/dbui/mmoutputpage.cxx | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
commit d1234b1bcd542b4ce523b6be76e7491afdce4de8
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Mar 18 12:29:41 2011 +0000
Resolves: fdo#32553 freeze/hang on mailmerge to attached pdf
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sw/source/core/docnode/nodes.cxx | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
commit 5974be757044982b8f510c5fc642e8e03ae62c74
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Mar 8 16:32:57 2011 +0100
n#663622: Fix the positions of imported fields to avoid crashes
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sw/source/core/crsr/bookmrk.cxx | 2 +-
sw/source/core/inc/bookmrk.hxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Notes
split repo tag: writer_libreoffice-3.3.3.1
Diffstat (limited to 'sw/source/filter/rtf/rtftbl.cxx')
-rw-r--r-- | sw/source/filter/rtf/rtftbl.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/filter/rtf/rtftbl.cxx b/sw/source/filter/rtf/rtftbl.cxx index d2fa7f37368e..e3b1e644edbb 100644 --- a/sw/source/filter/rtf/rtftbl.cxx +++ b/sw/source/filter/rtf/rtftbl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -145,7 +145,7 @@ void SwRTFParser::ReadTable( int nToken ) if (CantUseTables()) { // alle Tabellen-Tokens ueberlesen - nToken = GetNextToken(); // RTF_TROWD ueberlesen + nToken = GetNextToken(); // RTF_TROWD ueberlesen do { if( RTF_TABLEDEF != (nToken & ~(0xff | RTF_SWGDEFS)) && RTF_UNKNOWNCONTROL != nToken ) @@ -175,7 +175,7 @@ void SwRTFParser::ReadTable( int nToken ) if( RTF_TROWD == nToken || !pTableNode ) { if( RTF_TROWD == nToken ) - nToken = GetNextToken(); // RTF_TROWD ueberlesen + nToken = GetNextToken(); // RTF_TROWD ueberlesen // Flags fuer die gemergten Boxen loeschen aMergeBoxes.Remove( 0, aMergeBoxes.Count() ); @@ -458,7 +458,7 @@ void SwRTFParser::ReadTable( int nToken ) case RTF_CLTXLRTB: case RTF_CLTXTBRL: - case RTF_INTBL: // das wissen wir ! + case RTF_INTBL: // das wissen wir ! case RTF_CLMGF: case RTF_CLVMGF: case RTF_CLVMRG: @@ -529,7 +529,7 @@ void SwRTFParser::ReadTable( int nToken ) int nC = aMergeBackup.Count(); for (USHORT i = 0; i < nC; ++i) aMergeBoxes.Insert(aMergeBackup[i], i); - SkipToken( -1 ); // zum Letzen gueltigen zurueck + SkipToken( -1 ); // zum Letzen gueltigen zurueck return; } @@ -635,9 +635,9 @@ void SwRTFParser::ReadTable( int nToken ) } aBoxFmts.Remove( 0, n ); - if( aBoxFmts.Count() ) // es muessen noch neue zugefuegt werden + if( aBoxFmts.Count() ) // es muessen noch neue zugefuegt werden nAktBox = n; - else // es mussen noch Boxen geloescht werden + else // es mussen noch Boxen geloescht werden { // remove ContentIndex of other Bound pPam->SetMark(); pPam->DeleteMark(); @@ -727,7 +727,7 @@ void SwRTFParser::ReadTable( int nToken ) } else { - SkipToken( -1 ); // zum Letzen gueltigen zurueck + SkipToken( -1 ); // zum Letzen gueltigen zurueck return; } @@ -832,7 +832,7 @@ void SwRTFParser::ReadTable( int nToken ) OSL_ENSURE(!bFailure, "RTF Table failure"); if (bFailure) { - SkipToken( -1 ); // zum Letzen gueltigen zurueck + SkipToken( -1 ); // zum Letzen gueltigen zurueck return; } @@ -867,7 +867,7 @@ void SwRTFParser::ReadTable( int nToken ) pStk->MoveFullNode(aOldPos, aNewPos); } } - SkipToken( -1 ); // zum Letzen gueltigen zurueck + SkipToken( -1 ); // zum Letzen gueltigen zurueck } // in die naechste Box dieser Line (opt.: falls es nicht die letzte ist) @@ -945,7 +945,7 @@ void SwRTFParser::NewTblLine() if( !bMakeCopy && 64000 < pTableNode->GetTable().GetTabSortBoxes().Count() ) { - bMakeCopy = TRUE; // spaetestens jetzt eine neue anfangen! + bMakeCopy = TRUE; // spaetestens jetzt eine neue anfangen! } if( bMakeCopy ) @@ -964,7 +964,7 @@ void SwRTFParser::NewTblLine() pLns = &pTableNode->GetTable().GetTabLines(); } else -// pDoc->InsertRow( aBoxes ); +// pDoc->InsertRow( aBoxes ); pTableNode->GetTable().AppendRow( pDoc ); pBox = (*pLns)[ pLns->Count()-1 ]->GetTabBoxes()[0]; @@ -1018,8 +1018,8 @@ void SwRTFParser::CheckInsNewTblLine() { if( nInsTblRow > GetOpenBrakets() || IsPardTokenRead() ) nInsTblRow = USHRT_MAX; - else if( !pTableNode ) // Tabelle nicht mehr vorhanden ? - NewTblLine(); // evt. Line copieren + else if( !pTableNode ) // Tabelle nicht mehr vorhanden ? + NewTblLine(); // evt. Line copieren } } |