[Libreoffice-commits] core.git: 2 commits - sc/inc svgio/source

[Caolán McNamara]

 sc/inc/pch/precompiled_sc.hxx               |    1 -
 svgio/source/svgreader/svgcharacternode.cxx |   14 ++++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit c8b15ef45cd0916a0a42c2ede064e7a4bd4f06d9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 17 14:05:15 2013 +0100

    don't include xftsfit.hxx anymore
    
    Change-Id: I1d90bfaa4ea594fee2dbd42f936538950ca6662f

diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index a913837..2c9d432b 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -838,7 +838,6 @@
 #include <svx/xftdiit.hxx>
 #include <svx/xftmrit.hxx>
 #include <svx/xftouit.hxx>
-#include <svx/xftsfit.hxx>
 #include <svx/xftshcit.hxx>
 #include <svx/xftshit.hxx>
 #include <svx/xftshxy.hxx>
commit 5f84a4cdcb9ae2b2fc002cefeccf349682f0a29d
Author: Armin Le Grand <alg at apache.org>
Date:   Thu May 16 14:53:56 2013 +0000

    Resolves: #i122324# detect own re-import of EmbeddedFonts...
    
    and correct font name
    
    (cherry picked from commit c2b5f0eedcc0fb7e0175e81b6f6127b99b8b7499)
    
    Conflicts:
    	svgio/source/svgreader/svgcharacternode.cxx
    
    Change-Id: I437db7feccd31a653f1100b426b568278faee4cc

diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx
index e6a4a19..b154645 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -243,9 +243,19 @@ namespace svgio
             if(nLength)
             {
                 // prepare FontAttribute
-                const OUString aFontFamily = rSvgStyleAttributes.getFontFamily().empty() ?
-                    OUString(OUString::createFromAscii("Times New Roman")) :
+                OUString aFontFamily = rSvgStyleAttributes.getFontFamily().empty() ?
+                    OUString("Times New Roman") :
                     rSvgStyleAttributes.getFontFamily()[0];
+
+                // #i122324# if the FontFamily name ends on ' embedded' it is probably a re-import
+                // of a SVG export with font embedding. Remove this to make font matching work. This
+                // is pretty safe since there should be no font family names ending on ' embedded'.
+                // Remove again when FontEmbedding is implemented in SVG import
+                if(aFontFamily.endsWithAsciiL(" embedded", 9))
+                {
+                    aFontFamily = aFontFamily.copy(0, aFontFamily.getLength() - 9);
+                }
+
                 const ::FontWeight nFontWeight(getVclFontWeight(rSvgStyleAttributes.getFontWeight()));
                 bool bSymbol(false);
                 bool bVertical(false);