cui/source/tabpages/tpbitmap.cxx | 2 +-
cui/source/tabpages/tpgradnt.cxx | 4 ++--
cui/source/tabpages/tphatch.cxx | 4 ++--
cui/source/tabpages/tplnedef.cxx | 4 ++--
cui/source/tabpages/tplneend.cxx | 4 ++--
cui/source/tabpages/tppattern.cxx | 4 ++--
include/svx/XPropertyEntry.hxx | 8 ++++----
include/svx/xtable.hxx | 36 ++++++++++++++++++------------------
svx/source/dialog/dlgctrl.cxx | 4 ++--
svx/source/tbxctrls/fillctrl.cxx | 4 ++--
svx/source/tbxctrls/itemwin.cxx | 16 ++++++++--------
svx/source/tbxctrls/linectrl.cxx | 4 ++--
svx/source/xoutdev/xtabbtmp.cxx | 26 +++++++++++++-------------
svx/source/xoutdev/xtabcolr.cxx | 4 ++--
svx/source/xoutdev/xtabdash.cxx | 6 +++---
svx/source/xoutdev/xtabgrdt.cxx | 8 ++++----
svx/source/xoutdev/xtabhtch.cxx | 10 +++++-----
svx/source/xoutdev/xtable.cxx | 4 ++--
svx/source/xoutdev/xtablend.cxx | 4 ++--
svx/source/xoutdev/xtabptrn.cxx | 26 +++++++++++++-------------
20 files changed, 91 insertions(+), 91 deletions(-)
New commits:
commit 4f3c7aa921a097ceb4a5c680bb70e083c28cb04c
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Jul 30 12:38:40 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jul 31 07:59:05 2025 +0200
Bitmap->BitmapEx in XPropertyEntry
now that Bitmap can handle transparency
Change-Id: Iec8d9e867dca369ce3f1d5d9c14bcfd367930345
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188594
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 820b73a7e66d..a2ce864dd36e 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -867,7 +867,7 @@ tools::Long SvxBitmapTabPage::AddBitmap(const
GraphicObject& rGraphicObject, con
xBitmapEntry->SetSavingAllowed(false);
m_pBitmapList->Insert(std::move(xBitmapEntry), nLastPos);
- BitmapEx aBitmap = m_pBitmapList->GetBitmapForPreview(nLastPos,
m_xBitmapLB->GetIconSize());
+ Bitmap aBitmap = m_pBitmapList->GetBitmapForPreview(nLastPos,
m_xBitmapLB->GetIconSize());
const sal_uInt16 nHighestId = m_xBitmapLB->GetItemId(nLastPos - 1);
m_xBitmapLB->InsertItem(nHighestId + 1, Image(aBitmap), rName);
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 6e24a438fbf1..40522652fa32 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -392,7 +392,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl,
weld::Button&, void)
m_pGradientList->Insert(std::make_unique<XGradientEntry>(aBGradient,
aName), nCount);
sal_Int32 nId = m_xGradientLB->GetItemId(nCount - 1); //calculate the
last ID
- BitmapEx aBitmap = m_pGradientList->GetBitmapForPreview( nCount,
m_xGradientLB->GetIconSize() );
+ Bitmap aBitmap = m_pGradientList->GetBitmapForPreview( nCount,
m_xGradientLB->GetIconSize() );
m_xGradientLB->InsertItem( nId + 1, Image(aBitmap), aName );
m_xGradientLB->SelectItem( nId + 1 );
m_xGradientLB->Resize();
@@ -435,7 +435,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl,
weld::Button&, void)
m_pGradientList->Replace(std::make_unique<XGradientEntry>(aBGradient,
aName), nPos);
- BitmapEx aBitmap = m_pGradientList->GetBitmapForPreview(
static_cast<sal_uInt16>(nPos), m_xGradientLB->GetIconSize() );
+ Bitmap aBitmap = m_pGradientList->GetBitmapForPreview(
static_cast<sal_uInt16>(nPos), m_xGradientLB->GetIconSize() );
m_xGradientLB->RemoveItem( nId );
m_xGradientLB->InsertItem( nId, Image(aBitmap), aName,
static_cast<sal_uInt16>(nPos) );
m_xGradientLB->SelectItem( nId );
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 27e41070b6fa..d8a00f6b788f 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -462,7 +462,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl,
weld::Button&, void)
m_pHatchingList->Insert(std::make_unique<XHatchEntry>(aXHatch, aName),
nCount);
sal_Int32 nId = m_xHatchLB->GetItemId(nCount - 1); // calculate the last ID
- BitmapEx aBitmap = m_pHatchingList->GetBitmapForPreview( nCount,
m_xHatchLB->GetIconSize() );
+ Bitmap aBitmap = m_pHatchingList->GetBitmapForPreview( nCount,
m_xHatchLB->GetIconSize() );
// Insert the new entry at the next ID
m_xHatchLB->InsertItem( nId + 1, Image(aBitmap), aName );
m_xHatchLB->SelectItem( nId + 1 );
@@ -490,7 +490,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl,
weld::Button&, void)
m_pHatchingList->Replace(std::make_unique<XHatchEntry>(aXHatch, aName),
nPos);
- BitmapEx aBitmap = m_pHatchingList->GetBitmapForPreview(
static_cast<sal_uInt16>(nPos), m_xHatchLB->GetIconSize() );
+ Bitmap aBitmap = m_pHatchingList->GetBitmapForPreview(
static_cast<sal_uInt16>(nPos), m_xHatchLB->GetIconSize() );
m_xHatchLB->RemoveItem( nId );
m_xHatchLB->InsertItem( nId, Image(aBitmap), aName,
static_cast<sal_uInt16>(nPos) );
m_xHatchLB->SelectItem( nId );
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 7a5a3663641e..ab96e60fdc2d 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -526,7 +526,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl,
weld::Button&, void)
tools::Long nDashCount = pDashList->Count();
pDashList->Insert( std::make_unique<XDashEntry>(aDash, aName),
nDashCount );
- m_xLbLineStyles->Append( *pDashList->GetDash(nDashCount),
pDashList->GetUiBitmap(nDashCount) );
+ m_xLbLineStyles->Append( *pDashList->GetDash(nDashCount),
BitmapEx(pDashList->GetUiBitmap(nDashCount)) );
m_xLbLineStyles->set_active(m_xLbLineStyles->get_count() - 1);
@@ -595,7 +595,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl,
weld::Button&, void)
FillDash_Impl();
pDashList->Replace(std::make_unique<XDashEntry>(aDash, aName),
nPos);
- m_xLbLineStyles->Modify(*pDashList->GetDash(nPos), nPos,
pDashList->GetUiBitmap(nPos));
+ m_xLbLineStyles->Modify(*pDashList->GetDash(nPos), nPos,
BitmapEx(pDashList->GetUiBitmap(nPos)));
m_xLbLineStyles->set_active(nPos);
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 62edad474f97..53fc13d28494 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -320,7 +320,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl,
weld::Button&, void)
m_xEdtName->set_text(aName);
- m_xLbLineEnds->Modify(*pLineEndList->GetLineEnd(nPos), nPos,
pLineEndList->GetUiBitmap(nPos));
+ m_xLbLineEnds->Modify(*pLineEndList->GetLineEnd(nPos), nPos,
BitmapEx(pLineEndList->GetUiBitmap(nPos)));
m_xLbLineEnds->set_active(nPos);
// set flag for modified
@@ -411,7 +411,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl,
weld::Button&, void)
pLineEndList->Insert(std::make_unique<XLineEndEntry>(aNewPolyPolygon, aName),
nLineEndCount);
// add to the ListBox
-
m_xLbLineEnds->Append(*pLineEndList->GetLineEnd(nLineEndCount),
pLineEndList->GetUiBitmap(nLineEndCount));
+
m_xLbLineEnds->Append(*pLineEndList->GetLineEnd(nLineEndCount),
BitmapEx(pLineEndList->GetUiBitmap(nLineEndCount)));
m_xLbLineEnds->set_active(m_xLbLineEnds->get_count() - 1);
*pnLineEndListState |= ChangeType::MODIFIED;
diff --git a/cui/source/tabpages/tppattern.cxx
b/cui/source/tabpages/tppattern.cxx
index 3e7a20b37b80..7369e5606160 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -395,7 +395,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl,
weld::Button&, void)
{
m_pPatternList->Insert(std::move(pEntry), nCount);
sal_Int32 nId = m_xPatternLB->GetItemId( nCount - 1 );
- BitmapEx aBitmap = m_pPatternList->GetBitmapForPreview( nCount,
m_xPatternLB->GetIconSize() );
+ Bitmap aBitmap = m_pPatternList->GetBitmapForPreview( nCount,
m_xPatternLB->GetIconSize() );
m_xPatternLB->InsertItem( nId + 1, Image(aBitmap), aName );
m_xPatternLB->SelectItem( nId + 1 );
m_xPatternLB->Resize();
@@ -428,7 +428,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickModifyHdl_Impl,
weld::Button&, void)
// #i123497# Need to replace the existing entry with a new one (old
returned needs to be deleted)
m_pPatternList->Replace(std::make_unique<XBitmapEntry>(Graphic(aBitmapEx),
aName), nPos);
- BitmapEx aBitmap = m_pPatternList->GetBitmapForPreview(
static_cast<sal_uInt16>( nPos ), m_xPatternLB->GetIconSize() );
+ Bitmap aBitmap = m_pPatternList->GetBitmapForPreview(
static_cast<sal_uInt16>( nPos ), m_xPatternLB->GetIconSize() );
m_xPatternLB->RemoveItem(nId);
m_xPatternLB->InsertItem( nId, Image(aBitmap), aName,
static_cast<sal_uInt16>(nPos) );
m_xPatternLB->SelectItem( nId );
diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx
index 8ac1734a4196..f5506538ec43 100644
--- a/include/svx/XPropertyEntry.hxx
+++ b/include/svx/XPropertyEntry.hxx
@@ -21,13 +21,13 @@
#include <rtl/ustring.hxx>
#include <svx/svxdllapi.h>
-#include <vcl/bitmapex.hxx>
+#include <vcl/bitmap.hxx>
class SVXCORE_DLLPUBLIC XPropertyEntry
{
private:
OUString maPropEntryName;
- BitmapEx maUiBitmap;
+ Bitmap maUiBitmap;
bool mbSavingAllowed;
protected:
@@ -45,8 +45,8 @@ public:
void SetName(const OUString& rPropEntryName) { maPropEntryName =
rPropEntryName; }
const OUString& GetName() const { return maPropEntryName; }
- void SetUiBitmap(const BitmapEx& rUiBitmap) { maUiBitmap = rUiBitmap; }
- const BitmapEx& GetUiBitmap() const { return maUiBitmap; }
+ void SetUiBitmap(const Bitmap& rUiBitmap) { maUiBitmap = rUiBitmap; }
+ const Bitmap& GetUiBitmap() const { return maUiBitmap; }
void SetSavingAllowed(bool bSet) { mbSavingAllowed = bSet; }
bool GetSavingAllowed() const { return mbSavingAllowed; }
};
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index da8d86fe162c..ac7b9c7b764e 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -171,7 +171,7 @@ protected:
XPropertyList(XPropertyListType t, OUString aPath, OUString aReferer);
bool isValidIdx(tools::Long nIndex) const;
- virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) = 0;
+ virtual Bitmap CreateBitmapForUI(tools::Long nIndex) = 0;
private:
bool mbNeedsExportableList; // impl: avoid seldom-needed, expensive list
cloning
@@ -190,7 +190,7 @@ public:
XPropertyEntry* Get(tools::Long nIndex) const;
tools::Long GetIndex(std::u16string_view rName) const;
- BitmapEx GetUiBitmap(tools::Long nIndex) const;
+ Bitmap GetUiBitmap(tools::Long nIndex) const;
const OUString& GetName() const { return maName; }
void SetName(const OUString& rString);
@@ -245,7 +245,7 @@ public:
class SVXCORE_DLLPUBLIC XColorList final : public XPropertyList
{
- virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override;
+ virtual Bitmap CreateBitmapForUI(tools::Long nIndex) override;
public:
XColorList(const OUString& rPath, const OUString& rReferer)
@@ -263,7 +263,7 @@ public:
class SVXCORE_DLLPUBLIC XLineEndList final : public XPropertyList
{
- virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override;
+ virtual Bitmap CreateBitmapForUI(tools::Long nIndex) override;
public:
XLineEndList(const OUString& rPath, const OUString& rReferer);
@@ -283,7 +283,7 @@ private:
OUString maStringNoLine;
static double ImpGetDefaultLineThickness();
- virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override;
+ virtual Bitmap CreateBitmapForUI(tools::Long nIndex) override;
public:
XDashList(const OUString& rPath, const OUString& rReferer);
@@ -300,7 +300,7 @@ public:
// using GetUiBitmap for existing entries.
BitmapEx const & GetBitmapForUISolidLine() const;
- static BitmapEx CreateBitmapForXDash(const XDash* pDash, double
fLineThickness);
+ static Bitmap CreateBitmapForXDash(const XDash* pDash, double
fLineThickness);
// 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
@@ -311,15 +311,15 @@ public:
class SVXCORE_DLLPUBLIC XHatchList final : public XPropertyList
{
private:
- BitmapEx CreateBitmap(tools::Long nIndex, const Size& rSize) const;
- virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override;
+ Bitmap CreateBitmap(tools::Long nIndex, const Size& rSize) const;
+ virtual Bitmap CreateBitmapForUI(tools::Long nIndex) override;
public:
XHatchList(const OUString& rPath, const OUString& rReferer);
virtual ~XHatchList() override;
void Replace(std::unique_ptr<XHatchEntry> pEntry, tools::Long nIndex);
XHatchEntry* GetHatch(tools::Long nIndex) const;
- BitmapEx GetBitmapForPreview(tools::Long nIndex, const Size& rSize);
+ Bitmap GetBitmapForPreview(tools::Long nIndex, const Size& rSize);
virtual css::uno::Reference< css::container::XNameContainer >
createInstance() override;
virtual bool Create() override;
@@ -328,8 +328,8 @@ public:
class SVXCORE_DLLPUBLIC XGradientList final : public XPropertyList
{
private:
- BitmapEx CreateBitmap(tools::Long nIndex, const Size& rSize) const;
- virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override;
+ Bitmap CreateBitmap(tools::Long nIndex, const Size& rSize) const;
+ virtual Bitmap CreateBitmapForUI(tools::Long nIndex) override;
public:
XGradientList(const OUString& rPath, const OUString& rReferer);
@@ -337,7 +337,7 @@ public:
void Replace(std::unique_ptr<XGradientEntry> pEntry, tools::Long nIndex);
XGradientEntry* GetGradient(tools::Long nIndex) const;
- BitmapEx GetBitmapForPreview(tools::Long nIndex, const Size& rSize);
+ Bitmap GetBitmapForPreview(tools::Long nIndex, const Size& rSize);
virtual css::uno::Reference< css::container::XNameContainer >
createInstance() override;
virtual bool Create() override;
@@ -346,15 +346,15 @@ public:
class SVXCORE_DLLPUBLIC XBitmapList final : public XPropertyList
{
private:
- BitmapEx CreateBitmap( tools::Long nIndex, const Size& rSize ) const;
- virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override;
+ Bitmap CreateBitmap( tools::Long nIndex, const Size& rSize ) const;
+ virtual Bitmap CreateBitmapForUI(tools::Long nIndex) override;
public:
XBitmapList(const OUString& rPath, const OUString& rReferer)
: XPropertyList(XPropertyListType::Bitmap, rPath, rReferer) {}
XBitmapEntry* GetBitmap(tools::Long nIndex) const;
- BitmapEx GetBitmapForPreview(tools::Long nIndex, const Size& rSize);
+ Bitmap GetBitmapForPreview(tools::Long nIndex, const Size& rSize);
virtual css::uno::Reference< css::container::XNameContainer >
createInstance() override;
virtual bool Create() override;
@@ -363,15 +363,15 @@ public:
class SVXCORE_DLLPUBLIC XPatternList final : public XPropertyList
{
private:
- BitmapEx CreateBitmap( tools::Long nIndex, const Size& rSize ) const;
- virtual BitmapEx CreateBitmapForUI(tools::Long nIndex) override;
+ Bitmap CreateBitmap( tools::Long nIndex, const Size& rSize ) const;
+ virtual Bitmap CreateBitmapForUI(tools::Long nIndex) override;
public:
XPatternList(const OUString& rPath, const OUString& rReferer)
: XPropertyList(XPropertyListType::Pattern, rPath, rReferer) {}
XBitmapEntry* GetBitmap(tools::Long nIndex) const;
- BitmapEx GetBitmapForPreview(tools::Long nIndex, const Size& rSize);
+ Bitmap GetBitmapForPreview(tools::Long nIndex, const Size& rSize);
virtual css::uno::Reference< css::container::XNameContainer >
createInstance() override;
virtual bool Create() override;
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index ab8fe31c94ae..54bf6f398e76 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -956,7 +956,7 @@ void SvxLineLB::Fill( const XDashListRef &pList )
for( tools::Long i = 0; i < nCount; i++ )
{
const XDashEntry* pEntry = pList->GetDash(i);
- const BitmapEx aBitmap = pList->GetUiBitmap( i );
+ const Bitmap aBitmap = pList->GetUiBitmap( i );
if( !aBitmap.IsEmpty() )
{
const Size aBmpSize(aBitmap.GetSizePixel());
@@ -1026,7 +1026,7 @@ void SvxLineEndLB::Fill( const XLineEndListRef &pList,
bool bStart )
for( tools::Long i = 0; i < nCount; i++ )
{
const XLineEndEntry* pEntry = pList->GetLineEnd(i);
- const BitmapEx aBitmap = pList->GetUiBitmap( i );
+ const Bitmap aBitmap = pList->GetUiBitmap( i );
if( !aBitmap.IsEmpty() )
{
const Size aBmpSize(aBitmap.GetSizePixel());
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 79135c3050cb..4c9d3a40fc32 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -408,7 +408,7 @@ void SvxFillToolBoxControl::Update()
rtl::Reference<XGradientList> xGradientList = new
XGradientList( u""_ustr, u""_ustr/*TODO?*/ );
xGradientList->Insert(std::make_unique<XGradientEntry>(mpFillGradientItem->GetGradientValue(),
aTmpStr));
xGradientList->SetDirty( false );
- const BitmapEx aBmp = xGradientList->GetUiBitmap( 0 );
+ const Bitmap aBmp = xGradientList->GetUiBitmap( 0 );
if (!aBmp.IsEmpty())
{
@@ -471,7 +471,7 @@ void SvxFillToolBoxControl::Update()
rtl::Reference<XHatchList> xHatchList = new
XHatchList( u""_ustr, u""_ustr/*TODO?*/ );
xHatchList->Insert(std::make_unique<XHatchEntry>(mpHatchItem->GetHatchValue(),
aTmpStr));
xHatchList->SetDirty( false );
- const BitmapEx aBmp = xHatchList->GetUiBitmap( 0 );
+ const Bitmap aBmp = xHatchList->GetUiBitmap( 0 );
if( !aBmp.IsEmpty() )
{
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index cea8c18e3d17..bfc5b14ea0e9 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -252,12 +252,12 @@ void SvxFillAttrBox::Fill(weld::ComboBox& rBox, const
XHatchListRef &pList)
for( tools::Long i = 0; i < nCount; i++ )
{
const XHatchEntry* pEntry = pList->GetHatch(i);
- const BitmapEx aBitmapEx = pList->GetUiBitmap( i );
- if( !aBitmapEx.IsEmpty() )
+ const Bitmap aBitmap = pList->GetUiBitmap( i );
+ if( !aBitmap.IsEmpty() )
{
- const Size aBmpSize(aBitmapEx.GetSizePixel());
+ const Size aBmpSize(aBitmap.GetSizePixel());
pVD->SetOutputSizePixel(aBmpSize, false);
- pVD->DrawBitmapEx(Point(), aBitmapEx);
+ pVD->DrawBitmapEx(Point(), aBitmap);
rBox.append(u""_ustr, pEntry->GetName(), *pVD);
}
else
@@ -279,12 +279,12 @@ void SvxFillAttrBox::Fill(weld::ComboBox& rBox, const
XGradientListRef &pList)
for( tools::Long i = 0; i < nCount; i++ )
{
const XGradientEntry* pEntry = pList->GetGradient(i);
- const BitmapEx aBitmapEx = pList->GetUiBitmap( i );
- if( !aBitmapEx.IsEmpty() )
+ const Bitmap aBitmap = pList->GetUiBitmap( i );
+ if( !aBitmap.IsEmpty() )
{
- const Size aBmpSize(aBitmapEx.GetSizePixel());
+ const Size aBmpSize(aBitmap.GetSizePixel());
pVD->SetOutputSizePixel(aBmpSize, false);
- pVD->DrawBitmapEx(Point(), aBitmapEx);
+ pVD->DrawBitmapEx(Point(), aBitmap);
rBox.append(u""_ustr, pEntry->GetName(), *pVD);
}
else
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 24c0b18816af..d07793005469 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -365,7 +365,7 @@ void SvxLineEndWindow::FillValueSet()
comphelper::LibreOfficeKit::isActive() ? SvxResId(RID_SVXSTR_INVISIBLE)
: SvxResId(RID_SVXSTR_NONE)));
const XLineEndEntry* pEntry = mpLineEndList->GetLineEnd(nCount);
- BitmapEx aBmp = mpLineEndList->GetUiBitmap( nCount );
+ Bitmap aBmp = mpLineEndList->GetUiBitmap( nCount );
OSL_ENSURE( !aBmp.IsEmpty(), "UI bitmap was not created" );
maBmpSize = aBmp.GetSizePixel();
@@ -552,7 +552,7 @@ void SvxLineBox::Fill( const XDashListRef &pList )
for( tools::Long i = 0; i < nCount; i++ )
{
const XDashEntry* pEntry = pList->GetDash(i);
- const BitmapEx aBitmap = pList->GetUiBitmap(i);
+ const Bitmap aBitmap = pList->GetUiBitmap(i);
mxLineStyleSet->InsertItem(i + 3, Image(aBitmap), pEntry->GetName());
}
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 9972efeef4b9..7b6a5e61dafe 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -43,17 +43,17 @@ bool XBitmapList::Create()
return true;
}
-BitmapEx XBitmapList::CreateBitmap( tools::Long nIndex, const Size& rSize )
const
+Bitmap XBitmapList::CreateBitmap( tools::Long nIndex, const Size& rSize ) const
{
OSL_ENSURE( nIndex < Count(), "Access out of range" );
if(nIndex < Count())
{
- BitmapEx rBitmapEx = GetBitmap( nIndex
)->GetGraphicObject().GetGraphic().GetBitmapEx();
+ Bitmap rBitmap( GetBitmap( nIndex
)->GetGraphicObject().GetGraphic().GetBitmapEx());
ScopedVclPtrInstance< VirtualDevice > pVirtualDevice;
pVirtualDevice->SetOutputSizePixel(rSize);
- if(rBitmapEx.IsAlpha())
+ if(rBitmap.HasAlpha())
{
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
@@ -73,14 +73,14 @@ BitmapEx XBitmapList::CreateBitmap( tools::Long nIndex,
const Size& rSize ) cons
}
}
- if(rBitmapEx.GetSizePixel().Width() >= rSize.Width() &&
rBitmapEx.GetSizePixel().Height() >= rSize.Height())
+ if(rBitmap.GetSizePixel().Width() >= rSize.Width() &&
rBitmap.GetSizePixel().Height() >= rSize.Height())
{
- rBitmapEx.Scale(rSize);
- pVirtualDevice->DrawBitmapEx(Point(0, 0), rBitmapEx);
+ rBitmap.Scale(rSize);
+ pVirtualDevice->DrawBitmapEx(Point(0, 0), rBitmap);
}
else
{
- const Size aBitmapSize(rBitmapEx.GetSizePixel());
+ const Size aBitmapSize(rBitmap.GetSizePixel());
for(tools::Long y(0); y < rSize.Height(); y +=
aBitmapSize.Height())
{
@@ -88,25 +88,25 @@ BitmapEx XBitmapList::CreateBitmap( tools::Long nIndex,
const Size& rSize ) cons
{
pVirtualDevice->DrawBitmapEx(
Point(x, y),
- rBitmapEx);
+ rBitmap);
}
}
}
- rBitmapEx = pVirtualDevice->GetBitmap(Point(0, 0), rSize);
- return rBitmapEx;
+ rBitmap = pVirtualDevice->GetBitmap(Point(0, 0), rSize);
+ return rBitmap;
}
else
- return BitmapEx();
+ return Bitmap();
}
-BitmapEx XBitmapList::CreateBitmapForUI( tools::Long nIndex )
+Bitmap XBitmapList::CreateBitmapForUI( tools::Long nIndex )
{
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
const Size& rSize = rStyleSettings.GetListBoxPreviewDefaultPixelSize();
return CreateBitmap(nIndex, rSize);
}
-BitmapEx XBitmapList::GetBitmapForPreview( tools::Long nIndex, const Size&
rSize )
+Bitmap XBitmapList::GetBitmapForPreview( tools::Long nIndex, const Size& rSize
)
{
return CreateBitmap(nIndex, rSize);
}
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index fc380fde55d7..18881585d4c5 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -151,9 +151,9 @@ bool XColorList::Create()
return(165 == Count());
}
-BitmapEx XColorList::CreateBitmapForUI( tools::Long /*nIndex*/ )
+Bitmap XColorList::CreateBitmapForUI( tools::Long /*nIndex*/ )
{
- return BitmapEx();
+ return Bitmap();
}
tools::Long XColorList::GetIndexOfColor( const Color& rColor ) const
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 7e3f0011acca..390abd10be4a 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -79,7 +79,7 @@ double XDashList::ImpGetDefaultLineThickness()
return StyleSettings::GetListBoxPreviewDefaultLineWidth() * 1.1;
}
-BitmapEx XDashList::CreateBitmapForXDash(const XDash* pDash, double
fLineThickness)
+Bitmap XDashList::CreateBitmapForXDash(const XDash* pDash, double
fLineThickness)
{
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
const Size& rSize = rStyleSettings.GetListBoxPreviewDefaultPixelSize();
@@ -172,7 +172,7 @@ BitmapEx XDashList::CreateBitmapForXDash(const XDash*
pDash, double fLineThickne
pProcessor2D.reset();
// get result bitmap and scale
- BitmapEx aRetval(pVirtualDevice->GetBitmap(Point(0, 0),
pVirtualDevice->GetOutputSizePixel()));
+ Bitmap aRetval(pVirtualDevice->GetBitmap(Point(0, 0),
pVirtualDevice->GetOutputSizePixel()));
if(1 != nFactor)
{
@@ -182,7 +182,7 @@ BitmapEx XDashList::CreateBitmapForXDash(const XDash*
pDash, double fLineThickne
return aRetval;
}
-BitmapEx XDashList::CreateBitmapForUI( tools::Long nIndex )
+Bitmap XDashList::CreateBitmapForUI( tools::Long nIndex )
{
const XDash& rDash = GetDash(nIndex)->GetDash();
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 7558d95af856..26d24a60815a 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -85,9 +85,9 @@ bool XGradientList::Create()
return true;
}
-BitmapEx XGradientList::CreateBitmap( tools::Long nIndex, const Size& rSize )
const
+Bitmap XGradientList::CreateBitmap( tools::Long nIndex, const Size& rSize )
const
{
- BitmapEx aRetval;
+ Bitmap aRetval;
OSL_ENSURE(nIndex < Count(), "OOps, access out of range (!)");
@@ -158,14 +158,14 @@ BitmapEx XGradientList::CreateBitmap( tools::Long nIndex,
const Size& rSize ) co
return aRetval;
}
-BitmapEx XGradientList::CreateBitmapForUI(tools::Long nIndex)
+Bitmap XGradientList::CreateBitmapForUI(tools::Long nIndex)
{
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
const Size& rSize = rStyleSettings.GetListBoxPreviewDefaultPixelSize();
return CreateBitmap(nIndex, rSize);
}
-BitmapEx XGradientList::GetBitmapForPreview(tools::Long nIndex, const Size&
rSize)
+Bitmap XGradientList::GetBitmapForPreview(tools::Long nIndex, const Size&
rSize)
{
return CreateBitmap(nIndex, rSize);
}
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index 3070cbfd7f74..7b5f17f06f07 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -76,9 +76,9 @@ bool XHatchList::Create()
return true;
}
-BitmapEx XHatchList::CreateBitmap( tools::Long nIndex, const Size& rSize) const
+Bitmap XHatchList::CreateBitmap( tools::Long nIndex, const Size& rSize) const
{
- BitmapEx aRetval;
+ Bitmap aRetval;
OSL_ENSURE(nIndex < Count(), "OOps, access out of range (!)");
if(nIndex < Count())
@@ -176,15 +176,15 @@ BitmapEx XHatchList::CreateBitmap( tools::Long nIndex,
const Size& rSize) const
return aRetval;
}
-BitmapEx XHatchList::CreateBitmapForUI(tools::Long nIndex)
+Bitmap XHatchList::CreateBitmapForUI(tools::Long nIndex)
{
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
const Size& rSize = rStyleSettings.GetListBoxPreviewDefaultPixelSize();
- BitmapEx aRetVal = CreateBitmap(nIndex, rSize);
+ Bitmap aRetVal = CreateBitmap(nIndex, rSize);
return aRetVal;
}
-BitmapEx XHatchList::GetBitmapForPreview(tools::Long nIndex, const Size& rSize)
+Bitmap XHatchList::GetBitmapForPreview(tools::Long nIndex, const Size& rSize)
{
return CreateBitmap(nIndex, rSize);
}
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index ab6cfc60882c..0307b2dab600 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -189,9 +189,9 @@ tools::Long XPropertyList::GetIndex(std::u16string_view
rName) const
return -1;
}
-BitmapEx XPropertyList::GetUiBitmap( tools::Long nIndex ) const
+Bitmap XPropertyList::GetUiBitmap( tools::Long nIndex ) const
{
- BitmapEx aRetval;
+ Bitmap aRetval;
if (!isValidIdx(nIndex))
return aRetval;
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index 2152922e0283..58632f09b387 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -79,9 +79,9 @@ bool XLineEndList::Create()
return true;
}
-BitmapEx XLineEndList::CreateBitmapForUI( tools::Long nIndex )
+Bitmap XLineEndList::CreateBitmapForUI( tools::Long nIndex )
{
- BitmapEx aRetval;
+ Bitmap 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 419ab4e4dddd..150741a47a56 100644
--- a/svx/source/xoutdev/xtabptrn.cxx
+++ b/svx/source/xoutdev/xtabptrn.cxx
@@ -78,17 +78,17 @@ bool XPatternList::Create()
return true;
}
-BitmapEx XPatternList::CreateBitmap( tools::Long nIndex, const Size& rSize )
const
+Bitmap XPatternList::CreateBitmap( tools::Long nIndex, const Size& rSize )
const
{
assert( nIndex < Count() );
if(nIndex < Count())
{
- BitmapEx rBitmapEx = GetBitmap( nIndex
)->GetGraphicObject().GetGraphic().GetBitmapEx();
+ Bitmap rBitmap(GetBitmap( nIndex
)->GetGraphicObject().GetGraphic().GetBitmapEx());
ScopedVclPtrInstance< VirtualDevice > pVirtualDevice;
pVirtualDevice->SetOutputSizePixel(rSize);
- if(rBitmapEx.IsAlpha())
+ if(rBitmap.HasAlpha())
{
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
@@ -108,14 +108,14 @@ BitmapEx XPatternList::CreateBitmap( tools::Long nIndex,
const Size& rSize ) con
}
}
- if(rBitmapEx.GetSizePixel().Width() >= rSize.Width() &&
rBitmapEx.GetSizePixel().Height() >= rSize.Height())
+ if(rBitmap.GetSizePixel().Width() >= rSize.Width() &&
rBitmap.GetSizePixel().Height() >= rSize.Height())
{
- rBitmapEx.Scale(rSize);
- pVirtualDevice->DrawBitmapEx(Point(0, 0), rBitmapEx);
+ rBitmap.Scale(rSize);
+ pVirtualDevice->DrawBitmapEx(Point(0, 0), rBitmap);
}
else
{
- const Size aBitmapSize(rBitmapEx.GetSizePixel());
+ const Size aBitmapSize(rBitmap.GetSizePixel());
for(tools::Long y(0); y < rSize.Height(); y +=
aBitmapSize.Height())
{
@@ -123,25 +123,25 @@ BitmapEx XPatternList::CreateBitmap( tools::Long nIndex,
const Size& rSize ) con
{
pVirtualDevice->DrawBitmapEx(
Point(x, y),
- rBitmapEx);
+ rBitmap);
}
}
}
- rBitmapEx = pVirtualDevice->GetBitmap(Point(0, 0), rSize);
- return rBitmapEx;
+ rBitmap = pVirtualDevice->GetBitmap(Point(0, 0), rSize);
+ return rBitmap;
}
else
- return BitmapEx();
+ return Bitmap();
}
-BitmapEx XPatternList::CreateBitmapForUI( tools::Long nIndex )
+Bitmap XPatternList::CreateBitmapForUI( tools::Long nIndex )
{
const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
const Size& rSize = rStyleSettings.GetListBoxPreviewDefaultPixelSize();
return CreateBitmap(nIndex, rSize);
}
-BitmapEx XPatternList::GetBitmapForPreview( tools::Long nIndex, const Size&
rSize )
+Bitmap XPatternList::GetBitmapForPreview( tools::Long nIndex, const Size&
rSize )
{
return CreateBitmap(nIndex, rSize);
}
