summaryrefslogtreecommitdiff
path: root/sc/source/ui/view/gridmerg.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:05:12 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:05:12 +0200
commit912d939b74d4ac436d4eb7a473f8c314c34148d8 (patch)
tree9786710241c767f0f6917200c9318978b0d787dd /sc/source/ui/view/gridmerg.cxx
parentbc9a24765b3a6f97bda09afc07bf47151fed14e8 (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 631630de93e96b82e3b94ee4b5c388e40305ff77 (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:03 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit 3152922a95e18814e32bcf8bc29c872077d05a65 Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Date: Wed May 4 09:06:08 2011 -0400 lp#775608: Libreoffice Calc's PRODUCT function doesn't calculate correctly. Signed-off-by: Kohei Yoshida <kyoshida@novell.com> sc/source/core/tool/interpr1.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 8f34ffa5677bfc86ef5aa33811955c577f8799c3 Author: Kohei Yoshida <kyoshida@novell.com> Date: Mon Mar 21 16:01:47 2011 -0400 Fix seg faults on sheet deletion. Sometimes a simple sheet removal causes segfault in certain types of documents. Not always reproducible, but this fix is certainly safer. (n#680272) Signed-off-by: Noel Power <nopower@novell.com> sc/source/ui/docshell/docfunc.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e54c3699db11dc1bcc7bd7fa069c9c4124715839 Author: Tibby Lickle <tibbylickle@googlemail.com> Date: Thu Mar 10 19:08:18 2011 +0000 Disabled auto-complete in Calc filter dialog - fix for bug 34898. A hyphen character caused auto-complete to kick in, changing the user's choice of conditional operator to "=". This was not changed back if auto-complete option is overridden. Signed-off-by: Kohei Yoshida <kyoshida@novell.com> sc/source/ui/dbgui/filtdlg.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
Notes
Notes: split repo tag: calc_libreoffice-3.3.3.1
Diffstat (limited to 'sc/source/ui/view/gridmerg.cxx')
-rw-r--r--sc/source/ui/view/gridmerg.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/ui/view/gridmerg.cxx b/sc/source/ui/view/gridmerg.cxx
index 31dba191b2fd..2481d4fc18be 100644
--- a/sc/source/ui/view/gridmerg.cxx
+++ b/sc/source/ui/view/gridmerg.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
@@ -44,8 +44,8 @@ ScGridMerger::ScGridMerger( OutputDevice* pOutDev, long nOnePixelX, long nOnePix
nCount( 0 ),
bVertical( FALSE )
{
- // optimize (DrawGrid) only for pixel MapMode,
- // to avoid rounding errors
+ // optimize (DrawGrid) only for pixel MapMode,
+ // to avoid rounding errors
bOptimize = ( pDev->GetMapMode().GetMapUnit() == MAP_PIXEL );
}
@@ -59,8 +59,8 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos )
{
if ( nCount )
{
- // not first line - test fix position
- // more than one previous line - test distance
+ // not first line - test fix position
+ // more than one previous line - test distance
if ( nStart != nFixStart || nEnd != nFixEnd )
{
@@ -68,8 +68,8 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos )
( nStart == nFixEnd ||
nStart == nFixEnd + ( bVertical ? nOneY : nOneX ) ) )
{
- // additional optimization: extend connected lines
- // keep nCount at 1
+ // additional optimization: extend connected lines
+ // keep nCount at 1
nFixEnd = nEnd;
}
else
@@ -80,7 +80,7 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos )
nVarDiff = nPos - nVarStart;
++nCount;
}
- else if ( nPos != nVarStart + nCount * nVarDiff ) //! keep VarEnd?
+ else if ( nPos != nVarStart + nCount * nVarDiff ) //! keep VarEnd?
Flush();
else
++nCount;
@@ -88,7 +88,7 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos )
if ( !nCount )
{
- // first line (or flushed above) - just store
+ // first line (or flushed above) - just store
nFixStart = nStart;
nFixEnd = nEnd;
@@ -141,9 +141,9 @@ void ScGridMerger::Flush()
long nVarEnd = nVarStart + ( nCount - 1 ) * nVarDiff;
if ( nVarDiff < 0 )
{
- // nVarDiff is negative in RTL layout mode
- // Change the positions so DrawGrid is called with a positive distance
- // (nVarStart / nVarDiff can be modified, aren't used after Flush)
+ // nVarDiff is negative in RTL layout mode
+ // Change the positions so DrawGrid is called with a positive distance
+ // (nVarStart / nVarDiff can be modified, aren't used after Flush)
nVarDiff = -nVarDiff;
long nTemp = nVarStart;