[Libreoffice-commits] core.git: 2 commits - i18npool/source sdext/source

[Vort]

 i18npool/source/localedata/data/et_EE.xml        |    4 +-
 sdext/source/pdfimport/tree/drawtreevisiting.cxx |   32 +++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit 9616b786adb9491f7c26fc0f1053e7b3d1b35f27
Author: Vort <vvort at yandex.ru>
Date:   Wed Feb 12 12:35:26 2014 +0200

    fdo#45003 PDF import: Implementing linejoin and linecap properties
    
    Change-Id: I4b09cd7b970d5aca4500ae333edef0e4c2f618b9
    Reviewed-on: https://gerrit.libreoffice.org/8009
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index e3b0135..bd44686 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -35,6 +35,8 @@
 #include "comphelper/processfactory.hxx"
 #include "com/sun/star/i18n/ScriptType.hpp"
 #include "com/sun/star/i18n/DirectionProperty.hpp"
+#include "com/sun/star/rendering/PathCapType.hpp"
+#include "com/sun/star/rendering/PathJoinType.hpp"
 
 #include <string.h>
 
@@ -793,6 +795,36 @@ void DrawXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element* >
 
             aGCProps[ "svg:stroke-width" ] = OUString::number( aVec.getLength() );
         }
+        OUString strokeLinejoinValue;
+        OUString strokeLinecapValue;
+        switch (rGC.LineJoin)
+        {
+        default:
+        case rendering::PathJoinType::MITER:
+            strokeLinejoinValue = "miter";
+            break;
+        case rendering::PathJoinType::ROUND:
+            strokeLinejoinValue = "round";
+            break;
+        case rendering::PathJoinType::BEVEL:
+            strokeLinejoinValue = "bevel";
+            break;
+        }
+        switch (rGC.LineCap)
+        {
+        default:
+        case rendering::PathCapType::BUTT:
+            strokeLinecapValue = "butt";
+            break;
+        case rendering::PathCapType::ROUND:
+            strokeLinecapValue = "round";
+            break;
+        case rendering::PathCapType::SQUARE:
+            strokeLinecapValue = "square";
+            break;
+        }
+        aGCProps[ "draw:stroke-linejoin" ] = strokeLinejoinValue;
+        aGCProps[ "svg:stroke-linecap" ] = strokeLinecapValue;
     }
     else
     {
commit 51fc602184ab8d1afbfb183a3d25b1122c8b1e29
Author: Mihkel Tõnnov <mihhkel at gmail.com>
Date:   Tue Feb 11 23:34:57 2014 +0200

    corrected Estonian [et-EE] quote characters
    
    Namely: Estonian has several sets of correct quote mark glyphs for double
    quotes („”, „“, «» are all common), however the Institute of Estonian
    Language [1] recommends using the first of these, i.e. „” (99 low, 99
    high) [2]. As for single quotes, Estonian texts rarely use them, except in
    a few fields such as linguistics and biology -- and both ‘’ (9-9) and ’’
    (6-9) are considered correct [2, 3]. However, apostrophe in the beginning
    of a word (which is effectively the same as a starting single quote) can
    also be used to indicate omitted character(s) -- but there, only ’ (9) is
    correct [3].
    
    [1] Eesti Keele Instituut, the main official body which maintains and
    studies the usage of Estonian language; http://en.eki.ee/index.php
    [2] The last page of
    https://docs.google.com/viewer?url=http://keeleabi.eki.ee/pdf/164.pdf (in
    Estonian)
    [3] Handbook of Estonian Language,
    http://www.eki.ee/books/ekk09/index.php?p=2&p1=11&id=86 (in Estonian)
    
    Change-Id: If88e6e03e3e4aa1919a25dbe2fa2ffc8c9a04f4a

diff --git a/i18npool/source/localedata/data/et_EE.xml b/i18npool/source/localedata/data/et_EE.xml
index 687b093..3bee9cc 100644
--- a/i18npool/source/localedata/data/et_EE.xml
+++ b/i18npool/source/localedata/data/et_EE.xml
@@ -42,10 +42,10 @@
       <LongDateYearSeparator> </LongDateYearSeparator>
     </Separators>
     <Markers>
-      <QuotationStart>‘</QuotationStart>
+      <QuotationStart>’</QuotationStart>
       <QuotationEnd>’</QuotationEnd>
       <DoubleQuotationStart>„</DoubleQuotationStart>
-      <DoubleQuotationEnd>“</DoubleQuotationEnd>
+      <DoubleQuotationEnd>”</DoubleQuotationEnd>
     </Markers>
     <TimeAM>AM</TimeAM>
     <TimePM>PM</TimePM>