[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - sc/qa vcl/source

[Eike Rathke]

 sc/qa/unit/ucalc.hxx              |    1 +
 sc/qa/unit/ucalc_sort.cxx         |   13 ++++++++++++-
 vcl/source/gdi/pdfwriter_impl.cxx |    2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 62a0a299b3c96cb743059d357c51b9c82aa38b98
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Nov 25 02:22:16 2014 +0100

    check that the fdo#79441 case works in both update references modes
    
    Change-Id: I4aa997847661021af27f27e8763a89a61f185f1f
    (cherry picked from commit fb2c3fec1b98b54f929d0cec64789b79306e03b1)
    Reviewed-on: https://gerrit.libreoffice.org/13115
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index a1688f7..328dc59 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -352,6 +352,7 @@ public:
     void testSortRefUpdate2();
     void testSortRefUpdate3();
     void testSortRefUpdate4();
+    void testSortRefUpdate4_Impl();
     void testSortRefUpdate5();
     void testSortOutOfPlaceResult();
     void testSortPartialFormulaGroup();
diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx
index ce6b9b3..177ad89 100644
--- a/sc/qa/unit/ucalc_sort.cxx
+++ b/sc/qa/unit/ucalc_sort.cxx
@@ -1028,8 +1028,19 @@ void Test::testSortRefUpdate3()
 // testRefInterne.ods
 void Test::testSortRefUpdate4()
 {
-    SortRefUpdateSetter aUpdateSet;
+    // This test has to work in both update reference modes.
+    {
+        SortRefNoUpdateSetter aUpdateSet;
+        testSortRefUpdate4_Impl();
+    }
+    {
+        SortRefUpdateSetter aUpdateSet;
+        testSortRefUpdate4_Impl();
+    }
+}
 
+void Test::testSortRefUpdate4_Impl()
+{
     sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
     m_pDoc->InsertTab(0, "Sort");
     m_pDoc->InsertTab(1, "Lesson1");
commit d10ae9cc61f2982efaa8d5135b719b3ea24a7640
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 25 15:56:29 2014 +0000

    Revert "Resolves: #i63015# always default to WinAnsiEncoding..."
    
    Because under Linux use text
    "'"
    and font "Nimbus Sans L"
    and export as pdf and the output is garbled
    
    If we do want to stick WinAnsiEncoding here then we'll presumably have have to
    test that pEncoding actually matches WinAnsiEncoding and/or generate an
    additional Encoding/Differences from WinAnsiEncoding for that font.
    
    This reverts commit eea16cb3e65a4308caddb7618d31a76ca259dbb1.
    
    (cherry picked from commit 297b22bd49ea11a90063ab8503fb83090f351668)
    
    Change-Id: I9dd8de2a68ad276cce769545186d169160880e09
    Reviewed-on: https://gerrit.libreoffice.org/13121
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 5548629..2f44dd5 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3491,7 +3491,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical
                 "<</Type/Font/Subtype/Type1/BaseFont/" );
             appendName( aInfo.m_aPSName, aLine );
             aLine.append( "\n" );
-            if( !pFont->IsSymbolFont() )
+            if( !pFont->IsSymbolFont() &&  pEncoding == 0 )
                 aLine.append( "/Encoding/WinAnsiEncoding\n" );
             if( nToUnicodeStream )
             {