include/svx/xbitmap.hxx | 16 ++++++++--------
svx/source/xoutdev/xattrbmp.cxx | 34 +++++++++++++++++-----------------
2 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 51a2b6e439d1d3a33d4136f9c505a343a04ce0ef
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jul 28 08:09:09 2025 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jul 28 19:22:06 2025 +0200
svx: prefix members of XOBitmap
See tdf#94879 for motivation.
Change-Id: I205654077a24eb97d47a91ef747bae6cee39a9ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188457
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/include/svx/xbitmap.hxx b/include/svx/xbitmap.hxx
index 0fff0a5cecb9..575f05dfc5fd 100644
--- a/include/svx/xbitmap.hxx
+++ b/include/svx/xbitmap.hxx
@@ -28,11 +28,11 @@
class SVXCORE_DLLPUBLIC XOBitmap
{
private:
- std::unique_ptr<GraphicObject> xGraphicObject;
- std::unique_ptr<sal_uInt16[]> pPixelArray;
- Color aPixelColor;
- Color aBckgrColor;
- bool bGraphicDirty;
+ std::unique_ptr<GraphicObject> m_xGraphicObject;
+ std::unique_ptr<sal_uInt16[]> m_pPixelArray;
+ Color m_aPixelColor;
+ Color m_aBckgrColor;
+ bool m_bGraphicDirty;
const GraphicObject& GetGraphicObject() const;
@@ -47,11 +47,11 @@ public:
void Bitmap2Array();
void Array2Bitmap();
- void SetPixelColor( const Color& rColor ) { aPixelColor =
rColor; bGraphicDirty = true; }
- void SetBackgroundColor( const Color& rColor ) { aBckgrColor =
rColor; bGraphicDirty = true; }
+ void SetPixelColor( const Color& rColor ) { m_aPixelColor =
rColor; m_bGraphicDirty = true; }
+ void SetBackgroundColor( const Color& rColor ) { m_aBckgrColor =
rColor; m_bGraphicDirty = true; }
BitmapEx GetBitmap() const;
- const Color& GetBackgroundColor() const { return aBckgrColor; }
+ const Color& GetBackgroundColor() const { return
m_aBckgrColor; }
};
#endif
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 66e7acb77fb5..a9bd46beb536 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -43,8 +43,8 @@
using namespace ::com::sun::star;
XOBitmap::XOBitmap( const BitmapEx& rBmp ) :
- xGraphicObject (new GraphicObject(rBmp)),
- bGraphicDirty ( false )
+ m_xGraphicObject (new GraphicObject(rBmp)),
+ m_bGraphicDirty ( false )
{
}
@@ -59,10 +59,10 @@ BitmapEx XOBitmap::GetBitmap() const
const GraphicObject& XOBitmap::GetGraphicObject() const
{
- if( bGraphicDirty )
+ if( m_bGraphicDirty )
const_cast<XOBitmap*>(this)->Array2Bitmap();
- return *xGraphicObject;
+ return *m_xGraphicObject;
}
void XOBitmap::Bitmap2Array()
@@ -72,26 +72,26 @@ void XOBitmap::Bitmap2Array()
const BitmapEx aBitmap( GetBitmap() );
const sal_Int32 nLines = 8; // type dependent
- if( !pPixelArray )
- pPixelArray.reset( new sal_uInt16[ nLines * nLines ] );
+ if( !m_pPixelArray )
+ m_pPixelArray.reset( new sal_uInt16[ nLines * nLines ] );
pVDev->SetOutputSizePixel( aBitmap.GetSizePixel() );
pVDev->DrawBitmapEx( Point(), aBitmap );
- aPixelColor = aBckgrColor = pVDev->GetPixel( Point() );
+ m_aPixelColor = m_aBckgrColor = pVDev->GetPixel( Point() );
// create array and determine foreground and background color
for (sal_Int32 i = 0; i < nLines; ++i)
{
for (sal_Int32 j = 0; j < nLines; ++j)
{
- if ( pVDev->GetPixel( Point( j, i ) ) == aBckgrColor )
- pPixelArray[ j + i * nLines ] = 0;
+ if ( pVDev->GetPixel( Point( j, i ) ) == m_aBckgrColor )
+ m_pPixelArray[ j + i * nLines ] = 0;
else
{
- pPixelArray[ j + i * nLines ] = 1;
+ m_pPixelArray[ j + i * nLines ] = 1;
if( !bPixelColor )
{
- aPixelColor = pVDev->GetPixel( Point( j, i ) );
+ m_aPixelColor = pVDev->GetPixel( Point( j, i ) );
bPixelColor = true;
}
}
@@ -102,7 +102,7 @@ void XOBitmap::Bitmap2Array()
/// convert array, fore- and background color into a bitmap
void XOBitmap::Array2Bitmap()
{
- if (!pPixelArray)
+ if (!m_pPixelArray)
return;
ScopedVclPtrInstance< VirtualDevice > pVDev;
@@ -115,15 +115,15 @@ void XOBitmap::Array2Bitmap()
{
for (sal_Int32 j = 0; j < nLines; ++j)
{
- if( pPixelArray[ j + i * nLines ] == 0 )
- pVDev->DrawPixel( Point( j, i ), aBckgrColor );
+ if( m_pPixelArray[ j + i * nLines ] == 0 )
+ pVDev->DrawPixel( Point( j, i ), m_aBckgrColor );
else
- pVDev->DrawPixel( Point( j, i ), aPixelColor );
+ pVDev->DrawPixel( Point( j, i ), m_aPixelColor );
}
}
- xGraphicObject.reset(new GraphicObject(pVDev->GetBitmap(Point(),
Size(nLines, nLines))));
- bGraphicDirty = false;
+ m_xGraphicObject.reset(new GraphicObject(pVDev->GetBitmap(Point(),
Size(nLines, nLines))));
+ m_bGraphicDirty = false;
}
