diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-28 15:02:39 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-03 08:58:59 +0200 |
commit | 3b1fefac9a8e7cd7c5c483cc896fc45ca25e6f8d (patch) | |
tree | 476f314ded3720388d82652f0e53d2e7342dab8f | |
parent | 7b2c8b97715f17f2ddb534089389e961aa9d7fe1 (diff) |
remove unused code in sdr::table
sdr::table::Cell::getName()
sdr::table::SdrTableObj::getRowCount() const
Change-Id: Icd4cbe591703aedb1412f8e9b485c773ffe79551
-rw-r--r-- | include/svx/svdotable.hxx | 1 | ||||
-rw-r--r-- | svx/source/table/cell.cxx | 65 | ||||
-rw-r--r-- | svx/source/table/cell.hxx | 2 | ||||
-rw-r--r-- | svx/source/table/svdotable.cxx | 7 | ||||
-rw-r--r-- | unusedcode.easy | 2 |
5 files changed, 0 insertions, 77 deletions
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index b679d4a6e150..4a8502cb08d9 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -146,7 +146,6 @@ 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 ); diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 26db3dfed1f0..af3da32c5a43 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -1749,71 +1749,6 @@ void SAL_CALL Cell::disposing( const EventObject& /*Source*/ ) throw (RuntimeExc dispose(); } -static OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ) -{ - OUStringBuffer aBuf; - - if (nCol < 26*26) - { - if (nCol < 26) - aBuf.append( static_cast<sal_Unicode>( 'A' + - static_cast<sal_uInt16>(nCol))); - else - { - aBuf.append( static_cast<sal_Unicode>( 'A' + - (static_cast<sal_uInt16>(nCol) / 26) - 1)); - aBuf.append( static_cast<sal_Unicode>( 'A' + - (static_cast<sal_uInt16>(nCol) % 26))); - } - } - else - { - OUString aStr; - while (nCol >= 26) - { - sal_Int32 nC = nCol % 26; - aStr += OUString( static_cast<sal_Unicode>( 'A' + - static_cast<sal_uInt16>(nC)) ); - nCol = nCol - nC; - nCol = nCol / 26 - 1; - } - aStr += OUString ( static_cast<sal_Unicode>( 'A' + - static_cast<sal_uInt16>(nCol)) ); - aBuf.append(comphelper::string::reverseString(aStr)); - } - aBuf.append( OUString::number(nRow+1) ); - return aBuf.makeStringAndClear(); -} - -OUString Cell::getName() -{ - // todo: optimize! - OUString sName; - if( mxTable.is() ) try - { - Reference< XCell > xThis( static_cast< XCell* >( this ) ); - - sal_Int32 nRowCount = mxTable->getRowCount(); - sal_Int32 nColCount = mxTable->getColumnCount(); - for( sal_Int32 nRow = 0; nRow < nRowCount; nRow++ ) - { - for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ ) - { - Reference< XCell > xCell( mxTable->getCellByPosition( nCol, nRow ) ); - if( xCell == xThis ) - { - return getCellName( nCol, nRow ); - } - } - } - } - catch( Exception& ) - { - } - - return sName; -} - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index d3983630638e..eb7b7f64ca6b 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -204,8 +204,6 @@ public: SVX_DLLPRIVATE void notifyModified(); - OUString getName(); - protected: SVX_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet(); SVX_DLLPRIVATE virtual void SetObjectItem(const SfxPoolItem& rItem); diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index a603afe30614..1d4dc8a2e7f0 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -1505,13 +1505,6 @@ const CellRef& SdrTableObj::getActiveCell() const -sal_Int32 SdrTableObj::getRowCount() const -{ - return mpImpl ? mpImpl->getRowCount() : 0; -} - - - sal_Int32 SdrTableObj::getColumnCount() const { return mpImpl ? mpImpl->getColumnCount() : 0; diff --git a/unusedcode.easy b/unusedcode.easy index c4cbfa8a186a..b87604c54911 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -275,8 +275,6 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::framework::Pane::SetWindow(Window*) sd::presenter::PresenterCanvas::copyRect(com::sun::star::uno::Reference<com::sun::star::rendering::XBitmapCanvas> const&, com::sun::star::geometry::RealRectangle2D const&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::geometry::RealRectangle2D const&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&) -sdr::table::Cell::getName() -sdr::table::SdrTableObj::getRowCount() const std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&) std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&) std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>) |