vcl/inc/pdf/COSWriter.hxx | 38 +++---
vcl/inc/pdf/pdfwriter_impl.hxx | 7 -
vcl/source/gdi/pdfwriter_impl.cxx | 230 +++++++++-----------------------------
vcl/source/pdf/COSWriter.cxx | 2
4 files changed, 82 insertions(+), 195 deletions(-)
New commits:
commit fe40cf26a3b416e4d3a71d4164f94ea10b68631e
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Tue Dec 17 22:39:59 2024 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Dec 26 07:52:59 2024 +0100
pdf: /Win entry is deprecated in PDF 2.0 for launch actions
/Win is deprecated, as well as /Mac and /Unix (which we don't
write), so instead write /F directly, not under /Win entry.
Change-Id: Ic6b71f6e7aba8d5e4a22e678f82fa5a70d9b7c5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178674
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178776
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
Tested-by: Jenkins
diff --git a/vcl/inc/pdf/COSWriter.hxx b/vcl/inc/pdf/COSWriter.hxx
index 2cc3790f76e0..b80f0f84f424 100644
--- a/vcl/inc/pdf/COSWriter.hxx
+++ b/vcl/inc/pdf/COSWriter.hxx
@@ -120,6 +120,14 @@ public:
void writeLiteralEncrypt(std::u16string_view value, sal_Int32 nObject,
rtl_TextEncoding nEncoding =
RTL_TEXTENCODING_ASCII_US);
+ void writeKeyAndLiteralEncrypt(std::string_view key, std::u16string_view
value,
+ sal_Int32 nObject,
+ rtl_TextEncoding nEncoding =
RTL_TEXTENCODING_ASCII_US)
+ {
+ mrBuffer.append(key);
+ writeLiteralEncrypt(value, nObject, nEncoding);
+ }
+
void writeLiteralEncrypt(std::string_view value, sal_Int32 nObject);
void writeKeyAndLiteralEncrypt(std::string_view key, std::string_view
value, sal_Int32 nObject)
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 11badef65241..84e40b463fe9 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3678,10 +3678,21 @@ we check in the following sequence:
aLine.append( "/A<</Type/Action/S");
if( bIsUNCPath ) // handle Win UNC paths
{
- aLine.append( "/Launch/Win<</F" );
- // INetURLObject is not good with UNC paths, use original path
- aWriter.writeLiteralEncrypt(url, rLink.m_nObject,
osl_getThreadTextEncoding());
- aLine.append( ">>" );
+ aLine.append("/Launch");
+ // Entry /Win is deprecated in PDF 2.0
+ if (m_aContext.Version >= PDFWriter::PDFVersion::PDF_2_0)
+ {
+ // So write /F directly. AFAICS it's up to PDF viewer to
resolve this correctly
+ aWriter.writeKeyAndLiteralEncrypt("/F", url,
rLink.m_nObject, osl_getThreadTextEncoding());
+ }
+ else
+ {
+ aLine.append("/Win");
+ aWriter.startDict();
+ // INetURLObject is not good with UNC paths, use original
path
+ aWriter.writeKeyAndLiteralEncrypt("/F", url,
rLink.m_nObject, osl_getThreadTextEncoding());
+ aWriter.endDict();
+ }
}
else
{
commit cb906a62d1df4be5988a85eed9b63505c78a72ff
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon Dec 16 22:09:01 2024 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Dec 26 07:52:45 2024 +0100
pdf: remove functions that have been replaced by COSWriter
The functions like appendUnicodeTextStringEncrypt, appendHexArray,
appendLiteralStringEncrypt, appendLiteralString, appendHex have
been copied into COSWriter and changed there to integrate with
it, then the existing code was refactored piece by piece to use
COSWriter instead. Now the final refactoring was done and the
code isn't using those functions anymore, so the functions can
be removed.
Change-Id: Ibf33d730a7fe50fad5e0175db14d90912e8636a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178594
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178775
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
Tested-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/vcl/inc/pdf/COSWriter.hxx b/vcl/inc/pdf/COSWriter.hxx
index 277805e720fa..2cc3790f76e0 100644
--- a/vcl/inc/pdf/COSWriter.hxx
+++ b/vcl/inc/pdf/COSWriter.hxx
@@ -29,20 +29,6 @@ class COSWriter
void appendLiteralString(const char* pStr, sal_Int32 nLength);
- template <typename T> static void appendHex(T nValue, OStringBuffer&
rBuffer)
- {
- static constexpr const auto constHexDigits = std::to_array<char>(
- { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C',
'D', 'E', 'F' });
- rBuffer.append(constHexDigits[(nValue >> 4) & 15]);
- rBuffer.append(constHexDigits[nValue & 15]);
- }
-
- void appendHexArray(sal_uInt8* pArray, size_t nSize)
- {
- for (size_t i = 0; i < nSize; i++)
- appendHex(pArray[i], mrBuffer);
- }
-
public:
COSWriter(EncryptionParams aParams = EncryptionParams(),
std::shared_ptr<IPDFEncryptor> const& pPDFEncryptor = nullptr)
@@ -146,10 +132,24 @@ public:
{
mrBuffer.append(key);
mrBuffer.append("<");
- appendHexArray(pData, nSize);
+ COSWriter::appendHexArray(pData, nSize, mrBuffer);
mrBuffer.append(">");
}
+ template <typename T> static void appendHex(T nValue, OStringBuffer&
rBuffer)
+ {
+ static constexpr const auto constHexDigits = std::to_array<char>(
+ { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C',
'D', 'E', 'F' });
+ rBuffer.append(constHexDigits[(nValue >> 4) & 15]);
+ rBuffer.append(constHexDigits[nValue & 15]);
+ }
+
+ static void appendHexArray(sal_uInt8* pArray, size_t nSize, OStringBuffer&
rBuffer)
+ {
+ for (size_t i = 0; i < nSize; i++)
+ appendHex(pArray[i], rBuffer);
+ }
+
static void appendUnicodeTextString(const OUString& rString,
OStringBuffer& rBuffer);
static void appendName(std::u16string_view rString, OStringBuffer&
rBuffer);
static void appendName(const char* pString, OStringBuffer& rBuffer);
diff --git a/vcl/inc/pdf/pdfwriter_impl.hxx b/vcl/inc/pdf/pdfwriter_impl.hxx
index 0a30fb363be6..6781d0f935fd 100644
--- a/vcl/inc/pdf/pdfwriter_impl.hxx
+++ b/vcl/inc/pdf/pdfwriter_impl.hxx
@@ -866,13 +866,6 @@ private:
/* */
void enableStringEncryption( sal_Int32 nObject );
-public: // Temporary for PDFStructureWriter
- // test if the encryption is active, if yes than encrypt the unicode
string and add to the OStringBuffer parameter
- void appendUnicodeTextStringEncrypt( const OUString& rInString, const
sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer );
-
- void appendLiteralStringEncrypt( std::u16string_view rInString, const
sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer, rtl_TextEncoding nEnc =
RTL_TEXTENCODING_ASCII_US );
- void appendLiteralStringEncrypt( std::string_view rInString, const
sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer );
-
private:
/* creates fonts and subsets that will be emitted later */
void registerGlyph(const sal_GlyphId, const vcl::font::PhysicalFontFace*,
const LogicalFontInstance* pFont, const std::vector<sal_Ucs>&, sal_Int32,
sal_uInt8&, sal_Int32&);
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 6816fca77bd5..11badef65241 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -136,57 +136,6 @@ void appendObjectReference(sal_Int32 nObjectID,
OStringBuffer & aLine)
aLine.append(" 0 R ");
}
-void appendHex(sal_Int8 nInt, OStringBuffer& rBuffer)
-{
- static const char pHexDigits[] = { '0', '1', '2', '3', '4', '5', '6', '7',
- '8', '9', 'A', 'B', 'C', 'D', 'E',
'F' };
- rBuffer.append( pHexDigits[ (nInt >> 4) & 15 ] );
- rBuffer.append( pHexDigits[ nInt & 15 ] );
-}
-
-void appendHexArray(sal_uInt8* pArray, size_t nSize, OStringBuffer& rBuffer)
-{
- for (size_t i = 0; i < nSize; i++)
- appendHex(pArray[i], rBuffer);
-}
-
-//used only to emit encoded passwords
-void appendLiteralString( const char* pStr, sal_Int32 nLength, OStringBuffer&
rBuffer )
-{
- while( nLength )
- {
- switch( *pStr )
- {
- case '
' :
- rBuffer.append( "\n" );
- break;
- case ' ' :
- rBuffer.append( "\r" );
- break;
- case ' ' :
- rBuffer.append( "\t" );
- break;
- case '' :
- rBuffer.append( "\b" );
- break;
- case ' ' :
- rBuffer.append( "\f" );
- break;
- case '(' :
- case ')' :
- case '\' :
- rBuffer.append( "\" );
- rBuffer.append( static_cast<char>(*pStr) );
- break;
- default:
- rBuffer.append( static_cast<char>(*pStr) );
- break;
- }
- pStr++;
- nLength--;
- }
-}
-
/*
* Convert a string before using it.
*
@@ -228,8 +177,8 @@ void appendDestinationName( const OUString& rString,
OStringBuffer& rBuffer )
{
sal_Int8 aValueHigh = sal_Int8(aChar >> 8);
if(aValueHigh > 0)
- appendHex( aValueHigh, rBuffer );
- appendHex( static_cast<sal_Int8>(aChar & 255 ), rBuffer );
+ vcl::COSWriter::appendHex(aValueHigh, rBuffer);
+ vcl::COSWriter::appendHex(static_cast<sal_Int8>(aChar & 255 ),
rBuffer);
}
}
}
@@ -282,7 +231,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32
i_nWidgetIndex, const PDFWr
else
{
aBuffer.append( '#' );
- appendHex( static_cast<sal_Int8>(aStr[i]), aBuffer );
+ COSWriter::appendHex(static_cast<sal_Int8>(aStr[i]), aBuffer);
}
}
@@ -1459,86 +1408,6 @@ OString
PDFWriter::GetDateTime(svl::crypto::SigningContext* pSigningContext)
return aRet.makeStringAndClear();
}
-
-/* i12626 methods */
-/*
-check if the Unicode string must be encrypted or not, perform the requested
task,
-append the string as unicode hex, encrypted if needed
- */
-inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const OUString&
rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer )
-{
- rOutBuffer.append( "<" );
- if (m_aContext.Encryption.canEncrypt())
- {
- const sal_Unicode* pStr = rInString.getStr();
- sal_Int32 nLen = rInString.getLength();
- //prepare a unicode string, encrypt it
- enableStringEncryption( nInObjectNumber );
- sal_Int32 nChars = 2 + (nLen * 2);
- m_vEncryptionBuffer.resize(nChars);
- sal_uInt8 *pCopy = m_vEncryptionBuffer.data();
- *pCopy++ = 0xFE;
- *pCopy++ = 0xFF;
- // we need to prepare a byte stream from the unicode string buffer
- for( int i = 0; i < nLen; i++ )
- {
- sal_Unicode aUnChar = pStr[i];
- *pCopy++ = static_cast<sal_uInt8>( aUnChar >> 8 );
- *pCopy++ = static_cast<sal_uInt8>( aUnChar & 255 );
- }
- //encrypt in place
- std::vector<sal_uInt8> aNewBuffer(nChars);
- m_pPDFEncryptor->encrypt(m_vEncryptionBuffer.data(), nChars,
aNewBuffer, nChars);
- //now append, hexadecimal (appendHex), the encrypted result
- appendHexArray(aNewBuffer.data(), aNewBuffer.size(), rOutBuffer);
- }
- else
- COSWriter::appendUnicodeTextString(rInString, rOutBuffer);
- rOutBuffer.append( ">" );
-}
-
-inline void PDFWriterImpl::appendLiteralStringEncrypt( std::string_view
rInString, const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer )
-{
- rOutBuffer.append( "(" );
- sal_Int32 nChars = rInString.size();
- //check for encryption, if ok, encrypt the string, then convert with
appndLiteralString
- if (m_aContext.Encryption.canEncrypt())
- {
- m_vEncryptionBuffer.resize(nChars);
- //encrypt the string in a buffer, then append it
- enableStringEncryption(nInObjectNumber);
- m_pPDFEncryptor->encrypt(rInString.data(), nChars,
m_vEncryptionBuffer, nChars);
-
appendLiteralString(reinterpret_cast<char*>(m_vEncryptionBuffer.data()),
m_vEncryptionBuffer.size(), rOutBuffer);
- }
- else
- appendLiteralString( rInString.data(), nChars , rOutBuffer );
- rOutBuffer.append( ")" );
-}
-
-void PDFWriterImpl::appendLiteralStringEncrypt( std::u16string_view rInString,
const sal_Int32 nInObjectNumber, OStringBuffer& rOutBuffer, rtl_TextEncoding
nEnc )
-{
- OString aBufferString( OUStringToOString( rInString, nEnc ) );
- sal_Int32 nLen = aBufferString.getLength();
- OStringBuffer aBuf( nLen );
- const char* pT = aBufferString.getStr();
-
- for( sal_Int32 i = 0; i < nLen; i++, pT++ )
- {
- if( (*pT & 0x80) == 0 )
- aBuf.append( *pT );
- else
- {
- aBuf.append( '<' );
- appendHex( *pT, aBuf );
- aBuf.append( '>' );
- }
- }
- aBufferString = aBuf.makeStringAndClear();
- appendLiteralStringEncrypt( aBufferString, nInObjectNumber, rOutBuffer);
-}
-
-/* end i12626 methods */
-
void PDFWriterImpl::emitComment( const char* pComment )
{
OString aLine = OString::Concat("% ") + pComment + "
";
@@ -2155,13 +2024,13 @@ sal_Int32 PDFWriterImpl::emitStructure(
PDFStructureElement& rEle )
if( !rEle.m_aActualText.isEmpty() )
{
aLine.append( "/ActualText" );
- appendUnicodeTextStringEncrypt( rEle.m_aActualText,
rEle.m_nObject, aLine );
+ aWriter.writeUnicodeEncrypt(rEle.m_aActualText, rEle.m_nObject);
aLine.append( "
" );
}
if( !rEle.m_aAltText.isEmpty() )
{
aLine.append( "/Alt" );
- appendUnicodeTextStringEncrypt( rEle.m_aAltText, rEle.m_nObject,
aLine );
+ aWriter.writeUnicodeEncrypt(rEle.m_aAltText, rEle.m_nObject);
aLine.append( "
" );
}
}
@@ -2672,7 +2541,7 @@ bool PDFWriterImpl::emitType3Font(const
vcl::font::PhysicalFontFace* pFace,
auto nAlpha = aColor.GetAlpha();
OStringBuffer aName(16);
aName.append("GS");
- appendHex(nAlpha, aName);
+ COSWriter::appendHex(nAlpha, aName);
aContents.append("/" + aName + " gs ");
@@ -2692,7 +2561,7 @@ bool PDFWriterImpl::emitType3Font(const
vcl::font::PhysicalFontFace* pFace,
aContents.append(
" Tf "
"<");
- appendHex(rLayer.m_nSubsetGlyphID, aContents);
+ COSWriter::appendHex(rLayer.m_nSubsetGlyphID, aContents);
aContents.append(
">Tj "
"ET "
@@ -2924,14 +2793,14 @@ sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8
const * pEncoding,
+ " beginbfchar
" );
}
aContents.append( '<' );
- appendHex( static_cast<sal_Int8>(pEncoding[n]), aContents );
+ COSWriter::appendHex(static_cast<sal_Int8>(pEncoding[n]),
aContents);
aContents.append( "> <" );
// TODO: handle code points>U+FFFF
sal_Int32 nIndex = pEncToUnicodeIndex[n];
for( sal_Int32 j = 0; j < pCodeUnitsPerGlyph[n]; j++ )
{
- appendHex( static_cast<sal_Int8>(rCodeUnits[nIndex + j] /
256), aContents );
- appendHex( static_cast<sal_Int8>(rCodeUnits[nIndex + j] &
255), aContents );
+ COSWriter::appendHex(static_cast<sal_Int8>(rCodeUnits[nIndex +
j] / 256), aContents);
+ COSWriter::appendHex(static_cast<sal_Int8>(rCodeUnits[nIndex +
j] & 255), aContents);
}
aContents.append( ">
" );
nCount++;
@@ -3411,6 +3280,7 @@ sal_Int32 PDFWriterImpl::emitOutline()
{
PDFOutlineEntry& rItem = m_aOutline[i];
OStringBuffer aLine( 1024 );
+ COSWriter aWriter(aLine, m_aContext.Encryption.getParams(),
m_pPDFEncryptor);
if (!updateObject(rItem.m_nObject))
return 0;
@@ -3435,7 +3305,7 @@ sal_Int32 PDFWriterImpl::emitOutline()
{
// Title, Dest, Parent, Prev, Next
aLine.append( "/Title" );
- appendUnicodeTextStringEncrypt( rItem.m_aTitle, rItem.m_nObject,
aLine );
+ aWriter.writeUnicodeEncrypt(rItem.m_aTitle, rItem.m_nObject);
aLine.append( "
" );
// Dest is not required
if( rItem.m_nDestID >= 0 && o3tl::make_unsigned(rItem.m_nDestID) <
m_aDests.size() )
@@ -3625,14 +3495,14 @@ bool PDFWriterImpl::emitScreenAnnotations()
if (PDFWriter::PDFVersion::PDF_1_7 <= m_aContext.Version)
{ // ISO 14289-1:2014, Clause: 7.11
aLine.append("/UF ");
- appendUnicodeTextStringEncrypt(rScreen.m_aURL,
rScreen.m_nObject, aLine);
+ aWriter.writeUnicodeEncrypt(rScreen.m_aURL, rScreen.m_nObject);
}
}
if (PDFWriter::PDFVersion::PDF_1_6 <= m_aContext.Version
&& !rScreen.m_AltText.isEmpty())
{ // ISO 14289-1:2014, Clause: 7.11
aLine.append("/Desc ");
- appendUnicodeTextStringEncrypt(rScreen.m_AltText,
rScreen.m_nObject, aLine);
+ aWriter.writeUnicodeEncrypt(rScreen.m_AltText, rScreen.m_nObject);
}
aLine.append(" >>
"); // end of /D
// Allow playing the video via a tempfile.
@@ -3643,7 +3513,7 @@ bool PDFWriterImpl::emitScreenAnnotations()
// ISO 14289-1:2014, Clause: 7.18.6.2
// Alt text is a "Multi-language Text Array"
aLine.append(" /Alt [ () ");
- appendUnicodeTextStringEncrypt(rScreen.m_AltText, rScreen.m_nObject,
aLine);
+ aWriter.writeUnicodeEncrypt(rScreen.m_AltText, rScreen.m_nObject);
aLine.append(" ] "
">>");
@@ -3703,7 +3573,7 @@ bool PDFWriterImpl::emitLinkAnnotations()
aLine.append( "]" );
// ISO 14289-1:2014, Clause: 7.18.5
aLine.append("/Contents");
- appendUnicodeTextStringEncrypt(rLink.m_AltText, rLink.m_nObject,
aLine);
+ aWriter.writeUnicodeEncrypt(rLink.m_AltText, rLink.m_nObject);
if( rLink.m_nDest >= 0 )
{
aLine.append( "/Dest" );
@@ -3967,6 +3837,8 @@ void appendAnnotationBorder(float fBorderWidth,
OStringBuffer & aLine)
void PDFWriterImpl::emitTextAnnotationLine(OStringBuffer & aLine, PDFNoteEntry
const & rNote)
{
+ COSWriter aWriter(aLine, m_aContext.Encryption.getParams(),
m_pPDFEncryptor);
+
appendObjectID(rNote.m_nObject, aLine);
double fPageHeight = m_aPages[rNote.m_nPage].getHeight();
@@ -4049,14 +3921,14 @@ void
PDFWriterImpl::emitTextAnnotationLine(OStringBuffer & aLine, PDFNoteEntry c
// contents of the note (type text string)
aLine.append("/Contents ");
- appendUnicodeTextStringEncrypt(rNote.m_aContents.maContents,
rNote.m_nObject, aLine);
+ aWriter.writeUnicodeEncrypt(rNote.m_aContents.maContents, rNote.m_nObject);
aLine.append("
");
// optional title
if (!rNote.m_aContents.maTitle.isEmpty())
{
aLine.append("/T ");
- appendUnicodeTextStringEncrypt(rNote.m_aContents.maTitle,
rNote.m_nObject, aLine);
+ aWriter.writeUnicodeEncrypt(rNote.m_aContents.maTitle,
rNote.m_nObject);
aLine.append("
");
}
@@ -4510,7 +4382,7 @@ void PDFWriterImpl::createDefaultCheckBoxAppearance(
PDFWidget& rBox, const PDFW
aDA.append( " " );
m_aPages[ m_nCurrentPage ].appendMappedLength( nCharYOffset, aDA );
aDA.append( " Td <" );
- appendHex( nMappedGlyph, aDA );
+ COSWriter::appendHex( nMappedGlyph, aDA );
aDA.append( "> Tj
ET
Q
EMC
" );
writeBuffer( aDA );
endRedirect();
@@ -4777,6 +4649,7 @@ bool PDFWriterImpl::emitWidgetAnnotations()
OStringBuffer aLine( 1024 );
COSWriter aWriter(aLine, m_aContext.Encryption.getParams(),
m_pPDFEncryptor);
OStringBuffer aValue( 256 );
+ COSWriter aValueWriter(aValue, m_aContext.Encryption.getParams(),
m_pPDFEncryptor);
aLine.append( rWidget.m_nObject );
aLine.append( " 0 obj
"
"<<" );
@@ -4849,7 +4722,9 @@ bool PDFWriterImpl::emitWidgetAnnotations()
sal_Int32 nEntry = rWidget.m_aSelectedEntries[i];
if( nEntry >= 0
&& o3tl::make_unsigned(nEntry) <
rWidget.m_aListEntries.size() )
- appendUnicodeTextStringEncrypt(
rWidget.m_aListEntries[ nEntry ], rWidget.m_nObject, aValue );
+ {
+
aValueWriter.writeUnicodeEncrypt(rWidget.m_aListEntries[ nEntry ],
rWidget.m_nObject);
+ }
}
aValue.append( "]" );
}
@@ -4857,19 +4732,19 @@ bool PDFWriterImpl::emitWidgetAnnotations()
rWidget.m_aSelectedEntries[0] >= 0 &&
o3tl::make_unsigned(rWidget.m_aSelectedEntries[0]) <
rWidget.m_aListEntries.size() )
{
- appendUnicodeTextStringEncrypt(
rWidget.m_aListEntries[ rWidget.m_aSelectedEntries[0] ], rWidget.m_nObject,
aValue );
+
aValueWriter.writeUnicodeEncrypt(rWidget.m_aListEntries[
rWidget.m_aSelectedEntries[0] ], rWidget.m_nObject);
}
else
- appendUnicodeTextStringEncrypt( OUString(),
rWidget.m_nObject, aValue );
+ aValueWriter.writeUnicodeEncrypt( OUString(),
rWidget.m_nObject);
aLine.append( "Ch" );
break;
case PDFWriter::ComboBox:
- appendUnicodeTextStringEncrypt( rWidget.m_aValue,
rWidget.m_nObject, aValue );
+ aValueWriter.writeUnicodeEncrypt( rWidget.m_aValue,
rWidget.m_nObject);
aLine.append( "Ch" );
break;
case PDFWriter::Edit:
aLine.append( "Tx" );
- appendUnicodeTextStringEncrypt( rWidget.m_aValue,
rWidget.m_nObject, aValue );
+ aValueWriter.writeUnicodeEncrypt( rWidget.m_aValue,
rWidget.m_nObject);
break;
case PDFWriter::Signature:
aLine.append( "Sig" );
@@ -6144,7 +6019,7 @@ bool PDFWriterImpl::emitTrailer()
OStringBuffer aDocChecksum( 2*RTL_DIGEST_LENGTH_MD5+1 );
::std::vector<unsigned char> const nMD5Sum(m_DocDigest.finalize());
for (sal_uInt8 i : nMD5Sum)
- appendHex( i, aDocChecksum );
+ COSWriter::appendHex( i, aDocChecksum );
// document id set in setDocInfo method
// emit trailer
aLine.setLength( 0 );
@@ -6171,13 +6046,13 @@ bool PDFWriterImpl::emitTrailer()
aLine.append( "/ID [ <" );
for (auto const& item : m_aContext.Encryption.DocumentIdentifier)
{
- appendHex( sal_Int8(item), aLine );
+ COSWriter::appendHex( sal_Int8(item), aLine );
}
aLine.append( ">
"
"<" );
for (auto const& item : m_aContext.Encryption.DocumentIdentifier)
{
- appendHex( sal_Int8(item), aLine );
+ COSWriter::appendHex( sal_Int8(item), aLine );
}
aLine.append( "> ]
" );
}
@@ -6682,7 +6557,7 @@ void PDFWriterImpl::drawVerticalGlyphs(
rLine.append( " Tf" );
}
rLine.append( "<" );
- appendHex( rGlyphs[i].m_nMappedGlyphId, rLine );
+ COSWriter::appendHex( rGlyphs[i].m_nMappedGlyphId, rLine );
rLine.append( ">Tj
" );
}
}
@@ -6760,14 +6635,14 @@ void PDFWriterImpl::drawHorizontalGlyphs(
OStringBuffer aKernedLine( 256 ), aUnkernedLine( 256 );
aKernedLine.append( "[<" );
aUnkernedLine.append( '<' );
- appendHex( rGlyphs[nBeginRun].m_nMappedGlyphId, aKernedLine );
- appendHex( rGlyphs[nBeginRun].m_nMappedGlyphId, aUnkernedLine );
+ COSWriter::appendHex( rGlyphs[nBeginRun].m_nMappedGlyphId, aKernedLine
);
+ COSWriter::appendHex( rGlyphs[nBeginRun].m_nMappedGlyphId,
aUnkernedLine );
aMat.invert();
bool bNeedKern = false;
for( sal_uInt32 nPos = nBeginRun+1; nPos < aRunEnds[nRun]; nPos++ )
{
- appendHex( rGlyphs[nPos].m_nMappedGlyphId, aUnkernedLine );
+ COSWriter::appendHex( rGlyphs[nPos].m_nMappedGlyphId,
aUnkernedLine );
// check if default glyph positioning is sufficient
const basegfx::B2DPoint aThisPos = aMat.transform(
rGlyphs[nPos].m_aPos );
const basegfx::B2DPoint aPrevPos = aMat.transform(
rGlyphs[nPos-1].m_aPos );
@@ -6787,7 +6662,7 @@ void PDFWriterImpl::drawHorizontalGlyphs(
aKernedLine.append( nAdjustment );
aKernedLine.append( "<" );
}
- appendHex( rGlyphs[nPos].m_nMappedGlyphId, aKernedLine );
+ COSWriter::appendHex( rGlyphs[nPos].m_nMappedGlyphId, aKernedLine
);
}
aKernedLine.append( ">]TJ
" );
aUnkernedLine.append( ">Tj
" );
@@ -7080,8 +6955,8 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const
OUString& rText, bool
for (int i = 0; i < nCharCount; i++)
{
sal_Unicode aChar = rText[nCharPos + i];
- appendHex(static_cast<sal_Int8>(aChar >> 8), aLine);
- appendHex(static_cast<sal_Int8>(aChar & 255), aLine);
+ COSWriter::appendHex(static_cast<sal_Int8>(aChar >> 8),
aLine);
+ COSWriter::appendHex(static_cast<sal_Int8>(aChar & 255),
aLine);
}
aLine.append( ">>>
BDC
" );
}
@@ -9753,16 +9628,16 @@ bool PDFWriterImpl::writeBitmapObject( const
BitmapEmit& rObject, bool bMask )
std::vector<sal_uInt8> aOutputBuffer(nChar);
m_pPDFEncryptor->encrypt(m_vEncryptionBuffer.data(), nChar,
aOutputBuffer, nChar);
//now queue the data for output
- appendHexArray(aOutputBuffer.data(), aOutputBuffer.size(),
aLine);
+ COSWriter::appendHexArray(aOutputBuffer.data(),
aOutputBuffer.size(), aLine);
}
else //no encryption requested (PDF/A-1a program flow drops here)
{
for( sal_uInt16 i = 0; i < pAccess->GetPaletteEntryCount();
i++ )
{
const BitmapColor& rColor = pAccess->GetPaletteColor( i );
- appendHex( rColor.GetRed(), aLine );
- appendHex( rColor.GetGreen(), aLine );
- appendHex( rColor.GetBlue(), aLine );
+ COSWriter::appendHex( rColor.GetRed(), aLine );
+ COSWriter::appendHex( rColor.GetGreen(), aLine );
+ COSWriter::appendHex( rColor.GetBlue(), aLine );
}
}
aLine.append( ">
]
" );
diff --git a/vcl/source/pdf/COSWriter.cxx b/vcl/source/pdf/COSWriter.cxx
index 064bec546b3e..bc9f49448a34 100644
--- a/vcl/source/pdf/COSWriter.cxx
+++ b/vcl/source/pdf/COSWriter.cxx
@@ -79,7 +79,7 @@ void COSWriter::writeUnicodeEncrypt(OUString const& rString,
sal_Int32 nObject)
std::vector<sal_uInt8> aNewBuffer(nChars);
mpPDFEncryptor->encrypt(aEncryptionBuffer.data(), nChars, aNewBuffer,
nChars);
//now append, hexadecimal (appendHex), the encrypted result
- appendHexArray(aNewBuffer.data(), aNewBuffer.size());
+ COSWriter::appendHexArray(aNewBuffer.data(), aNewBuffer.size(),
mrBuffer);
mrBuffer.append(">");
}
else
