[PATCH] Resolved bug fdo#63766

[gokul s (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3524

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/3524/1

Resolved bug fdo#63766

This check is not required as the option merge will be disabled
for merged cells, this code was returning true if any one the cells
selected for merging is merged hence throwing error, Which is not the
desired behviour.

Change-Id: Id1765b7c73beb8f3aa35394851413026d637088f
---
M sc/source/ui/docshell/docfunc.cxx
M sc/source/ui/view/viewfun2.cxx
2 files changed, 0 insertions(+), 18 deletions(-)



diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index fbdfdc0..0595379 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -4652,15 +4652,6 @@
                 rDocShell.ErrorMessage(aTester.GetMessageId());
             return false;
         }
-
-        if ( pDoc->HasAttrib( nStartCol, nStartRow, *itr, nEndCol, nEndRow, *itr,
-                                HASATTR_MERGED | HASATTR_OVERLAPPED ) )
-        {
-            // "Zusammenfassen nicht verschachteln !"
-            if (!bApi)
-                rDocShell.ErrorMessage(STR_MSSG_MERGECELLS_0);
-            return false;
-        }
     }
 
     ScDocument* pUndoDoc = NULL;
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 22a25ec..be7f165 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1085,21 +1085,12 @@
     rMark.GetMarkArea( aMarkRange );
     SCCOL nStartCol = aMarkRange.aStart.Col();
     SCROW nStartRow = aMarkRange.aStart.Row();
-    SCTAB nStartTab = aMarkRange.aStart.Tab();
     SCCOL nEndCol = aMarkRange.aEnd.Col();
     SCROW nEndRow = aMarkRange.aEnd.Row();
-    SCTAB nEndTab = aMarkRange.aEnd.Tab();
     if ( nStartCol == nEndCol && nStartRow == nEndRow )
     {
         // nothing to do
         return true;
-    }
-
-    if ( pDoc->HasAttrib( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab,
-                            HASATTR_MERGED | HASATTR_OVERLAPPED ) )
-    {       // "Don't nest merging  !"
-        ErrorMessage(STR_MSSG_MERGECELLS_0);
-        return false;
     }
 
     // Check for the contents of all selected tables.

-- 
To view, visit https://gerrit.libreoffice.org/3524
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1765b7c73beb8f3aa35394851413026d637088f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: gokul s <gswaminathan at kacst.edu.sa>