[Libreoffice-commits] .: sot/inc sot/source svtools/inc svtools/source tools/inc tools/source vcl/inc vcl/source vcl/unx
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Tue Aug 2 09:23:35 PDT 2011
sot/inc/sot/factory.hxx | 3 -
sot/source/base/factory.cxx | 62 ----------------------
svtools/inc/svtools/svlbox.hxx | 7 --
svtools/source/contnr/svimpbox.cxx | 31 -----------
svtools/source/contnr/svlbox.cxx | 51 ------------------
svtools/source/inc/svimpbox.hxx | 2
svtools/source/inc/svimpicn.hxx | 1
tools/inc/tools/poly.hxx | 15 -----
tools/source/generic/poly.cxx | 99 ------------------------------------
tools/source/generic/poly2.cxx | 55 --------------------
vcl/inc/sallayout.hxx | 1
vcl/inc/unx/saldisp.hxx | 1
vcl/inc/unx/salframe.h | 3 -
vcl/source/gdi/sallayout.cxx | 8 --
vcl/unx/generic/app/saldisp.cxx | 35 ------------
vcl/unx/generic/window/salframe.cxx | 47 -----------------
16 files changed, 421 deletions(-)
New commits:
commit 6e5f1fdacffe25fbd44ef4822f2d288ea2385598
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Aug 2 18:18:24 2011 +0200
callcatcher: remove unused methods
diff --git a/sot/inc/sot/factory.hxx b/sot/inc/sot/factory.hxx
index d62bbbc..9a455da 100644
--- a/sot/inc/sot/factory.hxx
+++ b/sot/inc/sot/factory.hxx
@@ -56,14 +56,11 @@ protected:
virtual ~SotFactory();
public:
TYPEINFO();
- static void DeInit();
static void IncSvObjectCount( SotObject * = NULL );
static void DecSvObjectCount( SotObject * = NULL );
- static sal_uInt32 GetSvObjectCount();
static void TestInvariant();
static const SotFactory * Find( const SvGlobalName & );
- static const SotFactoryList * GetFactoryList();
SotFactory( const SvGlobalName &,
const String & rClassName, CreateInstanceType );
diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx
index 7939337..c4fe282 100644
--- a/sot/source/base/factory.cxx
+++ b/sot/source/base/factory.cxx
@@ -67,51 +67,6 @@ SotData_Impl * SOTDATA()
return &ImplData::get();
}
-/*************************************************************************
-|* SotFactory::DeInit()
-|*
-|* Beschreibung
-*************************************************************************/
-void SotFactory::DeInit()
-{
- SotData_Impl * pSotData = SOTDATA();
-
- if( pSotData->nSvObjCount )
- {
-#ifdef DBG_UTIL
- rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Objects alive: "));
- aStr.append(static_cast<sal_Int32>(pSotData->nSvObjCount));
- DBG_WARNING(aStr.getStr());
-#endif
- return;
- }
-
- // Muss von hinten nach vorne zerstoert werden. Das ist die umgekehrte
- // Reihenfolge der Erzeugung
- SotFactoryList* pFactoryList = pSotData->pFactoryList;
- if( pFactoryList )
- {
- for ( size_t i = pFactoryList->size(); i > 0 ; )
- delete (*pFactoryList)[ --i ];
- pFactoryList->clear();
- delete pFactoryList;
- pSotData->pFactoryList = NULL;
-
- }
-
- pSotData->aObjectList.clear();
-
- if( pSotData->pDataFlavorList )
- {
-
- for( size_t i = 0, nMax = pSotData->pDataFlavorList->size(); i < nMax; i++ )
- delete (*pSotData->pDataFlavorList)[ i ];
- delete pSotData->pDataFlavorList;
- pSotData->pDataFlavorList = NULL;
- }
-}
-
-
/************** class SotFactory *****************************************/
/*************************************************************************
|* SotFactory::SotFactory()
@@ -154,23 +109,6 @@ SotFactory::~SotFactory()
delete [] pSuperClasses;
}
-
-/*************************************************************************
-|* SotFactory::
-|*
-|* Beschreibung Zugriffsmethoden auf SotData_Impl-Daten
-*************************************************************************/
-sal_uInt32 SotFactory::GetSvObjectCount()
-{
- return SOTDATA()->nSvObjCount;
-}
-
-
-const SotFactoryList * SotFactory::GetFactoryList()
-{
- return SOTDATA()->pFactoryList;
-}
-
/*************************************************************************
|* SotFactory::Find()
|*
diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index c56b740..a4cf74a 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.hxx
@@ -489,12 +489,6 @@ public:
virtual SvLBoxEntry*
GetCurEntry() const = 0;
- // Model
- void SetInUseEmphasis( SvLBoxEntry* pEntry, sal_Bool bInUse=sal_True);
- // View
- void SetCursorEmphasis( SvLBoxEntry* pEntry, sal_Bool bCursored=sal_True);
- sal_Bool HasCursorEmphasis( SvLBoxEntry* pEntry ) const;
-
void SetSelectHdl( const Link& rNewHdl ) {aSelectHdl=rNewHdl; }
void SetDeselectHdl( const Link& rNewHdl ) {aDeselectHdl=rNewHdl; }
void SetDoubleClickHdl(const Link& rNewHdl) {aDoubleClickHdl=rNewHdl;}
@@ -533,7 +527,6 @@ public:
sal_Int8 GetDragOptions() const { return nDragOptions; }
SvLBox* GetSourceView() const;
- SvLBox* GetTargetView() const;
virtual void NotifyRemoving( SvLBoxEntry* );
virtual void ShowTargetEmphasis( SvLBoxEntry*, sal_Bool bShow );
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index cf53330..7f8df9b 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -1041,35 +1041,6 @@ void SvImpLBox::ScrollToAbsPos( long nPos )
}
}
-void SvImpLBox::RepaintSelectionItems()
-{
- if( !pView->GetVisibleCount() )
- return;
-
- if( !pStartEntry )
- pStartEntry = pView->First();
-
- if( nNodeBmpTabDistance == NODE_BMP_TABDIST_NOTVALID )
- SetNodeBmpTabDistance();
-
- ShowCursor( sal_False );
-
- long nEntryHeight = pView->GetEntryHeight();
-
- sal_uLong nCount = nVisibleCount;
- long nY = 0;
- SvLBoxEntry* pEntry = pStartEntry;
- for( sal_uLong n=0; n< nCount && pEntry; n++ )
- {
- pView->PaintEntry1( pEntry, nY, 0xffff ); //wg. ItemsetBrowser SV_LBOXTAB_SHOW_SELECTION );
- nY += nEntryHeight;
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
- }
-
- ShowCursor( sal_True );
-}
-
-
void SvImpLBox::DrawNet()
{
if( pView->GetVisibleCount() < 2 && !pStartEntry->HasChildsOnDemand() &&
@@ -1587,8 +1558,6 @@ void SvImpLBox::SetEntryHeight( short /* nHeight */ )
// Callback-Functions
// ***********************************************************************
-void SvImpLBox::IndentChanged( short /* nIndentPixel */ ) {}
-
void SvImpLBox::EntryExpanded( SvLBoxEntry* pEntry )
{
// SelAllDestrAnch( sal_False, sal_True ); //DeselectAll();
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index 6ab6184..fd31433 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -1163,11 +1163,6 @@ SvLBox* SvLBox::GetSourceView() const
return pDDSource;
}
-SvLBox* SvLBox::GetTargetView() const
-{
- return pDDTarget;
-}
-
void SvLBox::RequestingChilds( SvLBoxEntry* )
{
DBG_CHKTHIS(SvLBox,0);
@@ -1658,52 +1653,6 @@ void SvLBox::ModelHasEntryInvalidated( SvListEntry* pEntry )
}
}
-void SvLBox::SetInUseEmphasis( SvLBoxEntry* pEntry, sal_Bool bInUse )
-{
- DBG_CHKTHIS(SvLBox,0);
- DBG_ASSERT(pEntry,"SetInUseEmphasis:No Entry");
- if( bInUse )
- {
- if( !pEntry->HasInUseEmphasis() )
- {
- pEntry->nEntryFlags |= SV_ENTRYFLAG_IN_USE;
- pModel->InvalidateEntry( pEntry );
- }
- }
- else
- {
- if( pEntry->HasInUseEmphasis() )
- {
- pEntry->nEntryFlags &= (~SV_ENTRYFLAG_IN_USE);
- pModel->InvalidateEntry( pEntry );
- }
- }
-}
-
-void SvLBox::SetCursorEmphasis( SvLBoxEntry* pEntry, sal_Bool bCursored )
-{
- DBG_CHKTHIS(SvLBox,0);
- DBG_ASSERT(pEntry,"SetInUseEmphasis:No Entry");
- SvViewDataEntry* pViewData = GetViewDataEntry( pEntry );
- if( pViewData && (bCursored != pViewData->IsCursored()) )
- {
- pViewData->SetCursored( bCursored );
- // paintet in allen Views
- // pModel->InvalidateEntry( pEntry );
- // invalidiert nur in dieser View
- ModelHasEntryInvalidated( pEntry );
- }
-}
-
-sal_Bool SvLBox::HasCursorEmphasis( SvLBoxEntry* pEntry ) const
-{
- DBG_CHKTHIS(SvLBox,0);
- DBG_ASSERT(pEntry,"SetInUseEmphasis:No Entry");
- SvViewDataEntry* pViewData = GetViewDataEntry( pEntry );
- DBG_ASSERT(pViewData,"Entry not in View");
- return pViewData->IsCursored();
-}
-
void SvLBox::WriteDragServerInfo( const Point&, SvLBoxDDInfo* )
{
DBG_CHKTHIS(SvLBox,0);
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index eb0ffdf..f8540e1 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -275,14 +275,12 @@ public:
void EntryMoved( SvLBoxEntry* pEntry );
void TreeInserted( SvLBoxEntry* pEntry );
- void IndentChanged( short nIndentPixel );
void EntryExpanded( SvLBoxEntry* pEntry );
void EntryCollapsed( SvLBoxEntry* pEntry );
void CollapsingEntry( SvLBoxEntry* pEntry );
void EntrySelected( SvLBoxEntry*, sal_Bool bSelect );
void Paint( const Rectangle& rRect );
- void RepaintSelectionItems();
void MouseButtonDown( const MouseEvent& );
void MouseButtonUp( const MouseEvent& );
void MouseMove( const MouseEvent&);
diff --git a/svtools/source/inc/svimpicn.hxx b/svtools/source/inc/svimpicn.hxx
index 105e81d..31fb404 100644
--- a/svtools/source/inc/svimpicn.hxx
+++ b/svtools/source/inc/svimpicn.hxx
@@ -184,7 +184,6 @@ public:
void EntrySelected( SvLBoxEntry*, sal_Bool bSelect );
void Paint( const Rectangle& rRect );
- void RepaintSelectionItems();
void MouseButtonDown( const MouseEvent& );
void MouseButtonUp( const MouseEvent& );
void MouseMove( const MouseEvent&);
diff --git a/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx
index 5c116e3..e77ef8e 100644
--- a/tools/inc/tools/poly.hxx
+++ b/tools/inc/tools/poly.hxx
@@ -123,9 +123,6 @@ private:
public:
- Point* ImplGetPointAry();
- sal_uInt8* ImplGetFlagAry();
-
static void ImplReduceEdges( Polygon& rPoly, const double& rArea, sal_uInt16 nPercent );
void ImplRead( SvStream& rIStream );
void ImplWrite( SvStream& rOStream ) const;
@@ -158,8 +155,6 @@ public:
PolyFlags GetFlags( sal_uInt16 nPos ) const;
sal_Bool HasFlags() const;
- sal_Bool IsControl( sal_uInt16 nPos ) const;
- sal_Bool IsSmooth( sal_uInt16 nPos ) const;
sal_Bool IsRect() const;
void SetSize( sal_uInt16 nNewSize );
@@ -168,7 +163,6 @@ public:
void Clear();
Rectangle GetBoundRect() const;
- double GetArea() const;
double GetSignedArea() const;
sal_Bool IsInside( const Point& rPt ) const;
sal_Bool IsRightOrientated() const;
@@ -196,11 +190,6 @@ public:
*/
void AdaptiveSubdivide( Polygon& rResult, const double d = 1.0 ) const;
- void GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
- void GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
- void GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
- void GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const;
-
void Move( long nHorzMove, long nVertMove );
void Translate( const Point& rTrans );
void Scale( double fScaleX, double fScaleY );
@@ -212,7 +201,6 @@ public:
void Insert( sal_uInt16 nPos, const Point& rPt, PolyFlags eFlags = POLY_NORMAL );
void Insert( sal_uInt16 nPos, const Polygon& rPoly );
- void Remove( sal_uInt16 nPos, sal_uInt16 nCount );
const Point& operator[]( sal_uInt16 nPos ) const { return GetPoint( nPos ); }
Point& operator[]( sal_uInt16 nPos );
@@ -309,9 +297,6 @@ public:
void Scale( double fScaleX, double fScaleY );
void Rotate( const Point& rCenter, double fSin, double fCos );
void Rotate( const Point& rCenter, sal_uInt16 nAngle10 );
- void SlantX( long nYRef, double fSin, double fCos );
- void SlantY( long nXRef, double fSin, double fCos );
- void Distort( const Rectangle& rRefRect, const Polygon& rDistortedRect );
const Polygon& operator[]( sal_uInt16 nPos ) const { return GetObject( nPos ); }
Polygon& operator[]( sal_uInt16 nPos );
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index bd7b5c0..ad650bd 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -676,27 +676,6 @@ Polygon::~Polygon()
// -----------------------------------------------------------------------
-Point* Polygon::ImplGetPointAry()
-{
- DBG_CHKTHIS( Polygon, NULL );
-
- ImplMakeUnique();
- return (Point*)mpImplPolygon->mpPointAry;
-}
-
-// -----------------------------------------------------------------------
-
-sal_uInt8* Polygon::ImplGetFlagAry()
-{
- DBG_CHKTHIS( Polygon, NULL );
-
- ImplMakeUnique();
- mpImplPolygon->ImplCreateFlagArray();
- return mpImplPolygon->mpFlagAry;
-}
-
-// -----------------------------------------------------------------------
-
const Point* Polygon::GetConstPointAry() const
{
DBG_CHKTHIS( Polygon, NULL );
@@ -773,32 +752,6 @@ sal_Bool Polygon::HasFlags() const
// -----------------------------------------------------------------------
-sal_Bool Polygon::IsControl(sal_uInt16 nPos) const
-{
- DBG_CHKTHIS( Polygon, NULL );
- DBG_ASSERT( nPos < mpImplPolygon->mnPoints,
- "Polygon::GetFlags(): nPos >= nPoints" );
- PolyFlags eFlags = mpImplPolygon->mpFlagAry ?
- (PolyFlags) mpImplPolygon->mpFlagAry[ nPos ] : POLY_NORMAL;
-
- return( POLY_CONTROL == eFlags );
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool Polygon::IsSmooth(sal_uInt16 nPos) const
-{
- DBG_CHKTHIS( Polygon, NULL );
- DBG_ASSERT( nPos < mpImplPolygon->mnPoints,
- "Polygon::GetFlags(): nPos >= nPoints" );
- PolyFlags eFlags = mpImplPolygon->mpFlagAry ?
- (PolyFlags) mpImplPolygon->mpFlagAry[ nPos ] : POLY_NORMAL;
-
- return( ( POLY_SMOOTH == eFlags ) || ( POLY_SYMMTR == eFlags ) );
-}
-
-// -----------------------------------------------------------------------
-
sal_Bool Polygon::IsRect() const
{
sal_Bool bIsRect = sal_False;
@@ -1087,38 +1040,6 @@ void Polygon::AdaptiveSubdivide( Polygon& rResult, const double d ) const
// -----------------------------------------------------------------------
-void Polygon::GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const
-{
- const PolyPolygon aTmp( *this );
- aTmp.GetIntersection( rPolyPoly, rResult );
-}
-
-// -----------------------------------------------------------------------
-
-void Polygon::GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const
-{
- const PolyPolygon aTmp( *this );
- aTmp.GetUnion( rPolyPoly, rResult );
-}
-
-// -----------------------------------------------------------------------
-
-void Polygon::GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const
-{
- const PolyPolygon aTmp( *this );
- aTmp.GetDifference( rPolyPoly, rResult );
-}
-
-// -----------------------------------------------------------------------
-
-void Polygon::GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const
-{
- const PolyPolygon aTmp( *this );
- aTmp.GetXOR( rPolyPoly, rResult );
-}
-
-// -----------------------------------------------------------------------
-
void Polygon::ImplReduceEdges( Polygon& rPoly, const double& rArea, sal_uInt16 nPercent )
{
const double fBound = 2000.0 * ( 100 - nPercent ) * 0.01;
@@ -1654,14 +1575,6 @@ Rectangle Polygon::GetBoundRect() const
// -----------------------------------------------------------------------
-double Polygon::GetArea() const
-{
- const double fArea = GetSignedArea();
- return( ( fArea < 0.0 ) ? -fArea : fArea );
-}
-
-// -----------------------------------------------------------------------
-
double Polygon::GetSignedArea() const
{
DBG_CHKTHIS( Polygon, NULL );
@@ -1791,18 +1704,6 @@ void Polygon::Insert( sal_uInt16 nPos, const Polygon& rPoly )
// -----------------------------------------------------------------------
-void Polygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount )
-{
- DBG_CHKTHIS( Polygon, NULL );
- if( nCount && ( nPos < mpImplPolygon->mnPoints ) )
- {
- ImplMakeUnique();
- mpImplPolygon->ImplRemove( nPos, nCount );
- }
-}
-
-// -----------------------------------------------------------------------
-
Point& Polygon::operator[]( sal_uInt16 nPos )
{
DBG_CHKTHIS( Polygon, NULL );
diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index fbb624e..6feee19 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -541,61 +541,6 @@ void PolyPolygon::Rotate( const Point& rCenter, double fSin, double fCos )
// -----------------------------------------------------------------------
-void PolyPolygon::SlantX( long nYRef, double fSin, double fCos )
-{
- DBG_CHKTHIS( PolyPolygon, NULL );
-
- // Referenzcounter beruecksichtigen
- if( mpImplPolyPolygon->mnRefCount > 1 )
- {
- mpImplPolyPolygon->mnRefCount--;
- mpImplPolyPolygon = new ImplPolyPolygon( *mpImplPolyPolygon );
- }
-
- // Punkte verschieben
- for ( sal_uInt16 i = 0, nCount = mpImplPolyPolygon->mnCount; i < nCount; i++ )
- mpImplPolyPolygon->mpPolyAry[ i ]->SlantX( nYRef, fSin, fCos );
-}
-
-// -----------------------------------------------------------------------
-
-void PolyPolygon::SlantY( long nXRef, double fSin, double fCos )
-{
- DBG_CHKTHIS( PolyPolygon, NULL );
-
- // Referenzcounter beruecksichtigen
- if( mpImplPolyPolygon->mnRefCount > 1 )
- {
- mpImplPolyPolygon->mnRefCount--;
- mpImplPolyPolygon = new ImplPolyPolygon( *mpImplPolyPolygon );
- }
-
- // Punkte verschieben
- for ( sal_uInt16 i = 0, nCount = mpImplPolyPolygon->mnCount; i < nCount; i++ )
- mpImplPolyPolygon->mpPolyAry[ i ]->SlantY( nXRef, fSin, fCos );
-}
-
-// -----------------------------------------------------------------------
-
-void PolyPolygon::Distort( const Rectangle& rRefRect, const Polygon& rDistortedRect )
-{
- DBG_CHKTHIS( PolyPolygon, NULL );
-
- // Referenzcounter beruecksichtigen
- if( mpImplPolyPolygon->mnRefCount > 1 )
- {
- mpImplPolyPolygon->mnRefCount--;
- mpImplPolyPolygon = new ImplPolyPolygon( *mpImplPolyPolygon );
- }
-
- // Punkte verschieben
- for ( sal_uInt16 i = 0, nCount = mpImplPolyPolygon->mnCount; i < nCount; i++ )
- mpImplPolyPolygon->mpPolyAry[ i ]->Distort( rRefRect, rDistortedRect );
-}
-
-
-// -----------------------------------------------------------------------
-
void PolyPolygon::Clip( const Rectangle& rRect )
{
// Polygon-Clippen
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 01393b5..b3f2fe1 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -215,7 +215,6 @@ public:
virtual bool IsSpacingGlyph( sal_GlyphId ) const;
// reference counting
- void Reference() const;
void Release() const;
// used by glyph+font+script fallback
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index b209cde..9b2a1b0 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -141,7 +141,6 @@ public:
Pixel GetTCPixel( SalColor nColor ) const;
SalColor GetTCColor( Pixel nPixel ) const;
- sal_Bool Convert( int &n0, int &n1, int &n2, int &n3 ); // 32bit
sal_Bool Convert( int &n0, int &n1, int &n2 ); // 24bit
};
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index a213fe6..352c546 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -150,7 +150,6 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
void Minimize();
void Maximize();
void Restore();
- void SetWindowGravity (int nGravity ) const;
void RestackChildren( XLIB_Window* pTopLevelWindows, int nTopLevelWindows );
void RestackChildren();
@@ -201,8 +200,6 @@ public:
inline sal_Bool IsCaptured() const { return nCaptured_ == 1; }
#if !defined(__synchronous_extinput__)
void HandleExtTextEvent (XClientMessageEvent *pEvent);
- void PostExtTextEvent (sal_uInt16 nExtTextEventType,
- void *pExtTextEvent);
#endif
bool IsOverrideRedirect() const;
bool IsChildWindow() const { return (nStyle_ & (SAL_FRAME_STYLE_PLUG|SAL_FRAME_STYLE_SYSTEMCHILD)) != 0; }
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index e9aee36..74188d8 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -623,14 +623,6 @@ void SalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
// -----------------------------------------------------------------------
-void SalLayout::Reference() const
-{
- // TODO: protect when multiple threads can access this
- ++mnRefCount;
-}
-
-// -----------------------------------------------------------------------
-
void SalLayout::Release() const
{
// TODO: protect when multiple threads can access this
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index ff0f606..4bb32ed 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2765,41 +2765,6 @@ SalVisual::~SalVisual()
#define SALCOLOR RGB
#define SALCOLORREVERSE BGR
-sal_Bool SalVisual::Convert( int &n0, int &n1, int &n2, int &n3 )
-{
- int n;
-
- switch( GetMode() )
- {
- case otherSalRGB:
- return sal_False;
- case SALCOLOR:
- break;
- case SALCOLORREVERSE:
- case RBG:
- case BRG:
- case GBR:
- case GRB:
- return Convert( n0, n1, n2 );
- case RGBA:
- n = n0;
- n0 = n1;
- n1 = n2;
- n2 = n3;
- n3 = n;
- break;
- case BGRA:
- case RBGA:
- case BRGA:
- case GBRA:
- case GRBA:
- default:
- fprintf( stderr, "SalVisual::Convert %d\n", GetMode() );
- abort();
- }
- return sal_True;
-}
-
sal_Bool SalVisual::Convert( int &n0, int &n1, int &n2 )
{
int n;
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index f1891a2..35c124c 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -1408,24 +1408,6 @@ void X11SalFrame::GetClientSize( long &rWidth, long &rHeight )
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-void X11SalFrame::SetWindowGravity (int nGravity) const
-{
- if( ! IsChildWindow() )
- {
- XSizeHints* pHint = XAllocSizeHints();
- long nFlag;
-
- XGetWMNormalHints (GetXDisplay(), GetShellWindow(), pHint, &nFlag);
- pHint->flags |= PWinGravity;
- pHint->win_gravity = nGravity;
-
- XSetWMNormalHints (GetXDisplay(), GetShellWindow(), pHint);
- XSync (GetXDisplay(), False);
-
- XFree (pHint);
- }
-}
-
void X11SalFrame::Center( )
{
int nX, nY, nScreenWidth, nScreenHeight;
@@ -2477,35 +2459,6 @@ void X11SalFrame::SetPointerPos(long nX, long nY)
// delay handling of extended text input
#if !defined(__synchronous_extinput__)
void
-X11SalFrame::PostExtTextEvent (sal_uInt16 nExtTextEventType, void *pExtTextEvent)
-{
- XLIB_Window nFocusWindow = GetWindow();
- Atom nEventAtom = GetDisplay()->getWMAdaptor()->getAtom( WMAdaptor::SAL_EXTTEXTEVENT );
-
- XEvent aEvent;
- aEvent.xclient.type = ClientMessage;
- aEvent.xclient.serial = 0;
- aEvent.xclient.send_event = True;
- aEvent.xclient.display = GetXDisplay();
- aEvent.xclient.window = nFocusWindow;
- aEvent.xclient.message_type = nEventAtom;
- aEvent.xclient.format = 32;
-
-#if SAL_TYPES_SIZEOFLONG > 4
- aEvent.xclient.data.l[0] = (sal_uInt32)((long)pExtTextEvent & 0xffffffff);
- aEvent.xclient.data.l[1] = (sal_uInt32)((long)pExtTextEvent >> 32);
-#else
- aEvent.xclient.data.l[0] = (sal_uInt32)((long)pExtTextEvent);
- aEvent.xclient.data.l[1] = 0;
-#endif
- aEvent.xclient.data.l[2] = (sal_uInt32)nExtTextEventType;
- aEvent.xclient.data.l[3] = 0;
- aEvent.xclient.data.l[4] = 0;
-
- XPutBackEvent( GetXDisplay(), &aEvent );
-}
-
-void
X11SalFrame::HandleExtTextEvent (XClientMessageEvent *pEvent)
{
#if SAL_TYPES_SIZEOFLONG > 4
More information about the Libreoffice-commits
mailing list