[Libreoffice-commits] .: 2 commits - sot/source vcl/inc vcl/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Fri Jul 29 02:11:41 PDT 2011
sot/source/base/formats.cxx | 16 ---------
vcl/inc/vcl/alpha.hxx | 4 --
vcl/inc/vcl/bitmap.hxx | 2 -
vcl/inc/vcl/bmpacc.hxx | 8 ----
vcl/inc/vcl/cursor.hxx | 3 -
vcl/inc/vcl/floatwin.hxx | 1
vcl/source/fontsubset/cff.cxx | 13 -------
vcl/source/gdi/bitmap.cxx | 14 --------
vcl/source/gdi/bmpacc.cxx | 23 -------------
vcl/source/gdi/bmpacc3.cxx | 70 -----------------------------------------
vcl/source/window/cursor.cxx | 33 -------------------
vcl/source/window/floatwin.cxx | 9 -----
12 files changed, 196 deletions(-)
New commits:
commit b9d28dc6bbd71a5efbd9d6e743b44af97cc34a53
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Jul 28 21:16:11 2011 +0200
Get rid of these non-printable chars
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index ca4a9ed..961c4f9 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -98,7 +98,6 @@ static SotAction_Impl const aEmptyArr[] = \
{ 0xffff, 0, 0 } \
};
-/* */
#define EXCHG_DEST_DOC_OLEOBJ_ARRAY \
static SotAction_Impl const aEXCHG_DEST_DOC_OLEOBJ_Def[] = \
{ \
@@ -129,7 +128,6 @@ static SotAction_Impl const aEXCHG_DEST_DOC_OLEOBJ_Link[] = \
{ 0xffff, 0, 0 } \
};
-/* */
#define EXCHG_DEST_CHARTDOC_OLEOBJ_ARRAY \
static SotAction_Impl const aEXCHG_DEST_CHARTDOC_OLEOBJ_Def[] = \
{ \
@@ -160,7 +158,6 @@ static SotAction_Impl const aEXCHG_DEST_CHARTDOC_OLEOBJ_Link[] = \
{ 0xffff, 0, 0 } \
};
-/* */
#define EXCHG_DEST_DOC_TEXTFRAME_ARRAY \
static SotAction_Impl const aEXCHG_DEST_DOC_TEXTFRAME_Def[] = \
{ \
@@ -342,7 +339,6 @@ static SotAction_Impl const aEXCHG_DEST_DOC_TEXTFRAME_WEB_Link[] = \
{ 0xffff, 0, 0 } \
};
-/* */
#define EXCHG_DEST_DOC_GRAPHOBJ_ARRAY \
static SotAction_Impl const aEXCHG_DEST_DOC_GRAPHOBJ_Def[] = \
{ \
@@ -401,7 +397,6 @@ static SotAction_Impl const aEXCHG_DEST_DOC_GRAPHOBJ_Link[] = \
{ 0xffff, 0, 0 } \
};
-/* */
#define EXCHG_DEST_DOC_LNKD_GRAPHOBJ_ARRAY \
static SotAction_Impl const aEXCHG_DEST_DOC_LNKD_GRAPHOBJ_Def[] = \
{ \
@@ -460,7 +455,6 @@ static SotAction_Impl const aEXCHG_DEST_DOC_LNKD_GRAPHOBJ_Link[] =\
{ 0xffff, 0, 0 } \
};
-/* */
#define EXCHG_DEST_DOC_GRAPH_W_IMAP_ARRAY \
static SotAction_Impl const aEXCHG_DEST_DOC_GRAPH_W_IMAP_Def[] = \
{ \
@@ -520,7 +514,6 @@ static SotAction_Impl const aEXCHG_DEST_DOC_GRAPH_W_IMAP_Link[] = \
{ 0xffff, 0, 0 } \
};
-/* */
#define EXCHG_DEST_DOC_LNKD_GRAPH_W_IMAP_ARRAY \
static SotAction_Impl const aEXCHG_DEST_DOC_LNKD_GRAPH_W_IMAP_Def[] =\
{ \
@@ -581,7 +574,6 @@ static SotAction_Impl const aEXCHG_DEST_DOC_LNKD_GRAPH_W_IMAP_Link[] =\
};
-/* */
#define EXCHG_DEST_DOC_IMAPREGION_ARRAY \
static SotAction_Impl const aEXCHG_DEST_DOC_IMAPREGION_Def[] = \
{ \
@@ -601,7 +593,6 @@ static SotAction_Impl const aEXCHG_DEST_DOC_IMAPREGION_Copy[] = \
};
-/* */
#define EXCHG_DEST_DOC_DRAWOBJ_ARRAY \
static SotAction_Impl const aEXCHG_DEST_DOC_DRAWOBJ_Def[] = \
{ \
@@ -661,7 +652,6 @@ static SotAction_Impl const aEXCHG_DEST_DOC_DRAWOBJ_Link[] = \
};
-/* */
#define EXCHG_DEST_DOC_URLBUTTON_ARRAY \
static SotAction_Impl const aEXCHG_DEST_DOC_URLBUTTON_Def[] = \
{ \
@@ -698,7 +688,6 @@ static SotAction_Impl const aEXCHG_DEST_DOC_URLBUTTON_Copy[] = \
};
-/* */
#define EXCHG_DEST_DOC_URLFIELD_ARRAY \
static SotAction_Impl const aEXCHG_DEST_DOC_URLFIELD_Def[] = \
{ \
@@ -722,7 +711,6 @@ static SotAction_Impl const aEXCHG_DEST_DOC_URLFIELD_Link[] = \
{ 0xffff, 0, 0 } \
};
-/* */
#define EXCHG_DEST_DOC_GROUPOBJ_ARRAY \
static SotAction_Impl const aEXCHG_DEST_DOC_GROUPOBJ_Def[] = \
{ \
@@ -782,7 +770,6 @@ static SotAction_Impl const aEXCHG_DEST_DOC_GROUPOBJ_Link[] = \
};
-/* */
#define EXCHG_DEST_SWDOC_FREE_AREA_ARRAY \
static SotAction_Impl const aEXCHG_DEST_SWDOC_FREE_AREA_Def[] = \
{ \
@@ -963,7 +950,6 @@ static SotAction_Impl const aEXCHG_DEST_SWDOC_FREE_AREA_WEB_Link[] = \
};
-/* */
#define EXCHG_DEST_SCDOC_FREE_AREA_ARRAY \
static SotAction_Impl const aEXCHG_DEST_SCDOC_FREE_AREA_Def[] = \
{ \
@@ -1056,7 +1042,6 @@ static SotAction_Impl const aEXCHG_DEST_SCDOC_FREE_AREA_Link[] = \
};
-/* */
#define EXCHG_DEST_SDDOC_FREE_AREA_ARRAY \
static SotAction_Impl const aEXCHG_DEST_SDDOC_FREE_AREA_Def[] = \
{ \
@@ -1143,7 +1128,6 @@ static SotAction_Impl const aEXCHG_DEST_SDDOC_FREE_AREA_Link[] = \
};
-/* */
#define IMPL_DATA_ARRAY_1 \
EXCHG_EMPYT_ARRAY \
commit d03c2f51ffe47632d2961b2e03eff131e740e010
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Jul 28 21:12:38 2011 +0200
callcatcher: remove unused methods
diff --git a/vcl/inc/vcl/alpha.hxx b/vcl/inc/vcl/alpha.hxx
index 6e51a8a..45eed35 100644
--- a/vcl/inc/vcl/alpha.hxx
+++ b/vcl/inc/vcl/alpha.hxx
@@ -98,10 +98,6 @@ public:
{
return Bitmap::GetSizePixel();
}
- void SetSizePixel( const Size& rNewSize )
- {
- Bitmap::SetSizePixel( rNewSize );
- }
sal_uLong GetSizeBytes() const
{
diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx
index 1cd97d1..ee1233d 100644
--- a/vcl/inc/vcl/bitmap.hxx
+++ b/vcl/inc/vcl/bitmap.hxx
@@ -328,14 +328,12 @@ public:
inline void SetPrefSize( const Size& rSize );
Size GetSizePixel() const;
- void SetSizePixel( const Size& rNewSize );
/**
* The pixel size of a bitmap's source (e.g. an image file)
* and the pixel size of its resulting bitmap can differ,
* e.g. when the image reader has its preview mode enabled.
*/
- Size GetSourceSizePixel() const;
void SetSourceSizePixel( const Size& );
diff --git a/vcl/inc/vcl/bmpacc.hxx b/vcl/inc/vcl/bmpacc.hxx
index c91277e..1b3fc78 100644
--- a/vcl/inc/vcl/bmpacc.hxx
+++ b/vcl/inc/vcl/bmpacc.hxx
@@ -128,9 +128,6 @@ SAL_DLLPRIVATE BitmapBuffer* ImplGetBitmapBuffer() const { return mpBuffer; }
protected:
BitmapReadAccess( Bitmap& rBitmap, sal_Bool bModify );
- void Flush();
- void ReAccess( sal_Bool bModify );
-
public:
BitmapReadAccess( Bitmap& rBitmap );
virtual ~BitmapReadAccess();
@@ -194,13 +191,9 @@ public:
inline void SetPixel( long nY, long nX, const BitmapColor& rBitmapColor );
- void SetLineColor();
void SetLineColor( const Color& rColor );
- Color GetLineColor() const;
- void SetFillColor();
void SetFillColor( const Color& rColor );
- Color GetFillColor() const;
void Erase( const Color& rColor );
@@ -213,7 +206,6 @@ public:
void DrawPolygon( const Polygon& rPoly );
void FillPolyPolygon( const PolyPolygon& rPoly );
- void DrawPolyPolygon( const PolyPolygon& rPolyPoly );
private:
diff --git a/vcl/inc/vcl/cursor.hxx b/vcl/inc/vcl/cursor.hxx
index 0282a3a..adadcae 100644
--- a/vcl/inc/vcl/cursor.hxx
+++ b/vcl/inc/vcl/cursor.hxx
@@ -92,17 +92,14 @@ public:
void SetPos( const Point& rNewPos );
const Point& GetPos() const { return maPos; }
- void SetOffsetY( long mnOffsetY = 0 );
long GetOffsetY() const { return mnOffsetY; }
void SetSize( const Size& rNewSize );
const Size& GetSize() const { return maSize; }
void SetWidth( long nNewWidth );
long GetWidth() const { return maSize.Width(); }
- void SetHeight( long nNewHeight );
long GetHeight() const { return maSize.Height(); }
- void SetSlant( long nSlant = 0 );
long GetSlant() const { return mnSlant; }
void SetOrientation( short nOrientation = 0 );
diff --git a/vcl/inc/vcl/floatwin.hxx b/vcl/inc/vcl/floatwin.hxx
index a813a49..85a6e79 100644
--- a/vcl/inc/vcl/floatwin.hxx
+++ b/vcl/inc/vcl/floatwin.hxx
@@ -142,7 +142,6 @@ public:
void StartPopupMode( ToolBox* pBox, sal_uLong nFlags = 0 );
void EndPopupMode( sal_uInt16 nFlags = 0 );
void AddPopupModeWindow( Window* pWindow );
- void RemovePopupModeWindow( Window* pWindow );
sal_uLong GetPopupModeFlags() const { return mnPopupModeFlags; }
void SetPopupModeFlags( sal_uLong nFlags ) { mnPopupModeFlags = nFlags; }
sal_Bool IsInPopupMode() const { return mbPopupMode; }
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 6f0d77f..f1071e9 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -453,7 +453,6 @@ public: // TODO: is public really needed?
void addHints( bool bVerticalHints);
int getHorzHintCount( void) const { return (mnHorzHintSize/2);}
int getVertHintCount( void) const { return (mnHintSize-mnHorzHintSize)/2;}
- void getHintPair( int nIndex, ValType* nMin, ValType* nEnd) const;
// accessing other charstring specifics
bool hasCharWidth( void) const { return (maCharWidth > 0);}
@@ -582,18 +581,6 @@ void CffSubsetterContext::addHints( bool bVerticalHints)
// --------------------------------------------------------------------
-void CffSubsetterContext::getHintPair( int nIndex, ValType* pMin, ValType* pEnd) const
-{
- nIndex *= 2;
- assert( nIndex < mnHintSize);
- assert( nIndex >= 0);
- const ValType* pHint = &mnHintStack[ nIndex ];
- *pMin = pHint[0];
- *pEnd = pHint[1];
-}
-
-// --------------------------------------------------------------------
-
void CffSubsetterContext::setCharStringType( int nVal)
{
switch( nVal) {
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 57ead36..f70966c 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -293,20 +293,6 @@ Size Bitmap::GetSizePixel() const
}
// ------------------------------------------------------------------
-void Bitmap::SetSizePixel( const Size& rNewSize )
-{
- Scale( rNewSize );
-}
-
-// ------------------------------------------------------------------
-
-Size Bitmap::GetSourceSizePixel() const
-{
- return( mpImpBmp ? mpImpBmp->ImplGetSourceSize() : Size() );
-}
-
-// ------------------------------------------------------------------
-
void Bitmap::SetSourceSizePixel( const Size& rSize)
{
if( mpImpBmp )
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index 8a5c631..2f3f4fd 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -301,29 +301,6 @@ void BitmapReadAccess::ImplZeroInitUnusedBits()
// ------------------------------------------------------------------
-void BitmapReadAccess::Flush()
-{
- ImplDestroy();
-}
-
-// ------------------------------------------------------------------
-
-void BitmapReadAccess::ReAccess( sal_Bool bModify )
-{
- const ImpBitmap* pImpBmp = maBitmap.ImplGetImpBitmap();
-
- DBG_ASSERT( !mpBuffer, "No ReAccess possible while bitmap is being accessed!" );
- DBG_ASSERT( pImpBmp && ( pImpBmp->ImplGetRefCount() > 1UL ), "Accessed bitmap does not exist anymore!" );
-
- if( !mpBuffer && pImpBmp && ( pImpBmp->ImplGetRefCount() > 1UL ) )
- {
- mbModify = bModify;
- ImplCreate( maBitmap );
- }
-}
-
-// ------------------------------------------------------------------
-
sal_uInt16 BitmapReadAccess::GetBestPaletteIndex( const BitmapColor& rBitmapColor ) const
{
return( HasPalette() ? mpBuffer->maPalette.GetBestIndex( rBitmapColor ) : 0 );
diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx
index ef74667..fdc19f9 100644
--- a/vcl/source/gdi/bmpacc3.cxx
+++ b/vcl/source/gdi/bmpacc3.cxx
@@ -42,14 +42,6 @@
// - BitmapWriteAccess -
// ---------------------
-void BitmapWriteAccess::SetLineColor()
-{
- delete mpLineColor;
- mpLineColor = NULL;
-}
-
-// ------------------------------------------------------------------
-
void BitmapWriteAccess::SetLineColor( const Color& rColor )
{
delete mpLineColor;
@@ -62,28 +54,6 @@ void BitmapWriteAccess::SetLineColor( const Color& rColor )
// ------------------------------------------------------------------
-Color BitmapWriteAccess::GetLineColor() const
-{
- Color aRet;
-
- if( mpLineColor )
- aRet = (const Color&) *mpLineColor;
- else
- aRet.SetTransparency( 255 );
-
- return aRet;
-}
-
-// ------------------------------------------------------------------
-
-void BitmapWriteAccess::SetFillColor()
-{
- delete mpFillColor;
- mpFillColor = NULL;
-}
-
-// ------------------------------------------------------------------
-
void BitmapWriteAccess::SetFillColor( const Color& rColor )
{
delete mpFillColor;
@@ -96,20 +66,6 @@ void BitmapWriteAccess::SetFillColor( const Color& rColor )
// ------------------------------------------------------------------
-Color BitmapWriteAccess::GetFillColor() const
-{
- Color aRet;
-
- if( mpFillColor )
- aRet = (const Color&) *mpFillColor;
- else
- aRet.SetTransparency( 255 );
-
- return aRet;
-}
-
-// ------------------------------------------------------------------
-
void BitmapWriteAccess::Erase( const Color& rColor )
{
// convert the color format from RGB to palette index if needed
@@ -387,30 +343,4 @@ void BitmapWriteAccess::FillPolyPolygon( const PolyPolygon& rPolyPoly )
}
}
-// ------------------------------------------------------------------
-
-void BitmapWriteAccess::DrawPolyPolygon( const PolyPolygon& rPolyPoly )
-{
- if( mpFillColor )
- FillPolyPolygon( rPolyPoly );
-
- if( mpLineColor && ( !mpFillColor || ( *mpFillColor != *mpLineColor ) ) )
- {
- for( sal_uInt16 n = 0, nCount = rPolyPoly.Count(); n < nCount; )
- {
- const Polygon& rPoly = rPolyPoly[ n++ ];
- const sal_uInt16 nSize = rPoly.GetSize();
-
- if( nSize )
- {
- for( sal_uInt16 i = 0, nSize1 = nSize - 1; i < nSize1; i++ )
- DrawLine( rPoly[ i ], rPoly[ i + 1 ] );
-
- if( rPoly[ nSize - 1 ] != rPoly[ 0 ] )
- DrawLine( rPoly[ nSize - 1 ], rPoly[ 0 ] );
- }
- }
- }
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 9e1e896..3d27270 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -380,17 +380,6 @@ void Cursor::SetPos( const Point& rPoint )
// -----------------------------------------------------------------------
-void Cursor::SetOffsetY( long nNewOffsetY )
-{
- if ( mnOffsetY != nNewOffsetY )
- {
- mnOffsetY = nNewOffsetY;
- ImplNew();
- }
-}
-
-// -----------------------------------------------------------------------
-
void Cursor::SetSize( const Size& rSize )
{
if ( maSize != rSize )
@@ -413,28 +402,6 @@ void Cursor::SetWidth( long nNewWidth )
// -----------------------------------------------------------------------
-void Cursor::SetHeight( long nNewHeight )
-{
- if ( maSize.Height() != nNewHeight )
- {
- maSize.Height() = nNewHeight;
- ImplNew();
- }
-}
-
-// -----------------------------------------------------------------------
-
-void Cursor::SetSlant( long nNewSlant )
-{
- if ( mnSlant != nNewSlant )
- {
- mnSlant = nNewSlant;
- ImplNew();
- }
-}
-
-// -----------------------------------------------------------------------
-
void Cursor::SetOrientation( short nNewOrientation )
{
if ( mnOrientation != nNewOrientation )
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 5508620..d98cace 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -878,13 +878,4 @@ void FloatingWindow::AddPopupModeWindow( Window* pWindow )
mpFirstPopupModeWin = pWindow;
}
-// -----------------------------------------------------------------------
-
-void FloatingWindow::RemovePopupModeWindow( Window* pWindow )
-{
- // !!! bisher erst 1 Fenster und noch keine Liste
- if ( mpFirstPopupModeWin == pWindow )
- mpFirstPopupModeWin = NULL;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list