[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/source

Thorsten Behrens (via logerrit) logerrit at kemper.freedesktop.org
Wed Jul 3 12:49:36 UTC 2019


 vcl/source/gdi/pdfwriter_impl.cxx |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 76b5dca9dc0ff60f8f62cbecdee68f8f3b287ceb
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Tue Apr 9 02:19:14 2019 +0200
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Wed Jul 3 14:48:45 2019 +0200

    tdf#113448 don't export any font for radio buttons
    
    Change-Id: Ie84b19a3dfaec32184bb825b7593ec33a5c4145c
    Reviewed-on: https://gerrit.libreoffice.org/74994
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 6ec26ba3aa195eac62fb8803137070d23a69491c)
    Reviewed-on: https://gerrit.libreoffice.org/75012
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 3a6d659821a7..46f8393de082 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -4061,12 +4061,7 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( PDFWidget& rBox, const P
     pop();
 
     OStringBuffer aDA( 256 );
-    const pdf::BuildinFont& rBestFont = pdf::BuildinFontFace::Get(
-        getBestBuildinFont(Font("ZapfDingbats", aFont.GetFontSize())));
     appendNonStrokingColor( replaceColor( rWidget.TextColor, rSettings.GetRadioCheckTextColor() ), aDA );
-    aDA.append( ' ' );
-    aDA.append(rBestFont.getNameObject());
-    aDA.append( " 0 Tf" );
     rBox.m_aDAString = aDA.makeStringAndClear();
     //to encrypt this (el)
     rBox.m_aMKDict = "/CA";
@@ -4083,10 +4078,8 @@ void PDFWriterImpl::createDefaultRadioButtonAppearance( PDFWidget& rBox, const P
     aDA.append( "/Tx BMC\nq BT\n" );
     appendNonStrokingColor( replaceColor( rWidget.TextColor, rSettings.GetRadioCheckTextColor() ), aDA );
     aDA.append( ' ' );
-    aDA.append(rBestFont.getNameObject());
-    aDA.append( ' ' );
     m_aPages[m_nCurrentPage].appendMappedLength( sal_Int32( aCheckRect.GetHeight() ), aDA );
-    aDA.append( " Tf\n0 0 Td\nET\nQ\n" );
+    aDA.append( " 0 0 Td\nET\nQ\n" );
     writeBuffer( aDA.getStr(), aDA.getLength() );
     setFillColor( replaceColor( rWidget.TextColor, rSettings.GetRadioCheckTextColor() ) );
     setLineColor( COL_TRANSPARENT );


More information about the Libreoffice-commits mailing list