summaryrefslogtreecommitdiff
path: root/svx/source/xoutdev/xattrbmp.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/xoutdev/xattrbmp.cxx')
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx61
1 files changed, 1 insertions, 60 deletions
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index a25c5d41faf4..b20bbf4d5ec8 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -144,65 +144,6 @@ XFillBitmapItem::XFillBitmapItem(const XFillBitmapItem& rItem)
{
}
-BitmapEx createHistorical8x8FromArray(std::array<sal_uInt8,64> const & pArray, Color aColorPix, Color aColorBack)
-{
- vcl::bitmap::RawBitmap aBitmap(Size(8, 8), 24);
-
- for(sal_uInt16 a(0); a < 8; a++)
- {
- for(sal_uInt16 b(0); b < 8; b++)
- {
- if(pArray[(a * 8) + b])
- {
- aBitmap.SetPixel(a, b, aColorBack);
- }
- else
- {
- aBitmap.SetPixel(a, b, aColorPix);
- }
- }
- }
-
- return vcl::bitmap::CreateFromData(std::move(aBitmap));
-}
-
-bool isHistorical8x8(const BitmapEx& rBitmapEx, BitmapColor& o_rBack, BitmapColor& o_rFront)
-{
- bool bRet(false);
-
- if(!rBitmapEx.IsTransparent())
- {
- Bitmap aBitmap(rBitmapEx.GetBitmap());
-
- if(8 == aBitmap.GetSizePixel().Width() && 8 == aBitmap.GetSizePixel().Height())
- {
- if(2 == aBitmap.GetColorCount())
- {
- BitmapReadAccess* pRead = aBitmap.AcquireReadAccess();
-
- if(pRead)
- {
- if(pRead->HasPalette() && 2 == pRead->GetPaletteEntryCount())
- {
- const BitmapPalette& rPalette = pRead->GetPalette();
-
- // #i123564# background and foreground were exchanged; of course
- // rPalette[0] is the background color
- o_rFront = rPalette[1];
- o_rBack = rPalette[0];
-
- bRet = true;
- }
-
- Bitmap::ReleaseAccess(pRead);
- }
- }
- }
- }
-
- return bRet;
-}
-
XFillBitmapItem::XFillBitmapItem(const GraphicObject& rGraphicObject)
: NameOrIndex(XATTR_FILLBITMAP, -1)
, maGraphicObject(rGraphicObject)
@@ -224,7 +165,7 @@ bool XFillBitmapItem::operator==(const SfxPoolItem& rItem) const
bool XFillBitmapItem::isPattern() const
{
BitmapColor aBack, aFront;
- return isHistorical8x8(GetGraphicObject().GetGraphic().GetBitmapEx(), aBack, aFront);
+ return vcl::bitmap::isHistorical8x8(GetGraphicObject().GetGraphic().GetBitmapEx(), aBack, aFront);
}
sal_uInt16 XFillBitmapItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const