summaryrefslogtreecommitdiff
path: root/vcl/unx/generic/gdi
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx/generic/gdi')
-rw-r--r--vcl/unx/generic/gdi/gcach_xpeer.cxx15
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx68
-rw-r--r--vcl/unx/generic/gdi/salgdi2.cxx4
-rw-r--r--vcl/unx/generic/gdi/salgdi3.cxx40
-rw-r--r--vcl/unx/generic/gdi/salvd.cxx1
-rw-r--r--vcl/unx/generic/gdi/xrender_peer.cxx7
-rw-r--r--vcl/unx/generic/gdi/xrender_peer.hxx7
7 files changed, 0 insertions, 142 deletions
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx
index 51dd9b58ed29..6148912b8652 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "rtl/ustring.hxx"
#include "osl/module.h"
#include "osl/thread.h"
@@ -29,14 +28,10 @@
#include "gcach_xpeer.hxx"
#include "xrender_peer.hxx"
-
-
X11GlyphPeer::X11GlyphPeer()
{
}
-
-
X11GlyphPeer::~X11GlyphPeer()
{
if( !ImplGetSVData() )
@@ -62,15 +57,11 @@ X11GlyphPeer::~X11GlyphPeer()
}
}
-
-
X11GlyphCache::X11GlyphCache( X11GlyphPeer& rPeer )
: GlyphCache( rPeer )
{
}
-
-
namespace
{
struct GlyphCacheHolder
@@ -111,20 +102,14 @@ X11GlyphCache& X11GlyphCache::GetInstance()
return theGlyphCacheHolder::get().getGlyphCache();
}
-
-
void X11GlyphCache::KillInstance()
{
return theGlyphCacheHolder::get().release();
}
-
-
void X11SalGraphics::releaseGlyphPeer()
{
X11GlyphCache::KillInstance();
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 7e7aef3cf911..0b1c5bd0df6f 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include <stdio.h>
#include <errno.h>
@@ -52,7 +51,6 @@
// - SalBitmap -
-
SalBitmap* X11SalInstance::CreateSalBitmap()
{
return new X11SalBitmap();
@@ -61,8 +59,6 @@ SalBitmap* X11SalInstance::CreateSalBitmap()
ImplSalBitmapCache* X11SalBitmap::mpCache = NULL;
sal_uLong X11SalBitmap::mnCacheInstCount = 0;
-
-
X11SalBitmap::X11SalBitmap()
: mpDIB( NULL )
, mpDDB( NULL )
@@ -70,23 +66,17 @@ X11SalBitmap::X11SalBitmap()
{
}
-
-
X11SalBitmap::~X11SalBitmap()
{
Destroy();
}
-
-
void X11SalBitmap::ImplCreateCache()
{
if( !mnCacheInstCount++ )
mpCache = new ImplSalBitmapCache;
}
-
-
void X11SalBitmap::ImplDestroyCache()
{
DBG_ASSERT( mnCacheInstCount, "X11SalBitmap::ImplDestroyCache(): underflow" );
@@ -95,8 +85,6 @@ void X11SalBitmap::ImplDestroyCache()
delete mpCache, mpCache = NULL;
}
-
-
void X11SalBitmap::ImplRemovedFromCache()
{
if( mpDDB )
@@ -121,8 +109,6 @@ namespace
}
#endif
-
-
BitmapBuffer* X11SalBitmap::ImplCreateDIB(
const Size& rSize,
sal_uInt16 nBitCount,
@@ -212,8 +198,6 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
return pDIB;
}
-
-
BitmapBuffer* X11SalBitmap::ImplCreateDIB(
Drawable aDrawable,
SalX11Screen nScreen,
@@ -387,8 +371,6 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
return pDIB;
}
-
-
XImage* X11SalBitmap::ImplCreateXImage(
SalDisplay *pSalDisp,
SalX11Screen nScreen,
@@ -563,7 +545,6 @@ XImage* X11SalBitmap::ImplCreateXImage(
return pImage;
}
-
bool X11SalBitmap::ImplCreateFromDrawable(
Drawable aDrawable,
SalX11Screen nScreen,
@@ -581,7 +562,6 @@ bool X11SalBitmap::ImplCreateFromDrawable(
return( mpDDB != NULL );
}
-
ImplSalDDB* X11SalBitmap::ImplGetDDB(
Drawable aDrawable,
SalX11Screen nXScreen,
@@ -679,8 +659,6 @@ ImplSalDDB* X11SalBitmap::ImplGetDDB(
return mpDDB;
}
-
-
void X11SalBitmap::ImplDraw(
Drawable aDrawable,
SalX11Screen nXScreen,
@@ -694,8 +672,6 @@ void X11SalBitmap::ImplDraw(
mpDDB->ImplDraw( aDrawable, nDrawableDepth, rTwoRect, rGC );
}
-
-
bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal )
{
Destroy();
@@ -704,8 +680,6 @@ bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const Bitmap
return( mpDIB != NULL );
}
-
-
bool X11SalBitmap::Create( const SalBitmap& rSSalBmp )
{
Destroy();
@@ -745,22 +719,16 @@ bool X11SalBitmap::Create( const SalBitmap& rSSalBmp )
( rSalBmp.mpDDB && ( mpDDB != NULL ) ) );
}
-
-
bool X11SalBitmap::Create( const SalBitmap&, SalGraphics* )
{
return false;
}
-
-
bool X11SalBitmap::Create( const SalBitmap&, sal_uInt16 )
{
return false;
}
-
-
bool X11SalBitmap::Create(
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas,
Size& rSize,
@@ -800,8 +768,6 @@ bool X11SalBitmap::Create(
return false;
}
-
-
void X11SalBitmap::Destroy()
{
if( mpDIB )
@@ -817,8 +783,6 @@ void X11SalBitmap::Destroy()
mpCache->ImplRemove( this );
}
-
-
Size X11SalBitmap::GetSize() const
{
Size aSize;
@@ -831,8 +795,6 @@ Size X11SalBitmap::GetSize() const
return aSize;
}
-
-
sal_uInt16 X11SalBitmap::GetBitCount() const
{
sal_uInt16 nBitCount;
@@ -847,8 +809,6 @@ sal_uInt16 X11SalBitmap::GetBitCount() const
return nBitCount;
}
-
-
BitmapBuffer* X11SalBitmap::AcquireBuffer( bool )
{
if( !mpDIB && mpDDB )
@@ -867,8 +827,6 @@ BitmapBuffer* X11SalBitmap::AcquireBuffer( bool )
return mpDIB;
}
-
-
void X11SalBitmap::ReleaseBuffer( BitmapBuffer*, bool bReadOnly )
{
if( !bReadOnly )
@@ -881,8 +839,6 @@ void X11SalBitmap::ReleaseBuffer( BitmapBuffer*, bool bReadOnly )
}
}
-
-
bool X11SalBitmap::GetSystemData( BitmapSystemData& rData )
{
if( mpDDB )
@@ -899,10 +855,8 @@ bool X11SalBitmap::GetSystemData( BitmapSystemData& rData )
return false;
}
-
// - ImplSalDDB -
-
ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable,
SalX11Screen nXScreen, const SalTwoRect& rTwoRect )
: maPixmap ( 0 )
@@ -933,8 +887,6 @@ ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable,
}
}
-
-
ImplSalDDB::ImplSalDDB(
Drawable aDrawable,
SalX11Screen nXScreen,
@@ -974,16 +926,12 @@ ImplSalDDB::ImplSalDDB(
}
}
-
-
ImplSalDDB::~ImplSalDDB()
{
if( maPixmap && ImplGetSVData() )
XFreePixmap( GetGenericData()->GetSalDisplay()->GetDisplay(), maPixmap );
}
-
-
bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRect& rTwoRect ) const
{
bool bRet = false;
@@ -1018,8 +966,6 @@ bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRe
return bRet;
}
-
-
void ImplSalDDB::ImplDraw(
Drawable aDrawable,
long nDrawableDepth,
@@ -1033,8 +979,6 @@ void ImplSalDDB::ImplDraw(
rTwoRect.mnDestX, rTwoRect.mnDestY, rGC );
}
-
-
void ImplSalDDB::ImplDraw(
Drawable aSrcDrawable,
long nSrcDrawableDepth,
@@ -1063,10 +1007,8 @@ void ImplSalDDB::ImplDraw(
}
}
-
// - ImplSalBitmapCache -
-
struct ImplBmpObj
{
X11SalBitmap* mpBmp;
@@ -1077,22 +1019,16 @@ struct ImplBmpObj
mpBmp( pBmp ), mnMemSize( nMemSize ), mnFlags( nFlags ) {}
};
-
-
ImplSalBitmapCache::ImplSalBitmapCache() :
mnTotalSize( 0UL )
{
}
-
-
ImplSalBitmapCache::~ImplSalBitmapCache()
{
ImplClear();
}
-
-
void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uLong nFlags )
{
ImplBmpObj* pObj = NULL;
@@ -1119,8 +1055,6 @@ void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uL
maBmpList.push_back( new ImplBmpObj( pBmp, nMemSize, nFlags ) );
}
-
-
void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp )
{
for(
@@ -1139,8 +1073,6 @@ void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp )
}
}
-
-
void ImplSalBitmapCache::ImplClear()
{
for(
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 66eecb4a389e..ef76996c8c27 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include <poll.h>
@@ -236,7 +235,6 @@ extern "C"
}
}
-
void X11SalGraphics::YieldGraphicsExpose()
{
// get frame if necessary
@@ -422,8 +420,6 @@ void X11SalGraphics::copyBits( const SalTwoRect& rPosAry,
}
}
-
-
void X11SalGraphics::copyArea ( long nDestX, long nDestY,
long nSrcX, long nSrcY,
long nSrcWidth, long nSrcHeight,
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 05e9de371c15..841aeef8a2ee 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -83,12 +83,8 @@ struct _XRegion
BOX extents;
};
-
-
// X11SalGraphics
-
-
GC
X11SalGraphics::GetFontGC()
{
@@ -116,8 +112,6 @@ X11SalGraphics::GetFontGC()
return pFontGC_;
}
-
-
bool X11SalGraphics::setFont( const FontSelectPattern *pEntry, int nFallbackLevel )
{
// release all no longer needed font resources
@@ -184,8 +178,6 @@ void ImplServerFontEntry::HandleFontOptions( void )
mpServerFont->SetFontOptions( mpFontOptions );
}
-
-
CairoFontsCache::LRUFonts CairoFontsCache::maLRUFonts;
int CairoFontsCache::mnRefCount = 0;
@@ -439,8 +431,6 @@ void X11SalGraphics::DrawServerFontLayout( const ServerFontLayout& rLayout )
cairo_destroy(cr);
}
-
-
const ImplFontCharMap* X11SalGraphics::GetImplFontCharMap() const
{
if( !mpServerFont[0] )
@@ -457,12 +447,8 @@ bool X11SalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rGetImplFont
return mpServerFont[0]->GetFontCapabilities(rGetImplFontCapabilities);
}
-
-
// SalGraphics
-
-
sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel )
{
sal_uInt16 nRetVal = 0;
@@ -473,8 +459,6 @@ sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLeve
return nRetVal;
}
-
-
void
X11SalGraphics::SetTextColor( SalColor nSalColor )
{
@@ -486,8 +470,6 @@ X11SalGraphics::SetTextColor( SalColor nSalColor )
}
}
-
-
bool X11SalGraphics::AddTempDevFont( PhysicalFontCollection* pFontCollection,
const OUString& rFileURL,
const OUString& rFontName )
@@ -566,8 +548,6 @@ void X11SalGraphics::GetDevFontList( PhysicalFontCollection* pFontCollection )
ImplGetSVData()->maGDIData.mbNativeFontConfig = true;
}
-
-
void cairosubcallback(void* pPattern)
{
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
@@ -591,8 +571,6 @@ ImplFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, in
return rPFM.getFontOptions(aInfo, nSize, cairosubcallback);
}
-
-
void
X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel )
{
@@ -606,8 +584,6 @@ X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel )
}
}
-
-
bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
{
const int nLevel = aGlyphId >> GF_FONTSHIFT;
@@ -638,8 +614,6 @@ bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
return true;
}
-
-
bool X11SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId,
::basegfx::B2DPolyPolygon& rPolyPoly )
{
@@ -658,8 +632,6 @@ bool X11SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId,
return false;
}
-
-
SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel )
{
SalLayout* pLayout = NULL;
@@ -682,8 +654,6 @@ SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
return pLayout;
}
-
-
SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const
{
SystemFontData aSysFontData;
@@ -707,8 +677,6 @@ SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const
return aSysFontData;
}
-
-
bool X11SalGraphics::CreateFontSubset(
const OUString& rToFile,
const PhysicalFontFace* pFont,
@@ -737,8 +705,6 @@ bool X11SalGraphics::CreateFontSubset(
return bSuccess;
}
-
-
const void* X11SalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, const sal_Ucs* pUnicodes, sal_Int32* pWidths, FontSubsetInfo& rInfo, long* pDataLen )
{
// in this context the pFont->GetFontId() is a valid PSP
@@ -750,15 +716,11 @@ const void* X11SalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, con
return GenPspGraphics::DoGetEmbedFontData( aFont, pUnicodes, pWidths, rInfo, pDataLen );
}
-
-
void X11SalGraphics::FreeEmbedFontData( const void* pData, long nLen )
{
GenPspGraphics::DoFreeEmbedFontData( pData, nLen );
}
-
-
const Ucs2SIntMap* X11SalGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded )
{
// in this context the pFont->GetFontId() is a valid PSP
@@ -770,8 +732,6 @@ const Ucs2SIntMap* X11SalGraphics::GetFontEncodingVector( const PhysicalFontFace
return GenPspGraphics::DoGetFontEncodingVector( aFont, pNonEncoded );
}
-
-
void X11SalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont,
bool bVertical,
Int32Vector& rWidths,
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index a858223c939b..56aa036c8266 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <vcl/sysdata.hxx>
#include <prex.h>
diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx
index 03974a859caf..111b20a8e161 100644
--- a/vcl/unx/generic/gdi/xrender_peer.cxx
+++ b/vcl/unx/generic/gdi/xrender_peer.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include <rtl/ustring.hxx>
@@ -29,8 +28,6 @@
using namespace rtl;
-
-
XRenderPeer::XRenderPeer()
: mpDisplay( GetGenericData()->GetSalDisplay()->GetDisplay() )
, mpStandardFormatA8( NULL )
@@ -38,16 +35,12 @@ XRenderPeer::XRenderPeer()
InitRenderLib();
}
-
-
XRenderPeer& XRenderPeer::GetInstance()
{
static XRenderPeer aPeer;
return aPeer;
}
-
-
void XRenderPeer::InitRenderLib()
{
int nDummy;
diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx
index 172fb1fb35a6..cb71889bb7f9 100644
--- a/vcl/unx/generic/gdi/xrender_peer.hxx
+++ b/vcl/unx/generic/gdi/xrender_peer.hxx
@@ -76,8 +76,6 @@ public:
const _XTrap*, int nCount ) const;
};
-
-
inline XRenderPictFormat* XRenderPeer::GetStandardFormatA8() const
{
return mpStandardFormatA8;
@@ -174,7 +172,6 @@ inline void XRenderPeer::FillRectangle( int a, Picture b, const XRenderColor* c,
XRenderFillRectangle( mpDisplay, a, b, c, d, e, f, g );
}
-
inline void XRenderPeer::CompositeTrapezoids( int nOp,
Picture aSrc, Picture aDst, const XRenderPictFormat* pXRPF,
int nXSrc, int nYSrc, const XTrapezoid* pXT, int nCount ) const
@@ -189,8 +186,6 @@ inline void XRenderPeer::AddTraps( Picture aDst, int nXOfs, int nYOfs,
XRenderAddTraps( mpDisplay, aDst, nXOfs, nYOfs, pTraps, nCount );
}
-
-
inline XRenderColor GetXRenderColor( const SalColor& rSalColor, double fTransparency = 0.0 )
{
XRenderColor aRetVal;
@@ -214,8 +209,6 @@ inline XRenderColor GetXRenderColor( const SalColor& rSalColor, double fTranspar
return aRetVal;
}
-
-
#endif // INCLUDED_VCL_UNX_GENERIC_GDI_XRENDER_PEER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit (git 2.34.1) at 2024-07-23 16:50:55 +0000