[Libreoffice-commits] .: svx/inc svx/source unusedcode.easy
Marc-André Laverdière
malaverdiere at kemper.freedesktop.org
Fri Feb 10 18:47:55 PST 2012
svx/inc/svx/svdotable.hxx | 12 ----
svx/source/table/svdotable.cxx | 89 -----------------------------------
svx/source/table/tablecontroller.cxx | 28 -----------
svx/source/table/tablecontroller.hxx | 3 -
unusedcode.easy | 9 ---
5 files changed, 1 insertion(+), 140 deletions(-)
New commits:
commit 00a81960c1a1fdffd80e1bf84268ed2567ef6f7d
Author: Marc-André Laverdière-Papineau <marc-andre at atc.tcs.com>
Date: Fri Feb 10 11:49:22 2012 -0500
Removed some dead code
diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx
index 1493e88..543b476 100644
--- a/svx/inc/svx/svdotable.hxx
+++ b/svx/inc/svx/svdotable.hxx
@@ -156,19 +156,12 @@ public:
void setActiveCell( const sdr::table::CellPos& rPos );
void getActiveCellPos( sdr::table::CellPos& rPos ) const;
-
sal_Int32 getRowCount() const;
sal_Int32 getColumnCount() const;
-
void getCellBounds( const sdr::table::CellPos& rPos, ::Rectangle& rCellRect );
const SfxItemSet& GetActiveCellItemSet() const;
- void InsertRows( sal_Int32 nIndex, sal_Int32 nCount = 1 );
- void InsertColumns( sal_Int32 nIndex, sal_Int32 nCount = 1 );
- void DeleteRows( sal_Int32 nIndex, sal_Int32 nCount = 1 );
- void DeleteColumns( sal_Int32 nIndex, sal_Int32 nCount = 1 );
-
void setTableStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xAutoFormatStyle );
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& getTableStyle() const;
@@ -196,10 +189,6 @@ public:
/** returns true only if we are in edit mode and the user actually changed anything */
virtual bool IsRealyEdited() const;
- void FitFrameToTextSize();
-
- SdrOutliner* GetCellTextEditOutliner( const sdr::table::CellPos& rPos ) const;
-
// Gleichzeitig wird der Text in den Outliner gesetzt (ggf.
// der des EditOutliners) und die PaperSize gesetzt.
virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText = false, ::Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const;
@@ -286,6 +275,7 @@ public:
virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus );
+
////////////////////////////////////////////////////////////////////////////////////////////////////
//
// transformation interface for StarOfficeAPI. This implements support for
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index f9b8269..3f7535f 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -244,7 +244,6 @@ public:
void DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset );
- const SfxPoolItem* GetCellItem( const CellPos& rPos, sal_uInt16 nWhich ) const;
// void GetBorderLines( const CellPos& rPos, const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop, const SvxBorderLine** ppRight, const SvxBorderLine** ppBottom ) const;
void operator=( const SdrTableObjImpl& rSource );
@@ -697,17 +696,6 @@ void SdrTableObjImpl::UpdateCells( Rectangle& rArea )
}
// -----------------------------------------------------------------------------
-
-const SfxPoolItem* SdrTableObjImpl::GetCellItem( const CellPos& rPos, sal_uInt16 nWhich ) const
-{
- CellRef xCell( getCell( rPos ) );
- if( xCell.is() )
- return xCell->GetItemSet().GetItem( nWhich );
- else
- return 0;
-}
-
-// -----------------------------------------------------------------------------
// BaseProperties section
// -----------------------------------------------------------------------------
@@ -1160,66 +1148,6 @@ const SfxItemSet& SdrTableObj::GetActiveCellItemSet() const
// --------------------------------------------------------------------
-void SdrTableObj::InsertRows( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ )
-{
- if( mpImpl->mxTable.is() ) try
- {
- Reference< XTableRows > xRows( mpImpl->mxTable->getRows(), UNO_QUERY_THROW );
- xRows->insertByIndex( nIndex, nCount );
- }
- catch( Exception& )
- {
- OSL_FAIL("SdrTableObj::InsertRows(), exception caught!");
- }
-}
-
-// --------------------------------------------------------------------
-
-void SdrTableObj::InsertColumns( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ )
-{
- if( mpImpl->mxTable.is() ) try
- {
- Reference< XTableColumns > xColumns( mpImpl->mxTable->getColumns(), UNO_QUERY_THROW );
- xColumns->insertByIndex( nIndex, nCount );
- }
- catch( Exception& )
- {
- OSL_FAIL("SdrTableObj::InsertColumns(), exception caught!");
- }
-}
-
-// --------------------------------------------------------------------
-
-void SdrTableObj::DeleteRows( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ )
-{
- if( mpImpl->mxTable.is() ) try
- {
- Reference< XTableRows > xRows( mpImpl->mxTable->getRows(), UNO_QUERY_THROW );
- xRows->removeByIndex( nIndex, nCount );
- }
- catch( Exception& )
- {
- OSL_FAIL("SdrTableObj::DeleteRows(), exception caught!");
- }
-}
-
-// --------------------------------------------------------------------
-
-void SdrTableObj::DeleteColumns( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ )
-{
- if( mpImpl->mxTable.is() ) try
- {
- Reference< XTableColumns > xColumns( mpImpl->mxTable->getColumns(), UNO_QUERY_THROW );
- xColumns->removeByIndex( nIndex, nCount );
- }
- catch( Exception& )
- {
- OSL_FAIL("SdrTableObj::DeleteColumns(), exception caught!");
- }
-}
-
-// --------------------------------------------------------------------
-
void SdrTableObj::setTableStyle( const Reference< XIndexAccess >& xTableStyle )
{
if( mpImpl && (mpImpl->mxTableStyle != xTableStyle) )
@@ -1346,13 +1274,6 @@ const TableLayouter& SdrTableObj::getTableLayouter() const
// --------------------------------------------------------------------
-void SdrTableObj::FitFrameToTextSize()
-{
- // todo
-}
-
-// --------------------------------------------------------------------
-
bool SdrTableObj::IsAutoGrowHeight() const
{
return true;
@@ -1821,16 +1742,6 @@ OutlinerParaObject* SdrTableObj::GetEditOutlinerParaObject() const
// --------------------------------------------------------------------
-SdrOutliner* SdrTableObj::GetCellTextEditOutliner( const CellPos& rPos ) const
-{
- if( pEdtOutl && mpImpl && (mpImpl->maEditPos == rPos) )
- return pEdtOutl;
- else
- return 0;
-}
-
-// --------------------------------------------------------------------
-
struct ImplTableShadowPaintInfo
{
Color maShadowColor;
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 6b17f79..faf93a0 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1573,27 +1573,6 @@ const CellPos& SvxTableController::getSelectionEnd()
// --------------------------------------------------------------------
-Reference< XCellCursor > SvxTableController::getSelectionCursor()
-{
- Reference< XCellCursor > xCursor;
-
- if( mxTable.is() )
- {
- if( hasSelectedCells() )
- {
- CellPos aStart, aEnd;
- getSelectedCells( aStart, aEnd );
- xCursor = mxTable->createCursorByRange( mxTable->getCellRangeByPosition( aStart.mnCol, aStart.mnRow, aEnd.mnCol, aEnd.mnRow ) );
- }
- else
- {
- xCursor = mxTable->createCursor();
- }
- }
-
- return xCursor;
-}
-
void SvxTableController::MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow )
{
if( mxTable.is() ) try
@@ -1770,13 +1749,6 @@ bool SvxTableController::StopTextEdit()
// --------------------------------------------------------------------
-void SvxTableController::DeleteTable()
-{
- //
-}
-
-// --------------------------------------------------------------------
-
void SvxTableController::getSelectedCells( CellPos& rFirst, CellPos& rLast )
{
if( mbCellSelectionMode )
diff --git a/svx/source/table/tablecontroller.hxx b/svx/source/table/tablecontroller.hxx
index 944d120..ed64dce 100644
--- a/svx/source/table/tablecontroller.hxx
+++ b/svx/source/table/tablecontroller.hxx
@@ -123,7 +123,6 @@ private:
SVX_DLLPRIVATE const CellPos& getSelectionStart();
SVX_DLLPRIVATE void setSelectionStart( const CellPos& rPos );
SVX_DLLPRIVATE const CellPos& getSelectionEnd();
- SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellCursor > getSelectionCursor();
SVX_DLLPRIVATE void checkCell( CellPos& rPos );
SVX_DLLPRIVATE void MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow );
@@ -131,8 +130,6 @@ private:
SVX_DLLPRIVATE void EditCell( const CellPos& rPos, ::Window* pWindow, const ::com::sun::star::awt::MouseEvent* pMouseEvent = 0, sal_uInt16 nAction = 0 );
SVX_DLLPRIVATE bool StopTextEdit();
- SVX_DLLPRIVATE void DeleteTable();
-
SVX_DLLPRIVATE sal_uInt16 getKeyboardAction( const KeyEvent& rKEvt, Window* pWindow );
SVX_DLLPRIVATE bool executeAction( sal_uInt16 nAction, bool bSelect, Window* pWindow );
SVX_DLLPRIVATE void gotoCell( const CellPos& rCell, bool bSelect, Window* pWindow, sal_uInt16 nAction = 0 );
diff --git a/unusedcode.easy b/unusedcode.easy
index 455ead8..799faab 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1452,15 +1452,6 @@ sdr::overlay::OverlayRollingRectangleStriped::setShowBounds(bool)
sdr::overlay::OverlayTriangle::setSecondPosition(basegfx::B2DPoint const&)
sdr::overlay::OverlayTriangle::setThirdPosition(basegfx::B2DPoint const&)
sdr::table::Cell::GetStyleSheetPool() const
-sdr::table::SdrTableObj::DeleteColumns(int, int)
-sdr::table::SdrTableObj::DeleteRows(int, int)
-sdr::table::SdrTableObj::FitFrameToTextSize()
-sdr::table::SdrTableObj::GetCellTextEditOutliner(sdr::table::CellPos const&) const
-sdr::table::SdrTableObj::InsertColumns(int, int)
-sdr::table::SdrTableObj::InsertRows(int, int)
-sdr::table::SdrTableObj::getColumnCount() const
-sdr::table::SdrTableObj::getRowCount() const
-sdr::table::SdrTableObjImpl::GetCellItem(sdr::table::CellPos const&, unsigned short) const
sdr::table::SvxTableController::DeleteTable()
sdr::table::SvxTableController::getSelectionCursor()
sfx2::TaskPaneWrapper::GetChildWindowId()
More information about the Libreoffice-commits
mailing list