[Libreoffice-commits] core.git: chart2/source formula/source include/formula include/test include/unotools sc/inc sc/source test/source unotools/source unusedcode.easy
Marcos Paulo de Souza
marcos.souza.org at gmail.com
Tue Jul 29 07:21:05 PDT 2014
chart2/source/inc/InternalData.hxx | 1 -
chart2/source/tools/InternalData.cxx | 11 -----------
formula/source/core/api/token.cxx | 11 -----------
include/formula/tokenarray.hxx | 1 -
include/test/mtfxmldump.hxx | 1 -
include/unotools/datetime.hxx | 1 -
sc/inc/document.hxx | 1 -
sc/source/core/data/document.cxx | 13 -------------
sc/source/ui/inc/tabvwsh.hxx | 1 -
sc/source/ui/view/tabvwsh4.cxx | 8 --------
test/source/mtfxmldump.cxx | 5 -----
unotools/source/misc/datetime.cxx | 8 --------
unusedcode.easy | 6 ------
13 files changed, 68 deletions(-)
New commits:
commit 5021f298418f6efa7bb7b6540113b712599778fe
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Mon Jul 28 12:11:08 2014 -0300
Remove some unused code
Change-Id: Ib1fb5108a858c35a5bbe8ba865e15660639725e3
Reviewed-on: https://gerrit.libreoffice.org/10593
Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/chart2/source/inc/InternalData.hxx b/chart2/source/inc/InternalData.hxx
index 28506b5..d35d7a5 100644
--- a/chart2/source/inc/InternalData.hxx
+++ b/chart2/source/inc/InternalData.hxx
@@ -34,7 +34,6 @@ public:
void createDefaultData();
bool isDefaultData();
- void clearDefaultData();
void setData( const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Sequence< double > > & rDataInRows );
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index 8f51469..b0f871bb 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -132,17 +132,6 @@ bool InternalData::isDefaultData()
return false;
}
-void InternalData::clearDefaultData()
-{
- if( isDefaultData() )
- {
- m_nRowCount = m_nColumnCount = 1;
- m_aData.resize( 1 );
- m_aRowLabels.clear();
- m_aColumnLabels.clear();
- }
-}
-
void InternalData::setData( const Sequence< Sequence< double > >& rDataInRows )
{
m_nRowCount = rDataInRows.getLength();
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 3e37c28..227cd3d 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -464,17 +464,6 @@ FormulaToken* FormulaTokenArray::GetNextName()
return NULL;
}
-FormulaToken* FormulaTokenArray::GetNextOpCodeRPN( OpCode eOp )
-{
- while( nIndex < nRPN )
- {
- FormulaToken* t = pRPN[ nIndex++ ];
- if ( t->GetOpCode() == eOp )
- return t;
- }
- return NULL;
-}
-
FormulaToken* FormulaTokenArray::Next()
{
if( pCode && nIndex < nLen )
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index e20d578..c6433aa 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -114,7 +114,6 @@ public:
FormulaToken* GetNextReferenceRPN();
FormulaToken* GetNextReferenceOrName();
FormulaToken* GetNextColRowName();
- FormulaToken* GetNextOpCodeRPN( OpCode );
/// Peek at nIdx-1 if not out of bounds, decrements nIdx if successful. Returns NULL if not.
FormulaToken* PeekPrev( sal_uInt16 & nIdx );
FormulaToken* PeekNext();
diff --git a/include/test/mtfxmldump.hxx b/include/test/mtfxmldump.hxx
index 86ffe9d..e91eb6b 100644
--- a/include/test/mtfxmldump.hxx
+++ b/include/test/mtfxmldump.hxx
@@ -27,7 +27,6 @@ public:
void filterActionType(const sal_uInt16 nActionType, bool bShouldFilter);
void filterAllActionTypes();
- void filterNoneActionTypes();
/** The actual result that will be used for testing.
diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx
index 56bdec9..d07402b 100644
--- a/include/unotools/datetime.hxx
+++ b/include/unotools/datetime.hxx
@@ -43,7 +43,6 @@ namespace utl
UNOTOOLS_DLLPUBLIC void typeConvert(const starutil::DateTime& _rDateTime, DateTime& _rOut);
UNOTOOLS_DLLPUBLIC void extractDate(const starutil::DateTime& _rDateTime, starutil::Date& _rOut);
- UNOTOOLS_DLLPUBLIC void extractTime(const starutil::DateTime& _rDateTime, starutil::Time& _rOut);
UNOTOOLS_DLLPUBLIC ::rtl::OUString toISO8601(const starutil::DateTime& _rDateTime);
UNOTOOLS_DLLPUBLIC bool ISO8601parseDateTime(const ::rtl::OUString &i_rIn, starutil::DateTime& o_rDateTime);
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index c7b797b..0dc3239 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2054,7 +2054,6 @@ public:
void AddSubTotalCell(ScFormulaCell* pCell);
void RemoveSubTotalCell(ScFormulaCell* pCell);
void SetSubTotalCellsDirty(const ScRange& rDirtyRange);
- void MarkSubTotalCells( sc::ColumnSpanSet& rSet, const ScRange& rRange, bool bVal ) const;
sal_uInt16 GetTextWidth( const ScAddress& rPos ) const;
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index e68758c..549ab9c 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -5858,19 +5858,6 @@ void ScDocument::SetSubTotalCellsDirty(const ScRange& rDirtyRange)
maSubTotalCells.swap(aNewSet); // update the list.
}
-void ScDocument::MarkSubTotalCells( sc::ColumnSpanSet& rSet, const ScRange& rRange, bool bVal ) const
-{
- for (SCTAB nTab = rRange.aStart.Tab(); nTab <= rRange.aEnd.Tab(); ++nTab)
- {
- const ScTable* pTab = FetchTable(nTab);
- if (!pTab)
- continue;
-
- pTab->MarkSubTotalCells(
- rSet, rRange.aStart.Col(), rRange.aStart.Row(), rRange.aEnd.Col(), rRange.aEnd.Row(), bVal);
- }
-}
-
sal_uInt16 ScDocument::GetTextWidth( const ScAddress& rPos ) const
{
SCTAB nTab = rPos.Tab();
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 346f66f..548c6ae 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -339,7 +339,6 @@ public:
void FillFieldData( ScHeaderFieldData& rData );
- void SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest );
bool GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const;
void SetEditChartName(const OUString& aStr){aEditChartName=aStr;}
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index f46b5bf..87e326d 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1891,14 +1891,6 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData )
// eNumType kennt der Dialog selber
}
-void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest )
-{
- bChartAreaValid = true;
- aChartSource = rSource;
- aChartPos = rDest;
- nChartDestTab = GetViewData().GetTabNo();
-}
-
bool ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const
{
rSource = aChartSource;
diff --git a/test/source/mtfxmldump.cxx b/test/source/mtfxmldump.cxx
index 9223797..87588c1 100644
--- a/test/source/mtfxmldump.cxx
+++ b/test/source/mtfxmldump.cxx
@@ -245,11 +245,6 @@ void MetafileXmlDump::filterAllActionTypes()
maFilter.assign(constMaxActionType, true);
}
-void MetafileXmlDump::filterNoneActionTypes()
-{
- maFilter.assign(constMaxActionType, false);
-}
-
xmlDocPtr MetafileXmlDump::dumpAndParse(GDIMetaFile& rMetaFile, const OUString& rTempStreamName)
{
boost::scoped_ptr<SvStream> pStream;
diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx
index f898f79..8709aac 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -216,14 +216,6 @@ void extractDate(const starutil::DateTime& _rDateTime, starutil::Date& _rOut)
_rOut.Year = _rDateTime.Year;
}
-void extractTime(const starutil::DateTime& _rDateTime, starutil::Time& _rOut)
-{
- _rOut.Hours = _rDateTime.Hours;
- _rOut.Minutes = _rDateTime.Minutes;
- _rOut.Seconds = _rDateTime.Seconds;
- _rOut.NanoSeconds = _rDateTime.NanoSeconds;
-}
-
OUString toISO8601(const starutil::DateTime& rDateTime)
{
OUStringBuffer rBuffer;
diff --git a/unusedcode.easy b/unusedcode.easy
index e26494b06..5da63ae 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -9,7 +9,6 @@ Json::Json(std::__debug::map<std::basic_string<char, std::char_traits<char>, std
Json::Json(std::__debug::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::shared_ptr<libcmis::Property>, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, boost::shared_ptr<libcmis::Property> > > > const&)
Json::swap(Json&)
MetaAction::TypeName(unsigned short)
-MetafileXmlDump::filterNoneActionTypes()
OpenGLContext::renderToFile()
OpenGLRender::CreateTextTexture(rtl::OUString const&, Font, long, com::sun::star::awt::Point, com::sun::star::awt::Size, long)
OutputDevice::GetCanvas() const
@@ -24,12 +23,10 @@ SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint c
ScDBFuncUndo::SetDrawUndoAction(SdrUndoAction*)
ScDocument::AreaBroadcastInRange(ScRange const&, ScHint const&)
ScDocument::CreateFormatTable() const
-ScDocument::MarkSubTotalCells(sc::ColumnSpanSet&, ScRange const&, bool) const
ScFormulaCellGroup::scheduleCompilation()
ScRawToken::Clone() const
ScRawToken::Delete()
ScTabView::DrawMarkRect(Rectangle const&)
-ScTabViewShell::SetChartArea(tools::SvRef<ScRangeList> const&, Rectangle const&)
ScTable::AttachFormulaCells(sc::StartListeningContext&, short, int, short, int)
ScTable::DetachFormulaCells(sc::EndListeningContext&, short, int, short, int)
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
@@ -177,7 +174,6 @@ calc::OCellListSource::checkConsistency_static(void const*)
calc::OCellValueBinding::checkConsistency_static(void const*)
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
chart::ChartTypeUnoDlg::Create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
-chart::InternalData::clearDefaultData()
chart::ShapeToolbarController::create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
chart::opengl3D::Bar::Bar(chart::opengl3D::OpenGL3DRenderer*, glm::detail::tmat4x4<float> const&, unsigned int, unsigned int)
comphelper::OAccessibleImplementationAccess::setStateBit(short, bool)
@@ -187,7 +183,6 @@ comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::share
connectivity::firebird::release(int&, cppu::OBroadcastHelperVar<cppu::OMultiTypeInterfaceContainerHelper, com::sun::star::uno::Type>&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&, com::sun::star::lang::XComponent*)
connectivity::sdbcx::OGroup::OGroup(bool)
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, bool)
-formula::FormulaTokenArray::GetNextOpCodeRPN(OpCodeEnum)
oglcanvas::CanvasHelper::flush() const
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const
oox::drawingml::TextListStyle::dump() const
@@ -211,5 +206,4 @@ svl::GridPrinter::resize(unsigned long, unsigned long)
svt::CheckInvariants(void const*)
svt::table::TableControl_Impl::impl_checkInvariants() const
svt::table::UnoControlTableModel::checkInvariants() const
-utl::extractTime(com::sun::star::util::DateTime const&, com::sun::star::util::Time&)
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
More information about the Libreoffice-commits
mailing list