[calligra] respin qreal patch

Rex Dieter rdieter at fedoraproject.org
Sun Dec 15 07:17:27 UTC 2013


commit a350b120eb599b7079fb2f1575c2970d43a16680
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Dec 15 01:17:21 2013 -0600

    respin qreal patch

 calligra-2.7.90-qreal.patch |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/calligra-2.7.90-qreal.patch b/calligra-2.7.90-qreal.patch
index e0e702e..c9db055 100644
--- a/calligra-2.7.90-qreal.patch
+++ b/calligra-2.7.90-qreal.patch
@@ -21,3 +21,33 @@ diff -up calligra-2.7.90/krita/image/kis_distance_information.cpp.qreal calligra
  
      qreal x = m_d->distance.x();
      qreal y = m_d->distance.y();
+diff -up calligra-2.7.90/sheets/commands/RowColumnManipulators.cpp.qreal calligra-2.7.90/sheets/commands/RowColumnManipulators.cpp
+--- calligra-2.7.90/sheets/commands/RowColumnManipulators.cpp.qreal	2013-12-01 12:24:25.000000000 -0600
++++ calligra-2.7.90/sheets/commands/RowColumnManipulators.cpp	2013-12-15 01:16:42.439862904 -0600
+@@ -60,7 +60,7 @@ bool ResizeColumnManipulator::process(El
+         if (m_firstrun)
+             m_oldSizes[col] = format->width();
+         qreal delta = format->width();
+-        format->setWidth(m_reverse ? m_oldSizes[col] : qMax(qreal(2.0), m_newSize));
++        format->setWidth(m_reverse ? m_oldSizes[col] : qMax(2.0, m_newSize));
+         delta = format->width() - delta;
+         m_sheet->adjustCellAnchoredShapesX(delta, col+1);
+     }
+@@ -282,7 +282,7 @@ bool AdjustColumnRowManipulator::process
+                         if (widths.contains(col) && widths[col] != -1.0) {
+                             ColumnFormat* format = sheet->nonDefaultColumnFormat(col);
+                             if (qAbs(format->width() - widths[col]) > DBL_EPSILON) {
+-                                format->setWidth(qMax(qreal(2.0), widths[col]));
++                                format->setWidth(qMax(2.0, widths[col]));
+                             }
+                         }
+                     }
+@@ -294,7 +294,7 @@ bool AdjustColumnRowManipulator::process
+                 if (widths.contains(col) && widths[col] != -1.0) {
+                     ColumnFormat* format = sheet->nonDefaultColumnFormat(col);
+                     if (qAbs(format->width() - widths[col]) > DBL_EPSILON) {
+-                        format->setWidth(qMax(qreal(2.0), widths[col]));
++                        format->setWidth(qMax(2.0, widths[col]));
+                     }
+                 }
+             }


More information about the scm-commits mailing list