sc/source/core/data/column2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit de27adb9d92463ec346977270fd92feb20aea7f6
Author: Kohei Yoshida <kohei.yosh...@collabora.com>
Date:   Thu Dec 12 13:22:42 2013 -0500

    Fix "fit to column" breakage.
    
    I broke it during the grand cell storage refactoring.
    
    Change-Id: I75361750a859b42d83f76dd4e30ad6b134af81c5
    (cherry picked from commit 3c95f901d5f30919b339695ddac94bf5a67aa9a9)

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 8759c51..307d42b 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -611,7 +611,7 @@ sal_uInt16 ScColumn::GetOptimalColWidth(
 
     sc::SingleColumnSpanSet aSpanSet;
     sc::SingleColumnSpanSet::SpansType aMarkedSpans;
-    if (pMarkData)
+    if (pMarkData && (pMarkData->IsMarked() || pMarkData->IsMultiMarked()))
     {
         aSpanSet.scan(*pMarkData, nTab, nCol);
         aSpanSet.getSpans(aMarkedSpans);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to