drop Image(Bitmap) constructor

and convert some more code from Bitmap to BitmapEx

Change-Id: Icf3c18608e0bb608408fe69722441cfa19f6b161
Reviewed-on: https://gerrit.libreoffice.org/55160
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>

15 files changed, 63 insertions, 63 deletions

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);
 }