sw/source/ui/misc/num.cxx | 4 ++-- vcl/source/gdi/pdfwriter_impl.cxx | 8 ++++---- vcl/source/gdi/pdfwriter_impl2.cxx | 21 +++++++++++---------- 3 files changed, 17 insertions(+), 16 deletions(-)
New commits: commit 3e49b01d49aab76cd7b7a9c0e93a850385528b17 Author: Ilmari Lauhakangas <[email protected]> AuthorDate: Thu Sep 4 07:00:58 2025 +0200 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Thu Sep 4 19:04:07 2025 +0200 tdf#167446 Fix Unordered and Ordered list entries in Bullets and Numbering dialog and place them in the order they used to be in Change-Id: I16333b47766e76f8a65fb1c176a22cdfb857148e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190571 Tested-by: Ilmari Lauhakangas <[email protected]> Reviewed-by: Ilmari Lauhakangas <[email protected]> Tested-by: Jenkins diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 78bc532fe860..13bf376cdb03 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -874,9 +874,9 @@ SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(weld::Window* pParent, pButton->set_sensitive(m_rWrtSh.GetNumRuleAtCurrCursorPos() != nullptr); weld::Button& pCancelButton = GetCancelButton(); pCancelButton.connect_clicked(LINK(this, SwSvxNumBulletTabDialog, CancelHdl)); - AddTabPage(u"singlenum"_ustr, TabResId(RID_TAB_UNOORDERED.aLabel), RID_SVXPAGE_PICK_SINGLE_NUM, + AddTabPage(u"bullets"_ustr, TabResId(RID_TAB_UNOORDERED.aLabel), RID_SVXPAGE_PICK_BULLET, RID_M + RID_TAB_UNOORDERED.sIconName); - AddTabPage(u"bullets"_ustr, TabResId(RID_TAB_ORDERED.aLabel), RID_SVXPAGE_PICK_BULLET, + AddTabPage(u"singlenum"_ustr, TabResId(RID_TAB_ORDERED.aLabel), RID_SVXPAGE_PICK_SINGLE_NUM, RID_M + RID_TAB_ORDERED.sIconName); AddTabPage(u"outlinenum"_ustr, TabResId(RID_TAB_OUTLINE.aLabel), RID_SVXPAGE_PICK_NUM, RID_M + RID_TAB_OUTLINE.sIconName); commit 01583ae3d65d34fe2d1b6d1fd06bb522c31e5e63 Author: Noel Grandin <[email protected]> AuthorDate: Thu Sep 4 15:21:47 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Sep 4 19:03:53 2025 +0200 BitmapEx->Bitmap in pdfwriter now that Bitmap supports transparency Change-Id: I5a697dc283c4b835119ff548e2beedb3a4722438 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190594 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 1483bec191b0..9d22648174f6 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -9921,8 +9921,8 @@ void PDFWriterImpl::drawJPGBitmap( SvStream& rDCTData, bool bIsTrueColor, const if( !rAlphaMask.IsEmpty() && rAlphaMask.GetSizePixel() == aGraphic.GetSizePixel() ) { Bitmap aBmp( aGraphic.GetBitmap().CreateColorBitmap() ); - BitmapEx aBmpEx( aBmp, rAlphaMask ); - drawBitmap( rTargetArea.TopLeft(), rTargetArea.GetSize(), Bitmap(aBmpEx) ); + Bitmap aBmp2( aBmp, rAlphaMask ); + drawBitmap( rTargetArea.TopLeft(), rTargetArea.GetSize(), aBmp2 ); } else drawBitmap( rTargetArea.TopLeft(), rTargetArea.GetSize(), aGraphic.GetBitmap() ); @@ -10029,7 +10029,7 @@ const BitmapEmit& PDFWriterImpl::createBitmapEmit(const Bitmap& i_rBitmap, const BitmapID aID; aID.m_aPixelSize = aBitmap.GetSizePixel(); aID.m_nSize = vcl::pixelFormatBitCount(ePixelFormat); - aID.m_nChecksum = BitmapEx(aBitmap).GetBitmap().GetChecksum(); + aID.m_nChecksum = aBitmap.CreateColorBitmap().GetChecksum(); aID.m_nMaskChecksum = 0; if( aBitmap.HasAlpha() ) aID.m_nMaskChecksum = aBitmap.CreateAlphaMask().GetChecksum(); @@ -10072,7 +10072,7 @@ void PDFWriterImpl::drawBitmap( const Point& rDestPoint, const Size& rDestSize, void PDFWriterImpl::drawBitmap( const Point& rDestPoint, const Size& rDestSize, const Bitmap& rBitmap ) { - MARK( "drawBitmap (BitmapEx)" ); + MARK( "drawBitmap (Bitmap)" ); // #i40055# sanity check if( ! (rDestSize.Width() && rDestSize.Height()) ) diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index a7cc43728196..1a69026b2221 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -19,6 +19,7 @@ #include <pdf/pdfwriter_impl.hxx> #include <pdf/EncryptionHashTransporter.hxx> +#include <vcl/dibtools.hxx> #include <vcl/pdfextoutdevdata.hxx> #include <vcl/virdev.hxx> #include <vcl/gdimtf.hxx> @@ -82,7 +83,7 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz Size aSize( i_rSize ); // #i19065# Negative sizes have mirror semantics on - // OutputDevice. BitmapEx and co. have no idea about that, so + // OutputDevice. Bitmap and co. have no idea about that, so // perform that _before_ doing anything with aBitmapEx. BmpMirrorFlags nMirrorFlags(BmpMirrorFlags::NONE); if( aSize.Width() < 0 ) @@ -195,7 +196,7 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz SvMemoryStream aTemp; aTemp.SetCompressMode( aTemp.GetCompressMode() | SvStreamCompressFlags::ZBITMAP ); aTemp.SetVersion( SOFFICE_FILEFORMAT_40 ); // sj: up from version 40 our bitmap stream operator - WriteDIBBitmapEx(BitmapEx(aBitmap), aTemp); // is capable of zlib stream compression + WriteDIBBitmapEx(aBitmap, aTemp); // is capable of zlib stream compression nZippedFileSize = aTemp.TellEnd(); } if ( aBitmap.HasAlpha() ) @@ -488,7 +489,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa aTmpMtf.Play(*xVDev, aPoint, aDstSize); aTmpMtf.WindStart(); xVDev->EnableMapMode( false ); - BitmapEx aPaint(xVDev->GetBitmap(aPoint, xVDev->GetOutputSizePixel())); + Bitmap aPaint(xVDev->GetBitmap(aPoint, xVDev->GetOutputSizePixel())); xVDev->EnableMapMode( bVDevOldMap ); // #i35331#: MUST NOT use EnableMapMode( sal_True ) here! // create alpha mask from gradient @@ -515,12 +516,12 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa // https://bugs.documentfoundation.org/attachment.cgi?id=188084 aAlpha.Invert(); // convert to alpha } - aAlpha.BlendWith(aPaint.GetAlphaMask()); + aAlpha.BlendWith(aPaint.CreateAlphaMask()); xVDev.disposeAndClear(); Graphic aGraphic = i_pOutDevData ? i_pOutDevData->GetCurrentGraphic() : Graphic(); - implWriteBitmapEx( rPos, rSize, Bitmap(aPaint.GetBitmap(), aAlpha ), aGraphic, pDummyVDev, i_rContext ); + implWriteBitmapEx( rPos, rSize, Bitmap(aPaint.CreateColorBitmap(), aAlpha ), aGraphic, pDummyVDev, i_rContext ); } } } @@ -732,14 +733,14 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa case MetaActionType::BMP: { const MetaBmpAction* pA = static_cast<const MetaBmpAction*>(pAction); - BitmapEx aBitmapEx( pA->GetBitmap() ); - Size aSize( OutputDevice::LogicToLogic( aBitmapEx.GetPrefSize(), - aBitmapEx.GetPrefMapMode(), pDummyVDev->GetMapMode() ) ); + Bitmap aBitmap( pA->GetBitmap() ); + Size aSize( OutputDevice::LogicToLogic( aBitmap.GetPrefSize(), + aBitmap.GetPrefMapMode(), pDummyVDev->GetMapMode() ) ); if( ! ( aSize.Width() && aSize.Height() ) ) - aSize = pDummyVDev->PixelToLogic( aBitmapEx.GetSizePixel() ); + aSize = pDummyVDev->PixelToLogic( aBitmap.GetSizePixel() ); Graphic aGraphic = i_pOutDevData ? i_pOutDevData->GetCurrentGraphic() : Graphic(); - implWriteBitmapEx( pA->GetPoint(), aSize, Bitmap(aBitmapEx), aGraphic, pDummyVDev, i_rContext ); + implWriteBitmapEx( pA->GetPoint(), aSize, aBitmap, aGraphic, pDummyVDev, i_rContext ); } break;
