vcl/qa/cppunit/BitmapTest.cxx | 10
vcl/source/app/svmain.cxx | 14
vcl/source/control/field.cxx | 9
vcl/source/control/fmtfield.cxx | 26 -
vcl/source/control/throbber.cxx | 12
vcl/source/filter/ipdf/pdfdocument.cxx | 40 +-
vcl/source/gdi/mtfxmldump.cxx | 5
vcl/source/gdi/pdfobjectcopier.cxx | 8
vcl/source/gdi/pdfwriter_impl.cxx | 530 +++++++++++++++------------------
vcl/source/gdi/print3.cxx | 3
vcl/source/treelist/headbar.cxx | 3
vcl/source/treelist/imap2.cxx | 3
vcl/source/treelist/transfer.cxx | 10
vcl/source/window/printdlg.cxx | 7
vcl/unx/generic/fontmanager/helper.cxx | 7
vcl/unx/generic/print/glyphset.cxx | 6
vcl/unx/generic/print/printerjob.cxx | 38 +-
vcl/unx/generic/printer/jobdata.cxx | 55 +--
vcl/unx/generic/printer/ppdparser.cxx | 18 -
vcl/unx/gtk3/gtkinst.cxx | 6
20 files changed, 359 insertions(+), 451 deletions(-)
New commits:
commit a5084d15e1b72e303e1628fbff84432036b014a9
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Mar 30 10:42:07 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Mar 30 13:36:59 2023 +0000
loplugin:stringadd in vcl
when applying my upcoming patch to also consider O[U]StringBuffer
Change-Id: I44ce7183e4b292269fac1e3d2217286bf5abe823
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149752
Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index 98fabd569f24..dfcf44a8f6a7 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -330,13 +330,9 @@ void checkAndInsert(CRCHash& rHash, sal_uInt64 nCRC, const
char* pLocation)
auto it = rHash.find(nCRC);
if (it != rHash.end())
{
- OStringBuffer aBuf("CRC collision between ");
- aBuf.append(pLocation);
- aBuf.append(" and ");
- aBuf.append(it->second);
- aBuf.append(" hash is 0x");
- aBuf.append(static_cast<sal_Int64>(nCRC), 16);
- CPPUNIT_FAIL(aBuf.toString().getStr());
+ OString aBuf = OString::Concat("CRC collision between ") + pLocation +
" and " + it->second
+ + " hash is 0x" +
OString::number(static_cast<sal_Int64>(nCRC), 16);
+ CPPUNIT_FAIL(aBuf.getStr());
}
rHash[nCRC] = pLocation;
}
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 571be29579bc..ab461912724f 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -456,13 +456,13 @@ void DeInitVCL()
nBadTopWindows--;
else
{
- aBuf.append( "text = \"" );
- aBuf.append( OUStringToOString( pWin->GetText(),
osl_getThreadTextEncoding() ) );
- aBuf.append( "\" type = \"" );
- aBuf.append( typeid(*pWin).name() );
- aBuf.append( "\", ptr = 0x" );
- aBuf.append( reinterpret_cast<sal_Int64>( pWin ), 16 );
- aBuf.append( "\n" );
+ aBuf.append( "text = \""
+ + OUStringToOString( pWin->GetText(),
osl_getThreadTextEncoding() )
+ + "\" type = \""
+ + typeid(*pWin).name()
+ + "\", ptr = 0x"
+ + OString::number(reinterpret_cast<sal_Int64>( pWin ), 16 )
+ + "\n" );
}
}
SAL_WARN_IF( nBadTopWindows!=0, "vcl", aBuf.getStr() );
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 0bd9ebab713e..3de0eaf50165 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -314,8 +314,7 @@ bool ImplNumericGetValue( const OUString& rStr, sal_Int64&
rValue,
sal_Int64 nDenom = o3tl::toInt64(aStrDenom);
if (nDenom == 0) return false; // Division by zero
double nFrac2Dec = nWholeNum + static_cast<double>(nNum)/nDenom; //
Convert to double for floating point precision
- OUStringBuffer aStrFrac;
- aStrFrac.append(nFrac2Dec);
+ OUStringBuffer aStrFrac(OUString::number(nFrac2Dec));
// Reconvert division result to string and parse
nDecPos = aStrFrac.indexOf('.');
if ( nDecPos >= 0)
@@ -383,14 +382,12 @@ void ImplUpdateSeparatorString( OUString& io_rText,
|| (nIndexTh != -1 && nIndexDec == -1)
)
{
- aBuf.append( pBuffer + nIndex, nIndexTh - nIndex );
- aBuf.append( rNewThSep );
+ aBuf.append( OUString::Concat(std::u16string_view(pBuffer +
nIndex, nIndexTh - nIndex )) + rNewThSep );
nIndex = nIndexTh + rOldThSep.size();
}
else if( nIndexDec != -1 )
{
- aBuf.append( pBuffer + nIndex, nIndexDec - nIndex );
- aBuf.append( rNewDecSep );
+ aBuf.append( OUString::Concat(std::u16string_view(pBuffer +
nIndex, nIndexDec - nIndex )) + rNewDecSep );
nIndex = nIndexDec + rOldDecSep.size();
}
else
diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx
index d48f4c7560b0..196e457e41e9 100644
--- a/vcl/source/control/fmtfield.cxx
+++ b/vcl/source/control/fmtfield.cxx
@@ -1096,9 +1096,7 @@ void DoubleCurrencyField::UpdateCurrencyFormat()
OUStringBuffer sNewFormat;
if (bThSep)
{
- sNewFormat.append('#');
- sNewFormat.append(aLocaleInfo.getNumThousandSep());
- sNewFormat.append("##0");
+ sNewFormat.append("#" + aLocaleInfo.getNumThousandSep() + "##0");
}
else
sNewFormat.append('0');
@@ -1114,30 +1112,24 @@ void DoubleCurrencyField::UpdateCurrencyFormat()
OUString sSymbol = getCurrencySymbol();
sSymbol = comphelper::string::strip(sSymbol, ' ');
- OUStringBuffer sTemp("[$");
- sTemp.append(sSymbol);
- sTemp.append("] ");
- sTemp.append(sNewFormat);
-
+ sNewFormat =
+ "[$" + sSymbol + "] "
+ + sNewFormat
// for negative values : $ -0.00, not -$ 0.00...
// (the real solution would be a possibility to choose a "positive
currency format" and a "negative currency format"...
// But not now... (and hey, you could take a formatted field for
this...))
// FS - 31.03.00 74642
- sTemp.append(";[$");
- sTemp.append(sSymbol);
- sTemp.append("] -");
- sTemp.append(sNewFormat);
-
- sNewFormat = sTemp;
+ + ";[$"
+ + sSymbol
+ + "] -"
+ + sNewFormat;
}
else
{
OUString sTemp = getCurrencySymbol();
sTemp = comphelper::string::strip(sTemp, ' ');
- sNewFormat.append(" [$");
- sNewFormat.append(sTemp);
- sNewFormat.append(']');
+ sNewFormat.append(" [$" + sTemp + "]");
}
// set this new basic format
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index d7dc3e4a763d..c44cbb12d7b2 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -179,7 +179,7 @@ void Throbber::setImageList( ::std::vector< Image > &&
i_images )
{
::std::vector< OUString > aImageURLs;
- char const* const pResolutions[] = { "16", "32", "64" };
+ sal_Unicode const* const pResolutions[] = { u"16", u"32", u"64" };
size_t const nImageCounts[] = { 6, 12, 12 };
size_t index = 0;
@@ -193,14 +193,12 @@ void Throbber::setImageList( ::std::vector< Image > &&
i_images )
aImageURLs.reserve( nImageCounts[index] );
for ( size_t i=0; i<nImageCounts[index]; ++i )
{
- OUStringBuffer aURL;
- aURL.append( "private:graphicrepository/vcl/res/spinner-" );
- aURL.appendAscii( pResolutions[index] );
- aURL.append( "-" );
+ OUStringBuffer aURL(
OUString::Concat("private:graphicrepository/vcl/res/spinner-")
+ + pResolutions[index]
+ + "-" );
if ( i < 9 )
aURL.append( "0" );
- aURL.append ( sal_Int32( i + 1 ) );
- aURL.append( ".png" );
+ aURL.append( OUString::number( sal_Int32( i + 1 ) ) + ".png" );
aImageURLs.push_back( aURL.makeStringAndClear() );
}
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx
b/vcl/source/filter/ipdf/pdfdocument.cxx
index 568b1980ab5d..c6638ec201eb 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -132,42 +132,37 @@ sal_Int32 PDFDocument::WriteSignatureObject(const
OUString& rDescription, bool b
aSignatureEntry.SetOffset(m_aEditBuffer.Tell());
aSignatureEntry.SetDirty(true);
m_aXRef[nSignatureId] = aSignatureEntry;
- OStringBuffer aSigBuffer;
- aSigBuffer.append(nSignatureId);
- aSigBuffer.append(" 0 obj\n");
- aSigBuffer.append("<</Contents <");
+ OStringBuffer aSigBuffer(OString::number(nSignatureId)
+ + " 0 obj\n"
+ "<</Contents <");
rContentOffset = aSignatureEntry.GetOffset() + aSigBuffer.getLength();
// Reserve space for the PKCS#7 object.
OStringBuffer aContentFiller(MAX_SIGNATURE_CONTENT_LENGTH);
comphelper::string::padToLength(aContentFiller,
MAX_SIGNATURE_CONTENT_LENGTH, '0');
- aSigBuffer.append(aContentFiller);
- aSigBuffer.append(">\n/Type/Sig/SubFilter");
+ aSigBuffer.append(aContentFiller + ">\n/Type/Sig/SubFilter");
if (bAdES)
aSigBuffer.append("/ETSI.CAdES.detached");
else
aSigBuffer.append("/adbe.pkcs7.detached");
// Time of signing.
- aSigBuffer.append(" /M (");
- aSigBuffer.append(vcl::PDFWriter::GetDateTime());
- aSigBuffer.append(")");
-
- // Byte range: we can write offset1-length1 and offset2 right now, will
- // write length2 later.
- aSigBuffer.append(" /ByteRange [ 0 ");
- // -1 and +1 is the leading "<" and the trailing ">" around the hex string.
- aSigBuffer.append(rContentOffset - 1);
- aSigBuffer.append(" ");
- aSigBuffer.append(rContentOffset + MAX_SIGNATURE_CONTENT_LENGTH + 1);
- aSigBuffer.append(" ");
+ aSigBuffer.append(" /M (" + vcl::PDFWriter::GetDateTime()
+ + ")"
+
+ // Byte range: we can write offset1-length1 and
offset2 right now, will
+ // write length2 later.
+ " /ByteRange [ 0 "
+ // -1 and +1 is the leading "<" and the trailing ">"
around the hex string.
+ + OString::number(rContentOffset - 1) + " "
+ + OString::number(rContentOffset +
MAX_SIGNATURE_CONTENT_LENGTH + 1) + " ");
rLastByteRangeOffset = aSignatureEntry.GetOffset() +
aSigBuffer.getLength();
// We don't know how many bytes we need for the last ByteRange value, this
// should be enough.
OStringBuffer aByteRangeFiller;
comphelper::string::padToLength(aByteRangeFiller, 100, ' ');
- aSigBuffer.append(aByteRangeFiller);
- // Finish the Sig obj.
- aSigBuffer.append(" /Filter/Adobe.PPKMS");
+ aSigBuffer.append(aByteRangeFiller
+ // Finish the Sig obj.
+ + " /Filter/Adobe.PPKMS");
if (!rDescription.isEmpty())
{
@@ -803,8 +798,7 @@ void PDFDocument::WriteXRef(sal_uInt64 nXRefOffset,
PDFReferenceElement const* p
m_aEditBuffer.WriteUInt32AsString(nObject);
m_aEditBuffer.WriteCharPtr(" 1\n");
- OStringBuffer aBuffer;
- aBuffer.append(static_cast<sal_Int32>(nOffset));
+ OStringBuffer aBuffer =
OString::number(static_cast<sal_Int32>(nOffset));
while (aBuffer.getLength() < 10)
aBuffer.insert(0, "0");
if (nObject == 0)
diff --git a/vcl/source/gdi/mtfxmldump.cxx b/vcl/source/gdi/mtfxmldump.cxx
index bda1c8f9843b..b20dd7d35513 100644
--- a/vcl/source/gdi/mtfxmldump.cxx
+++ b/vcl/source/gdi/mtfxmldump.cxx
@@ -868,11 +868,10 @@ void MetafileXmlDump::writeXml(const GDIMetaFile&
rMetaFile, tools::XmlWriter& r
rWriter.attribute("first", rArray[aIndex]);
if (aIndex + aLength - 1 <
o3tl::narrowing<sal_Int32>(rArray.size()))
rWriter.attribute("last", rArray[aIndex + aLength -
1]);
- OUStringBuffer sDxLengthString;
+ OUStringBuffer sDxLengthString(std::max((aLength - aIndex)
* 4, sal_Int32(0)));
for (sal_Int32 i = 0; i < aLength - aIndex; ++i)
{
- sDxLengthString.append(rArray[aIndex + i]);
- sDxLengthString.append(" ");
+ sDxLengthString.append(OUString::number(rArray[aIndex
+ i]) + " ");
}
rWriter.content(sDxLengthString);
rWriter.endElement();
diff --git a/vcl/source/gdi/pdfobjectcopier.cxx
b/vcl/source/gdi/pdfobjectcopier.cxx
index 4c9228235cd3..e0e1599f384c 100644
--- a/vcl/source/gdi/pdfobjectcopier.cxx
+++ b/vcl/source/gdi/pdfobjectcopier.cxx
@@ -89,9 +89,7 @@ sal_Int32
PDFObjectCopier::copyExternalResource(SvMemoryStream& rDocBuffer,
SAL_INFO("vcl.pdfwriter", "PDFObjectCopier::copyExternalResource: " <<
rObject.GetObjectValue()
<< "
-> " << nObject);
- OStringBuffer aLine;
- aLine.append(nObject);
- aLine.append(" 0 obj\n");
+ OStringBuffer aLine = OString::number(nObject) + " 0 obj\n";
if (rObject.GetDictionary())
{
@@ -104,9 +102,7 @@ sal_Int32
PDFObjectCopier::copyExternalResource(SvMemoryStream& rDocBuffer,
else
aLine.append(" ");
- aLine.append("/");
- aLine.append(rPair.first);
- aLine.append(" ");
+ aLine.append("/" + rPair.first + " ");
copyRecursively(aLine, *rPair.second, rDocBuffer,
rCopiedResources);
}
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index b2ba4d69555e..f5837c48ba7b 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -443,11 +443,7 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32
i_nWidgetIndex, const PDFWr
sal_Int32 nTry = 2;
do
{
- OStringBuffer aUnique( aFullName.getLength() + 16 );
- aUnique.append( aFullName );
- aUnique.append( '_' );
- aUnique.append( nTry++ );
- aTry = aUnique.makeStringAndClear();
+ aTry = aFullName + "_" + OString::number(nTry++);
check_it = m_aFieldNameMap.find( aTry );
} while( check_it != m_aFieldNameMap.end() );
aFullName = aTry;
@@ -662,11 +658,11 @@ void PDFPage::beginStream()
m_nStreamLengthObject = m_pWriter->createObject();
// write content stream header
- OStringBuffer aLine;
- aLine.append( m_aStreamObjects.back() );
- aLine.append( " 0 obj\n<</Length " );
- aLine.append( m_nStreamLengthObject );
- aLine.append( " 0 R" );
+ OStringBuffer aLine(
+ OString::number(m_aStreamObjects.back())
+ + " 0 obj\n<</Length "
+ + OString::number( m_nStreamLengthObject )
+ + " 0 R" );
if (!g_bDebugDisableCompression)
aLine.append( "/Filter/FlateDecode" );
aLine.append( ">>\nstream\n" );
@@ -713,27 +709,25 @@ bool PDFPage::emit(sal_Int32 nParentObject )
// emit page object
if( ! m_pWriter->updateObject( m_nPageObject ) )
return false;
- OStringBuffer aLine;
-
- aLine.append( m_nPageObject );
- aLine.append( " 0 obj\n"
- "<</Type/Page/Parent " );
- aLine.append( nParentObject );
- aLine.append( " 0 R" );
- aLine.append( "/Resources " );
- aLine.append( m_pWriter->getResourceDictObj() );
- aLine.append( " 0 R" );
+ OStringBuffer aLine(
+ OString::number(m_nPageObject)
+ + " 0 obj\n"
+ "<</Type/Page/Parent "
+ + OString::number(nParentObject)
+ + " 0 R"
+ "/Resources "
+ + OString::number(m_pWriter->getResourceDictObj())
+ + " 0 R" );
if( m_nPageWidth && m_nPageHeight )
{
- aLine.append( "/MediaBox[0 0 " );
- aLine.append(m_nPageWidth / m_nUserUnit);
- aLine.append( ' ' );
- aLine.append(m_nPageHeight / m_nUserUnit);
- aLine.append( "]" );
+ aLine.append( "/MediaBox[0 0 "
+ + OString::number(m_nPageWidth / m_nUserUnit)
+ + " "
+ + OString::number(m_nPageHeight / m_nUserUnit)
+ + "]" );
if (m_nUserUnit > 1)
{
- aLine.append("\n/UserUnit ");
- aLine.append(m_nUserUnit);
+ aLine.append("\n/UserUnit " + OString::number(m_nUserUnit));
}
}
switch( m_eOrientation )
@@ -747,8 +741,8 @@ bool PDFPage::emit(sal_Int32 nParentObject )
aLine.append( "/Annots[\n" );
for( int i = 0; i < nAnnots; i++ )
{
- aLine.append( m_aAnnotations[i] );
- aLine.append( " 0 R" );
+ aLine.append( OString::number(m_aAnnotations[i])
+ + " 0 R" );
aLine.append( ((i+1)%15) ? " " : "\n" );
}
aLine.append( "]\n" );
@@ -765,16 +759,16 @@ bool PDFPage::emit(sal_Int32 nParentObject )
int nParents = m_aMCIDParents.size();
for( int i = 0; i < nParents; i++ )
{
- aStructParents.append( m_aMCIDParents[i] );
- aStructParents.append( " 0 R" );
+ aStructParents.append( OString::number(m_aMCIDParents[i])
+ + " 0 R" );
aStructParents.append( ((i%10) == 9) ? "\n" : " " );
}
aStructParents.append( "]" );
m_pWriter->m_aStructParentTree.push_back(
aStructParents.makeStringAndClear() );
- aLine.append( "/StructParents " );
- aLine.append( sal_Int32(m_pWriter->m_aStructParentTree.size()-1) );
- aLine.append( "\n" );
+ aLine.append( "/StructParents "
+ + OString::number(
sal_Int32(m_pWriter->m_aStructParentTree.size()-1) )
+ + "\n" );
}
if( m_eTransition != PDFWriter::PageTransition::Regular && m_nTransTime >
0 )
{
@@ -817,27 +811,19 @@ bool PDFPage::emit(sal_Int32 nParentObject )
// transition style
if( pStyle )
{
- aLine.append( "/S/" );
- aLine.append( pStyle );
- aLine.append( "\n" );
+ aLine.append( OString::Concat("/S/") + pStyle + "\n" );
}
if( pDm )
{
- aLine.append( "/Dm/" );
- aLine.append( pDm );
- aLine.append( "\n" );
+ aLine.append( OString::Concat("/Dm/") + pDm + "\n" );
}
if( pM )
{
- aLine.append( "/M/" );
- aLine.append( pM );
- aLine.append( "\n" );
+ aLine.append( OString::Concat("/M/") + pM + "\n" );
}
if( pDi )
{
- aLine.append( "/Di " );
- aLine.append( pDi );
- aLine.append( "\n" );
+ aLine.append( OString::Concat("/Di ") + pDi + "\n" );
}
aLine.append( ">>\n" );
}
@@ -848,9 +834,7 @@ bool PDFPage::emit(sal_Int32 nParentObject )
aLine.append( '[' );
for(sal_Int32 i : m_aStreamObjects)
{
- aLine.append( ' ' );
- aLine.append( i );
- aLine.append( " 0 R" );
+ aLine.append( " " + OString::number( i ) + " 0 R" );
}
if( nStreamObjects > 1 )
aLine.append( ']' );
@@ -1442,25 +1426,26 @@ void PDFWriterImpl::computeDocumentIdentifier(
std::vector< sal_uInt8 >& o_rIden
// to use the localtime notation only
// according to a recommendation in XMP Specification (Jan 2004, page 75)
// the Acrobat way seems the right approach
- aCreationMetaDateString.append( static_cast<char>('0' +
((aDT.Year/1000)%10)) );
- aCreationMetaDateString.append( static_cast<char>('0' +
((aDT.Year/100)%10)) );
- aCreationMetaDateString.append( static_cast<char>('0' +
((aDT.Year/10)%10)) );
- aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Year)%10)) );
- aCreationMetaDateString.append( "-" );
- aCreationMetaDateString.append( static_cast<char>('0' +
((aDT.Month/10)%10)) );
- aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Month)%10))
);
- aCreationMetaDateString.append( "-" );
- aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Day/10)%10))
);
- aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Day)%10)) );
- aCreationMetaDateString.append( "T" );
- aCreationMetaDateString.append( static_cast<char>('0' +
((aDT.Hours/10)%10)) );
- aCreationMetaDateString.append( static_cast<char>('0' + ((aDT.Hours)%10))
);
- aCreationMetaDateString.append( ":" );
- aCreationMetaDateString.append( static_cast<char>('0' +
((aDT.Minutes/10)%10)) );
- aCreationMetaDateString.append( static_cast<char>('0' +
((aDT.Minutes)%10)) );
- aCreationMetaDateString.append( ":" );
- aCreationMetaDateString.append( static_cast<char>('0' +
((aDT.Seconds/10)%10)) );
- aCreationMetaDateString.append( static_cast<char>('0' +
((aDT.Seconds)%10)) );
+ aCreationMetaDateString.append(
+ OStringChar(static_cast<char>('0' + ((aDT.Year/1000)%10)) )
+ + OStringChar(static_cast<char>('0' + ((aDT.Year/100)%10)) )
+ + OStringChar(static_cast<char>('0' + ((aDT.Year/10)%10)) )
+ + OStringChar(static_cast<char>('0' + ((aDT.Year)%10)) )
+ + "-"
+ + OStringChar(static_cast<char>('0' + ((aDT.Month/10)%10)) )
+ + OStringChar(static_cast<char>('0' + ((aDT.Month)%10)) )
+ + "-"
+ + OStringChar(static_cast<char>('0' + ((aDT.Day/10)%10)) )
+ + OStringChar(static_cast<char>('0' + ((aDT.Day)%10)) )
+ + "T"
+ + OStringChar(static_cast<char>('0' + ((aDT.Hours/10)%10)) )
+ + OStringChar(static_cast<char>('0' + ((aDT.Hours)%10)) )
+ + ":"
+ + OStringChar(static_cast<char>('0' + ((aDT.Minutes/10)%10)) )
+ + OStringChar(static_cast<char>('0' + ((aDT.Minutes)%10)) )
+ + ":"
+ + OStringChar(static_cast<char>('0' + ((aDT.Seconds/10)%10)) )
+ + OStringChar(static_cast<char>('0' + ((aDT.Seconds)%10)) ));
sal_uInt32 nDelta = 0;
if( aGMT.Seconds > aTVal.Seconds )
@@ -1480,11 +1465,12 @@ void PDFWriterImpl::computeDocumentIdentifier(
std::vector< sal_uInt8 >& o_rIden
}
if( nDelta )
{
- aCreationMetaDateString.append( static_cast<char>('0' +
((nDelta/36000)%10)) );
- aCreationMetaDateString.append( static_cast<char>('0' +
((nDelta/3600)%10)) );
- aCreationMetaDateString.append( ":" );
- aCreationMetaDateString.append( static_cast<char>('0' +
((nDelta/600)%6)) );
- aCreationMetaDateString.append( static_cast<char>('0' +
((nDelta/60)%10)) );
+ aCreationMetaDateString.append(
+ OStringChar(static_cast<char>('0' + ((nDelta/36000)%10)) )
+ + OStringChar(static_cast<char>('0' + ((nDelta/3600)%10)) )
+ + ":"
+ + OStringChar(static_cast<char>('0' + ((nDelta/600)%6)) )
+ + OStringChar(static_cast<char>('0' + ((nDelta/60)%10)) ));
}
aID.append( i_rCString1.getStr(), i_rCString1.getLength() );
@@ -1794,16 +1780,15 @@ sal_Int32 PDFWriterImpl::emitStructParentTree(
sal_Int32 nObject )
{
OStringBuffer aLine( 1024 );
- aLine.append( nObject );
- aLine.append( " 0 obj\n"
- "<</Nums[\n" );
+ aLine.append( OString::number(nObject)
+ + " 0 obj\n"
+ "<</Nums[\n" );
sal_Int32 nTreeItems = m_aStructParentTree.size();
for( sal_Int32 n = 0; n < nTreeItems; n++ )
{
- aLine.append( n );
- aLine.append( ' ' );
- aLine.append( m_aStructParentTree[n] );
- aLine.append( "\n" );
+ aLine.append( OString::number(n) + " "
+ + m_aStructParentTree[n]
+ + "\n" );
}
aLine.append( "]>>\nendobj\n\n" );
CHECK_RETURN( updateObject( nObject ) );
@@ -2048,10 +2033,10 @@ OString PDFWriterImpl::emitStructureAttributes(
PDFStructureElement& i_rEle )
aAttribObjects.push_back( createObject() );
if (updateObject( aAttribObjects.back() ))
{
- OStringBuffer aObj( 64 );
- aObj.append( aAttribObjects.back() );
- aObj.append( " 0 obj\n"
- "<</O/Layout\n" );
+ OString aObj =
+ OString::number(aAttribObjects.back())
+ + " 0 obj\n"
+ "<</O/Layout\n";
aLayout.append( ">>\nendobj\n\n" );
writeBuffer( aObj );
writeBuffer( aLayout );
@@ -2062,10 +2047,10 @@ OString PDFWriterImpl::emitStructureAttributes(
PDFStructureElement& i_rEle )
aAttribObjects.push_back( createObject() );
if (updateObject( aAttribObjects.back() ))
{
- OStringBuffer aObj( 64 );
- aObj.append( aAttribObjects.back() );
- aObj.append( " 0 obj\n"
- "<</O/List\n" );
+ OString aObj =
+ OString::number( aAttribObjects.back() )
+ + " 0 obj\n"
+ "<</O/List\n";
aList.append( ">>\nendobj\n\n" );
writeBuffer( aObj );
writeBuffer( aList );
@@ -2076,10 +2061,10 @@ OString PDFWriterImpl::emitStructureAttributes(
PDFStructureElement& i_rEle )
aAttribObjects.push_back( createObject() );
if (updateObject( aAttribObjects.back() ))
{
- OStringBuffer aObj( 64 );
- aObj.append( aAttribObjects.back() );
- aObj.append( " 0 obj\n"
- "<</O/Table\n" );
+ OString aObj =
+ OString::number( aAttribObjects.back() )
+ + " 0 obj\n"
+ "<</O/Table\n";
aTable.append( ">>\nendobj\n\n" );
writeBuffer( aObj );
writeBuffer( aTable );
@@ -2091,9 +2076,7 @@ OString PDFWriterImpl::emitStructureAttributes(
PDFStructureElement& i_rEle )
aRet.append( " [" );
for (auto const& attrib : aAttribObjects)
{
- aRet.append( " " );
- aRet.append( attrib );
- aRet.append( " 0 R" );
+ aRet.append( " " + OString::number(attrib) + " 0 R" );
}
if( aAttribObjects.size() > 1 )
aRet.append( " ]" );
@@ -2133,29 +2116,26 @@ sal_Int32 PDFWriterImpl::emitStructure(
PDFStructureElement& rEle )
}
OStringBuffer aLine( 512 );
- aLine.append( rEle.m_nObject );
- aLine.append( " 0 obj\n"
- "<</Type" );
+ aLine.append(
+ OString::number(rEle.m_nObject)
+ + " 0 obj\n"
+ "<</Type" );
sal_Int32 nParentTree = -1;
sal_Int32 nIDTree = -1;
if( rEle.m_nOwnElement == rEle.m_nParentElement )
{
nParentTree = createObject();
CHECK_RETURN( nParentTree );
- aLine.append( "/StructTreeRoot\n" );
- aLine.append( "/ParentTree " );
- aLine.append( nParentTree );
- aLine.append( " 0 R\n" );
+ aLine.append( "/StructTreeRoot\n"
+ "/ParentTree "
+ + OString::number(nParentTree)
+ + " 0 R\n" );
if( ! m_aRoleMap.empty() )
{
aLine.append( "/RoleMap<<" );
for (auto const& role : m_aRoleMap)
{
- aLine.append( '/' );
- aLine.append(role.first);
- aLine.append( '/' );
- aLine.append( role.second );
- aLine.append( '\n' );
+ aLine.append( "/" + role.first + "/" + role.second + "\n" );
}
aLine.append( ">>\n" );
}
@@ -2180,13 +2160,14 @@ sal_Int32 PDFWriterImpl::emitStructure(
PDFStructureElement& rEle )
aLine.append("\n/ID ");
appendLiteralStringEncrypt(GenerateID(rEle.m_nObject),
rEle.m_nObject, aLine);
}
- aLine.append( "\n"
- "/P " );
- aLine.append( m_aStructure[ rEle.m_nParentElement ].m_nObject );
- aLine.append( " 0 R\n"
- "/Pg " );
- aLine.append( rEle.m_nFirstPageObject );
- aLine.append( " 0 R\n" );
+ aLine.append(
+ "\n"
+ "/P "
+ + OString::number(m_aStructure[ rEle.m_nParentElement ].m_nObject)
+ + " 0 R\n"
+ "/Pg "
+ + OString::number(rEle.m_nFirstPageObject)
+ + " 0 R\n" );
if( !rEle.m_aActualText.isEmpty() )
{
aLine.append( "/ActualText" );
@@ -2205,9 +2186,7 @@ sal_Int32 PDFWriterImpl::emitStructure(
PDFStructureElement& rEle )
OString aAttribs = emitStructureAttributes( rEle );
if( !aAttribs.isEmpty() )
{
- aLine.append( "/A" );
- aLine.append( aAttribs );
- aLine.append( "\n" );
+ aLine.append( "/A" + aAttribs + "\n" );
}
}
if( !rEle.m_aLocale.Language.isEmpty() )
@@ -2227,8 +2206,7 @@ sal_Int32 PDFWriterImpl::emitStructure(
PDFStructureElement& rEle )
aLocBuf.append( aLanguage );
if( !aCountry.isEmpty() )
{
- aLocBuf.append( '-' );
- aLocBuf.append( aCountry );
+ aLocBuf.append( "-" + aCountry );
}
aLine.append( "/Lang" );
appendLiteralStringEncrypt( aLocBuf, rEle.m_nObject, aLine );
@@ -2262,24 +2240,25 @@ sal_Int32 PDFWriterImpl::emitStructure(
PDFStructureElement& rEle )
{
if( kid.nMCID == -1 )
{
- aLine.append( kid.nObject );
- aLine.append( " 0 R" );
+ aLine.append(
+ OString::number(kid.nObject)
+ + " 0 R" );
aLine.append( ( (i & 15) == 15 ) ? "\n" : " " );
}
else
{
if( kid.nObject == rEle.m_nFirstPageObject )
{
- aLine.append( kid.nMCID );
- aLine.append( " " );
+ aLine.append( OString::number(kid.nMCID) + " " );
}
else
{
- aLine.append( "<</Type/MCR/Pg " );
- aLine.append( kid.nObject );
- aLine.append( " 0 R /MCID " );
- aLine.append( kid.nMCID );
- aLine.append( ">>\n" );
+ aLine.append(
+ "<</Type/MCR/Pg "
+ + OString::number(kid.nObject)
+ + " 0 R /MCID "
+ + OString::number(kid.nMCID)
+ + ">>\n" );
}
}
++i;
@@ -2337,12 +2316,13 @@ bool PDFWriterImpl::emitTilings()
tiling.m_pTilingStream->Seek( STREAM_SEEK_TO_BEGIN );
// write pattern object
- aTilingObj.append( tiling.m_nObject );
- aTilingObj.append( " 0 obj\n" );
- aTilingObj.append( "<</Type/Pattern/PatternType 1\n"
- "/PaintType 1\n"
- "/TilingType 2\n"
- "/BBox[" );
+ aTilingObj.append(
+ OString::number(tiling.m_nObject)
+ + " 0 obj\n"
+ "<</Type/Pattern/PatternType 1\n"
+ "/PaintType 1\n"
+ "/TilingType 2\n"
+ "/BBox[" );
appendFixedInt( nX, aTilingObj );
aTilingObj.append( ' ' );
appendFixedInt( nY, aTilingObj );
@@ -2383,9 +2363,9 @@ bool PDFWriterImpl::emitTilings()
tiling.m_aResources.append( aTilingObj, getFontDictObject() );
if( bDeflate )
aTilingObj.append( "/Filter/FlateDecode" );
- aTilingObj.append( "/Length " );
- aTilingObj.append( static_cast<sal_Int32>(nTilingStreamSize) );
- aTilingObj.append( ">>\nstream\n" );
+ aTilingObj.append( "/Length "
+ + OString::number(static_cast<sal_Int32>(nTilingStreamSize))
+ + ">>\nstream\n" );
if ( !updateObject( tiling.m_nObject ) ) return false;
if ( !writeBuffer( aTilingObj ) ) return false;
checkAndEnableStreamEncryption( tiling.m_nObject );
@@ -2412,9 +2392,10 @@ sal_Int32 PDFWriterImpl::emitBuildinFont(const
pdf::BuildinFontFace* pFD, sal_In
if( nFontObject <= 0 )
nFontObject = createObject();
CHECK_RETURN( updateObject( nFontObject ) );
- aLine.append( nFontObject );
- aLine.append( " 0 obj\n"
- "<</Type/Font/Subtype/Type1/BaseFont/" );
+ aLine.append(
+ OString::number(nFontObject)
+ + " 0 obj\n"
+ "<</Type/Font/Subtype/Type1/BaseFont/" );
appendName( rBuildinFont.m_pPSName, aLine );
aLine.append( "\n" );
if( rBuildinFont.m_eCharSet == RTL_TEXTENCODING_MS_1252 )
@@ -2469,10 +2450,11 @@ std::map< sal_Int32, sal_Int32 >
PDFWriterImpl::emitSystemFont( const vcl::font:
if( updateObject( nObject ) )
{
OStringBuffer aLine( 1024 );
- aLine.append( nObject );
- aLine.append( " 0 obj\n"
- "<</Type/Font/Subtype/TrueType" );
- aLine.append( "/BaseFont/" );
+ aLine.append(
+ OString::number(nObject)
+ + " 0 obj\n"
+ "<</Type/Font/Subtype/TrueType"
+ "/BaseFont/" );
appendName( aInfo.m_aPSName, aLine );
aLine.append( "\n" );
if (!pFace->IsMicrosoftSymbolEncoded())
@@ -2485,10 +2467,10 @@ std::map< sal_Int32, sal_Int32 >
PDFWriterImpl::emitSystemFont( const vcl::font:
aLine.append( ((i&15) == 15) ? "\n" : " " );
}
aLine.append( "]\n"
- "/FontDescriptor " );
- aLine.append( nFontDescriptor );
- aLine.append( " 0 R>>\n"
- "endobj\n\n" );
+ "/FontDescriptor "
+ + OString::number( nFontDescriptor )
+ + " 0 R>>\n"
+ "endobj\n\n" );
writeBuffer( aLine );
aRet[ rEmbed.m_nNormalFontID ] = nObject;
@@ -2582,78 +2564,74 @@ bool PDFWriterImpl::emitType3Font(const
vcl::font::PhysicalFontFace* pFace,
return false;
OStringBuffer aLine(1024);
- aLine.append(nFontObject);
- aLine.append(" 0 obj\n"
- "<</Type/Font/Subtype/Type3/Name/");
+ aLine.append(
+ OString::number(nFontObject)
+ + " 0 obj\n"
+ "<</Type/Font/Subtype/Type3/Name/");
appendName(aSubsetInfo.m_aPSName, aLine);
- aLine.append("\n/FontBBox[");
+ aLine.append(
+ "\n/FontBBox["
// note: Top and Bottom are reversed in VCL and PDF rectangles
- aLine.append(OString::number(aSubsetInfo.m_aFontBBox.Left()));
- aLine.append(' ');
- aLine.append(OString::number(aSubsetInfo.m_aFontBBox.Top()));
- aLine.append(' ');
- aLine.append(OString::number(aSubsetInfo.m_aFontBBox.Right()));
- aLine.append(' ');
- aLine.append(OString::number(aSubsetInfo.m_aFontBBox.Bottom() + 1));
- aLine.append("]\n");
+ + OString::number(aSubsetInfo.m_aFontBBox.Left())
+ + " "
+ + OString::number(aSubsetInfo.m_aFontBBox.Top())
+ + " "
+ + OString::number(aSubsetInfo.m_aFontBBox.Right())
+ + " "
+ + OString::number(aSubsetInfo.m_aFontBBox.Bottom() + 1)
+ + "]\n");
auto nScale = 1. / pFace->UnitsPerEm();
- aLine.append("/FontMatrix[");
- aLine.append(nScale);
- aLine.append(" 0 0 ");
- aLine.append(nScale);
- aLine.append(" 0 0]\n");
+ aLine.append(
+ "/FontMatrix["
+ + OString::number(nScale)
+ + " 0 0 "
+ + OString::number(nScale)
+ + " 0 0]\n");
sal_Int32 pGlyphStreams[256] = {};
aLine.append("/CharProcs<<\n");
for (auto i = 1u; i < nGlyphs; i++)
{
auto nStream = createObject();
- aLine.append("/");
- aLine.append(pFace->GetGlyphName(pGlyphIds[i], true));
- aLine.append(" ");
- aLine.append(nStream);
- aLine.append(" 0 R\n");
+ aLine.append("/"
+ + pFace->GetGlyphName(pGlyphIds[i], true)
+ + " "
+ + OString::number(nStream)
+ + " 0 R\n");
pGlyphStreams[i] = nStream;
}
- aLine.append(">>\n");
+ aLine.append(">>\n"
- aLine.append("/Encoding<</Type/Encoding/Differences[1");
+ "/Encoding<</Type/Encoding/Differences[1");
for (auto i = 1u; i < nGlyphs; i++)
aLine.append(" /" + pFace->GetGlyphName(pGlyphIds[i], true));
- aLine.append("]>>\n");
+ aLine.append("]>>\n"
- aLine.append("/FirstChar 0\n"
- "/LastChar ");
- aLine.append(OString::number(nGlyphs));
- aLine.append("\n");
+ "/FirstChar 0\n"
+ "/LastChar "
+ + OString::number(nGlyphs)
+ + "\n"
- aLine.append("/Widths[");
+ "/Widths[");
for (auto i = 0u; i < nGlyphs; i++)
{
- aLine.append(pWidths[i]);
- aLine.append(" ");
+ aLine.append(OString::number(pWidths[i]) + " ");
}
aLine.append("]\n");
if (m_aContext.Version > PDFWriter::PDFVersion::PDF_1_4)
{
- aLine.append("/FontDescriptor ");
- aLine.append(nFontDescriptor);
- aLine.append(" 0 R\n");
+ aLine.append("/FontDescriptor " + OString::number(nFontDescriptor)
+ " 0 R\n");
}
auto nResources = createObject();
- aLine.append("/Resources ");
- aLine.append(nResources);
- aLine.append(" 0 R\n");
+ aLine.append("/Resources " + OString::number(nResources) + " 0 R\n");
if (nToUnicodeStream)
{
- aLine.append("/ToUnicode ");
- aLine.append(nToUnicodeStream);
- aLine.append(" 0 R\n");
+ aLine.append("/ToUnicode " + OString::number(nToUnicodeStream) + "
0 R\n");
}
aLine.append(">>\n"
@@ -2674,8 +2652,7 @@ bool PDFWriterImpl::emitType3Font(const
vcl::font::PhysicalFontFace* pFace,
if (!updateObject(nStream))
return false;
OStringBuffer aContents(1024);
- aContents.append(pWidths[i]);
- aContents.append(" 0 d0\n");
+ aContents.append(OString::number(pWidths[i]) + " 0 d0\n");
const auto& rGlyph = rSubset.m_aMapping.find(pGlyphIds[i])->second;
const auto& rLayers = rGlyph.getColorLayers();
@@ -2710,14 +2687,16 @@ bool PDFWriterImpl::emitType3Font(const
vcl::font::PhysicalFontFace* pFace,
}
}
}
- aContents.append("BT ");
- aContents.append("/F" + OString::number(rLayer.m_nFontID) + "
");
- aContents.append(OString::number(pFace->UnitsPerEm()) + " Tf
");
- aContents.append("<");
+ aContents.append(
+ "BT "
+ "/F" + OString::number(rLayer.m_nFontID) + " "
+ + OString::number(pFace->UnitsPerEm()) + " Tf "
+ "<");
appendHex(rLayer.m_nSubsetGlyphID, aContents);
- aContents.append(">Tj ");
- aContents.append("ET ");
- aContents.append("Q\n");
+ aContents.append(
+ ">Tj "
+ "ET "
+ "Q\n");
}
tools::Rectangle aRect;
@@ -2731,18 +2710,19 @@ bool PDFWriterImpl::emitType3Font(const
vcl::font::PhysicalFontFace* pFace,
aUsedBitmaps,
aResourceDict, aOutputStreams);
auto nObject = aBitmapEmit.m_aReferenceXObject.getObject();
- aContents.append("q ");
- aContents.append(aRect.GetWidth());
- aContents.append(" 0 0 ");
- aContents.append(aRect.GetHeight());
- aContents.append(" ");
- aContents.append(aRect.getX());
- aContents.append(" ");
- aContents.append(aRect.getY());
- aContents.append(" cm ");
- aContents.append("/Im");
- aContents.append(nObject);
- aContents.append(" Do Q\n");
+ aContents.append(
+ "q "
+ + OString::number(aRect.GetWidth())
+ + " 0 0 "
+ + OString::number(aRect.GetHeight())
+ + " "
+ + OString::number(aRect.getX())
+ + " "
+ + OString::number(aRect.getY())
+ + " cm "
+ "/Im"
+ + OString::number(nObject)
+ + " Do Q\n");
}
const auto& rOutline = rGlyph.getOutline();
@@ -2753,15 +2733,15 @@ bool PDFWriterImpl::emitType3Font(const
vcl::font::PhysicalFontFace* pFace,
appendDouble(m_aPages.back().getHeight() * -10, aContents, 3);
aContents.append(" cm\n");
m_aPages.back().appendPolyPolygon(rOutline, aContents);
- aContents.append("f\n");
- aContents.append("Q\n");
+ aContents.append("f\n"
+ "Q\n");
}
aLine.setLength(0);
- aLine.append(nStream);
- aLine.append(" 0 obj\n<</Length ");
- aLine.append(aContents.getLength());
- aLine.append(">>\nstream\n");
+ aLine.append(OString::number(nStream)
+ + " 0 obj\n<</Length "
+ + OString::number(aContents.getLength())
+ + ">>\nstream\n");
if (!writeBuffer(aLine))
return false;
if (!writeBuffer(aContents))
@@ -2775,15 +2755,14 @@ bool PDFWriterImpl::emitType3Font(const
vcl::font::PhysicalFontFace* pFace,
// write font dict
auto nFontDict = createObject();
aLine.setLength(0);
- aLine.append(nFontDict);
- aLine.append(" 0 obj\n<<");
+ aLine.append(OString::number(nFontDict) + " 0 obj\n<<");
for (auto nFontID : aUsedFonts)
{
- aLine.append("/F");
- aLine.append(nFontID);
- aLine.append(" ");
- aLine.append(rFontIDToObject[nFontID]);
- aLine.append(" 0 R");
+ aLine.append("/F"
+ + OString::number(nFontID)
+ + " "
+ + OString::number(rFontIDToObject[nFontID])
+ + " 0 R");
}
aLine.append(">>\nendobj\n\n");
if (!updateObject(nFontDict))
@@ -2797,8 +2776,7 @@ bool PDFWriterImpl::emitType3Font(const
vcl::font::PhysicalFontFace* pFace,
for (const auto & [ nAlpha, nObject ] : aUsedAlpha)
{
aLine.setLength(0);
- aLine.append(nObject);
- aLine.append(" 0 obj\n<<");
+ aLine.append(OString::number(nObject) + " 0 obj\n<<");
if (m_bIsPDF_A1)
{
aLine.append("/CA 1.0/ca 1.0");
@@ -2825,8 +2803,7 @@ bool PDFWriterImpl::emitType3Font(const
vcl::font::PhysicalFontFace* pFace,
// write resources dict
aLine.setLength(0);
- aLine.append(nResources);
- aLine.append(" 0 obj\n");
+ aLine.append(OString::number(nResources) + " 0 obj\n");
aResourceDict.append(aLine, nFontDict);
aLine.append("endobj\n\n");
if (!updateObject(nResources))
@@ -2928,8 +2905,8 @@ sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8
const * pEncoding,
{
if( nCount )
aContents.append( "endbfchar\n" );
- aContents.append(
static_cast<sal_Int32>(std::min(nMapped-nCount, 100)) );
- aContents.append( " beginbfchar\n" );
+ aContents.append(
OString::number(static_cast<sal_Int32>(std::min(nMapped-nCount, 100)) )
+ + " beginbfchar\n" );
}
aContents.append( '<' );
appendHex( static_cast<sal_Int8>(pEncoding[n]), aContents );
@@ -2965,15 +2942,13 @@ sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8
const * pEncoding,
}
OStringBuffer aLine( 40 );
- aLine.append( nStream );
- aLine.append( " 0 obj\n<</Length " );
+ aLine.append( OString::number(nStream ) + " 0 obj\n<</Length " );
sal_Int32 nLen = 0;
if (!g_bDebugDisableCompression)
{
nLen = static_cast<sal_Int32>(aStream.Tell());
aStream.Seek( 0 );
- aLine.append( nLen );
- aLine.append( "/Filter/FlateDecode" );
+ aLine.append( OString::number(nLen) + "/Filter/FlateDecode" );
}
else
aLine.append( aContents.getLength() );
@@ -3015,41 +2990,42 @@ sal_Int32 PDFWriterImpl::emitFontDescriptor( const
vcl::font::PhysicalFontFace*
sal_Int32 nFontDescriptor = createObject();
CHECK_RETURN( updateObject( nFontDescriptor ) );
aLine.setLength( 0 );
- aLine.append( nFontDescriptor );
- aLine.append( " 0 obj\n"
- "<</Type/FontDescriptor/FontName/" );
+ aLine.append(
+ OString::number(nFontDescriptor)
+ + " 0 obj\n"
+ "<</Type/FontDescriptor/FontName/" );
appendSubsetName( nSubsetID, rInfo.m_aPSName, aLine );
aLine.append( "\n"
- "/Flags " );
- aLine.append( nFontFlags );
- aLine.append( "\n"
- "/FontBBox[" );
+ "/Flags "
+ + OString::number( nFontFlags )
+ + "\n"
+ "/FontBBox["
// note: Top and Bottom are reversed in VCL and PDF rectangles
- aLine.append( static_cast<sal_Int32>(rInfo.m_aFontBBox.Left()) );
- aLine.append( ' ' );
- aLine.append( static_cast<sal_Int32>(rInfo.m_aFontBBox.Top()) );
- aLine.append( ' ' );
- aLine.append( static_cast<sal_Int32>(rInfo.m_aFontBBox.Right()) );
- aLine.append( ' ' );
- aLine.append( static_cast<sal_Int32>(rInfo.m_aFontBBox.Bottom()+1) );
- aLine.append( "]/ItalicAngle " );
+ + OString::number( static_cast<sal_Int32>(rInfo.m_aFontBBox.Left()) )
+ + " "
+ + OString::number( static_cast<sal_Int32>(rInfo.m_aFontBBox.Top()) )
+ + " "
+ + OString::number( static_cast<sal_Int32>(rInfo.m_aFontBBox.Right()) )
+ + " "
+ + OString::number(
static_cast<sal_Int32>(rInfo.m_aFontBBox.Bottom()+1) )
+ + "]/ItalicAngle " );
if( pFace->GetItalic() == ITALIC_OBLIQUE || pFace->GetItalic() ==
ITALIC_NORMAL )
aLine.append( "-30" );
else
aLine.append( "0" );
aLine.append( "\n"
- "/Ascent " );
- aLine.append( static_cast<sal_Int32>(rInfo.m_nAscent) );
- aLine.append( "\n"
- "/Descent " );
- aLine.append( static_cast<sal_Int32>(-rInfo.m_nDescent) );
- aLine.append( "\n"
- "/CapHeight " );
- aLine.append( static_cast<sal_Int32>(rInfo.m_nCapHeight) );
+ "/Ascent "
+ + OString::number( static_cast<sal_Int32>(rInfo.m_nAscent) )
+ + "\n"
+ "/Descent "
+ + OString::number( static_cast<sal_Int32>(-rInfo.m_nDescent) )
+ + "\n"
+ "/CapHeight "
+ + OString::number( static_cast<sal_Int32>(rInfo.m_nCapHeight) )
// According to PDF reference 1.4 StemV is required
// seems a tad strange to me, but well ...
- aLine.append( "\n"
- "/StemV 80\n" );
+ + "\n"
+ "/StemV 80\n" );
if( nFontStream )
{
aLine.append( "/FontFile" );
@@ -3066,9 +3042,7 @@ sal_Int32 PDFWriterImpl::emitFontDescriptor( const
vcl::font::PhysicalFontFace*
OSL_FAIL( "unknown fonttype in PDF font descriptor" );
return 0;
}
- aLine.append( ' ' );
- aLine.append( nFontStream );
- aLine.append( " 0 R\n" );
+ aLine.append( " " + OString::number(nFontStream) + " 0 R\n" );
}
aLine.append( ">>\n"
"endobj\n\n" );
@@ -3124,10 +3098,10 @@ bool PDFWriterImpl::emitFonts()
sal_Int32 nStreamLengthObject = createObject();
if ( !updateObject( nFontStream ) ) return false;
aLine.setLength( 0 );
- aLine.append( nFontStream );
- aLine.append( " 0 obj\n"
- "<</Length " );
- aLine.append( nStreamLengthObject );
+ aLine.append( OString::number(nFontStream)
+ + " 0 obj\n"
+ "<</Length "
+ + OString::number( nStreamLengthObject ) );
if (!g_bDebugDisableCompression)
aLine.append( " 0 R"
"/Filter/FlateDecode"
@@ -3201,10 +3175,10 @@ bool PDFWriterImpl::emitFonts()
// emit stream length object
if ( !updateObject( nStreamLengthObject ) ) return false;
aLine.setLength( 0 );
- aLine.append( nStreamLengthObject );
- aLine.append( " 0 obj\n" );
- aLine.append( static_cast<sal_Int64>(nEndPos-nStartPos) );
- aLine.append( "\nendobj\n\n" );
+ aLine.append( OString::number(nStreamLengthObject)
+ + " 0 obj\n"
+ + OString::number(
static_cast<sal_Int64>(nEndPos-nStartPos) )
+ + "\nendobj\n\n" );
if ( !writeBuffer( aLine ) ) return false;
// write font descriptor
@@ -3216,19 +3190,17 @@ bool PDFWriterImpl::emitFonts()
sal_Int32 nFontObject = createObject();
if ( !updateObject( nFontObject ) ) return false;
aLine.setLength( 0 );
- aLine.append( nFontObject );
-
- aLine.append( " 0 obj\n" );
+ aLine.append( OString::number(nFontObject) + " 0 obj\n" );
aLine.append( (aSubsetInfo.m_nFontType & FontType::ANY_TYPE1) ?
"<</Type/Font/Subtype/Type1/BaseFont/" :
"<</Type/Font/Subtype/TrueType/BaseFont/" );
appendSubsetName( s_subset.m_nFontID, aSubsetInfo.m_aPSName,
aLine );
aLine.append( "\n"
"/FirstChar 0\n"
- "/LastChar " );
- aLine.append( static_cast<sal_Int32>(nGlyphs-1) );
- aLine.append( "\n"
- "/Widths[" );
+ "/LastChar "
+ + OString::number( static_cast<sal_Int32>(nGlyphs-1) )
+ + "\n"
+ "/Widths[" );
for (auto i = 0u; i < nGlyphs; i++)
{
aLine.append( pWidths[ i ] );
@@ -3286,9 +3258,9 @@ bool PDFWriterImpl::emitFonts()
}
OStringBuffer aFontDict( 1024 );
- aFontDict.append( getFontDictObject() );
- aFontDict.append( " 0 obj\n"
- "<<" );
+ aFontDict.append( OString::number(getFontDictObject())
+ + " 0 obj\n"
+ "<<" );
int ni = 0;
for (auto const& itemMap : aFontIDToObject)
{
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index dc2fc5e74d35..1ebab3b48177 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -424,8 +424,7 @@ bool
Printer::PreparePrintJob(std::shared_ptr<PrinterController> xController,
aBuf.append( "1" );
if( nPages > 1 )
{
- aBuf.append( "-" );
- aBuf.append( nPages );
+ aBuf.append( "-" + OUString::number( nPages ) );
}
xController->setValue("PageRange",
css::uno::Any(aBuf.makeStringAndClear()));
}
diff --git a/vcl/source/treelist/headbar.cxx b/vcl/source/treelist/headbar.cxx
index 3bd6bbaa3120..fa17e69ff25d 100644
--- a/vcl/source/treelist/headbar.cxx
+++ b/vcl/source/treelist/headbar.cxx
@@ -377,8 +377,7 @@ void HeaderBar::ImplDrawItem(vcl::RenderContext&
rRenderContext, sal_uInt16 nPos
if (nTxtWidth > nMaxTxtWidth)
{
bLeftText = true;
- OUStringBuffer aBuf(pItem->maOutText);
- aBuf.append("...");
+ OUStringBuffer aBuf(pItem->maOutText + "...");
do
{
aBuf.remove(aBuf.getLength() - 3 - 1, 1);
diff --git a/vcl/source/treelist/imap2.cxx b/vcl/source/treelist/imap2.cxx
index f0e3c6913f47..0c3d4d8bf9e2 100644
--- a/vcl/source/treelist/imap2.cxx
+++ b/vcl/source/treelist/imap2.cxx
@@ -96,8 +96,7 @@ void IMapCircleObject::WriteCERN( SvStream& rOStm ) const
OStringBuffer aStrBuf("circle ");
AppendCERNCoords(aStrBuf, aCenter);
- aStrBuf.append(nRadius);
- aStrBuf.append(' ');
+ aStrBuf.append(OString::number(nRadius) + " ");
AppendCERNURL(aStrBuf);
rOStm.WriteLine(aStrBuf);
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index bef49272b7c1..1fd9df908854 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -749,11 +749,11 @@ bool TransferableHelper::SetINetBookmark( const
INetBookmark& rBmk,
{
OString sURL(OUStringToOString(rBmk.GetURL(), eSysCSet));
OString sDesc(OUStringToOString(rBmk.GetDescription(), eSysCSet));
- OStringBuffer sOut;
- sOut.append(sURL.getLength());
- sOut.append("@" + sURL);
- sOut.append(sDesc.getLength());
- sOut.append("@" + sDesc);
+ OString sOut =
+ OString::number(sURL.getLength())
+ + "@" + sURL
+ + OString::number(sDesc.getLength())
+ + "@" + sDesc;
Sequence< sal_Int8 > aSeq(sOut.getLength());
memcpy(aSeq.getArray(), sOut.getStr(), sOut.getLength());
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index eb483eb7f771..b67e15bfab80 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -234,14 +234,11 @@ void PrintDialog::PrintPreviewWindow::setPreview( const
GDIMetaFile& i_rNewPrevi
}
Size aLogicPaperSize(o3tl::convert(i_rOrigSize, o3tl::Length::mm100,
eUnit));
OUString aNumText( rLocWrap.getNum( aLogicPaperSize.Width(), nDigits ) );
- OUStringBuffer aBuf;
- aBuf.append( aNumText + " " );
+ OUStringBuffer aBuf( aNumText + " " );
aBuf.appendAscii( eUnit == o3tl::Length::mm ? "mm" : "in" );
if( !i_rPaperName.empty() )
{
- aBuf.append( " (" );
- aBuf.append( i_rPaperName );
- aBuf.append( ')' );
+ aBuf.append( OUString::Concat(" (") + i_rPaperName + ")" );
}
maHorzText = aBuf.makeStringAndClear();
diff --git a/vcl/unx/generic/fontmanager/helper.cxx
b/vcl/unx/generic/fontmanager/helper.cxx
index 6cea0998e771..0abbb812a610 100644
--- a/vcl/unx/generic/fontmanager/helper.cxx
+++ b/vcl/unx/generic/fontmanager/helper.cxx
@@ -207,13 +207,12 @@ OUString const & psp::getFontPath()
{
if( !aInstallationRootPath.isEmpty() )
{
- aPathBuffer.append( aInstallationRootPath );
- aPathBuffer.append( "/" LIBO_SHARE_FOLDER "/fonts/truetype;");
+ aPathBuffer.append( aInstallationRootPath
+ + "/" LIBO_SHARE_FOLDER "/fonts/truetype;");
}
if( !aUserPath.isEmpty() )
{
- aPathBuffer.append( aUserPath );
- aPathBuffer.append( "/user/fonts" );
+ aPathBuffer.append( aUserPath + "/user/fonts" );
}
}
diff --git a/vcl/unx/generic/print/glyphset.cxx
b/vcl/unx/generic/print/glyphset.cxx
index e9355fce3d7c..283558ad7075 100644
--- a/vcl/unx/generic/print/glyphset.cxx
+++ b/vcl/unx/generic/print/glyphset.cxx
@@ -132,9 +132,9 @@ OString
GlyphSet::GetGlyphSetName (sal_Int32 nGlyphSetID)
{
OStringBuffer aSetName( maBaseName.getLength() + 32 );
- aSetName.append( maBaseName );
- aSetName.append( "FID" );
- aSetName.append( mnFontID );
+ aSetName.append( maBaseName
+ + "FID" +
+ OString::number( mnFontID ) );
aSetName.append( mbVertical ? "VGSet" : "HGSet" );
aSetName.append( nGlyphSetID );
return aSetName.makeStringAndClear();
diff --git a/vcl/unx/generic/print/printerjob.cxx
b/vcl/unx/generic/print/printerjob.cxx
index 2355f34da4b5..5bfe6b735561 100644
--- a/vcl/unx/generic/print/printerjob.cxx
+++ b/vcl/unx/generic/print/printerjob.cxx
@@ -394,18 +394,18 @@ PrinterJob::EndJob()
// write document trailer according to Document Structuring Conventions
(DSC)
OStringBuffer aTrailer(512);
- aTrailer.append( "%%Trailer\n" );
- aTrailer.append( "%%BoundingBox: 0 0 " );
- aTrailer.append( static_cast<sal_Int32>(mnMaxWidthPt) );
- aTrailer.append( " " );
- aTrailer.append( static_cast<sal_Int32>(mnMaxHeightPt) );
+ aTrailer.append( "%%Trailer\n"
+ "%%BoundingBox: 0 0 "
+ + OString::number( static_cast<sal_Int32>(mnMaxWidthPt) )
+ + " "
+ + OString::number( static_cast<sal_Int32>(mnMaxHeightPt) ) );
if( mnLandscapes > mnPortraits )
aTrailer.append("\n%%Orientation: Landscape");
else
aTrailer.append("\n%%Orientation: Portrait");
- aTrailer.append( "\n%%Pages: " );
- aTrailer.append( static_cast<sal_Int32>(maPageVector.size()) );
- aTrailer.append( "\n%%EOF\n" );
+ aTrailer.append( "\n%%Pages: "
+ + OString::number( static_cast<sal_Int32>(maPageVector.size()) )
+ + "\n%%EOF\n" );
WritePS (mpJobTrailer.get(), aTrailer.getStr());
/*
@@ -654,15 +654,15 @@ static bool writeFeature( osl::File* pFile, const PPDKey*
pKey, const PPDValue*
aFeature.append( "%%IncludeFeature:" );
else
aFeature.append( "%%BeginFeature:" );
- aFeature.append( " *" );
- aFeature.append( OUStringToOString( pKey->getKey(),
RTL_TEXTENCODING_ASCII_US ) );
- aFeature.append( ' ' );
- aFeature.append( OUStringToOString( pValue->m_aOption,
RTL_TEXTENCODING_ASCII_US ) );
+ aFeature.append( " *"
+ + OUStringToOString( pKey->getKey(), RTL_TEXTENCODING_ASCII_US )
+ + " "
+ + OUStringToOString( pValue->m_aOption, RTL_TEXTENCODING_ASCII_US ) );
if( !bUseIncluseFeature )
{
- aFeature.append( '\n' );
- aFeature.append( OUStringToOString( pValue->m_aValue,
RTL_TEXTENCODING_ASCII_US ) );
- aFeature.append( "\n%%EndFeature" );
+ aFeature.append( "\n"
+ + OUStringToOString( pValue->m_aValue, RTL_TEXTENCODING_ASCII_US )
+ + "\n%%EndFeature" );
}
aFeature.append( "\n} stopped cleartomark\n" );
sal_uInt64 nWritten = 0;
@@ -931,16 +931,12 @@ bool PrinterJob::writeSetup( osl::File* pFile, const
JobData& rJob )
{
std::vector< OString >::const_iterator it = aFonts.begin();
OStringBuffer aLine( 256 );
- aLine.append( "%%DocumentSuppliedResources: font " );
- aLine.append( *it );
- aLine.append( "\n" );
+ aLine.append( "%%DocumentSuppliedResources: font " + (*it) + "\n" );
WritePS ( pFile, aLine.getStr() );
while( (++it) != aFonts.end() )
{
aLine.setLength(0);
- aLine.append( "%%+ font " );
- aLine.append( *it );
- aLine.append( "\n" );
+ aLine.append( "%%+ font " + (*it) + "\n" );
WritePS ( pFile, aLine.getStr() );
}
}
diff --git a/vcl/unx/generic/printer/jobdata.cxx
b/vcl/unx/generic/printer/jobdata.cxx
index 9707a81096ed..4a4eec609a1d 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -124,10 +124,8 @@ bool JobData::getStreamBuffer( void*& pData, sal_uInt32&
bytes )
// write header job data
aStream.WriteLine("JobData 1");
- OStringBuffer aLine;
-
- aLine.append("printer=");
- aLine.append(OUStringToOString(m_aPrinterName, RTL_TEXTENCODING_UTF8));
+ OStringBuffer aLine("printer="
+ + OUStringToOString(m_aPrinterName, RTL_TEXTENCODING_UTF8));
aStream.WriteLine(aLine);
aLine.setLength(0);
@@ -139,49 +137,30 @@ bool JobData::getStreamBuffer( void*& pData, sal_uInt32&
bytes )
aStream.WriteLine(aLine);
aLine.setLength(0);
- aLine.append("copies=");
- aLine.append(static_cast<sal_Int32>(m_nCopies));
- aStream.WriteLine(aLine);
- aLine.setLength(0);
+ aStream.WriteLine(Concat2View("copies=" +
OString::number(static_cast<sal_Int32>(m_nCopies))));
if (m_nPDFDevice > 0)
{
- aLine.append("collate=");
- aLine.append(OString::boolean(m_bCollate));
- aStream.WriteLine(aLine);
- aLine.setLength(0);
+ aStream.WriteLine(Concat2View("collate=" +
OString::boolean(m_bCollate)));
}
- aLine.append("marginadjustment=");
- aLine.append(static_cast<sal_Int32>(m_nLeftMarginAdjust));
- aLine.append(',');
- aLine.append(static_cast<sal_Int32>(m_nRightMarginAdjust));
- aLine.append(',');
- aLine.append(static_cast<sal_Int32>(m_nTopMarginAdjust));
- aLine.append(',');
- aLine.append(static_cast<sal_Int32>(m_nBottomMarginAdjust));
- aStream.WriteLine(aLine);
- aLine.setLength(0);
+ aStream.WriteLine(Concat2View(
+ "marginadjustment="
+ + OString::number(static_cast<sal_Int32>(m_nLeftMarginAdjust))
+ + ","
+ + OString::number(static_cast<sal_Int32>(m_nRightMarginAdjust))
+ + ",'"
+ + OString::number(static_cast<sal_Int32>(m_nTopMarginAdjust))
+ + ","
+ + OString::number(static_cast<sal_Int32>(m_nBottomMarginAdjust))));
- aLine.append("colordepth=");
- aLine.append(static_cast<sal_Int32>(m_nColorDepth));
- aStream.WriteLine(aLine);
- aLine.setLength(0);
+ aStream.WriteLine(Concat2View("colordepth=" +
OString::number(static_cast<sal_Int32>(m_nColorDepth))));
- aLine.append("pslevel=");
- aLine.append(static_cast<sal_Int32>(m_nPSLevel));
- aStream.WriteLine(aLine);
- aLine.setLength(0);
+ aStream.WriteLine(Concat2View("pslevel=" +
OString::number(static_cast<sal_Int32>(m_nPSLevel))));
- aLine.append("pdfdevice=");
- aLine.append(static_cast<sal_Int32>(m_nPDFDevice));
- aStream.WriteLine(aLine);
- aLine.setLength(0);
+ aStream.WriteLine(Concat2View("pdfdevice=" +
OString::number(static_cast<sal_Int32>(m_nPDFDevice))));
- aLine.append("colordevice=");
- aLine.append(static_cast<sal_Int32>(m_nColorDevice));
- aStream.WriteLine(aLine);
- aLine.setLength(0);
+ aStream.WriteLine(Concat2View("colordevice=" +
OString::number(static_cast<sal_Int32>(m_nColorDevice))));
// now append the PPDContext stream buffer
aStream.WriteLine( "PPDContextData" );
diff --git a/vcl/unx/generic/printer/ppdparser.cxx
b/vcl/unx/generic/printer/ppdparser.cxx
index 42a2a2a50cd8..6563b55b56e0 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -178,13 +178,11 @@ namespace psp
aKey.append( i_rKey );
if( !i_rOption.empty() || !i_rValue.empty() )
{
- aKey.append( ':' );
- aKey.append( i_rOption );
+ aKey.append( OUString::Concat(":") + i_rOption );
}
if( !i_rValue.empty() )
{
- aKey.append( ':' );
- aKey.append( i_rValue );
+ aKey.append( OUString::Concat(":") + i_rValue );
}
if( !aKey.isEmpty() && !i_rTranslation.isEmpty() )
{
@@ -209,8 +207,7 @@ namespace psp
aKey.append( i_rKey );
if( !i_rOption.empty() )
{
- aKey.append( ':' );
- aKey.append( i_rOption );
+ aKey.append( OUString::Concat(":") + i_rOption );
}
if( !aKey.isEmpty() )
{
@@ -637,9 +634,9 @@ PPDParser::PPDParser(OUString aFile, const
std::vector<PPDKey*>& keys)
OUString::number(PWG_TO_POINTS(pPWGMedia -> length));
if ( pImageableAreaValue )
pImageableAreaValue->m_aValue = aBuf.makeStringAndClear();
- aBuf.append( PWG_TO_POINTS(pPWGMedia -> width) );
- aBuf.append( " " );
- aBuf.append( PWG_TO_POINTS(pPWGMedia -> length) );
+ aBuf.append( OUString::number(PWG_TO_POINTS(pPWGMedia ->
width))
+ + " "
+ + OUString::number(PWG_TO_POINTS(pPWGMedia -> length) ));
if ( pPaperDimensionValue )
pPaperDimensionValue->m_aValue = aBuf.makeStringAndClear();
if (aValueName.equals(pKey -> getDefaultValue() -> m_aOption))
{
@@ -1113,8 +1110,7 @@ void PPDParser::parse( ::std::vector< OString >& rLines )
while (line != rLines.end() && oddDoubleQuoteCount(aBuffer))
{
// copy the newlines also
- aBuffer.append('\n');
- aBuffer.append(*line);
+ aBuffer.append("\n" + *line);
++line;
}
aLine = aBuffer.makeStringAndClear();
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 575abd64d82e..c6b08487756c 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -9573,9 +9573,9 @@ IMPL_LINK_NOARG(GtkInstanceNotebook, SizeAllocateHdl,
void*, void)
OUString vcl_font_to_css(const vcl::Font& rFont)
{
- OUStringBuffer sCSS;
- sCSS.append("font-family: \"" + rFont.GetFamilyName() + "\"; ");
- sCSS.append("font-size: " + OUString::number(rFont.GetFontSize().Height())
+ "pt; ");
+ OUStringBuffer sCSS(
+ "font-family: \"" + rFont.GetFamilyName() + "\"; "
+ "font-size: " + OUString::number(rFont.GetFontSize().Height()) + "pt;
");
switch (rFont.GetItalic())
{
case ITALIC_NONE:
