[Libreoffice-commits] core.git: Branch 'feature/calc-cell-borders' - 3 commits - drawinglayer/source sc/source svtools/source

[Kohei Yoshida]

 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx |    2 +-
 sc/source/filter/inc/xlconst.hxx                          |    8 ++++----
 svtools/source/control/ctrlbox.cxx                        |    8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 2abb67d8bea2b537974a973738fdb63d54bbd394
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Jan 15 22:39:15 2014 -0500

    Revise the line patterns further. Now they look satisfactory to my eye.
    
    Change-Id: I27f4e11bceac25c10de28a866bdcec9576027582

diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index a6e545d..80de8e5 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -596,12 +596,12 @@ std::vector<double> GetDashing( sal_uInt16 nDashing )
             aPattern.push_back( 2.0 ); // blank
         break;
         case table::BorderLineStyle::DASHED:
-            aPattern.push_back( 9.0 );
-            aPattern.push_back( 3.0 );
+            aPattern.push_back( 16.0 ); // line
+            aPattern.push_back( 5.0 );  // blank
         break;
         case table::BorderLineStyle::FINE_DASHED:
-            aPattern.push_back( 3.0 );
-            aPattern.push_back( 2.0 );
+            aPattern.push_back( 6.0 ); // line
+            aPattern.push_back( 2.0 ); // blank
         break;
         default:
             ;
commit a58e31e374335894099836b5cb9167c09a239ab6
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Jan 15 22:32:46 2014 -0500

    Double line looks a bit too apart.
    
    Change-Id: I14676b6e8282a76d0be9dc0cc78e01837726e494

diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 853ab7c..de1a02d 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -154,7 +154,7 @@ namespace drawinglayer
                                 getStart(), getEnd(), rViewInformation);
 
                     // distance is already scaled.
-                    double fGap = mfDistance*12.0;
+                    double fGap = mfDistance*8.0;
 
                     if (bIsHairline)
                     {
commit 18c54db842d35e88c3c344930a0c90ea184556fa
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Jan 15 22:28:33 2014 -0500

    More faithful mapping of border line thicknesses.
    
    This time based on how they get printed on paper, not how they look
    on screen.
    
    Change-Id: I61a217822229f843de3e89e96cf58b273f2cd8ac

diff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxx
index 1fccc6a..03d9e8c 100644
--- a/sc/source/filter/inc/xlconst.hxx
+++ b/sc/source/filter/inc/xlconst.hxx
@@ -254,10 +254,10 @@ const sal_uInt16 EXC_FUTUREREC_ALERT        = 0x0002;
 // TODO: These values are approximate; we should probably tweak these values
 // further to better match Excel's border thickness.
 
-const sal_uInt16 EXC_BORDER_THICK = 30;
-const sal_uInt16 EXC_BORDER_MEDIUM = 20;
-const sal_uInt16 EXC_BORDER_THIN = 1;
-const sal_uInt16 EXC_BORDER_HAIR = 1;
+const sal_uInt16 EXC_BORDER_THICK  = 50;
+const sal_uInt16 EXC_BORDER_MEDIUM = 35;
+const sal_uInt16 EXC_BORDER_THIN   = 15;
+const sal_uInt16 EXC_BORDER_HAIR   = 1;
 
 // ============================================================================