Kaydet (Commit) 1bc9a5a9 authored tarafından Caolán McNamara's avatar Caolán McNamara

odd SvxBitmapCtl is used in only one place

Change-Id: I82a4c8f2e36153b0bc59571ce39956637e278fcb
üst c3addf79
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
class SdrModel; class SdrModel;
class SdrView; class SdrView;
class SvxBitmapCtl;
/************************************************************************/ /************************************************************************/
......
...@@ -49,6 +49,36 @@ ...@@ -49,6 +49,36 @@
using namespace com::sun::star; using namespace com::sun::star;
/*************************************************************************
|* Preview control for the display of bitmaps
\************************************************************************/
class SvxBitmapCtl
{
private:
Color aPixelColor, aBackgroundColor;
const sal_uInt16* pBmpArray;
public:
// Constructor: BitmapCtl for SvxPixelCtl
SvxBitmapCtl()
: pBmpArray(nullptr)
{
}
// BitmapCtl: Returns the Bitmap
BitmapEx GetBitmapEx()
{
const Bitmap aRetval(createHistorical8x8FromArray(pBmpArray, aPixelColor, aBackgroundColor));
return BitmapEx(aRetval);
}
void SetBmpArray( const sal_uInt16* pPixel ) { pBmpArray = pPixel; }
void SetPixelColor( Color aColor ) { aPixelColor = aColor; }
void SetBackgroundColor( Color aColor ) { aBackgroundColor = aColor; }
};
SvxPatternTabPage::SvxPatternTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxPatternTabPage::SvxPatternTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs) :
SvxTabPage ( pParent, SvxTabPage ( pParent,
......
...@@ -141,27 +141,6 @@ public: ...@@ -141,27 +141,6 @@ public:
void DoCompletelyDisable(bool bNew); void DoCompletelyDisable(bool bNew);
}; };
/*************************************************************************
|* Preview control for the display of bitmaps
\************************************************************************/
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBitmapCtl final
{
private:
Color aPixelColor, aBackgroundColor;
const sal_uInt16* pBmpArray;
public:
SvxBitmapCtl();
~SvxBitmapCtl();
BitmapEx GetBitmapEx();
void SetBmpArray( const sal_uInt16* pPixel ) { pBmpArray = pPixel; }
void SetPixelColor( Color aColor ) { aPixelColor = aColor; }
void SetBackgroundColor( Color aColor ) { aBackgroundColor = aColor; }
};
/************************************************************************* /*************************************************************************
|* Control for editing bitmaps |* Control for editing bitmaps
\************************************************************************/ \************************************************************************/
......
...@@ -1103,26 +1103,6 @@ void SvxPixelCtl::Reset() ...@@ -1103,26 +1103,6 @@ void SvxPixelCtl::Reset()
Invalidate(); Invalidate();
} }
// Constructor: BitmapCtl for SvxPixelCtl
SvxBitmapCtl::SvxBitmapCtl()
: pBmpArray(nullptr)
{
}
SvxBitmapCtl::~SvxBitmapCtl()
{
}
// BitmapCtl: Returns the Bitmap
BitmapEx SvxBitmapCtl::GetBitmapEx()
{
const Bitmap aRetval(createHistorical8x8FromArray(pBmpArray, aPixelColor, aBackgroundColor));
return BitmapEx(aRetval);
}
VCL_BUILDER_DECL_FACTORY(ColorLB) VCL_BUILDER_DECL_FACTORY(ColorLB)
{ {
bool bDropdown = VclBuilder::extractDropdown(rMap); bool bDropdown = VclBuilder::extractDropdown(rMap);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment