vcl/source/gdi/pdfwriter_impl.cxx | 51 +++++++++++++++++++++++++++++---------
1 file changed, 40 insertions(+), 11 deletions(-)
New commits:
commit 35f71c648c45769d4cc75f8b422bcdb020916a73
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Thu Apr 11 09:47:27 2019 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Tue Jul 2 19:20:20 2019 +0200
tdf#113448 Export font used for checkbox mark
Related tdf#93853 make sure we use the opensymbol nice
checkmark (0x2713) to compel viewers to use that.
Change-Id: Id5028b0d062e0491b1cc9c36e2d9d4e4a7ab14a1
Reviewed-on: https://gerrit.libreoffice.org/74995
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 468e1c2888f6..19773af668b9 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -60,6 +60,7 @@
#include <vcl/bitmapaccess.hxx>
#include <vcl/canvastools.hxx>
#include <vcl/cvtgrf.hxx>
+#include <vcl/fontcharmap.hxx>
#include <vcl/image.hxx>
#include <vcl/lineinfo.hxx>
#include <vcl/metric.hxx>
@@ -3927,46 +3928,74 @@ void PDFWriterImpl::createDefaultCheckBoxAppearance(
PDFWidget& rBox, const PDFW
pop();
OStringBuffer aDA( 256 );
- const pdf::BuildinFont& rBestFont = pdf::BuildinFontFace::Get(
- getBestBuildinFont(Font("ZapfDingbats", aFont.GetFontSize())));
+
+ // tdf#93853 don't rely on Zapf (or any other 'standard' font)
+ // being present, but our own OpenSymbol - N.B. PDF/A for good
+ // reasons require even the standard PS fonts to be embedded!
+ Push();
+ SetFont( Font( OUString( "OpenSymbol" ), aFont.GetFontSize() ) );
+ FontCharMapRef pMap;
+ GetFontCharMap(pMap);
+ const LogicalFontInstance* pFontInstance = GetFontInstance();
+ const PhysicalFontFace* pDevFont = pFontInstance->GetFontFace();
+ Pop();
+
+ // make sure OpenSymbol is embedded, and includes our checkmark
+ const sal_Unicode cMark=0x2713;
+ const GlyphItem aItem(0, 0, pMap->GetGlyphIndex(cMark),
+ Point(), 0, 0, 0,
+ const_cast<LogicalFontInstance*>(pFontInstance));
+ const std::vector<sal_Ucs> aCodeUnits={ cMark };
+ sal_uInt8 nMappedGlyph;
+ sal_Int32 nMappedFontObject;
+ registerGlyph(&aItem, pDevFont, aCodeUnits, nMappedGlyph,
nMappedFontObject);
+
appendNonStrokingColor( replaceColor( rWidget.TextColor,
rSettings.GetRadioCheckTextColor() ), aDA );
aDA.append( ' ' );
- aDA.append(rBestFont.getNameObject());
+ aDA.append( "/F" );
+ aDA.append( nMappedFontObject );
aDA.append( " 0 Tf" );
+
+ OStringBuffer aDR( 32 );
+ aDR.append( "/Font " );
+ aDR.append( getFontDictObject() );
+ aDR.append( " 0 R" );
+ rBox.m_aDRDict = aDR.makeStringAndClear();
rBox.m_aDAString = aDA.makeStringAndClear();
rBox.m_aMKDict = "/CA";
rBox.m_aMKDictCAString = "8";
rBox.m_aRect = aCheckRect;
// create appearance streams
- sal_Char cMark = '8';
- const pdf::BuildinFont& rFont = pdf::BuildinFontFace::Get(13);
- sal_Int32 nCharXOffset = 1000-rFont.m_aWidths[sal_Int32(cMark)];
+ sal_Int32 nCharXOffset = 1000 - 787; // metrics from OpenSymbol
nCharXOffset *= aCheckRect.GetHeight();
nCharXOffset /= 2000;
- sal_Int32 nCharYOffset = 1000-(rFont.m_nAscent+rFont.m_nDescent); //
descent is negative
+ sal_Int32 nCharYOffset = 1000 - (820-143); // metrics from Zapf
nCharYOffset *= aCheckRect.GetHeight();
nCharYOffset /= 2000;
+ // write 'checked' appearance stream
SvMemoryStream* pCheckStream = new SvMemoryStream( 256, 256 );
beginRedirect( pCheckStream, aCheckRect );
aDA.append( "/Tx BMC\nq BT\n" );
appendNonStrokingColor( replaceColor( rWidget.TextColor,
rSettings.GetRadioCheckTextColor() ), aDA );
aDA.append( ' ' );
- aDA.append(rBestFont.getNameObject());
+ aDA.append( "/F" );
+ aDA.append( nMappedFontObject );
aDA.append( ' ' );
m_aPages[ m_nCurrentPage ].appendMappedLength( sal_Int32(
aCheckRect.GetHeight() ), aDA );
aDA.append( " Tf\n" );
m_aPages[ m_nCurrentPage ].appendMappedLength( nCharXOffset, aDA );
aDA.append( " " );
m_aPages[ m_nCurrentPage ].appendMappedLength( nCharYOffset, aDA );
- aDA.append( " Td (" );
- aDA.append( cMark );
- aDA.append( ") Tj\nET\nQ\nEMC\n" );
+ aDA.append( " Td <" );
+ appendHex( nMappedGlyph, aDA );
+ aDA.append( "> Tj\nET\nQ\nEMC\n" );
writeBuffer( aDA.getStr(), aDA.getLength() );
endRedirect();
rBox.m_aAppearances[ "N" ][ "Yes" ] = pCheckStream;
+ // write 'unchecked' appearance stream
SvMemoryStream* pUncheckStream = new SvMemoryStream( 256, 256 );
beginRedirect( pUncheckStream, aCheckRect );
writeBuffer( "/Tx BMC\nEMC\n", 12 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
