[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source

Markus Mohrhard markus.mohrhard at collabora.co.uk
Sun Aug 17 23:38:10 PDT 2014


 sc/source/core/data/document10.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 3dc5743ad17fed7cc05a90457e6c0b92eb9cb460
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sat Aug 16 03:07:07 2014 +0200

    copy conditional formatting for single cells, fdo#82503
    
    Change-Id: I22f239fbbbfa3ac562b860efb990dff10d0e0e24
    Reviewed-on: https://gerrit.libreoffice.org/10942
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx
index 3629d4d..e468dd3 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -202,7 +202,12 @@ bool ScDocument::CopyOneCellFromClip(
 
     SCTAB nTabEnd = rCxt.getTabEnd();
     for (SCTAB i = rCxt.getTabStart(); i <= nTabEnd && i < static_cast<SCTAB>(maTabs.size()); ++i)
+    {
         maTabs[i]->CopyOneCellFromClip(rCxt, nCol1, nRow1, nCol2, nRow2);
+        if (rCxt.getInsertFlag() & IDF_ATTRIB)
+            maTabs[i]->CopyConditionalFormat(nCol1, nRow1, nCol2, nRow2, nCol1 - aClipRange.aStart.Col(),
+                    nRow1 - aClipRange.aStart.Row(), pSrcTab);
+    }
 
     return true;
 }


More information about the Libreoffice-commits mailing list