[Libreoffice-commits] .: 3 commits - sc/inc sc/source unusedcode.easy vcl/inc vcl/source
Muthu Subramanian
sumuthu at kemper.freedesktop.org
Sun Apr 22 22:46:47 PDT 2012
sc/inc/dbdata.hxx | 1
sc/source/core/tool/dbdata.cxx | 5 ----
unusedcode.easy | 7 ------
vcl/inc/salgdi.hxx | 4 ---
vcl/inc/vcl/outdev.hxx | 4 ---
vcl/source/gdi/outmap.cxx | 42 ----------------------------------------
vcl/source/gdi/salgdilayout.cxx | 34 --------------------------------
7 files changed, 97 deletions(-)
New commits:
commit d31aae4c9eea4f4aecea2a051518536b47aa8ab6
Author: Monica Ramirez Arceda <monica at probeta.net>
Date: Mon Apr 23 11:30:01 2012 +0530
Remove unused vcl methods.
diff --git a/unusedcode.easy b/unusedcode.easy
index b2ca35e..b09221f 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -27,10 +27,6 @@ Matrix3d::Inverse() const
Matrix3d::Matrix3d()
PopupMenu::SetSelectedEntry(unsigned short)
PropBrwMgr::GetChildWindowId()
-SalGraphics::DrawBitmap(SalTwoRect const*, SalBitmap const&, unsigned int, OutputDevice const*)
-SalGraphics::drawAlphaBitmap(SalTwoRect const&, SalBitmap const&, SalBitmap const&)
-SalGraphics::drawPolyLine(basegfx::B2DPolygon const&, double, basegfx::B2DVector const&, basegfx::B2DLineJoin)
-SalGraphics::drawPolyPolygon(basegfx::B2DPolyPolygon const&, double)
SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
ScAddInAsyncs::Insert(ScAddInAsync* const&, unsigned short&)
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index e351ed3..6c99e46 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -405,10 +405,6 @@ public:
const OutputDevice *pOutDev );
void DrawBitmap( const SalTwoRect* pPosAry,
const SalBitmap& rSalBitmap,
- SalColor nTransparentColor,
- const OutputDevice *pOutDev );
- void DrawBitmap( const SalTwoRect* pPosAry,
- const SalBitmap& rSalBitmap,
const SalBitmap& rTransparentBitmap,
const OutputDevice *pOutDev );
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 2197905..d750264 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -91,14 +91,6 @@ SalGraphics::~SalGraphics()
// ----------------------------------------------------------------------------
-bool SalGraphics::drawAlphaBitmap( const SalTwoRect&,
- const SalBitmap&, const SalBitmap& )
-{
- return false;
-}
-
-// ----------------------------------------------------------------------------
-
void SalGraphics::mirror( long& x, const OutputDevice *pOutDev, bool bBack ) const
{
long w;
@@ -411,14 +403,6 @@ void SalGraphics::DrawRect( long nX, long nY, long nWidth, long nHeight, cons
mirror( nX, nWidth, pOutDev );
drawRect( nX, nY, nWidth, nHeight );
}
-bool SalGraphics::drawPolyLine(
- const basegfx::B2DPolygon& /*rPolyPolygon*/,
- double /*fTransparency*/,
- const basegfx::B2DVector& /*rLineWidths*/,
- basegfx::B2DLineJoin /*eLineJoin*/)
-{
- return false;
-}
void SalGraphics::DrawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev )
{
@@ -483,11 +467,6 @@ bool SalGraphics::DrawPolyPolygon( const ::basegfx::B2DPolyPolygon& i_rPolyPolyg
return bRet;
}
-bool SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double /*fTransparency*/)
-{
- return false;
-}
-
sal_Bool SalGraphics::DrawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev )
{
sal_Bool bResult = sal_False;
@@ -600,19 +579,6 @@ void SalGraphics::DrawBitmap( const SalTwoRect* pPosAry,
else
drawBitmap( pPosAry, rSalBitmap );
}
-void SalGraphics::DrawBitmap( const SalTwoRect* pPosAry,
- const SalBitmap& rSalBitmap,
- SalColor nTransparentColor, const OutputDevice *pOutDev )
-{
- if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
- {
- SalTwoRect pPosAry2 = *pPosAry;
- mirror( pPosAry2.mnDestX, pPosAry2.mnDestWidth, pOutDev );
- drawBitmap( &pPosAry2, rSalBitmap, nTransparentColor );
- }
- else
- drawBitmap( pPosAry, rSalBitmap, nTransparentColor );
-}
void SalGraphics::DrawBitmap( const SalTwoRect* pPosAry,
const SalBitmap& rSalBitmap,
const SalBitmap& rTransparentBitmap, const OutputDevice *pOutDev )
commit 2910933f2609b19d9c6c4b793288e1b2d9991080
Author: Santiago Martinez <smvarela at gmail.com>
Date: Mon Apr 23 11:27:07 2012 +0530
Remove unused code in vcl
diff --git a/unusedcode.easy b/unusedcode.easy
index 7a6a78b..b2ca35e 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -25,8 +25,6 @@ MSDffImportRecords::Remove(unsigned short, unsigned short)
MailDispatcher::removeListener(rtl::Reference<IMailDispatcherListener>)
Matrix3d::Inverse() const
Matrix3d::Matrix3d()
-OutputDevice::LogicToPixel(PolyPolygon const&, MapMode const&) const
-OutputDevice::PixelToLogic(PolyPolygon const&, MapMode const&) const
PopupMenu::SetSelectedEntry(unsigned short)
PropBrwMgr::GetChildWindowId()
SalGraphics::DrawBitmap(SalTwoRect const*, SalBitmap const&, unsigned int, OutputDevice const*)
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index b6c0411..284340f 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -995,8 +995,6 @@ public:
const MapMode& rMapMode ) const;
Polygon LogicToPixel( const Polygon& rLogicPoly,
const MapMode& rMapMode ) const;
- PolyPolygon LogicToPixel( const PolyPolygon& rLogicPolyPoly,
- const MapMode& rMapMode ) const;
basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly,
const MapMode& rMapMode ) const;
Point PixelToLogic( const Point& rDevicePt ) const;
@@ -1015,8 +1013,6 @@ public:
const MapMode& rMapMode ) const;
basegfx::B2DPolygon PixelToLogic( const basegfx::B2DPolygon& rDevicePoly,
const MapMode& rMapMode ) const;
- PolyPolygon PixelToLogic( const PolyPolygon& rDevicePolyPoly,
- const MapMode& rMapMode ) const;
basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly,
const MapMode& rMapMode ) const;
Point LogicToLogic( const Point& rPtSource,
diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx
index 583e1c8..42e96c2 100644
--- a/vcl/source/gdi/outmap.cxx
+++ b/vcl/source/gdi/outmap.cxx
@@ -1303,27 +1303,6 @@ Polygon OutputDevice::LogicToPixel( const Polygon& rLogicPoly,
// -----------------------------------------------------------------------
-PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly,
- const MapMode& rMapMode ) const
-{
- DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
- DBG_CHKOBJ( &rLogicPolyPoly, PolyPolygon, NULL );
-
- if ( rMapMode.IsDefault() )
- return rLogicPolyPoly;
-
- PolyPolygon aPolyPoly( rLogicPolyPoly );
- sal_uInt16 nPoly = aPolyPoly.Count();
- for( sal_uInt16 i = 0; i < nPoly; i++ )
- {
- Polygon& rPoly = aPolyPoly[i];
- rPoly = LogicToPixel( rPoly, rMapMode );
- }
- return aPolyPoly;
-}
-
-// -----------------------------------------------------------------------
-
basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly,
const MapMode& rMapMode ) const
{
@@ -1603,27 +1582,6 @@ Polygon OutputDevice::PixelToLogic( const Polygon& rDevicePoly,
// -----------------------------------------------------------------------
-PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly,
- const MapMode& rMapMode ) const
-{
- DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
- DBG_CHKOBJ( &rDevicePolyPoly, PolyPolygon, NULL );
-
- if ( rMapMode.IsDefault() )
- return rDevicePolyPoly;
-
- PolyPolygon aPolyPoly( rDevicePolyPoly );
- sal_uInt16 nPoly = aPolyPoly.Count();
- for( sal_uInt16 i = 0; i < nPoly; i++ )
- {
- Polygon& rPoly = aPolyPoly[i];
- rPoly = PixelToLogic( rPoly, rMapMode );
- }
- return aPolyPoly;
-}
-
-// -----------------------------------------------------------------------
-
basegfx::B2DPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolygon& rPixelPoly,
const MapMode& rMapMode ) const
{
commit 5d5e02452fecc7400ebee3372dd9fb45dce179c7
Author: Ferran Vidal <vidalmarginet at hotmail.com>
Date: Mon Apr 23 11:24:34 2012 +0530
Remove unused code
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 9dcd457..f770deb 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -218,7 +218,6 @@ public:
void insert(ScDBData* p);
void erase(iterator itr);
bool empty() const;
- size_t size() const;
bool operator== (const AnonDBs& r) const;
};
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 36d1914..60e6d28 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -852,11 +852,6 @@ bool ScDBCollection::AnonDBs::empty() const
return maDBs.empty();
}
-size_t ScDBCollection::AnonDBs::size() const
-{
- return maDBs.size();
-}
-
bool ScDBCollection::AnonDBs::operator== (const AnonDBs& r) const
{
return maDBs == r.maDBs;
diff --git a/unusedcode.easy b/unusedcode.easy
index b62d53a..7a6a78b 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -62,7 +62,6 @@ ScConditionalFormats_Impl::Remove(unsigned short, unsigned short)
ScCsvControl::ScCsvControl(Window*, ScCsvLayoutData const&, long)
ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<void**, std::__cxx1998::vector<void*, std::allocator<void*> > >, std::__debug::vector<void*, std::allocator<void*> > >, ScDBData>)
ScDBCollection::AnonDBs::findByTable(short) const
-ScDBCollection::AnonDBs::size() const
ScDPItemData::ScDPItemData(rtl::OUString const*)
ScDPItemData::SetErrorString(rtl::OUString const&)
ScDPLabelData::ScDPLabelData(rtl::OUString const&, short, bool)
More information about the Libreoffice-commits
mailing list