diff options
31 files changed, 112 insertions, 113 deletions
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index a405266f3748..d0fa722fe0d5 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -543,7 +543,7 @@ void ScreenshotAnnotationDlg_Impl::RepaintPictureElement() // also set image to get repaints right, but trigger no repaint mpPicture->SetImage( Image( - mpVirtualBufferDevice->GetBitmap( + mpVirtualBufferDevice->GetBitmapEx( Point(0, 0), mpVirtualBufferDevice->GetOutputSizePixel()))); mpPicture->Validate(); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index feba29eb1a7e..d9c92433c006 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -47,7 +47,7 @@ void SvxDefaultColorOptPage::InsertColorEntry(const XColorEntry& rEntry, sal_Int xDevice->SetFillColor(rColor); xDevice->SetLineColor(rStyleSettings.GetDisableColor()); xDevice->DrawRect(aRect); - Bitmap aBitmap(xDevice->GetBitmap(Point(0, 0), xDevice->GetOutputSize())); + BitmapEx aBitmap(xDevice->GetBitmap(Point(0, 0), xDevice->GetOutputSize())); nPos = m_pLbChartColors->InsertEntry(rStr, Image(aBitmap), nPos); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 52ca43fb6892..24136082515e 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -794,7 +794,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void) m_pBitmapList->Insert(o3tl::make_unique<XBitmapEntry>(aGraphic, aName), nCount); sal_Int32 nId = m_pBitmapLB->GetItemId( nCount - 1 ); - Bitmap aBitmap = m_pBitmapList->GetBitmapForPreview( nCount, m_pBitmapLB->GetIconSize() ); + BitmapEx aBitmap = m_pBitmapList->GetBitmapForPreview( nCount, m_pBitmapLB->GetIconSize() ); m_pBitmapLB->InsertItem( nId + 1, Image(aBitmap), aName ); m_pBitmapLB->SelectItem( nId + 1 ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 0a91b2c02f0c..96b0063b81c7 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -411,7 +411,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) m_pGradientList->Insert(o3tl::make_unique<XGradientEntry>(aXGradient, aName), nCount); sal_Int32 nId = m_pGradientLB->GetItemId(nCount - 1); //calculate the last ID - Bitmap aBitmap = m_pGradientList->GetBitmapForPreview( nCount, m_pGradientLB->GetIconSize() ); + BitmapEx aBitmap = m_pGradientList->GetBitmapForPreview( nCount, m_pGradientLB->GetIconSize() ); m_pGradientLB->InsertItem( nId + 1, Image(aBitmap), aName ); m_pGradientLB->SelectItem( nId + 1 ); m_pGradientLB->Resize(); @@ -449,7 +449,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void) m_pGradientList->Replace(o3tl::make_unique<XGradientEntry>(aXGradient, aName), nPos); - Bitmap aBitmap = m_pGradientList->GetBitmapForPreview( static_cast<sal_uInt16>(nPos), m_pGradientLB->GetIconSize() ); + BitmapEx aBitmap = m_pGradientList->GetBitmapForPreview( static_cast<sal_uInt16>(nPos), m_pGradientLB->GetIconSize() ); m_pGradientLB->RemoveItem( nId ); m_pGradientLB->InsertItem( nId, Image(aBitmap), aName, static_cast<sal_uInt16>(nPos) ); m_pGradientLB->SelectItem( nId ); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 9f7985e3d9e5..16e45e307db7 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -474,7 +474,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) m_pHatchingList->Insert(o3tl::make_unique<XHatchEntry>(aXHatch, aName), nCount); sal_Int32 nId = m_pHatchLB->GetItemId(nCount - 1); // calculate the last ID - Bitmap aBitmap = m_pHatchingList->GetBitmapForPreview( nCount, m_pHatchLB->GetIconSize() ); + BitmapEx aBitmap = m_pHatchingList->GetBitmapForPreview( nCount, m_pHatchLB->GetIconSize() ); // Insert the new entry at the next ID m_pHatchLB->InsertItem( nId + 1, Image(aBitmap), aName ); m_pHatchLB->SelectItem( nId + 1 ); @@ -502,7 +502,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void) m_pHatchingList->Replace(o3tl::make_unique<XHatchEntry>(aXHatch, aName), nPos); - Bitmap aBitmap = m_pHatchingList->GetBitmapForPreview( static_cast<sal_uInt16>(nPos), m_pHatchLB->GetIconSize() ); + BitmapEx aBitmap = m_pHatchingList->GetBitmapForPreview( static_cast<sal_uInt16>(nPos), m_pHatchLB->GetIconSize() ); m_pHatchLB->RemoveItem( nId ); m_pHatchLB->InsertItem( nId, Image(aBitmap), aName, static_cast<sal_uInt16>(nPos) ); m_pHatchLB->SelectItem( nId ); diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 4768d0189a49..52ad7eb3762c 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -404,7 +404,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void) { m_pPatternList->Insert(std::move(pEntry), nCount); sal_Int32 nId = m_pPatternLB->GetItemId( nCount - 1 ); - Bitmap aBitmap = m_pPatternList->GetBitmapForPreview( nCount, m_pPatternLB->GetIconSize() ); + BitmapEx aBitmap = m_pPatternList->GetBitmapForPreview( nCount, m_pPatternLB->GetIconSize() ); m_pPatternLB->InsertItem( nId + 1, Image(aBitmap), aName ); m_pPatternLB->SelectItem( nId + 1 ); m_pPatternLB->Resize(); @@ -441,7 +441,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickModifyHdl_Impl, Button*, void) // #i123497# Need to replace the existing entry with a new one (old returned needs to be deleted) m_pPatternList->Replace(o3tl::make_unique<XBitmapEntry>(Graphic(aBitmapEx), aName), nPos); - Bitmap aBitmap = m_pPatternList->GetBitmapForPreview( static_cast<sal_uInt16>( nPos ), m_pPatternLB->GetIconSize() ); + BitmapEx aBitmap = m_pPatternList->GetBitmapForPreview( static_cast<sal_uInt16>( nPos ), m_pPatternLB->GetIconSize() ); m_pPatternLB->RemoveItem(nId); m_pPatternLB->InsertItem( nId, Image(aBitmap), aName, static_cast<sal_uInt16>(nPos) ); m_pPatternLB->SelectItem( nId ); diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index efd1fd403521..b672a497635e 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -173,13 +173,13 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, const Reference< X // This is an unknown implementation of a XBitmap interface. We have to // use a more time consuming way to build an Image! Image aImage; - Bitmap aBitmap; + BitmapEx aBitmap; Sequence< sal_Int8 > aDIBSeq; { aDIBSeq = xBitmap->getDIB(); SvMemoryStream aMem( const_cast<sal_Int8 *>(aDIBSeq.getConstArray()), aDIBSeq.getLength(), StreamMode::READ ); - ReadDIB(aBitmap, aMem, true); + ReadDIBBitmapEx(aBitmap, aMem); } aDIBSeq = xBitmap->getMaskDIB(); @@ -188,7 +188,7 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, const Reference< X Bitmap aMaskBitmap; SvMemoryStream aMem( const_cast<sal_Int8 *>(aDIBSeq.getConstArray()), aDIBSeq.getLength(), StreamMode::READ ); ReadDIB(aMaskBitmap, aMem, true); - aImage = Image(BitmapEx(aBitmap, aMaskBitmap)); + aImage = Image(BitmapEx(aBitmap.GetBitmap(), aMaskBitmap)); } else aImage = Image( aBitmap ); diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index bb080249fa42..97db99c3e07c 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -230,7 +230,7 @@ private: SVT_DLLPRIVATE void ImpGetLine( long nLine1, long nLine2, long nDistance, Color nColor1, Color nColor2, Color nColorDist, - SvxBorderLineStyle nStyle, Bitmap& rBmp ); + SvxBorderLineStyle nStyle, BitmapEx& rBmp ); using Window::ImplInit; void UpdatePaintLineColor(); // returns sal_True if maPaintCol has changed virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx index 004aa3f1418d..4a180c33ea6b 100644 --- a/include/svx/XPropertyEntry.hxx +++ b/include/svx/XPropertyEntry.hxx @@ -21,7 +21,7 @@ #include <rtl/ustring.hxx> #include <svx/svxdllapi.h> -#include <vcl/bitmap.hxx> +#include <vcl/bitmapex.hxx> // class XPropertyEntry @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC XPropertyEntry { private: OUString maPropEntryName; - Bitmap maUiBitmap; + BitmapEx maUiBitmap; protected: XPropertyEntry(const OUString& rPropEntryName); @@ -41,8 +41,8 @@ public: void SetName(const OUString& rPropEntryName) { maPropEntryName = rPropEntryName; } const OUString& GetName() const { return maPropEntryName; } - void SetUiBitmap(const Bitmap& rUiBitmap) { maUiBitmap = rUiBitmap; } - const Bitmap& GetUiBitmap() const { return maUiBitmap; } + void SetUiBitmap(const BitmapEx& rUiBitmap) { maUiBitmap = rUiBitmap; } + const BitmapEx& GetUiBitmap() const { return maUiBitmap; } }; #endif // INCLUDED_SVX_XPROPERTYENTRY_HXX diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index c7a1e1087765..55bf1848755c 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -323,8 +323,8 @@ public: bool getAddStandardFields() const { return mbAddStandardFields; } void setAddStandardFields(bool bNew); - void Append(const XDashEntry& rEntry, const Bitmap& rBitmap ); - void Modify(const XDashEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap ); + void Append(const XDashEntry& rEntry, const BitmapEx& rBitmap ); + void Modify(const XDashEntry& rEntry, sal_Int32 nPos, const BitmapEx& rBitmap ); }; @@ -338,8 +338,8 @@ public: void Fill( const XLineEndListRef &pList, bool bStart = true ); - void Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap ); - void Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap ); + void Append( const XLineEndEntry& rEntry, const BitmapEx& rBitmap ); + void Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const BitmapEx& rBitmap ); }; diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx index 7208e57a5689..38efceb2106a 100644 --- a/include/svx/xtable.hxx +++ b/include/svx/xtable.hxx @@ -170,7 +170,7 @@ protected: XPropertyList(XPropertyListType t, const OUString& rPath, const OUString& rReferer); bool isValidIdx(long nIndex) const; - virtual Bitmap CreateBitmapForUI(long nIndex) = 0; + virtual BitmapEx CreateBitmapForUI(long nIndex) = 0; public: XPropertyList(const XPropertyList&) = delete; @@ -186,7 +186,7 @@ public: XPropertyEntry* Get(long nIndex) const; long GetIndex(const OUString& rName) const; - Bitmap GetUiBitmap(long nIndex) const; + BitmapEx GetUiBitmap(long nIndex) const; const OUString& GetName() const { return maName; } void SetName(const OUString& rString); @@ -242,7 +242,7 @@ public: class SVX_DLLPUBLIC XColorList : public XPropertyList { protected: - virtual Bitmap CreateBitmapForUI(long nIndex) override; + virtual BitmapEx CreateBitmapForUI(long nIndex) override; public: XColorList(const OUString& rPath, const OUString& rReferer) @@ -261,7 +261,7 @@ public: class SVX_DLLPUBLIC XLineEndList : public XPropertyList { protected: - virtual Bitmap CreateBitmapForUI(long nIndex) override; + virtual BitmapEx CreateBitmapForUI(long nIndex) override; public: XLineEndList(const OUString& rPath, const OUString& rReferer); @@ -276,13 +276,13 @@ public: class SVX_DLLPUBLIC XDashList : public XPropertyList { private: - Bitmap maBitmapSolidLine; + BitmapEx maBitmapSolidLine; OUString maStringSolidLine; OUString maStringNoLine; protected: - static Bitmap ImpCreateBitmapForXDash(const XDash* pDash); - virtual Bitmap CreateBitmapForUI(long nIndex) override; + static BitmapEx ImpCreateBitmapForXDash(const XDash* pDash); + virtual BitmapEx CreateBitmapForUI(long nIndex) override; public: XDashList(const OUString& rPath, const OUString& rReferer); @@ -297,7 +297,7 @@ public: // Special call to get a bitmap for the solid line representation. It // creates a bitmap fitting in size and style to the ones you get by // using GetUiBitmap for existing entries. - Bitmap const & GetBitmapForUISolidLine() const; + BitmapEx const & GetBitmapForUISolidLine() const; // Special calls to get the translated strings for the UI entry for no // line style (XLINE_NONE) and solid line style (XLINE_SOLID) for dialogs @@ -308,16 +308,16 @@ public: class SVX_DLLPUBLIC XHatchList : public XPropertyList { private: - Bitmap CreateBitmap(long nIndex, const Size& rSize) const; + BitmapEx CreateBitmap(long nIndex, const Size& rSize) const; protected: - virtual Bitmap CreateBitmapForUI(long nIndex) override; + virtual BitmapEx CreateBitmapForUI(long nIndex) override; public: XHatchList(const OUString& rPath, const OUString& rReferer); virtual ~XHatchList() override; void Replace(std::unique_ptr<XHatchEntry> pEntry, long nIndex); XHatchEntry* GetHatch(long nIndex) const; - Bitmap GetBitmapForPreview(long nIndex, const Size& rSize); + BitmapEx GetBitmapForPreview(long nIndex, const Size& rSize); virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; @@ -326,10 +326,10 @@ public: class SVX_DLLPUBLIC XGradientList : public XPropertyList { private: - Bitmap CreateBitmap(long nIndex, const Size& rSize) const; + BitmapEx CreateBitmap(long nIndex, const Size& rSize) const; protected: - virtual Bitmap CreateBitmapForUI(long nIndex) override; + virtual BitmapEx CreateBitmapForUI(long nIndex) override; public: XGradientList(const OUString& rPath, const OUString& rReferer); @@ -337,7 +337,7 @@ public: void Replace(std::unique_ptr<XGradientEntry> pEntry, long nIndex); XGradientEntry* GetGradient(long nIndex) const; - Bitmap GetBitmapForPreview(long nIndex, const Size& rSize); + BitmapEx GetBitmapForPreview(long nIndex, const Size& rSize); virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; @@ -346,17 +346,17 @@ public: class SVX_DLLPUBLIC XBitmapList : public XPropertyList { private: - Bitmap CreateBitmap( long nIndex, const Size& rSize ) const; + BitmapEx CreateBitmap( long nIndex, const Size& rSize ) const; protected: - virtual Bitmap CreateBitmapForUI(long nIndex) override; + virtual BitmapEx CreateBitmapForUI(long nIndex) override; public: XBitmapList(const OUString& rPath, const OUString& rReferer) : XPropertyList(XPropertyListType::Bitmap, rPath, rReferer) {} XBitmapEntry* GetBitmap(long nIndex) const; - Bitmap GetBitmapForPreview(long nIndex, const Size& rSize); + BitmapEx GetBitmapForPreview(long nIndex, const Size& rSize); virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; @@ -365,17 +365,17 @@ public: class SVX_DLLPUBLIC XPatternList : public XPropertyList { private: - Bitmap CreateBitmap( long nIndex, const Size& rSize ) const; + BitmapEx CreateBitmap( long nIndex, const Size& rSize ) const; protected: - virtual Bitmap CreateBitmapForUI(long nIndex) override; + virtual BitmapEx CreateBitmapForUI(long nIndex) override; public: XPatternList(const OUString& rPath, const OUString& rReferer) : XPropertyList(XPropertyListType::Pattern, rPath, rReferer) {} XBitmapEntry* GetBitmap(long nIndex) const; - Bitmap GetBitmapForPreview(long nIndex, const Size& rSize); + BitmapEx GetBitmapForPreview(long nIndex, const Size& rSize); virtual css::uno::Reference< css::container::XNameContainer > createInstance() override; virtual bool Create() override; diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx index 6f324c25b852..526243bcf382 100644 --- a/include/vcl/image.hxx +++ b/include/vcl/image.hxx @@ -56,7 +56,6 @@ class SAL_WARN_UNUSED VCL_DLLPUBLIC Image public: Image(); explicit Image( const BitmapEx& rBitmapEx ); - explicit Image( const Bitmap& rBitmap ) : Image( BitmapEx(rBitmap) ) {} explicit Image( const css::uno::Reference< css::graphic::XGraphic >& rxGraphic ); explicit Image( const OUString &rPNGFileUrl ); diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 2eed71680ac5..b5c6ba0f147a 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -179,7 +179,7 @@ FrameView* DrawDocShell::GetFrameView() /** * Creates a bitmap of an arbitrary page */ -Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage) +BitmapEx DrawDocShell::GetPagePreviewBitmap(SdPage* pPage) { const sal_uInt16 nMaxEdgePixel = 90; MapMode aMapMode( MapUnit::Map100thMM ); @@ -262,7 +262,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage) pVDev->SetMapMode( MapMode() ); - Bitmap aPreview( pVDev->GetBitmap( aNullPt, pVDev->GetOutputSizePixel() ) ); + BitmapEx aPreview( pVDev->GetBitmap( aNullPt, pVDev->GetOutputSizePixel() ) ); DBG_ASSERT(!!aPreview, "Preview-Bitmap could not be generated"); diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 7012e2113433..a823be100156 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -131,7 +131,7 @@ public: void GotoBookmark(const OUString& rBookmark); - Bitmap GetPagePreviewBitmap(SdPage* pPage); + BitmapEx GetPagePreviewBitmap(SdPage* pPage); /** checks, if the given name is a valid new name for a slide diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 76f980e0f60c..83812ebbe69a 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -120,7 +120,7 @@ Image PreviewRenderer::RenderPage ( PaintFrame(); Size aSize (mpPreviewDevice->GetOutputSizePixel()); - aPreview = Image(mpPreviewDevice->GetBitmap ( + aPreview = Image(mpPreviewDevice->GetBitmapEx( mpPreviewDevice->PixelToLogic(Point(0,0)), mpPreviewDevice->PixelToLogic(aSize))); @@ -182,7 +182,7 @@ Image PreviewRenderer::RenderSubstitution ( PaintFrame(); const Size aSize (mpPreviewDevice->GetOutputSizePixel()); - aPreview = Image(mpPreviewDevice->GetBitmap( + aPreview = Image(mpPreviewDevice->GetBitmapEx( mpPreviewDevice->PixelToLogic(Point(0,0)), mpPreviewDevice->PixelToLogic(aSize))); } @@ -456,7 +456,7 @@ Image PreviewRenderer::ScaleBitmap ( aScaledBitmap.GetBitmap()); // Get the resulting bitmap. - aPreview = Image(mpPreviewDevice->GetBitmap(Point(0,0), aFrameSize)); + aPreview = Image(mpPreviewDevice->GetBitmapEx(Point(0,0), aFrameSize)); } while (false); diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 5704f3e9d977..5952bc7e4529 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -406,7 +406,7 @@ void DrawLine( OutputDevice& rDev, const basegfx::B2DPoint& rP1, const basegfx:: void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance, Color aColor1, Color aColor2, Color aColorDist, - SvxBorderLineStyle nStyle, Bitmap& rBmp ) + SvxBorderLineStyle nStyle, BitmapEx& rBmp ) { //TODO, rather than including the " " text to force //the line height, better would be do drop @@ -608,7 +608,7 @@ void LineListBox::UpdateEntries( long nOldWidth ) auto& pData = m_vLineList[ n ]; if ( pData->GetMinWidth() <= m_nWidth ) { - Bitmap aBmp; + BitmapEx aBmp; ImpGetLine( pData->GetLine1ForWidth( m_nWidth ), pData->GetLine2ForWidth( m_nWidth ), pData->GetDistForWidth( m_nWidth ), diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index eee6d668d1e0..16f6eed39600 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -1609,7 +1609,7 @@ void LineLB::Fill( const XDashListRef &pList ) for( long i = 0; i < nCount; i++ ) { const XDashEntry* pEntry = pList->GetDash(i); - const Bitmap aBitmap = pList->GetUiBitmap( i ); + const BitmapEx aBitmap = pList->GetUiBitmap( i ); if( !aBitmap.IsEmpty() ) { InsertEntry(pEntry->GetName(), Image(aBitmap)); @@ -1622,7 +1622,7 @@ void LineLB::Fill( const XDashListRef &pList ) SetUpdateMode( true ); } -void LineLB::Append( const XDashEntry& rEntry, const Bitmap& rBitmap ) +void LineLB::Append( const XDashEntry& rEntry, const BitmapEx& rBitmap ) { if(!rBitmap.IsEmpty()) { @@ -1636,7 +1636,7 @@ void LineLB::Append( const XDashEntry& rEntry, const Bitmap& rBitmap ) AdaptDropDownLineCountToMaximum(); } -void LineLB::Modify( const XDashEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap ) +void LineLB::Modify( const XDashEntry& rEntry, sal_Int32 nPos, const BitmapEx& rBitmap ) { RemoveEntry( nPos ); @@ -1684,14 +1684,14 @@ void LineEndLB::Fill( const XLineEndListRef &pList, bool bStart ) for( long i = 0; i < nCount; i++ ) { const XLineEndEntry* pEntry = pList->GetLineEnd(i); - const Bitmap aBitmap = pList->GetUiBitmap( i ); + const BitmapEx aBitmap = pList->GetUiBitmap( i ); if( !aBitmap.IsEmpty() ) { Size aBmpSize( aBitmap.GetSizePixel() ); pVD->SetOutputSizePixel( aBmpSize, false ); - pVD->DrawBitmap( Point(), aBitmap ); + pVD->DrawBitmapEx( Point(), aBitmap ); InsertEntry( pEntry->GetName(), - Image(pVD->GetBitmap( + Image(pVD->GetBitmapEx( bStart ? Point() : Point(aBmpSize.Width() / 2, 0), Size(aBmpSize.Width() / 2, aBmpSize.Height())))); } @@ -1703,7 +1703,7 @@ void LineEndLB::Fill( const XLineEndListRef &pList, bool bStart ) SetUpdateMode( true ); } -void LineEndLB::Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap ) +void LineEndLB::Append( const XLineEndEntry& rEntry, const BitmapEx& rBitmap ) { if(!rBitmap.IsEmpty()) { @@ -1711,10 +1711,10 @@ void LineEndLB::Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap ) const Size aBmpSize(rBitmap.GetSizePixel()); pVD->SetOutputSizePixel(aBmpSize, false); - pVD->DrawBitmap(Point(), rBitmap); + pVD->DrawBitmapEx(Point(), rBitmap); InsertEntry( rEntry.GetName(), - Image(pVD->GetBitmap( + Image(pVD->GetBitmapEx( Point(), Size(aBmpSize.Width() / 2, aBmpSize.Height())))); } @@ -1726,7 +1726,7 @@ void LineEndLB::Append( const XLineEndEntry& rEntry, const Bitmap& rBitmap ) AdaptDropDownLineCountToMaximum(); } -void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitmap& rBitmap ) +void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const BitmapEx& rBitmap ) { RemoveEntry( nPos ); @@ -1736,10 +1736,10 @@ void LineEndLB::Modify( const XLineEndEntry& rEntry, sal_Int32 nPos, const Bitma const Size aBmpSize(rBitmap.GetSizePixel()); pVD->SetOutputSizePixel(aBmpSize, false); - pVD->DrawBitmap(Point(), rBitmap); + pVD->DrawBitmapEx(Point(), rBitmap); InsertEntry( rEntry.GetName(), - Image(pVD->GetBitmap( + Image(pVD->GetBitmapEx( Point(), Size(aBmpSize.Width() / 2, aBmpSize.Height()))), nPos); diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index d489eb2f176b..473953f6ed20 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -55,7 +55,7 @@ const char UNO_SELECTWIDTH[] = ".uno:SelectWidth"; namespace { -void FillLineEndListBox(ListBox& rListBoxStart, ListBox& rListBoxEnd, const XLineEndList& rList, const Bitmap& rBitmapZero) +void FillLineEndListBox(ListBox& rListBoxStart, ListBox& rListBoxEnd, const XLineEndList& rList, const BitmapEx& rBitmapZero) { const sal_uInt32 nCount(rList.Count()); const OUString sNone(SvxResId(RID_SVXSTR_NONE)); @@ -69,12 +69,12 @@ void FillLineEndListBox(ListBox& rListBoxStart, ListBox& rListBoxEnd, const XLin for(sal_uInt32 i(0); i < nCount; i++) { const XLineEndEntry* pEntry = rList.GetLineEnd(i); - const Bitmap aBitmap = const_cast< XLineEndList& >(rList).GetUiBitmap(i); + const BitmapEx aBitmap = const_cast< XLineEndList& >(rList).GetUiBitmap(i); if(!aBitmap.IsEmpty()) { - Bitmap aCopyStart(aBitmap); - Bitmap aCopyEnd(aBitmap); + BitmapEx aCopyStart(aBitmap); + BitmapEx aCopyEnd(aBitmap); const Size aBmpSize(aCopyStart.GetSizePixel()); const tools::Rectangle aCropRectStart(Point(), Size(aBmpSize.Width() / 2, aBmpSize.Height())); @@ -105,7 +105,7 @@ void FillLineEndListBox(ListBox& rListBoxStart, ListBox& rListBoxEnd, const XLin // take solid line bitmap and crop it to the size of // line cap entries - Bitmap aCopyZero( rBitmapZero ); + BitmapEx aCopyZero( rBitmapZero ); const tools::Rectangle aCropZero( Point(), aImgSize ); aCopyZero.Crop( aCropZero ); @@ -140,11 +140,11 @@ void FillLineStyleListBox(ListBox& rListBox, const XDashList& rList) for(sal_uInt32 i(0); i < nCount; i++) { const XDashEntry* pEntry = rList.GetDash(i); - const Bitmap aBitmap = const_cast< XDashList& >(rList).GetUiBitmap(i); + const BitmapEx & rBitmap = const_cast< XDashList& >(rList).GetUiBitmap(i); - if(!aBitmap.IsEmpty()) + if(!rBitmap.IsEmpty()) { - rListBox.InsertEntry(pEntry->GetName(), Image(aBitmap)); + rListBox.InsertEntry(pEntry->GetName(), Image(rBitmap)); } else { @@ -744,7 +744,7 @@ void LinePropertyPanelBase::FillLineEndList() if (mxLineEndList.is()) { - Bitmap aZeroBitmap; + BitmapEx aZeroBitmap; if (mxLineStyleList.is()) aZeroBitmap = mxLineStyleList->GetBitmapForUISolidLine(); diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 637f2c4872ba..c07f74952e0d 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -277,7 +277,7 @@ void SvxColorDockingWindow::FillValueSet() pVD->DrawLine( Point(), Point( nPtX, nPtY ) ); pVD->DrawLine( Point( 0, nPtY ), Point( nPtX, 0 ) ); - Bitmap aBmp( pVD->GetBitmap( Point(), aColorSize ) ); + BitmapEx aBmp( pVD->GetBitmap( Point(), aColorSize ) ); aColorSet->InsertItem( sal_uInt16(1), Image(aBmp), SvxResId( RID_SVXSTR_INVISIBLE ) ); diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 7d4be49160c1..d1212ed1bdc6 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -374,7 +374,7 @@ void SvxFillToolBoxControl::Update() XGradientList aGradientList( "", ""/*TODO?*/ ); aGradientList.Insert(o3tl::make_unique<XGradientEntry>(mpFillGradientItem->GetGradientValue(), aTmpStr)); aGradientList.SetDirty( false ); - const Bitmap aBmp = aGradientList.GetUiBitmap( 0 ); + const BitmapEx aBmp = aGradientList.GetUiBitmap( 0 ); if(!aBmp.IsEmpty()) { @@ -432,7 +432,7 @@ void SvxFillToolBoxControl::Update() XHatchList aHatchList( "", ""/*TODO?*/ ); aHatchList.Insert(o3tl::make_unique<XHatchEntry>(mpHatchItem->GetHatchValue(), aTmpStr)); aHatchList.SetDirty( false ); - const Bitmap aBmp = aHatchList.GetUiBitmap( 0 ); + const BitmapEx & aBmp = aHatchList.GetUiBitmap( 0 ); if( !aBmp.IsEmpty() ) { diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 4a3def8fb809..1f9f2fd31497 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -527,7 +527,7 @@ void SvxFillAttrBox::Fill( const XHatchListRef &pList ) for( long i = 0; i < nCount; i++ ) { const XHatchEntry* pEntry = pList->GetHatch(i); - const Bitmap aBitmap = pList->GetUiBitmap( i ); + const BitmapEx aBitmap = pList->GetUiBitmap( i ); if( !aBitmap.IsEmpty() ) ListBox::InsertEntry(pEntry->GetName(), Image(aBitmap)); else @@ -548,7 +548,7 @@ void SvxFillAttrBox::Fill( const XGradientListRef &pList ) for( long i = 0; i < nCount; i++ ) { const XGradientEntry* pEntry = pList->GetGradient(i); - const Bitmap aBitmap = pList->GetUiBitmap( i ); + const BitmapEx aBitmap = pList->GetUiBitmap( i ); if( !aBitmap.IsEmpty() ) ListBox::InsertEntry(pEntry->GetName(), Image(aBitmap)); else diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index e03effe1e119..10ca0115120f 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -374,7 +374,7 @@ void SvxLineEndWindow::FillValueSet() basegfx::B2DPolyPolygon aNothing; mpLineEndList->Insert(o3tl::make_unique<XLineEndEntry>(aNothing, SvxResId(RID_SVXSTR_NONE))); const XLineEndEntry* pEntry = mpLineEndList->GetLineEnd(nCount); - Bitmap aBmp = mpLineEndList->GetUiBitmap( nCount ); + BitmapEx aBmp = mpLineEndList->GetUiBitmap( nCount ); OSL_ENSURE( !aBmp.IsEmpty(), "UI bitmap was not created" ); maBmpSize = aBmp.GetSizePixel(); @@ -383,9 +383,9 @@ void SvxLineEndWindow::FillValueSet() Point aPt0( 0, 0 ); Point aPt1( maBmpSize.Width(), 0 ); - pVD->DrawBitmap( Point(), aBmp ); - mpLineEndSet->InsertItem(1, Image(pVD->GetBitmap(aPt0, maBmpSize)), pEntry->GetName()); - mpLineEndSet->InsertItem(2, Image(pVD->GetBitmap(aPt1, maBmpSize)), pEntry->GetName()); + pVD->DrawBitmapEx( Point(), aBmp ); + mpLineEndSet->InsertItem(1, Image(pVD->GetBitmapEx(aPt0, maBmpSize)), pEntry->GetName()); + mpLineEndSet->InsertItem(2, Image(pVD->GetBitmapEx(aPt1, maBmpSize)), pEntry->GetName()); mpLineEndList->Remove(nCount); @@ -396,11 +396,11 @@ void SvxLineEndWindow::FillValueSet() aBmp = mpLineEndList->GetUiBitmap( i ); OSL_ENSURE( !aBmp.IsEmpty(), "UI bitmap was not created" ); - pVD->DrawBitmap( aPt0, aBmp ); + pVD->DrawBitmapEx( aPt0, aBmp ); mpLineEndSet->InsertItem(static_cast<sal_uInt16>((i+1)*2L+1), - Image(pVD->GetBitmap(aPt0, maBmpSize)), pEntry->GetName()); + Image(pVD->GetBitmapEx(aPt0, maBmpSize)), pEntry->GetName()); mpLineEndSet->InsertItem(static_cast<sal_uInt16>((i+2)*2L), - Image(pVD->GetBitmap(aPt1, maBmpSize)), pEntry->GetName()); + Image(pVD->GetBitmapEx(aPt1, maBmpSize)), pEntry->GetName()); } mnLines = std::min( static_cast<sal_uInt16>(nCount + 1), sal_uInt16(MAX_LINES) ); mpLineEndSet->SetLineCount( mnLines ); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index ae103afddc21..8b63a0f45ef3 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -3356,7 +3356,7 @@ void SvxColorListBox::ShowPreview(const NamedColor &rColor) xDevice->SetLineColor(rStyleSettings.GetDisableColor()); xDevice->DrawRect(aRect); - Bitmap aBitmap(xDevice->GetBitmap(Point(0, 0), xDevice->GetOutputSize())); + BitmapEx aBitmap(xDevice->GetBitmap(Point(0, 0), xDevice->GetOutputSize())); SetImageAlign(ImageAlign::Left); SetModeImage(Image(aBitmap)); SetText(rColor.second); diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx index 5f40b197c063..48e35946b790 100644 --- a/svx/source/xoutdev/xtabbtmp.cxx +++ b/svx/source/xoutdev/xtabbtmp.cxx @@ -47,7 +47,7 @@ bool XBitmapList::Create() return true; } -Bitmap XBitmapList::CreateBitmap( long nIndex, const Size& rSize ) const +BitmapEx XBitmapList::CreateBitmap( long nIndex, const Size& rSize ) const { OSL_ENSURE( nIndex < Count(), "Access out of range" ); @@ -97,20 +97,20 @@ Bitmap XBitmapList::CreateBitmap( long nIndex, const Size& rSize ) const } } rBitmapEx = pVirtualDevice->GetBitmap(Point(0, 0), rSize); - return rBitmapEx.GetBitmap(); + return rBitmapEx; } else - return Bitmap(); + return BitmapEx(); } -Bitmap XBitmapList::CreateBitmapForUI( long nIndex ) +BitmapEx XBitmapList::CreateBitmapForUI( long nIndex ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); const Size& rSize = rStyleSettings.GetListBoxPreviewDefaultPixelSize(); return CreateBitmap(nIndex, rSize); } -Bitmap XBitmapList::GetBitmapForPreview( long nIndex, const Size& rSize ) +BitmapEx XBitmapList::GetBitmapForPreview( long nIndex, const Size& rSize ) { return CreateBitmap(nIndex, rSize); } diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index f8edca7ed90e..3c616ecb999c 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -156,9 +156,9 @@ bool XColorList::Create() return(165 == Count()); } -Bitmap XColorList::CreateBitmapForUI( long /*nIndex*/ ) +BitmapEx XColorList::CreateBitmapForUI( long /*nIndex*/ ) { - return Bitmap(); + return BitmapEx(); } long XColorList::GetIndexOfColor( const Color& rColor ) const diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index 492731d52fa6..72687605b11d 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -75,7 +75,7 @@ bool XDashList::Create() return true; } -Bitmap XDashList::ImpCreateBitmapForXDash(const XDash* pDash) +BitmapEx XDashList::ImpCreateBitmapForXDash(const XDash* pDash) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); const Size& rSize = rStyleSettings.GetListBoxPreviewDefaultPixelSize(); @@ -168,7 +168,7 @@ Bitmap XDashList::ImpCreateBitmapForXDash(const XDash* pDash) } // get result bitmap and scale - Bitmap aRetval(pVirtualDevice->GetBitmap(Point(0, 0), pVirtualDevice->GetOutputSizePixel())); + BitmapEx aRetval(pVirtualDevice->GetBitmap(Point(0, 0), pVirtualDevice->GetOutputSizePixel())); if(1 != nFactor) { @@ -178,14 +178,14 @@ Bitmap XDashList::ImpCreateBitmapForXDash(const XDash* pDash) return aRetval; } -Bitmap XDashList::CreateBitmapForUI( long nIndex ) +BitmapEx XDashList::CreateBitmapForUI( long nIndex ) { const XDash& rDash = GetDash(nIndex)->GetDash(); return ImpCreateBitmapForXDash(&rDash); } -Bitmap const & XDashList::GetBitmapForUISolidLine() const +BitmapEx const & XDashList::GetBitmapForUISolidLine() const { if(maBitmapSolidLine.IsEmpty()) { diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index 5bf0e3e96646..f9e3f0b0ced9 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -83,9 +83,9 @@ bool XGradientList::Create() return true; } -Bitmap XGradientList::CreateBitmap( long nIndex, const Size& rSize ) const +BitmapEx XGradientList::CreateBitmap( long nIndex, const Size& rSize ) const { - Bitmap aRetval; + BitmapEx aRetval; OSL_ENSURE(nIndex < Count(), "OOps, access out of range (!)"); @@ -206,14 +206,14 @@ Bitmap XGradientList::CreateBitmap( long nIndex, const Size& rSize ) const return aRetval; } -Bitmap XGradientList::CreateBitmapForUI(long nIndex) +BitmapEx XGradientList::CreateBitmapForUI(long nIndex) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); const Size& rSize = rStyleSettings.GetListBoxPreviewDefaultPixelSize(); return CreateBitmap(nIndex, rSize); } -Bitmap XGradientList::GetBitmapForPreview(long nIndex, const Size& rSize) +BitmapEx XGradientList::GetBitmapForPreview(long nIndex, const Size& rSize) { return CreateBitmap(nIndex, rSize); } diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index b808a275dc65..41eda4885fea 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -76,9 +76,9 @@ bool XHatchList::Create() return true; } -Bitmap XHatchList::CreateBitmap( long nIndex, const Size& rSize) const +BitmapEx XHatchList::CreateBitmap( long nIndex, const Size& rSize) const { - Bitmap aRetval; + BitmapEx aRetval; OSL_ENSURE(nIndex < Count(), "OOps, access out of range (!)"); if(nIndex < Count()) @@ -181,15 +181,15 @@ Bitmap XHatchList::CreateBitmap( long nIndex, const Size& rSize) const return aRetval; } -Bitmap XHatchList::CreateBitmapForUI(long nIndex) +BitmapEx XHatchList::CreateBitmapForUI(long nIndex) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); const Size& rSize = rStyleSettings.GetListBoxPreviewDefaultPixelSize(); - Bitmap aRetVal = CreateBitmap(nIndex, rSize); + BitmapEx aRetVal = CreateBitmap(nIndex, rSize); return aRetVal; } -Bitmap XHatchList::GetBitmapForPreview(long nIndex, const Size& rSize) +BitmapEx XHatchList::GetBitmapForPreview(long nIndex, const Size& rSize) { return CreateBitmap(nIndex, rSize); } diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index b633303b30e9..aec72447ae82 100644 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -165,9 +165,9 @@ long XPropertyList::GetIndex(const OUString& rName) const return -1; } -Bitmap XPropertyList::GetUiBitmap( long nIndex ) const +BitmapEx XPropertyList::GetUiBitmap( long nIndex ) const { - Bitmap aRetval; + BitmapEx aRetval; if (!isValidIdx(nIndex)) return aRetval; diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index 0cf7502ba55d..ccf9aba113eb 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -79,9 +79,9 @@ bool XLineEndList::Create() return true; } -Bitmap XLineEndList::CreateBitmapForUI( long nIndex ) +BitmapEx XLineEndList::CreateBitmapForUI( long nIndex ) { - Bitmap aRetval; + BitmapEx aRetval; OSL_ENSURE(nIndex < Count(), "OOps, access out of range (!)"); if(nIndex < Count()) diff --git a/svx/source/xoutdev/xtabptrn.cxx b/svx/source/xoutdev/xtabptrn.cxx index ff9fc20f3471..1395fdc12d7d 100644 --- a/svx/source/xoutdev/xtabptrn.cxx +++ b/svx/source/xoutdev/xtabptrn.cxx @@ -83,7 +83,7 @@ bool XPatternList::Create() return true; } -Bitmap XPatternList::CreateBitmap( long nIndex, const Size& rSize ) const +BitmapEx XPatternList::CreateBitmap( long nIndex, const Size& rSize ) const { assert( nIndex < Count() ); @@ -133,20 +133,20 @@ Bitmap XPatternList::CreateBitmap( long nIndex, const Size& rSize ) const } } rBitmapEx = pVirtualDevice->GetBitmap(Point(0, 0), rSize); - return rBitmapEx.GetBitmap(); + return rBitmapEx; } else - return Bitmap(); + return BitmapEx(); } -Bitmap XPatternList::CreateBitmapForUI( long nIndex ) +BitmapEx XPatternList::CreateBitmapForUI( long nIndex ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); const Size& rSize = rStyleSettings.GetListBoxPreviewDefaultPixelSize(); return CreateBitmap(nIndex, rSize); } -Bitmap XPatternList::GetBitmapForPreview( long nIndex, const Size& rSize ) +BitmapEx XPatternList::GetBitmapForPreview( long nIndex, const Size& rSize ) { return CreateBitmap(nIndex, rSize); } |