Merging upstream version 4:24.2.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 23 insertions, 18 deletions

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index ac06f445e0..138f17d0d4 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2530,6 +2530,7 @@ void RadioButton::Draw( OutputDevice* pDev, const Point& rPos,
     if ( !maImage )
     {
         MapMode     aResMapMode( MapUnit::Map100thMM );
+        Point       aPos  = pDev->LogicToPixel( rPos );
         Size        aSize = GetSizePixel();
         Size        aImageSize = pDev->LogicToPixel( Size( 300, 300 ), aResMapMode );
         Size        aBrd1Size = pDev->LogicToPixel( Size( 20, 20 ), aResMapMode );
@@ -2563,7 +2564,7 @@ void RadioButton::Draw( OutputDevice* pDev, const Point& rPos,
             pDev->SetTextColor( GetTextColor() );
         pDev->SetTextFillColor();
 
-        ImplDraw( pDev, nFlags, rPos, aSize,
+        ImplDraw( pDev, nFlags, aPos, aSize,
                   aImageSize, aStateRect, aMouseRect );
 
         Point   aCenterPos = aStateRect.Center();
@@ -3353,6 +3354,7 @@ void CheckBox::Draw( OutputDevice* pDev, const Point& rPos,
                      SystemTextColorFlags nFlags )
 {
     MapMode     aResMapMode( MapUnit::Map100thMM );
+    Point       aPos  = pDev->LogicToPixel( rPos );
     Size        aSize = GetSizePixel();
     Size        aImageSize = pDev->LogicToPixel( Size( 300, 300 ), aResMapMode );
     Size        aBrd1Size = pDev->LogicToPixel( Size( 20, 20 ), aResMapMode );
@@ -3389,7 +3391,7 @@ void CheckBox::Draw( OutputDevice* pDev, const Point& rPos,
         pDev->SetTextColor( GetTextColor() );
     pDev->SetTextFillColor();
 
-    ImplDraw( pDev, nFlags, rPos, aSize,
+    ImplDraw( pDev, nFlags, aPos, aSize,
               aImageSize, aStateRect, aMouseRect );
 
     pDev->SetLineColor();
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 2a979b70b0..82520cc765 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1152,6 +1152,7 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags
 {
     GetMainWindow()->ApplySettings(*pDev);
 
+    Point aPos = pDev->LogicToPixel( rPos );
     Size aSize = GetSizePixel();
     vcl::Font aFont = GetMainWindow()->GetDrawPixelFont( pDev );
 
@@ -1167,7 +1168,7 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags
     bool bBackground = IsControlBackground();
     if ( bBorder || bBackground )
     {
-        tools::Rectangle aRect( rPos, aSize );
+        tools::Rectangle aRect( aPos, aSize );
         // aRect.Top() += nEditHeight;
         if ( bBorder )
         {
@@ -1191,7 +1192,7 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags
         // First, draw the edit part
         Size aOrigSize(m_pImpl->m_pSubEdit->GetSizePixel());
         m_pImpl->m_pSubEdit->SetSizePixel(Size(aSize.Width(), nEditHeight));
-        m_pImpl->m_pSubEdit->Draw( pDev, rPos, nFlags );
+        m_pImpl->m_pSubEdit->Draw( pDev, aPos, nFlags );
         m_pImpl->m_pSubEdit->SetSizePixel(aOrigSize);
 
         // Second, draw the listbox
@@ -1219,14 +1220,14 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags
             }
         }
 
-        tools::Rectangle aClip( rPos, aSize );
+        tools::Rectangle aClip( aPos, aSize );
         pDev->IntersectClipRegion( aClip );
         sal_Int32 nLines = static_cast<sal_Int32>( nTextHeight > 0 ? (aSize.Height()-nEditHeight)/nTextHeight : 1 );
         if ( !nLines )
             nLines = 1;
         const sal_Int32 nTEntry = IsReallyVisible() ? m_pImpl->m_pImplLB->GetTopEntry() : 0;
 
-        tools::Rectangle aTextRect( rPos, aSize );
+        tools::Rectangle aTextRect( aPos, aSize );
 
         aTextRect.AdjustLeft(3*nOnePixel );
         aTextRect.AdjustRight( -(3*nOnePixel) );
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;
diff --git a/vcl/source/outdev/stack.cxx b/vcl/source/outdev/stack.cxx
index 129348051e..72ef63af55 100644
--- a/vcl/source/outdev/stack.cxx
+++ b/vcl/source/outdev/stack.cxx
@@ -84,9 +84,6 @@ void OutputDevice::Push(vcl::PushFlags nFlags)
     if (nFlags & vcl::PushFlags::REFPOINT && mbRefPoint)
         rState.mpRefPoint = maRefPoint;
 
-    if (nFlags & vcl::PushFlags::RTLENABLED)
-        rState.mbRTLEnabled = IsRTLEnabled();
-
     if (mpAlphaVDev)
         mpAlphaVDev->Push();
 }
@@ -187,9 +184,6 @@ void OutputDevice::Pop()
             SetRefPoint();
     }
 
-    if ( rState.mnFlags & vcl::PushFlags::RTLENABLED )
-        EnableRTL( rState.mbRTLEnabled );
-
     maOutDevStateStack.pop_back();
 
     mpMetaFile = pOldMetaFile;
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index a98703ca25..de2222b4bc 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1523,7 +1523,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
     VclPtrInstance<VirtualDevice> pMaskedDevice(*i_pTargetOutDev,
                                                 DeviceFormat::WITH_ALPHA);
 
-    pMaskedDevice->SetOutputSizePixel( GetOutputSizePixel() );
+    pMaskedDevice->SetOutputSizePixel( GetOutputSizePixel(), true, true );
     pMaskedDevice->EnableRTL( IsRTLEnabled() );
     aMtf.WindStart();
     aMtf.Play(*pMaskedDevice);
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 612b17d272..b97becf2e0 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -163,6 +163,7 @@ void TabPage::Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle&
 
 void TabPage::Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags )
 {
+    Point aPos = pDev->LogicToPixel( rPos );
     Size aSize = GetSizePixel();
 
     Wallpaper aWallpaper = GetBackground();
@@ -174,14 +175,14 @@ void TabPage::Draw( OutputDevice* pDev, const Point& rPos, SystemTextColorFlags
     pDev->SetLineColor();
 
     if ( aWallpaper.IsBitmap() )
-        pDev->DrawBitmapEx( rPos, aSize, aWallpaper.GetBitmap() );
+        pDev->DrawBitmapEx( aPos, aSize, aWallpaper.GetBitmap() );
     else
     {
         if( aWallpaper.GetColor() == COL_AUTO )
             pDev->SetFillColor( GetSettings().GetStyleSettings().GetDialogColor() );
         else
             pDev->SetFillColor( aWallpaper.GetColor() );
-        pDev->DrawRect( tools::Rectangle( rPos, aSize ) );
+        pDev->DrawRect( tools::Rectangle( aPos, aSize ) );
     }
 
     pDev->Pop();
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index c3fa7fb3d7..d683f9b415 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -224,6 +224,7 @@ void Window::dispose()
         Reference< XComponent> xC( mpWindowImpl->mxAccessible, UNO_QUERY );
         if ( xC.is() )
             xC->dispose();
+        mpWindowImpl->mxAccessible.clear();
     }
 
     ImplSVData* pSVData = ImplGetSVData();