diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:43 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:43 +0200 |
commit | b4e4583b94e78d6e81ab07894cfc0e99cefa33c1 (patch) | |
tree | 26e22c8ab20d2c38bc88dfcc041c8143e0609557 /sc/source/filter/rtf/eeimpars.cxx | |
parent | 69bb367315288b644439dc46d34743a2575a3527 (diff) |
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 8964ceb596c66db5e9677de1ad99f9747342b87b (tag: refs/tags/libreoffice-3.3.1.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Feb 8 18:07:42 2011 +0100
Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1)
commit 737b6a92adca9a8285370918671b93b56a028537
Author: Jan Holesovsky <kendy@suse.cz>
Date: Mon Feb 7 21:23:21 2011 +0100
Branch libreoffice-3-3-1
This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
commit d4d6a678bf169eebee2fe4d71c8ec66de6898d6e
Author: Jani Monoses <jani.monoses@canonical.com>
Date: Thu Jan 27 15:33:06 2011 +0200
Remove unused declaration
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
sc/source/core/tool/token.cxx | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
commit 96bee1507119ca0525845022019d90f0694996aa
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 20 23:44:52 2011 -0500
Fixed incorrect page number in page preview mode. (fdo#33155)
When the window is large enough to show several 'Page X' strings,
the page number was not properly incremented. This commit fixes
it.
sc/source/ui/view/gridwin4.cxx | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
commit ed46df1fcb5869818f5f74e0c7a5b19c65102e83
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Wed Jan 19 00:24:24 2011 -0500
Fixed incorrect import of cell attributes from Excel documents.
When a cell with non-default formatting attribute starts with non-first
row in a column, the filter would incorrectly apply the same format to
all the cells above it if they didn't have any formats. This commit
fixes it.
sc/source/filter/excel/xistyle.cxx | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
commit af63319fcdeea3f9b5018eab83ef5a9e64905446
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 13 11:18:07 2011 -0500
Reverting the merge commit 0fe55349b05fae496a86a3fa958d184f0453916c.
I created a patch between before and after the merge commit, and
reverse-applied it. This is because if you revert a merge commit
in git you are denying all future merges from that branch. I wasn't
sure if we really wanted that.
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sc/inc/document.hxx | 22 +------
sc/inc/drwlayer.hxx | 2 +-
sc/inc/table.hxx | 16 +-----
sc/source/core/data/document.cxx | 7 +--
sc/source/core/data/drwlayer.cxx | 6 +-
sc/source/core/data/table1.cxx | 38 ++++--------
sc/source/core/data/table2.cxx | 91 ++++++------------------------
sc/source/core/data/table3.cxx | 71 +----------------------
sc/source/filter/xml/xmlrowi.cxx | 17 +----
sc/source/ui/docshell/externalrefmgr.cxx | 7 +-
sc/source/ui/view/dbfunc.cxx | 5 +-
sc/source/ui/view/tabvwshe.cxx | 4 +-
12 files changed, 52 insertions(+), 234 deletions(-)
commit 5ada5635cff38af87830b091b36159cf80e4cf5d
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 13 11:04:14 2011 -0500
Revert "This is also part of the merge."
This reverts commit 0fe55349b05fae496a86a3fa958d184f0453916c.
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sc/source/core/data/table3.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit c900e3db767518b7a60eaf24bdf298c94315f685
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 23:05:56 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit 15d298ba7c4e89b043b3077e17747ba027a62c43
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:39:06 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: calc_libreoffice-3.3.1.1
split repo tag: calc_libreoffice-3.3.1.2
Diffstat (limited to 'sc/source/filter/rtf/eeimpars.cxx')
-rw-r--r-- | sc/source/filter/rtf/eeimpars.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index 126ce0ef6865..2526e118f05a 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.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 @@ -201,7 +201,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu bSimple = FALSE; else if (eState == SFX_ITEM_SET) { - if ( nId == EE_CHAR_ESCAPEMENT ) // Hoch-/Tiefstellen immer ueber EE + if ( nId == EE_CHAR_ESCAPEMENT ) // Hoch-/Tiefstellen immer ueber EE { if ( (SvxEscapement)((const SvxEscapementItem*)pItem)->GetEnumValue() != SVX_ESCAPEMENT_OFF ) @@ -210,7 +210,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu } } if ( bSimple ) - { // Feldbefehle enthalten? + { // Feldbefehle enthalten? SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, FALSE ); if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET ) bSimple = FALSE; @@ -222,7 +222,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu sal_uInt32 nNumForm = 0; LanguageType eNumLang = LANGUAGE_NONE; if ( pE->pNumStr ) - { // SDNUM muss sein wenn SDVAL + { // SDNUM muss sein wenn SDVAL aNumStr = *pE->pNumStr; if ( pE->pValStr ) aValStr = *pE->pValStr; @@ -300,7 +300,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu } } if ( pE->nColOverlap > 1 || pE->nRowOverlap > 1 ) - { // merged cells, mit SfxItemSet Put schneller als mit + { // merged cells, mit SfxItemSet Put schneller als mit // nachtraeglichem ScDocument DoMerge ScMergeAttr aMerge( pE->nColOverlap, pE->nRowOverlap ); rSet.Put( aMerge ); @@ -378,8 +378,8 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu pFormatter->ChangeIntl( LANGUAGE_SYSTEM); } - // #105460#, #i4180# String cells can't contain tabs or linebreaks - // -> replace with spaces + // #105460#, #i4180# String cells can't contain tabs or linebreaks + // -> replace with spaces aStr.SearchAndReplaceAll( (sal_Unicode)'\t', (sal_Unicode)' ' ); aStr.SearchAndReplaceAll( (sal_Unicode)'\n', (sal_Unicode)' ' ); @@ -402,7 +402,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu if ( pE->pImageList ) bHasGraphics |= GraphicSize( nCol, nRow, nTab, pE ); if ( pE->pName ) - { // Anchor Name => RangeName + { // Anchor Name => RangeName USHORT nIndex; if ( !pRangeNames->SearchName( *pE->pName, nIndex ) ) { @@ -430,11 +430,11 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu pProgress->SetState( ++nProgress ); } } - DELETEZ( pProgress ); // SetOptimalHeight hat seinen eigenen ProgressBar + DELETEZ( pProgress ); // SetOptimalHeight hat seinen eigenen ProgressBar // Zeilenhoehen anpassen, Basis 100% Zoom Fraction aZoom( 1, 1 ); double nPPTX = ScGlobal::nScreenPPTX * (double) aZoom - / nOutputFactor; // Faktor ist Drucker zu Bildschirm + / nOutputFactor; // Faktor ist Drucker zu Bildschirm double nPPTY = ScGlobal::nScreenPPTY * (double) aZoom; VirtualDevice aVirtDev; mpDoc->SetOptimalHeight( 0, nEndRow, 0, @@ -451,7 +451,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu } } if ( bHasGraphics ) - { // Grafiken einfuegen + { // Grafiken einfuegen for ( pE = mpParser->First(); pE; pE = mpParser->Next() ) { if ( pE->pImageList ) @@ -507,7 +507,7 @@ BOOL ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/, nColWidths += (long) pColWidths->Get( nC ); } if ( nWidth > nColWidths ) - { // Differenz nur in der ersten Spalte eintragen + { // Differenz nur in der ersten Spalte eintragen if ( nThisWidth ) pColWidths->Replace( nCol, (void*)(nWidth - nColWidths + nThisWidth) ); else @@ -517,7 +517,7 @@ BOOL ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/, SCROW nRowSpan = pE->nRowOverlap; nHeight /= nRowSpan; if ( nHeight == 0 ) - nHeight = 1; // fuer eindeutigen Vergleich + nHeight = 1; // fuer eindeutigen Vergleich for ( SCROW nR = nRow; nR < nRow + nRowSpan; nR++ ) { long nRowHeight = (long) mpRowHeights->Get( nR ); @@ -559,13 +559,13 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab, for ( ScHTMLImage* pI = pIL->First(); pI; pI = pIL->Next() ) { if ( nDir & nHorizontal ) - { // horizontal + { // horizontal aInsertPos.X() += aLogicSize.Width(); aInsertPos.X() += aSpace.X(); aInsertPos.Y() = aCellInsertPos.Y(); } else - { // vertikal + { // vertikal aInsertPos.X() = aCellInsertPos.X(); aInsertPos.Y() += aLogicSize.Height(); aInsertPos.Y() += aSpace.Y(); @@ -576,7 +576,7 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab, Size aSizePix = pI->aSize; aLogicSize = pDefaultDev->PixelToLogic( aSizePix, MapMode( MAP_100TH_MM ) ); - // Groesse begrenzen + // Groesse begrenzen ::ScLimitSizeOnDrawPage( aLogicSize, aInsertPos, pPage->GetSize() ); if ( pI->pGraphic ) @@ -593,7 +593,7 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab, // See #i37444#. pObj->SetGraphicLink( pI->aURL, pI->aFilterName ); - pObj->SetLogicRect( aRect ); // erst nach InsertObject !!! + pObj->SetLogicRect( aRect ); // erst nach InsertObject !!! } nDir = pI->nDir; } @@ -635,7 +635,7 @@ ScEEParser::~ScEEParser() void ScEEParser::NewActEntry( ScEEParseEntry* pE ) -{ // neuer freifliegender pActEntry +{ // neuer freifliegender pActEntry pActEntry = new ScEEParseEntry( pPool ); pActEntry->aSel.nStartPara = (pE ? pE->aSel.nEndPara + 1 : 0); pActEntry->aSel.nStartPos = 0; |