[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Oct 2 08:37:11 PDT 2011
binfilter/bf_sc/source/core/data/sc_documen5.cxx | 2 -
binfilter/bf_sc/source/core/data/sc_document.cxx | 6 ---
binfilter/bf_sc/source/core/tool/sc_chartlis.cxx | 45 -----------------------
binfilter/inc/bf_sc/chartlis.hxx | 14 +------
4 files changed, 2 insertions(+), 65 deletions(-)
New commits:
commit 7cb861abf2f817eefd5ca4435639182fe477a095
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Oct 2 08:37:05 2011 -0700
Cleanup class ScChartListenerCollection
diff --git a/binfilter/bf_sc/source/core/data/sc_documen5.cxx b/binfilter/bf_sc/source/core/data/sc_documen5.cxx
index 2230ac5..4bda4a3 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen5.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen5.cxx
@@ -163,8 +163,6 @@ void ScDocument::UpdateChartArea( const String& rChartName,
aArray.SetRangeList( rNewList );
aArray.SetHeaders( bColHeaders, bRowHeaders );
}
- pChartListenerCollection->ChangeListening(
- rChartName, aArray.GetRangeList() );
SchMemChart* pMemChart = aArray.CreateMemChart();
ScChartArray::CopySettings( *pMemChart, *pChartData );
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 26643cd..f2d43b7 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -283,9 +283,6 @@ namespace binfilter {
/*N*/ // update conditional formats after table is inserted
/*N*/ if ( pCondFormList )
/*N*/ pCondFormList->UpdateReference( URM_INSDEL, aRange, 0,0,1 );
-/*N*/ // #81844# sheet names of references are not valid until sheet is inserted
-/*N*/ if ( pChartListenerCollection )
-/*N*/ pChartListenerCollection->UpdateScheduledSeriesRanges();
/*N*/
/*N*/ SetDirty();
/*N*/ bValid = TRUE;
@@ -351,7 +348,6 @@ namespace binfilter {
/*N*/ SetDirty();
/*N*/ }
/*N*/ // #81844# sheet names of references are not valid until sheet is deleted
-/*N*/ pChartListenerCollection->UpdateScheduledSeriesRanges();
/*N*/ SetAutoCalc( bOldAutoCalc );
/*N*/ bValid = TRUE;
/*N*/ }
@@ -383,8 +379,6 @@ namespace binfilter {
/*N*/ if (bValid)
/*N*/ {
/*N*/ pTab[nTab]->SetName(rName);
-/*N*/ if ( pChartListenerCollection )
-/*N*/ pChartListenerCollection->UpdateSeriesRangesContainingTab( nTab );
/*N*/ }
/*N*/ }
/*N*/ return bValid;
diff --git a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
index 48cb6de..f6186d7 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
@@ -112,16 +112,10 @@ using namespace ::com::sun::star;
/*N*/ delete pUnoData;
/*N*/ }
-/*N*/ DataObject* ScChartListener::Clone() const
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");return NULL;
-/*N*/ }
-
/*N*/ void ScChartListener::SetUno(
/*N*/ const uno::Reference< chart::XChartDataChangeEventListener >& rListener,
/*N*/ const uno::Reference< chart::XChartData >& rSource )
/*N*/ {
-/*N*/ // DBG_ASSERT( rListener.is() && rSource.is(), "Nullpointer bei SetUno" );
/*N*/ delete pUnoData;
/*N*/ pUnoData = new ScChartUnoData( rListener, rSource );
/*N*/ }
@@ -237,18 +231,6 @@ using namespace ::com::sun::star;
/*N*/ FreeAll();
/*N*/ }
-/*N*/ DataObject* ScChartListenerCollection::Clone() const
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");return NULL;
-/*N*/ }
-
-
-/*N*/ void ScChartListenerCollection::ChangeListening( const String& /*rName*/,
-/*N*/ const ScRangeListRef& /*rRangeListRef*/, BOOL /*bDirty*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ void ScChartListenerCollection::FreeUnused()
/*N*/ {
/*N*/ // rueckwaerts wg. Pointer-Aufrueckerei im Array
@@ -325,33 +307,6 @@ using namespace ::com::sun::star;
/*N*/ }
-
-
-
-
-/*N*/ void ScChartListenerCollection::UpdateScheduledSeriesRanges()
-/*N*/ {
-/*N*/ for ( USHORT nIndex = 0; nIndex < nCount; nIndex++ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-
-
-/*N*/ void ScChartListenerCollection::UpdateSeriesRangesContainingTab( USHORT nTab )
-/*N*/ {
-/*N*/ ScRange aRange( 0, 0, nTab, MAXCOL, MAXROW, nTab );
-/*N*/ for ( USHORT nIndex = 0; nIndex < nCount; nIndex++ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-
-
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sc/chartlis.hxx b/binfilter/inc/bf_sc/chartlis.hxx
index a40e7f9..5edda6d 100644
--- a/binfilter/inc/bf_sc/chartlis.hxx
+++ b/binfilter/inc/bf_sc/chartlis.hxx
@@ -64,7 +64,7 @@ public:
const ScRangeListRef& rRangeListRef );
ScChartListener( const ScChartListener& );
virtual ~ScChartListener();
- virtual DataObject* Clone() const;
+ virtual DataObject* Clone() const { return NULL; } // DBG_BF_ASSERT
void SetUno( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& rListener,
const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartData >& rSource );
@@ -104,15 +104,10 @@ private:
public:
ScChartListenerCollection( ScDocument* pDoc );
ScChartListenerCollection( const ScChartListenerCollection& );
- virtual DataObject* Clone() const;
+ virtual DataObject* Clone() const { return NULL; } // DBG_BF_ASSERT
virtual ~ScChartListenerCollection();
- // nur nach copy-ctor noetig, wenn neu ins Dok gehaengt
-
- void ChangeListening( const String& rName,
- const ScRangeListRef& rRangeListRef,
- BOOL bDirty = FALSE );
// FreeUnused nur wie in ScDocument::UpdateChartListenerCollection verwenden!
void FreeUnused();
void FreeUno( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& rListener,
@@ -120,11 +115,6 @@ public:
void StartTimer();
void UpdateDirtyCharts();
void SetDirty();
-
-
- void UpdateScheduledSeriesRanges();
- void UpdateSeriesRangesContainingTab( USHORT nTab );
-
};
More information about the Libreoffice-commits
mailing list