[ooo-build-commit] Branch 'ooo/master' - sc/source

[Jan Holesovsky]

 sc/source/ui/docshell/docfunc.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5686c082b93d793f0ac7eb46a0b73e74e2825864
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date:   Mon Jul 27 17:18:56 2009 +0000

    CWS-TOOLING: integrate CWS cmcfixes60
    2009-07-03 21:56:04 +0200 cmc  r273718 : #i103313# org.openoffice.System not org.openoffice.Setup for looking up default locale
    2009-07-01 17:15:31 +0200 cmc  r273606 : #i102636# extra rounding precision
    2009-07-01 11:04:47 +0200 cmc  r273556 : #i100000# workaround build issue
    2009-06-30 17:27:41 +0200 cmc  r273525 : #i102636# extra rounding precision
    2009-06-30 09:42:46 +0200 cmc  r273491 : #i102634# numbers got mixed up somehow
    2009-06-30 09:19:56 +0200 cmc  r273490 : CWS-TOOLING: rebase CWS cmcfixes60 to trunk at 273468 (milestone: DEV300:m51)
    2009-06-22 12:54:45 +0200 cmc  r273217 : #i103000# micro-optimization to remove unused symbols from fpicker etc.
    2009-06-19 10:06:21 +0200 cmc  r273148 : #i102932# put same type into an Any as we take out of that Any, affect 64bit
    2009-06-13 17:38:42 +0200 cmc  r272957 : #i102742# gcc44 warnings, return of const primitive type doesn't mean anything
    2009-06-13 16:22:40 +0200 cmc  r272955 : #i102737# keep existing logic and silence new gcc44 warnings
    2009-06-13 16:06:25 +0200 cmc  r272954 : #i102736# confirm existing logic to be gcc44 warnings free
    2009-06-10 19:40:24 +0200 cmc  r272837 : #i87461# 64bit color lossage
    2009-06-10 19:23:38 +0200 cmc  r272836 : #i102636# tidy up UI rounding errors

diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 884b95f..8ff0776 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1446,8 +1446,8 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
                 pDoc->ExtendMerge( nMergeStartX, nMergeStartY, nMergeEndX, nMergeEndY, i );
                 pDoc->ExtendOverlapped( nMergeStartX, nMergeStartY, nMergeEndX, nMergeEndY, i );
                 
-                if(( eCmd == INS_CELLSDOWN && ( nMergeStartX != nMergeTestStartX || nMergeEndX != nMergeTestEndX ))||
-                    eCmd == INS_CELLSRIGHT && ( nMergeStartY != nMergeTestStartY || nMergeEndY != nMergeTestEndY ) )
+                if(( eCmd == INS_CELLSDOWN && ( nMergeStartX != nMergeTestStartX || nMergeEndX != nMergeTestEndX )) ||
+                    (eCmd == INS_CELLSRIGHT && ( nMergeStartY != nMergeTestStartY || nMergeEndY != nMergeTestEndY )) )
                 {
                     if (!bApi)
                         rDocShell.ErrorMessage(STR_MSSG_INSERTCELLS_0);