diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:44:04 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:44:04 +0000 |
| commit | eb358d77291eba677141bab113dc27d7aabb0f3e (patch) | |
| tree | 2e96f3b5d0c79beaeb536bbf05c3b8564846e65f /vcl/source/gdi | |
| parent | Adding debian version 4:24.2.1-4. (diff) | |
| download | libreoffice-eb358d77291eba677141bab113dc27d7aabb0f3e.tar.xz libreoffice-eb358d77291eba677141bab113dc27d7aabb0f3e.zip | |
Merging upstream version 4:24.2.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vcl/source/gdi')
| -rw-r--r-- | vcl/source/gdi/mtfxmldump.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/print.cxx | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/vcl/source/gdi/mtfxmldump.cxx b/vcl/source/gdi/mtfxmldump.cxx index e6b1adc80e..2792297fee 100644 --- a/vcl/source/gdi/mtfxmldump.cxx +++ b/vcl/source/gdi/mtfxmldump.cxx @@ -63,8 +63,6 @@ OUString collectPushFlags(vcl::PushFlags nFlags) aStrings.emplace_back("PushTextLanguage"); if (nFlags & vcl::PushFlags::OVERLINECOLOR) aStrings.emplace_back("PushOverlineColor"); - if (nFlags & vcl::PushFlags::RTLENABLED) - aStrings.emplace_back("PushRTLEnabled"); OUString aString; diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index c7ef07ff49..a5365e681b 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2775,7 +2775,7 @@ bool PDFWriterImpl::emitType3Font(const vcl::font::PhysicalFontFace* pFace, aLine.setLength(0); aLine.append(OString::number(nStream) + " 0 obj\n<</Length " - + OString::number(aContents.getLength()) + + OString::number(aContents.getLength() - 1) // Trailing newline doesn't count + ">>\nstream\n"); if (!writeBuffer(aLine)) return false; diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 401d38118c..2519e5ca44 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -1487,6 +1487,14 @@ sal_uInt16 Printer::GetPaperBinBySourceIndex(sal_uInt16 nPaperSource) const return mpInfoPrinter->GetPaperBinBySourceIndex( &maJobSetup.ImplGetConstData(), nPaperSource ); } +sal_uInt16 Printer::GetSourceIndexByPaperBin(sal_uInt16 nPaperBin) const +{ + if (IsDisplayPrinter()) + return 0; + + return mpInfoPrinter->GetSourceIndexByPaperBin( &maJobSetup.ImplGetConstData(), nPaperBin); +} + void Printer::SetCopyCount( sal_uInt16 nCopy, bool bCollate ) { mnCopyCount = nCopy; |