mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

callcatcher: remove unused SalColormap methods

Browse Source
This commit is contained in:
Thomas Arnhold
2011-12-17 19:29:49 +01:00
parent f072008981
commit 22d05186ed
2 changed files with 0 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vcl/inc/unx/saldisp.hxx
View File

@@ -163,7 +163,6 @@ public:
SalColormap( const SalDisplay* pSalDisplay, SalColormap( const SalDisplay* pSalDisplay,
Colormap hColormap, Colormap hColormap,
int nScreen ); int nScreen );
SalColormap( const BitmapPalette &rpPalette );
SalColormap( sal_uInt16 nDepth ); SalColormap( sal_uInt16 nDepth );
SalColormap(); SalColormap();
~SalColormap(); ~SalColormap();
@@ -189,7 +188,6 @@ public:
int b ) const; int b ) const;
Pixel GetPixel( SalColor nColor ) const; Pixel GetPixel( SalColor nColor ) const;
SalColor GetColor( Pixel nPixel ) const; SalColor GetColor( Pixel nPixel ) const;
void SetPalette( const BitmapPalette &rPalette );
}; };
// -=-= SalXLib =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= // -=-= SalXLib =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=

54
vcl/unx/generic/app/saldisp.cxx
View File

@@ -2777,30 +2777,6 @@ SalColormap::SalColormap( const SalDisplay *pDisplay, Colormap hColormap, int nS
} }
} }
// PseudoColor
SalColormap::SalColormap( const BitmapPalette &rPalette )
: m_pDisplay( GetGenericData()->GetSalDisplay() ),
m_hColormap( None ),
m_nWhitePixel( SALCOLOR_NONE ),
m_nBlackPixel( SALCOLOR_NONE ),
m_nUsed( rPalette.GetEntryCount() ),
m_nScreen( GetGenericData()->GetSalDisplay()->GetDefaultScreenNumber() )
{
m_aPalette = std::vector<SalColor>(m_nUsed);
for( unsigned int i = 0; i < m_nUsed; i++ )
{
const BitmapColor &rColor = rPalette[i];
m_aPalette[i] = MAKE_SALCOLOR( rColor.GetRed(),
rColor.GetGreen(),
rColor.GetBlue() );
if( (m_nBlackPixel == SALCOLOR_NONE) && (SALCOLOR_BLACK == m_aPalette[i]) )
m_nBlackPixel = i;
else if( (m_nWhitePixel == SALCOLOR_NONE) && (SALCOLOR_WHITE == m_aPalette[i]) )
m_nWhitePixel = i;
}
}
// MonoChrome // MonoChrome
SalColormap::SalColormap() SalColormap::SalColormap()
: m_pDisplay( GetGenericData()->GetSalDisplay() ), : m_pDisplay( GetGenericData()->GetSalDisplay() ),
@@ -2913,36 +2889,6 @@ SalColormap::~SalColormap()
#endif #endif
} }
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
void SalColormap::SetPalette( const BitmapPalette &rPalette )
{
if( this != &GetGenericData()->GetSalDisplay()->GetColormap(m_nScreen) )
{
m_nBlackPixel = SALCOLOR_NONE;
m_nWhitePixel = SALCOLOR_NONE;
}
if( rPalette.GetEntryCount() > m_nUsed )
{
m_nBlackPixel = SALCOLOR_NONE;
m_nWhitePixel = SALCOLOR_NONE;
m_nUsed = rPalette.GetEntryCount();
m_aPalette = std::vector<SalColor>(m_nUsed);
}
for( int i = 0; i < rPalette.GetEntryCount(); i++ )
{
const BitmapColor &rColor = rPalette[i];
m_aPalette[i] = MAKE_SALCOLOR( rColor.GetRed(),
rColor.GetGreen(),
rColor.GetBlue() );
if( (m_nBlackPixel == SALCOLOR_NONE) && (SALCOLOR_BLACK == m_aPalette[i]) )
m_nBlackPixel = i;
else if( (m_nWhitePixel == SALCOLOR_NONE) && (SALCOLOR_WHITE == m_aPalette[i]) )
m_nWhitePixel = i;
}
}
void SalColormap::GetPalette() void SalColormap::GetPalette()
{ {
Pixel i; Pixel i;