[Libreoffice-commits] .: sd/source unusedcode.easy vcl/inc vcl/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sun Nov 20 04:55:44 PST 2011
sd/source/filter/eppt/grouptable.hxx | 1 -
sd/source/filter/eppt/pptx-grouptable.cxx | 8 --------
unusedcode.easy | 4 ----
vcl/inc/salgdi.hxx | 5 -----
vcl/inc/vcl/graph.h | 1 -
vcl/inc/vcl/graph.hxx | 7 -------
vcl/source/gdi/graph.cxx | 18 ------------------
vcl/source/gdi/impgraph.cxx | 13 -------------
vcl/source/gdi/salgdilayout.cxx | 8 --------
9 files changed, 65 deletions(-)
New commits:
commit a84651f39d4afe662181f695a1a15c4dfe96e7e6
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Nov 20 04:06:00 2011 +0100
Remove some unused methods
diff --git a/sd/source/filter/eppt/grouptable.hxx b/sd/source/filter/eppt/grouptable.hxx
index d9e1166..23b2951 100644
--- a/sd/source/filter/eppt/grouptable.hxx
+++ b/sd/source/filter/eppt/grouptable.hxx
@@ -72,7 +72,6 @@ class GroupTable
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > &
GetCurrentGroupAccess() const { return mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mXIndexAccess; };
sal_uInt32 GetGroupsClosed();
- void SkipCurrentGroup();
void ResetGroupTable( sal_uInt32 nCount );
void ClearGroupTable();
sal_Bool EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex );
diff --git a/sd/source/filter/eppt/pptx-grouptable.cxx b/sd/source/filter/eppt/pptx-grouptable.cxx
index fed63ac..18f4019 100644
--- a/sd/source/filter/eppt/pptx-grouptable.cxx
+++ b/sd/source/filter/eppt/pptx-grouptable.cxx
@@ -131,12 +131,4 @@ sal_Bool GroupTable::GetNextGroupEntry()
// ---------------------------------------------------------------------------------------------
-void GroupTable::SkipCurrentGroup()
-{
- if ( mnCurrentGroupEntry )
- delete ( mpGroupEntry[ --mnCurrentGroupEntry ] );
-}
-
-// ---------------------------------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 46e92f4..40bb39a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -145,10 +145,6 @@ GDIMetaFile::Wind(unsigned long)
GDIMetaFile::WindEnd()
GDIMetaFile::WindNext()
GraphCtrl::GraphCtrl(Window*, long)
-Graphic::Draw(OutputDevice*, String const&, Font&, Bitmap const&, Point const&, Size const&)
-Graphic::StartAnimation(OutputDevice*, Point const&, long, OutputDevice*)
-GraphicReader::IsPreviewModeEnabled() const
-GroupTable::SkipCurrentGroup()
GtkSalFrame::popIgnoreDamage()
GtkSalFrame::pushIgnoreDamage()
HTMLControls::Insert(HTMLControl const*&, unsigned short&)
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 75559cb..1394c17 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -470,11 +470,6 @@ public:
Rectangle &rNativeContentRegion,
const OutputDevice *pOutDev );
- static void AddDevFontSubstitute( OutputDevice* pOutDev,
- const String& rFontName,
- const String& rReplaceFontName,
- sal_uInt16 nFlags = 0 );
-
bool DrawAlphaBitmap( const SalTwoRect&,
const SalBitmap& rSourceBitmap,
const SalBitmap& rAlphaBitmap,
diff --git a/vcl/inc/vcl/graph.h b/vcl/inc/vcl/graph.h
index 1df2ee7..b926936 100644
--- a/vcl/inc/vcl/graph.h
+++ b/vcl/inc/vcl/graph.h
@@ -73,7 +73,6 @@ public:
// TODO: when incompatible changes are possible again
// the preview size hint should be redone
- sal_Bool IsPreviewModeEnabled() const;
void DisablePreviewMode();
void SetPreviewSize( const Size& );
Size GetPreviewSize() const;
diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx
index d34a213..c5d57f4 100644
--- a/vcl/inc/vcl/graph.hxx
+++ b/vcl/inc/vcl/graph.hxx
@@ -155,19 +155,12 @@ public:
void Draw( OutputDevice* pOutDev,
const Point& rDestPt,
const Size& rDestSize ) const;
- static void Draw( OutputDevice* pOutDev, const String& rText,
- Font& rFont, const Bitmap& rBitmap,
- const Point& rDestPt, const Size& rDestSize );
static void DrawEx( OutputDevice* pOutDev, const String& rText,
Font& rFont, const BitmapEx& rBitmap,
const Point& rDestPt, const Size& rDestSize );
void StartAnimation( OutputDevice* pOutDev,
const Point& rDestPt,
- long nExtraData = 0L,
- OutputDevice* pFirstFrameOutDev = NULL );
- void StartAnimation( OutputDevice* pOutDev,
- const Point& rDestPt,
const Size& rDestSize,
long nExtraData = 0L,
OutputDevice* pFirstFrameOutDev = NULL );
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index ece06ca..1ca36eb 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -600,15 +600,6 @@ void Graphic::Draw( OutputDevice* pOutDev,
// ------------------------------------------------------------------------
-void Graphic::Draw( OutputDevice* pOutDev, const String& rText,
- Font& rFont, const Bitmap& rBitmap,
- const Point& rDestPt, const Size& rDestSz )
-{
- ImplDrawDefault( pOutDev, &rText, &rFont, &rBitmap, NULL, rDestPt, rDestSz );
-}
-
-// ------------------------------------------------------------------------
-
void Graphic::DrawEx( OutputDevice* pOutDev, const String& rText,
Font& rFont, const BitmapEx& rBitmap,
const Point& rDestPt, const Size& rDestSz )
@@ -618,15 +609,6 @@ void Graphic::DrawEx( OutputDevice* pOutDev, const String& rText,
// ------------------------------------------------------------------------
-void Graphic::StartAnimation( OutputDevice* pOutDev, const Point& rDestPt, long nExtraData,
- OutputDevice* pFirstFrameOutDev )
-{
- ImplTestRefCount();
- mpImpGraphic->ImplStartAnimation( pOutDev, rDestPt, nExtraData, pFirstFrameOutDev );
-}
-
-// ------------------------------------------------------------------------
-
void Graphic::StartAnimation( OutputDevice* pOutDev, const Point& rDestPt,
const Size& rDestSz, long nExtraData,
OutputDevice* pFirstFrameOutDev )
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index e184644..71563d2 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -93,19 +93,6 @@ GraphicReader::~GraphicReader()
// ------------------------------------------------------------------------
-sal_Bool GraphicReader::IsPreviewModeEnabled() const
-{
- if( !mpReaderData )
- return sal_False;
- if( mpReaderData->maPreviewSize.Width() )
- return sal_True;
- if( mpReaderData->maPreviewSize.Height() )
- return sal_True;
- return sal_False;
-}
-
-// ------------------------------------------------------------------------
-
void GraphicReader::DisablePreviewMode()
{
if( mpReaderData )
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index bf0f752..2db568c 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -820,12 +820,4 @@ bool SalGraphics::filterText( const String&, String&, xub_StrLen, xub_StrLen&, x
return false;
}
-void SalGraphics::AddDevFontSubstitute( OutputDevice* pOutDev,
- const String& rFontName,
- const String& rReplaceFontName,
- sal_uInt16 nFlags )
-{
- pOutDev->ImplAddDevFontSubstitute( rFontName, rReplaceFontName, nFlags );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list