[Libreoffice-commits] .: 2 commits - svl/inc svl/source toolkit/inc tools/inc tools/source vcl/inc vcl/source vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Aug 5 02:04:40 PDT 2011
svl/inc/svl/filerec.hxx | 8 --
svl/inc/svl/zforlist.hxx | 4 -
svl/source/filerec/filerec.cxx | 93 --------------------------------
svl/source/numbers/zforlist.cxx | 6 --
toolkit/inc/layout/layout.hxx | 2
tools/inc/poly.h | 1
tools/inc/tools/fsys.hxx | 1
tools/inc/tools/poly.hxx | 3 -
tools/source/fsys/unx.cxx | 11 ---
tools/source/fsys/wntmsc.cxx | 11 ---
tools/source/generic/poly.cxx | 113 ----------------------------------------
vcl/inc/unx/saldisp.hxx | 1
vcl/inc/vcl/menu.hxx | 6 --
vcl/source/gdi/textlayout.cxx | 12 ----
vcl/source/window/menu.cxx | 9 ---
vcl/unx/generic/app/saldisp.cxx | 44 ---------------
16 files changed, 4 insertions(+), 321 deletions(-)
New commits:
commit 7d20dd760a1c9a67f3f0b34a4689323b1200a5f6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 5 09:45:14 2011 +0100
declarations still present, though impls gone
diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
index 0832144..de53a46 100644
--- a/toolkit/inc/layout/layout.hxx
+++ b/toolkit/inc/layout/layout.hxx
@@ -137,8 +137,6 @@ public:
PeerHandle GetPeer() const;
Context *getContext();
- void Enable( bool bEnable = true );
- inline void Disable() { Enable( false ); }
void Show( bool bVisible = true );
inline void Hide() { Show( false ); }
void GrabFocus();
commit 3856af3578774360d77cd570d5323d2dbae97844
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 4 22:41:40 2011 +0100
callcatcher: unused methods
diff --git a/svl/inc/svl/filerec.hxx b/svl/inc/svl/filerec.hxx
index 155930e..2f217bd 100644
--- a/svl/inc/svl/filerec.hxx
+++ b/svl/inc/svl/filerec.hxx
@@ -361,9 +361,6 @@ protected:
public:
SfxSingleRecordWriter( SvStream *pStream,
sal_uInt16 nTag, sal_uInt8 nCurVer );
- SfxSingleRecordWriter( SvStream *pStream,
- sal_uInt16 nTag, sal_uInt8 nCurVer,
- sal_uInt32 nSize );
inline void Reset();
@@ -417,7 +414,6 @@ protected:
bool ReadHeader_Impl( sal_uInt16 nTypes );
public:
- SfxSingleRecordReader( SvStream *pStream );
SfxSingleRecordReader( SvStream *pStream, sal_uInt16 nTag );
inline sal_uInt16 GetTag() const;
@@ -489,9 +485,6 @@ protected:
sal_uInt32 nContentSize );
public:
- SfxMultiFixRecordWriter( SvStream *pStream,
- sal_uInt16 nTag, sal_uInt8 nCurVer,
- sal_uInt32 nContentSize );
inline ~SfxMultiFixRecordWriter();
inline void NewContent();
@@ -672,7 +665,6 @@ class SVL_DLLPUBLIC SfxMultiRecordReader: public SfxSingleRecordReader
bool ReadHeader_Impl();
public:
- SfxMultiRecordReader( SvStream *pStream );
SfxMultiRecordReader( SvStream *pStream, sal_uInt16 nTag );
~SfxMultiRecordReader();
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index eef1904..6b07356 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -798,10 +798,6 @@ public:
language/country, used in XML import */
String GetStandardName( LanguageType eLnge );
- /// Skip a NumberFormatter in stream, Chart needs this
- static void SkipNumberFormatterInStream( SvStream& );
-
-
private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager;
::com::sun::star::lang::Locale aLocale;
diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx
index d8beac1..1e154f9 100644
--- a/svl/source/filerec/filerec.cxx
+++ b/svl/source/filerec/filerec.cxx
@@ -285,29 +285,6 @@ SfxSingleRecordWriter::SfxSingleRecordWriter
*pStream << SFX_REC_HEADER( SFX_REC_TYPE_SINGLE, nContentTag, nContentVer);
}
-//-------------------------------------------------------------------------
-
-SfxSingleRecordWriter::SfxSingleRecordWriter
-(
- SvStream* pStream, // Stream, in dem der Record angelegt wird
- sal_uInt16 nContentTag, // Inhalts-Art-Kennung
- sal_uInt8 nContentVer, // Inhalts-Versions-Kennung
- sal_uInt32 nContentSize // Gr"o\se des Inhalts in Bytes
-)
-
-/* [Beschreibung]
-
- Legt in 'pStream' einen 'SfxSingleRecord' an, dessen Content-Gr"o\se
- von vornherein bekannt ist.
-*/
-
-: SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT,
- nContentSize + SFX_REC_HEADERSIZE_SINGLE )
-{
- // Erweiterten Header hinter den des SfxMiniRec schreiben
- *pStream << SFX_REC_HEADER( SFX_REC_TYPE_SINGLE, nContentTag, nContentVer);
-}
-
//=========================================================================
inline bool SfxSingleRecordReader::ReadHeader_Impl( sal_uInt16 nTypes )
@@ -344,29 +321,6 @@ inline bool SfxSingleRecordReader::ReadHeader_Impl( sal_uInt16 nTypes )
//-------------------------------------------------------------------------
-SfxSingleRecordReader::SfxSingleRecordReader( SvStream *pStream )
-: SfxMiniRecordReader()
-{
- // Startposition merken, um im Fehlerfall zur"uck-seeken zu k"onnen
- #ifdef DBG_UTIL
- sal_uInt32 nStartPos = pStream->Tell();
- DBG( DbgOutf( "SfxFileRec: reading record at %ul", nStartPos ) );
- #endif
-
- // Basisklasse initialisieren (nicht via Ctor, da der nur MiniRecs akzept.)
- Construct_Impl( pStream );
-
- // nur Header mit korrektem Record-Type akzeptieren
- if ( !ReadHeader_Impl( SFX_REC_TYPE_SINGLE ) )
- {
- // Error-Code setzen und zur"uck-seeken
- pStream->SeekRel( - SFX_REC_HEADERSIZE_SINGLE );
- pStream->SetError( ERRCODE_IO_WRONGFORMAT );
- }
-}
-
-//-------------------------------------------------------------------------
-
SfxSingleRecordReader::SfxSingleRecordReader( SvStream *pStream, sal_uInt16 nTag )
{
// StartPos merken, um im Fehlerfall zur"uck-seeken zu k"onnen
@@ -473,30 +427,6 @@ SfxMultiFixRecordWriter::SfxMultiFixRecordWriter
//------------------------------------------------------------------------
-SfxMultiFixRecordWriter::SfxMultiFixRecordWriter
-(
- SvStream* pStream, // Stream, in dem der Record angelegt wird
- sal_uInt16 nContentTag, // Content-Art-Kennung
- sal_uInt8 nContentVer, // Content-Versions-Kennung
- sal_uInt32 // Gr"o\se jedes einzelnen Contents in Bytes
-)
-
-/* [Beschreibung]
-
- Legt in 'pStream' einen 'SfxMultiFixRecord' an, dessen Content-Gr"o\se
- konstant und von vornherein bekannt ist.
-*/
-
-: SfxSingleRecordWriter( SFX_REC_TYPE_FIXSIZE,
- pStream, nContentTag, nContentVer ),
- _nContentCount( 0 )
-{
- // Platz f"ur eigenen Header
- pStream->SeekRel( + SFX_REC_HEADERSIZE_MULTI );
-}
-
-//------------------------------------------------------------------------
-
sal_uInt32 SfxMultiFixRecordWriter::Close( bool bSeekToEndOfRec )
// siehe <SfxMiniRecordWriter>
@@ -738,29 +668,6 @@ bool SfxMultiRecordReader::ReadHeader_Impl()
//-------------------------------------------------------------------------
-SfxMultiRecordReader::SfxMultiRecordReader( SvStream *pStream )
- : _pContentOfs(0)
- , _nContentSize(0)
- , _nContentCount(0)
- , _nContentNo(0)
-{
- // Position im Stream merken, um im Fehlerfall zur"uck-seeken zu k"onnen
- _nStartPos = pStream->Tell();
-
- // Basisklasse konstruieren (normaler Ctor w"urde nur SingleRecs lesen)
- SfxSingleRecordReader::Construct_Impl( pStream );
-
- // Header der Basisklasse lesen
- if ( !SfxSingleRecordReader::ReadHeader_Impl( SFX_REC_TYPE_FIXSIZE |
- SFX_REC_TYPE_VARSIZE | SFX_REC_TYPE_VARSIZE_RELOC |
- SFX_REC_TYPE_MIXTAGS | SFX_REC_TYPE_MIXTAGS_RELOC ) ||
- !ReadHeader_Impl() )
- // als ung"ultig markieren und zur"uck-seeken
- SetInvalid_Impl( _nStartPos );
-}
-
-//-------------------------------------------------------------------------
-
SfxMultiRecordReader::SfxMultiRecordReader( SvStream *pStream, sal_uInt16 nTag )
: _nContentNo(0)
{
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index bc0df6a..1ed6b75 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -940,12 +940,6 @@ sal_Bool SvNumberFormatter::Save( SvStream& rStream ) const
return sal_True;
}
-// static
-void SvNumberFormatter::SkipNumberFormatterInStream( SvStream& rStream )
-{
- ImpSvNumMultipleReadHeader::Skip( rStream );
-}
-
void SvNumberFormatter::GetUsedLanguages( SvUShorts& rList )
{
rList.Remove( 0, rList.Count() );
diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index 33ba895..6eed4a5 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -61,7 +61,6 @@ public:
void ImplSetSize( sal_uInt16 nSize, sal_Bool bResize = sal_True );
void ImplCreateFlagArray();
void ImplSplit( sal_uInt16 nPos, sal_uInt16 nSpace, ImplPolygon* pInitPoly = NULL );
- void ImplRemove( sal_uInt16 nPos, sal_uInt16 nCount );
};
// -------------------
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index e176c30..f9acc49 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -348,7 +348,6 @@ public:
static String GetAccessDelimiter( FSysPathStyle eFormatter = FSYS_STYLE_HOST );
static String GetSearchDelimiter( FSysPathStyle eFormatter = FSYS_STYLE_HOST );
- static FSysPathStyle GetPathStyle();
};
// --------------
diff --git a/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx
index e77ef8e..d0efe71 100644
--- a/tools/inc/tools/poly.hxx
+++ b/tools/inc/tools/poly.hxx
@@ -195,9 +195,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 );
void Insert( sal_uInt16 nPos, const Point& rPt, PolyFlags eFlags = POLY_NORMAL );
void Insert( sal_uInt16 nPos, const Polygon& rPoly );
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index 92eb913..a3461d9 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -474,17 +474,6 @@ const char *TempDirImpl( char *pBuf )
/*************************************************************************
|*
-|* DirEntry::GetPathStyle() const
-|*
-*************************************************************************/
-
-FSysPathStyle DirEntry::GetPathStyle()
-{
- return FSYS_STYLE_UNX;
-}
-
-/*************************************************************************
-|*
|* FileStat::SetDateTime
|*
*************************************************************************/
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx
index ab783b4..3d8bd91 100644
--- a/tools/source/fsys/wntmsc.cxx
+++ b/tools/source/fsys/wntmsc.cxx
@@ -110,17 +110,6 @@ int closedir( DIR *pDir )
/*************************************************************************
|*
-|* DirEntry::GetPathStyle() const
-|*
-*************************************************************************/
-
-FSysPathStyle DirEntry::GetPathStyle()
-{
- return FSYS_STYLE_NTFS;
-}
-
-/*************************************************************************
-|*
|* DirEntry::ToAbs()
|*
*************************************************************************/
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index ad650bd..1e7cafc 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -303,41 +303,6 @@ void ImplPolygon::ImplSplit( sal_uInt16 nPos, sal_uInt16 nSpace, ImplPolygon* pI
// -----------------------------------------------------------------------
-void ImplPolygon::ImplRemove( sal_uInt16 nPos, sal_uInt16 nCount )
-{
- const sal_uInt16 nRemoveCount = Min( (sal_uInt16) ( mnPoints - nPos ), (sal_uInt16) nCount );
-
- if( nRemoveCount )
- {
- const sal_uInt16 nNewSize = mnPoints - nRemoveCount;
- const sal_uInt16 nSecPos = nPos + nRemoveCount;
- const sal_uInt16 nRest = mnPoints - nSecPos;
-
- Point* pNewAry = (Point*) new char[ (sal_uIntPtr) nNewSize * sizeof( Point ) ];
-
- memcpy( pNewAry, mpPointAry, nPos * sizeof( Point ) );
- memcpy( pNewAry + nPos, mpPointAry + nSecPos, nRest * sizeof( Point ) );
-
- delete[] (char*) mpPointAry;
-
- // ggf. FlagArray beruecksichtigen
- if( mpFlagAry )
- {
- sal_uInt8* pNewFlagAry = new sal_uInt8[ nNewSize ];
-
- memcpy( pNewFlagAry, mpFlagAry, nPos );
- memcpy( pNewFlagAry + nPos, mpFlagAry + nSecPos, nRest );
- delete[] mpFlagAry;
- mpFlagAry = pNewFlagAry;
- }
-
- mpPointAry = pNewAry;
- mnPoints = nNewSize;
- }
-}
-
-// -----------------------------------------------------------------------
-
void ImplPolygon::ImplCreateFlagArray()
{
if( !mpFlagAry )
@@ -1225,84 +1190,6 @@ void Polygon::Rotate( const Point& rCenter, double fSin, double fCos )
// -----------------------------------------------------------------------
-void Polygon::SlantX( long nYRef, double fSin, double fCos )
-{
- DBG_CHKTHIS( Polygon, NULL );
- ImplMakeUnique();
-
- for( sal_uInt16 i = 0, nCount = mpImplPolygon->mnPoints; i < nCount; i++ )
- {
- Point& rPnt = mpImplPolygon->mpPointAry[ i ];
- const long nDy = rPnt.Y() - nYRef;
-
- rPnt.X() += (long)( fSin * nDy );
- rPnt.Y() = nYRef + (long)( fCos * nDy );
- }
-}
-
-// -----------------------------------------------------------------------
-
-void Polygon::SlantY( long nXRef, double fSin, double fCos )
-{
- DBG_CHKTHIS( Polygon, NULL );
- ImplMakeUnique();
-
- for( sal_uInt16 i = 0, nCount = mpImplPolygon->mnPoints; i < nCount; i++ )
- {
- Point& rPnt = mpImplPolygon->mpPointAry[ i ];
- const long nDx = rPnt.X() - nXRef;
-
- rPnt.X() = nXRef + (long)( fCos * nDx );
- rPnt.Y() -= (long)( fSin * nDx );
- }
-}
-
-// -----------------------------------------------------------------------
-
-void Polygon::Distort( const Rectangle& rRefRect, const Polygon& rDistortedRect )
-{
- DBG_CHKTHIS( Polygon, NULL );
- ImplMakeUnique();
-
- long Xr, Wr, X1, X2, X3, X4;
- long Yr, Hr, Y1, Y2, Y3, Y4;
- double fTx, fTy, fUx, fUy;
-
- Xr = rRefRect.Left();
- Yr = rRefRect.Top();
- Wr = rRefRect.GetWidth();
- Hr = rRefRect.GetHeight();
-
- if( Wr && Hr )
- {
- DBG_ASSERT( rDistortedRect.mpImplPolygon->mnPoints >= 4, "Distort rect too small!" );
-
- X1 = rDistortedRect[0].X();
- Y1 = rDistortedRect[0].Y();
- X2 = rDistortedRect[1].X();
- Y2 = rDistortedRect[1].Y();
- X3 = rDistortedRect[3].X();
- Y3 = rDistortedRect[3].Y();
- X4 = rDistortedRect[2].X();
- Y4 = rDistortedRect[2].Y();
-
- for( sal_uInt16 i = 0, nCount = mpImplPolygon->mnPoints; i < nCount; i++ )
- {
- Point& rPnt = mpImplPolygon->mpPointAry[ i ];
-
- fTx = (double)( rPnt.X() - Xr) / Wr;
- fTy = (double)( rPnt.Y() - Yr) / Hr;
- fUx = 1.0 - fTx;
- fUy = 1.0 - fTy;
-
- rPnt.X() = (long) ( fUy * (fUx * X1 + fTx * X2) + fTy * (fUx * X3 + fTx * X4) );
- rPnt.Y() = (long) ( fUx * (fUy * Y1 + fTy * Y3) + fTx * (fUy * Y2 + fTy * Y4) );
- }
- }
-}
-
-// -----------------------------------------------------------------------
-
class ImplPointFilter
{
public:
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 9b2a1b0..5ceb7d8 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 ); // 24bit
};
// -=-= SalColormap =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index 80aa68d..ebdbd90 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -212,9 +212,10 @@ public:
Menu();
Menu( sal_Bool bMenuBar );
SAL_DLLPRIVATE Window* ImplGetWindow() const { return pWindow; }
+#if defined(QUARTZ)
// ImplSelectWithStart() is used in vcl/aqua/source/window/salnsmenu.mm
SAL_DLLPRIVATE void ImplSelectWithStart( Menu* pStartMenu = NULL );
-
+#endif
public:
virtual ~Menu();
@@ -351,9 +352,6 @@ public:
// -1 is returned if no character is at that point
// if an index is found the corresponding item id is filled in (else 0)
long GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const;
- // returns the interval [start,end] of line nLine
- // returns [-1,-1] for an invalid line
- Pair GetLineStartEnd( long nLine ) const;
// returns the bounding rectangle for an item at pos nItemPos
Rectangle GetBoundingRectangle( sal_uInt16 nItemPos ) const;
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 39c13ff..489856f 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -295,18 +295,6 @@ namespace vcl
}
//--------------------------------------------------------------------
- namespace
- {
- long zoomBy( long _value, const Fraction& _zoom )
- {
- double n = (double)_value;
- n *= (double)_zoom.GetNumerator();
- n /= (double)_zoom.GetDenominator();
- return (long)::rtl::math::round( n );
- }
- }
-
- //--------------------------------------------------------------------
Rectangle ReferenceDeviceTextLayout::DrawText( const Rectangle& _rRect, const XubString& _rText, sal_uInt16 _nStyle, MetricVector* _pVector, String* _pDisplayText )
{
if ( !_rText.Len() )
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index a4ca8d5..4ada3bc 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1154,6 +1154,7 @@ void Menu::Select()
}
}
+#if defined(QUARTZ)
void Menu::ImplSelectWithStart( Menu* pSMenu )
{
Menu* pOldStartedFrom = pStartedFrom;
@@ -1164,6 +1165,7 @@ void Menu::ImplSelectWithStart( Menu* pSMenu )
pOldStartedFrom->pStartedFrom = pOldStartedStarted;
pStartedFrom = pOldStartedFrom;
}
+#endif
void Menu::RequestHelp( const HelpEvent& )
{
@@ -3191,13 +3193,6 @@ long Menu::GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const
return nIndex;
}
-Pair Menu::GetLineStartEnd( long nLine ) const
-{
- if( ! mpLayoutData )
- ImplFillLayoutData();
- return mpLayoutData ? mpLayoutData->GetLineStartEnd( nLine ) : Pair( -1, -1 );
-}
-
Rectangle Menu::GetBoundingRectangle( sal_uInt16 nPos ) const
{
Rectangle aRet;
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 4bb32ed..42523a1 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2765,50 +2765,6 @@ SalVisual::~SalVisual()
#define SALCOLOR RGB
#define SALCOLORREVERSE BGR
-sal_Bool SalVisual::Convert( int &n0, int &n1, int &n2 )
-{
- int n;
-
- switch( GetMode() )
- {
- case otherSalRGB:
- return sal_False;
- case SALCOLOR:
- break;
- case RBG:
- n = n0;
- n0 = n1;
- n1 = n;
- break;
- case GRB:
- n = n1;
- n1 = n2;
- n2 = n;
- break;
- case SALCOLORREVERSE:
- n = n0;
- n0 = n2;
- n2 = n;
- break;
- case BRG:
- n = n0;
- n0 = n1;
- n1 = n2;
- n2 = n;
- break;
- case GBR:
- n = n2;
- n2 = n1;
- n1 = n0;
- n0 = n;
- break;
- default:
- fprintf( stderr, "SalVisual::Convert %d\n", GetMode() );
- abort();
- }
- return sal_True;
-}
-
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
SalColor SalVisual::GetTCColor( Pixel nPixel ) const
{
More information about the Libreoffice-commits
mailing list