[Libreoffice-commits] .: binfilter/bf_sch binfilter/bf_svtools binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Tue Oct 4 07:11:23 PDT 2011
binfilter/bf_sch/source/core/makefile.mk | 3
binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx | 3
binfilter/bf_sch/source/core/sch_axisid.cxx | 11 -
binfilter/bf_sch/source/core/sch_chartdoc.cxx | 37 ---
binfilter/bf_sch/source/core/sch_chaxis.cxx | 149 ----------------
binfilter/bf_sch/source/core/sch_chdescr.cxx | 12 -
binfilter/bf_sch/source/core/sch_chtmod2a.cxx | 95 ----------
binfilter/bf_sch/source/core/sch_chtmod3d.cxx | 52 -----
binfilter/bf_sch/source/core/sch_chtmode1.cxx | 57 ------
binfilter/bf_sch/source/core/sch_chtmode2.cxx | 4
binfilter/bf_sch/source/core/sch_chtmode3.cxx | 67 -------
binfilter/bf_sch/source/core/sch_chtmode5.cxx | 9
binfilter/bf_sch/source/core/sch_chtmode9.cxx | 97 ----------
binfilter/bf_sch/source/core/sch_chtmodel.cxx | 11 -
binfilter/bf_sch/source/core/sch_datalog.cxx | 37 ---
binfilter/bf_svtools/source/numbers/svt_zforlist.cxx | 2
binfilter/inc/bf_sch/axisid.hxx | 2
binfilter/inc/bf_sch/chaxis.hxx | 16 -
binfilter/inc/bf_sch/chdescr.hxx | 2
binfilter/inc/bf_sch/chtmodel.hxx | 12 -
binfilter/inc/bf_sch/datalog.hxx | 72 -------
binfilter/inc/bf_sch/modeldata.hxx | 54 -----
22 files changed, 36 insertions(+), 768 deletions(-)
New commits:
commit ed0a113489adcbfbb881583167f07987797b300f
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Oct 4 07:09:22 2011 -0700
DBG_BF_ASSERT cleanup for bf_sch
diff --git a/binfilter/bf_sch/source/core/makefile.mk b/binfilter/bf_sch/source/core/makefile.mk
index 9abe998..359c188 100644
--- a/binfilter/bf_sch/source/core/makefile.mk
+++ b/binfilter/bf_sch/source/core/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -75,7 +75,6 @@ SLOFILES = \
$(SLO)$/sch_datapoin.obj \
$(SLO)$/sch_schiocmp.obj \
$(SLO)$/sch_itempool.obj \
- $(SLO)$/sch_datalog.obj \
$(SLO)$/sch_memchrt.obj \
$(SLO)$/sch_chdescr.obj \
$(SLO)$/sch_chaxis.obj \
diff --git a/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx b/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx
index 0563ace..e7be100 100644
--- a/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx
+++ b/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx
@@ -104,9 +104,6 @@ using namespace ::com::sun::star;
/*N*/ uno::Reference< util::XRefreshable > SchAddInCollection::GetAddInByName( const ::rtl::OUString& rName )
/*N*/ {
-/*N*/ if( ! mbInitialized )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
/*N*/ const sal_Int32 nSize = maServiceNames.getLength();
/*N*/ for( sal_Int32 i = 0; i < nSize; i++ )
/*N*/ {
diff --git a/binfilter/bf_sch/source/core/sch_axisid.cxx b/binfilter/bf_sch/source/core/sch_axisid.cxx
index a29c257..2ef3a1e 100644
--- a/binfilter/bf_sch/source/core/sch_axisid.cxx
+++ b/binfilter/bf_sch/source/core/sch_axisid.cxx
@@ -68,17 +68,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Kopie erzeugen
-|*
-\************************************************************************/
-
-/*N*/ SdrObjUserData* SchAxisId::Clone(SdrObject *) const
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
-/*************************************************************************
-|*
|* Daten aus Stream lesen
|*
\************************************************************************/
diff --git a/binfilter/bf_sch/source/core/sch_chartdoc.cxx b/binfilter/bf_sch/source/core/sch_chartdoc.cxx
index 82f1a5a..2aa2afe 100644
--- a/binfilter/bf_sch/source/core/sch_chartdoc.cxx
+++ b/binfilter/bf_sch/source/core/sch_chartdoc.cxx
@@ -90,20 +90,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Diese Methode erzeugt ein neues Dokument (ChartModel) und gibt einen
-|* Zeiger darauf zurueck. Die Drawing Engine benutzt diese Methode um das
-|* Dokument oder Teile davon ins Clipboard/DragServer stellen zu koennen.
-|*
-|* this method works like a copy constructor. So make sure to copy all
-|* members inside this method !!!
-|*
-\************************************************************************/
-/*N*/ SdrModel* ChartModel::AllocModel() const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
-/*************************************************************************
-|*
|* Diese Methode erzeugt eine neue Seite (SchPage) und gibt einen Zeiger
|* darauf zurueck. Die Drawing Engine benutzt diese Methode beim Laden
|* zur Erzeugung von Seiten (deren Typ sie ja nicht kennt, da es ABLEITUNGEN
@@ -115,6 +101,7 @@ namespace binfilter {
/*N*/ {
/*N*/ return new SdrPage(*this, bMasterPage);
/*N*/ }
+
/*************************************************************************
|*
|* Inserter fuer SvStream zum Speichern
@@ -247,7 +234,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ // statt Basisklassenaufruf [ rIn >> (ChartModel&)rDoc;] direkt:
/*N*/ rIn >> (SdrModel&)rDoc;
/*N*/
/*N*/ if (rIn.GetError() != SVSTREAM_FILEFORMAT_ERROR)
@@ -262,14 +248,6 @@ namespace binfilter {
/*N*/
/*N*/ rDoc.ReadError () = FALSE;
/*N*/
-/*N*/ // alle 3D-Objekte werden bei einem Paint erstmailg sortiert, damit wird auch
-/*N*/ // das Dokument als geaendert gekennzeichnet. Diese Variable wird in der
-/*N*/ // CHVIEWSH-Paint-Methode abgefragt und bei Bedarf wird der Modified-Status
-/*N*/ // des Dokuments zurueckgesetzt.
-/*N*/
-/*N*/ // no longer needed
-/*N*/ //- rDoc.FreshLoaded () = TRUE;
-/*N*/
/*N*/ return rIn;
/*N*/ }
@@ -436,19 +414,6 @@ namespace binfilter {
/*N*/ #endif
/*N*/ }
-/*************************************************************************
-|*
-|* Setze den Modified-Status zurueck, wenn ein Dokument mit
-|* 3D-Objekten geladen und ausgegeben wurde
-|*
-\************************************************************************/
-
-// void ChartModel::ResetFreshLoaded ()
-// {
-// bFreshLoaded = FALSE;
-// SetChanged (FALSE);
-// }
-
}
diff --git a/binfilter/bf_sch/source/core/sch_chaxis.cxx b/binfilter/bf_sch/source/core/sch_chaxis.cxx
index 9bfb90c..da24985 100644
--- a/binfilter/bf_sch/source/core/sch_chaxis.cxx
+++ b/binfilter/bf_sch/source/core/sch_chaxis.cxx
@@ -50,11 +50,6 @@
#include <bf_svx/xlnwtit.hxx>
#include "schattr.hxx"
-#ifndef _SVX_CHRTITEM_HXX //autogen
-
-
-#endif
-
#define ITEMID_FONT EE_CHAR_FONTINFO
#define ITEMID_COLOR EE_CHAR_COLOR
#define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT
@@ -472,8 +467,6 @@ namespace binfilter {
/*N*/
/*N*/ if(mpModel->ChartStyle() == CHSTYLE_2D_LINE_STACKEDCOLUMN)
/*N*/ nRowCnt-=nLines;
-/*N*/ else
-/*N*/ nLines=0;
/*N*/
/*N*/ switch (meStackMode)
/*N*/ {
@@ -567,7 +560,6 @@ namespace binfilter {
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ //if ((fMin > fData) && !mbLogarithm || (fData > 0.0) && mbLogarithm)
/*N*/ if( (fMin > fData)
/*N*/ && (!mbLogarithm || fData > 0.0) )
/*N*/ fMin = fData;
@@ -591,7 +583,6 @@ namespace binfilter {
/*N*/
/*N*/ for (nRow = 1; nRow < nRowCnt; nRow++)
/*N*/ {
-/*N*/ //if(IsDataOnAxis(nRow)) //#63904#: 2,77%
/*N*/ const SfxItemSet& rDataRowAttr = mpModel->GetDataRowAttr(nRow);
/*N*/ if(mnUId == ((const SfxInt32Item &)rDataRowAttr.Get(SCHATTR_AXIS)).GetValue())
/*N*/ {
@@ -614,10 +605,6 @@ namespace binfilter {
/*N*/ double fDataMin = fData;
/*N*/ double fDataMax = fData;
/*N*/
-/*N*/ //#63904#neu: (18.8 ms -> 7.28 ms )
-/*N*/ // SfxItemSet aDataPointAttr(rDataRowAttr);
-/*N*/ // mpModel->MergeDataPointAttr(aDataPointAttr,nCol, nRow);
-/*N*/ // SfxItemSet aDataPointAttr(mpModel->GetFullDataPointAttr(nCol, nRow));//#63904#71% 69,66%
/*N*/ const SfxItemSet * pDataPointItemSet = mpModel->GetRawDataPointAttr (nCol,nRow);
/*N*/ BOOL bDataPointItemSetValid = (pDataPointItemSet!=NULL);
/*N*/
@@ -687,7 +674,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ //if ((nCol == 0) && (nRow == 1)) //und wenn hier mal DBL_MIN steht????
/*N*/ if(bInitialise)
/*N*/ {
/*N*/ bInitialise=FALSE;
@@ -714,7 +700,6 @@ namespace binfilter {
/*N*/ {
/*N*/ for (nRow = 0; nRow < nRowCnt; nRow++)
/*N*/ {
-/*N*/ //if(IsDataOnAxis(nRow)) //#63904#neu:
/*N*/ const SfxItemSet& rDataRowAttr = mpModel->GetDataRowAttr(nRow);
/*N*/ if(mnUId == ((const SfxInt32Item &)rDataRowAttr.Get(SCHATTR_AXIS)).GetValue())
/*N*/ {
@@ -734,10 +719,6 @@ namespace binfilter {
/*N*/ double fDataMin = fData;
/*N*/ double fDataMax = fData;
/*N*/
-/*N*/ //#63904#
-/*N*/ // SfxItemSet aDataPointAttr(rDataRowAttr);
-/*N*/ // mpModel->MergeDataPointAttr(aDataPointAttr,nCol, nRow);
-/*N*/ //SfxItemSet aDataPointAttr(mpModel->GetFullDataPointAttr(nCol, nRow));
/*N*/ const SfxItemSet * pDataPointItemSet = mpModel->GetRawDataPointAttr (nCol,nRow);
/*N*/ BOOL bDataPointItemSetValid = (pDataPointItemSet!=NULL);
/*N*/
@@ -807,7 +788,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ //if ((nCol == 0) && (nRow == 0))//und wenn hier mal DBL_MIN steht????
/*N*/ if(bInitialise)
/*N*/ {
/*N*/ bInitialise=FALSE;
@@ -831,17 +811,6 @@ namespace binfilter {
/*N*/ break;
/*N*/ }//switch meStackMode
/*N*/
-/*N*/
-/*N*/ // bei CHSTYLE_2D_LINE_STACKEDCOLUMN muessen die Linien nochmal extra berechnet
-/*N*/ // werden Letzte Linie = nRowCnt, da oben nRowCnt-=n #50212#
-/*N*/ long nIndex=nRowCnt;//ab hier liegen evtl. linien vor
-/*N*/ while(nLines) //nLines ist 0 wenn kein CHSTYLE_2D_LINE_STACKEDCOLUMN
-/*N*/ {
-/*?*/ if( IsDataOnAxis( nIndex ))
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*?*/ nLines--;
-/*?*/ nIndex++;
-/*N*/ }
/*N*/ if (mbPercent)
/*N*/ {
/*N*/ fMin = 0.0;
@@ -1112,9 +1081,7 @@ namespace binfilter {
/*N*/ meTextOrient = ((const SvxChartTextOrientItem&)
/*N*/ mpAxisAttr->Get(SCHATTR_TEXT_ORIENT)).GetValue();
/*N*/ // Determine the size of the texts bounding box.
-/*N*/ if (meTextOrient == CHTXTORIENT_STACKED)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ else
+/*N*/ if ( meTextOrient != CHTXTORIENT_STACKED)
/*N*/ pOutliner->SetText(aString, pOutliner->GetParagraph (0));
/*N*/ pOutliner->SetUpdateMode (TRUE);
/*N*/ Size aSize = pOutliner->CalcTextSize();
@@ -1330,21 +1297,6 @@ namespace binfilter {
/*N*/ VerifySteps();
/*N*/ }
/*N*/
-/* //NetCharts, nur absolutwerte (was passiert bei gemischt ?)
- //Sollte sowas nicht vor die Berechnung der Steps?
- if (mbRadial)
- {
- mfMin = std::max (mfMin, 0);
- mfMax = std::max (mfMax, 0);
- if (mfMin > mfMax)
- {
- double fTemp = mfMin;
-
- mfMin = mfMax;
- mfMax = fTemp;
- }
- }
-*/
/*N*/ }
@@ -1857,19 +1809,8 @@ namespace binfilter {
/*N*/
/*N*/ SvxChartTextOrder eDescrOrder;
/*N*/
-/*N*/ // FG: Einfachere Abfrage ob die Ausrichtung vom Programm vorgegeben wird oder vom Benutzer
-/*N*/ // #65364# (BM) text order is now independent from text orientation
-/* if (meTextOrient != CHTXTORIENT_AUTOMATIC)
- {
-*/
-/*N*/ eDescrOrder = ((const SvxChartTextOrderItem&)
-/*N*/ mpAxisAttr->Get(SCHATTR_TEXT_ORDER)).GetValue();
-/* }
- else
- {
- eDescrOrder = CHTXTORDER_SIDEBYSIDE;
- }
-*/
+/*N*/ eDescrOrder = ((const SvxChartTextOrderItem&) mpAxisAttr->Get(SCHATTR_TEXT_ORDER)).GetValue();
+
// FG: Hier wird nur abgefragt, ob die Beschriftung der X-Achse (der Datenachse)
// so erfolgen soll, dass Text abwechselnd hoch-tief gesetzt werden, oder nicht.
/*N*/ long nMaxWidth = IsVertical() ? maMaxTextSize.Height() : maMaxTextSize.Width();
@@ -2042,13 +1983,7 @@ namespace binfilter {
/*N*/ if (bAutoValue)
/*N*/ rValueOrient = CHTXTORIENT_STANDARD;
- // #65364# (BM) text order is now independent from text orientation
-/*N*/ SvxChartTextOrder eValueOrder = /*( bAutoValue
- ||( mbFlippedXY && (rValueOrient != CHTXTORIENT_STANDARD))
- ||(!mbFlippedXY && (rValueOrient == CHTXTORIENT_STANDARD)))
- ? CHTXTORDER_SIDEBYSIDE
- :*/
-/*N*/ ((const SvxChartTextOrderItem&)mpAxisAttr->Get(SCHATTR_TEXT_ORDER)).GetValue();
+/*N*/ SvxChartTextOrder eValueOrder = ((const SvxChartTextOrderItem&)mpAxisAttr->Get(SCHATTR_TEXT_ORDER)).GetValue();
/*N*/
/*N*/ mbStepValue = (eValueOrder != CHTXTORDER_SIDEBYSIDE);
/*N*/ mbValueDown = (eValueOrder == CHTXTORDER_DOWNUP);
@@ -2065,18 +2000,8 @@ namespace binfilter {
/*N*/ SvxChartTextOrder eValueOrder;
// FG: Einfachere Abfrage ob die Ausrichtung vom Programm vorgegeben wird oder vom Benutzer
- // #65364# (BM) text order is now independent from text orientation
-/* if (meTextOrient != CHTXTORIENT_AUTOMATIC)
- {
-*/
-/*N*/ eValueOrder = ((const SvxChartTextOrderItem&)
-/*N*/ mpAxisAttr->Get(SCHATTR_TEXT_ORDER)).GetValue();
-/* }
- else
- {
- eValueOrder = CHTXTORDER_SIDEBYSIDE;
- }
-*/
+/*N*/ eValueOrder = ((const SvxChartTextOrderItem&)mpAxisAttr->Get(SCHATTR_TEXT_ORDER)).GetValue();
+
// FG: Hier wird nur abgefragt, ob die Beschriftung der X-Achse (der Datenachse)
// so erfolgen soll, dass Text abwechselnd hoch-tief gesetzt werden, oder nicht.
/*N*/ long nMaxWidth = IsVertical() ? maMaxTextSize.Height() : maMaxTextSize.Width();
@@ -2089,7 +2014,6 @@ namespace binfilter {
/*N*/
/*N*/
/*N*/ mbValueDown = (eValueOrder == CHTXTORDER_DOWNUP);
-// meTextOrient = rValueOrient;
/*N*/ CreateTextAttr();
/*N*/ }
@@ -2161,43 +2085,6 @@ namespace binfilter {
/*N*/ mpAxisList->NbcInsertObject(SetObjectAttr (new SdrPathObj(OBJ_PLIN, aLine),
/*N*/ CHOBJID_LINE, TRUE, TRUE,mpAxisAttr));
/*N*/ }
-/* alter Original-Source, siehe ###hier###
- if (bSwitchColRow)
- {
- VERTICAL_LINE;
- if ((nPos != rRect.Left()) && (bShowYDescr ))
- {
- aLine[0].X() = aLine[1].X() = rRect.Left ();
-
- rObjList.InsertObject(SetObjectAttr(new SdrPathObj(OBJ_PLIN, aLine),
- CHOBJID_DIAGRAM_X_AXIS,TRUE, TRUE, pXGridMainAttr));
- }
- aLine[0].X() = aLine[1].X() = nPos;
- }
- else //!bSwitchColRow
- {
- HORIZONTAL_LINE;
- if ((nPos != rRect.Bottom()) && (bShowXDescr))
- {
- if(pChartYAxis->GetMin() < 0.0)
- {
- //###hier### ist jetzt anders!
-
- aLine[0].Y()=aLine[1].Y()= (pChartYAxis->GetMax()>0.0)
- ? rRect.Bottom ()
- : rRect.Top ();
-
- }
- else
- aLine[0].Y()=aLine[1].Y()= rRect.Bottom ();
-
- HORIZONTAL_LINE;
- rObjList.InsertObject(SetObjectAttr (new SdrPathObj(OBJ_PLIN, aLine),
- CHOBJID_DIAGRAM_X_AXIS,TRUE, TRUE, pXGridMainAttr));
- }
- aLine[0].Y() = aLine[1].Y() = nPos;
- }
-*/
/*N*/ }
/*N*/ long ChartAxis::CreateAxis()
@@ -2372,8 +2259,6 @@ namespace binfilter {
/*N*/ // #69810# prevent infinite loop if step wouldn't change the value of fAct
/*N*/ BOOL bStepIsOK = mbLogarithm? (fabs(mfStep) > 1.0): (mfStep != 0.0);
/*N*/
-/*N*/ // DBG_ASSERT( bStepIsOK, "Axis increment is ineffective and would cause loop" );
-/*N*/
/*N*/ if( mfMax!=mfMin && ( bStepIsOK ) )
/*N*/ {
/*N*/ double fAct = mfMin;
@@ -2577,28 +2462,6 @@ namespace binfilter {
/*N*/ ? SCHATTR_AXIS_NUMFMTPERCENT : SCHATTR_AXIS_NUMFMT)).GetValue();
/*N*/ }
-
-
-/*N*/ BOOL ChartAxis::TranslateMergedNumFormat( SvNumberFormatterIndexTable* /*pTransTable*/ )
-/*N*/ {
-/*N*/ ULONG nFmt, nMrgFmt;
-/*N*/ BOOL bRet =FALSE;
-/*N*/
-/*N*/ nFmt = GetNumFormat( mbPercent );
-/*N*/ nMrgFmt = mpNumFormatter->GetMergeFmtIndex( nFmt );
-/*N*/ if( nFmt != nMrgFmt )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
-/*N*/ nFmt = GetNumFormat( ! mbPercent );
-/*N*/ nMrgFmt = mpNumFormatter->GetMergeFmtIndex( nFmt );
-/*N*/ if( nFmt != nMrgFmt )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
-/*N*/ return bRet;
-/*N*/ }
-
/*N*/ void ChartAxis::SetAxisList( SdrObjList *pList )
/*N*/ {
/*N*/ mpAxisList = pList;
diff --git a/binfilter/bf_sch/source/core/sch_chdescr.cxx b/binfilter/bf_sch/source/core/sch_chdescr.cxx
index 29c3a22..cc5954c 100644
--- a/binfilter/bf_sch/source/core/sch_chdescr.cxx
+++ b/binfilter/bf_sch/source/core/sch_chdescr.cxx
@@ -101,18 +101,6 @@ namespace binfilter {
/*N*/ }
-/*N*/ DataDescription* ChartDataDescription::Insert( long /*nCol*/, long /*nRow*/, const SfxItemSet& rAttr, Point /*aPos*/,
-/*N*/ BOOL /*bPercent*/, ChartAdjust /*eAdjust*/, ChartAxis* /*pAxis*/ )
-/*N*/ {
-/*N*/ SvxChartDataDescr eDescr = ((const SvxChartDataDescrItem&)rAttr.Get(SCHATTR_DATADESCR_DESCR)).GetValue();
-/*N*/
-/*N*/ if(mbEnable && eDescr != CHDESCR_NONE)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ return NULL;
-/*N*/ }
-
/*N*/ void ChartDataDescription::Dirty2D( BOOL /*bRowDescr*/ )
/*N*/ {
/*N*/
diff --git a/binfilter/bf_sch/source/core/sch_chtmod2a.cxx b/binfilter/bf_sch/source/core/sch_chtmod2a.cxx
index 9c0ba27..6e61f29 100644
--- a/binfilter/bf_sch/source/core/sch_chtmod2a.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmod2a.cxx
@@ -47,8 +47,6 @@
#include <bf_svx/fwdtitem.hxx>
#include <bf_svx/fhgtitem.hxx>
#include <bf_svx/svxids.hrc>
-#ifndef _CHTMODEL_HXX
-#endif
#include "strings.hrc"
#include "glob.hrc"
@@ -112,18 +110,7 @@ namespace binfilter {
/*N*/
/*N*/ for( nCol = 0; nCol < nColCnt; nCol++ )
/*N*/ {
-/*N*/ SfxItemSet aDataPointAttr( GetFullDataPointAttr( nCol, nRow ));
-/*N*/ /*double fData =*/ GetData( nCol, nRow );
-/*N*/
/*N*/ nSegOfsMax = Max( PieSegOfs( nCol ), nSegOfsMax );
-/*N*/
-/*N*/ SvxChartDataDescr eDescr = ((const SvxChartDataDescrItem&)aDataPointAttr.
-/*N*/ Get(SCHATTR_DATADESCR_DESCR)).GetValue();
-/*N*/
-/*N*/ if( (eDescr != CHDESCR_NONE) && bShowDataDescr )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*N*/ }
/*N*/
/*N*/ // shrink rectangle if labels are printed beside the pies
@@ -336,23 +323,6 @@ namespace binfilter {
/*N*/ pList->NbcInsertObject(pRowGroup);
/*N*/ pRowLists[nRow] = pRowGroup->GetSubList();
/*N*/ pDescrLists[nRow] = 0;
-/*N*/
-/*N*/ // ******************** Data Descriptions erstellen ******************************
-/*N*/ for (nCol = 0; nCol < nColCnt; nCol++)
-/*N*/ {
-/*N*/ SfxItemSet aDataPointAttr(GetFullDataPointAttr(nCol, nRow));
-/*N*/ /*double fData =*/ GetData (nCol, nRow);
-/*N*/
-/*N*/ SvxChartDataDescr eDescr = ((const SvxChartDataDescrItem&)aDataPointAttr.
-/*N*/ Get(SCHATTR_DATADESCR_DESCR)).GetValue();
-/*N*/
-/*N*/ if( (eDescr != CHDESCR_NONE) && bShowDataDescr)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
- /**************************************************************
- * DataDescription erforderlich
- **************************************************************/
-/*N*/ }
-/*N*/ } //*************************** END DESCRIPTIONS ***********************************
/*N*/ }//End for nRow
// Das Rechteck wird dann etwas kleiner, da Text ausgegeben wird
@@ -558,10 +528,6 @@ namespace binfilter {
/*N*/
/*N*/ BOOL bRepaint = FALSE;
-/*N*/ if( IsXYChart() && ! ISFLAGSET( nChartStatus, CHS_USER_NOQUERY ) ) // in this case ask for sorting
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ SchObjGroup *pGroup;
/*N*/ SdrObjList *pList;
/*N*/ SdrObject *pObj;
@@ -632,9 +598,6 @@ namespace binfilter {
/*N*/ long nPoints = 0;
/*N*/ pLineObject = NULL;
/*N*/
- if( ((const SfxBoolItem &) rDataRowAttr.Get( SCHATTR_STAT_AVERAGE )).GetValue() )
- {DBG_BF_ASSERT(0, "STRIP"); }
-
/*N*/ aSplinePoints.clear();
/*N*/
/*N*/ for (nCol = 0; nCol < nColCnt; nCol++)
@@ -688,15 +651,10 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ if ((SvxChartKindError)
-/*?*/ ((const SfxInt32Item &) aDataPointAttr.Get (SCHATTR_STAT_KIND_ERROR)).GetValue () != CHERROR_NONE)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/
/*N*/ if(aDescr.Enabled())
/*N*/ {
/*N*/ Point aPos(aPolygon[(USHORT)nPoints-1]);
/*N*/ aPos.Y () -= 150;
-/*N*/ aDescr.Insert(nCol,nRow,aDataPointAttr,aPos,FALSE,CHADJUST_BOTTOM_CENTER,pAxis);
/*N*/ }
/*N*/ }
/*N*/
@@ -717,16 +675,16 @@ namespace binfilter {
/*N*/
/*N*/ if( bIsSplineChart )
/*N*/ {
-/*?*/ if ((eChartStyle == CHSTYLE_2D_CUBIC_SPLINE_XY) || (eChartStyle == CHSTYLE_2D_CUBIC_SPLINE_SYMBOL_XY))
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/ else
-/*?*/ {
+/*?*/ if (!( (eChartStyle == CHSTYLE_2D_CUBIC_SPLINE_XY)
+ || (eChartStyle == CHSTYLE_2D_CUBIC_SPLINE_SYMBOL_XY)
+ )
+ )
+/*?*/ {
/*?*/ XPolygon aMeshPoly;
/*?*/ approxMesh( nGranularity, aMeshPoly, aPolygon, nPoints - 1, nSplineDepth );
/*?*/ SchCalculationHelper::IntersectPolygonWithRectangle(
/*?*/ aMeshPoly, aClipRect, aSeriesPoly );
-/*?*/ }
+/*?*/ }
/*?*/
/*?*/ if( pLineObject )
/*?*/ pLineObject->NbcSetPathPoly( aSeriesPoly );
@@ -756,13 +714,6 @@ namespace binfilter {
/*N*/
/*N*/ }
/*N*/ }
-
- // insert regression curve if necessary
- // ------------------------------------
-/*N*/ if (((const SfxInt32Item &) rDataRowAttr.Get (SCHATTR_STAT_REGRESSTYPE)).GetValue () != CHREGRESS_NONE)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ aDescr.Build(TRUE);
@@ -1070,15 +1021,6 @@ namespace binfilter {
/*N*/
/*N*/ if( (eDescr != CHDESCR_NONE) && bShowDataDescr)
/*N*/ {
- /**************************************************************
- * DataDescription erforderlich
- **************************************************************/
-/*?*/ if (!pDescription)
-/*?*/ {
-/*?*/ // DataDescription noch nicht vorhanden -> erzeugen
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/
/*?*/ pDescription [nIndex].eDescr = eDescr;
/*?*/ pDescription [nIndex].bSymbol = ((const SfxBoolItem&)aDataPointAttr.
/*?*/ Get(SCHATTR_DATADESCR_SHOW_SYM)).GetValue();
@@ -1124,11 +1066,6 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ fOldData [nCol] = fData;
-/*N*/
-/*N*/ if (pDescription)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
/*N*/ else
/*N*/ {
@@ -1244,21 +1181,11 @@ namespace binfilter {
/*?*/ }
/*?*/ }
/*?*/
-/*?*/ BOOL bIsDirty = FALSE;
-/*?*/
/*?*/ for (nRows = nStart;nRows < nRowCnt;nRows ++)
/*?*/ if (pDescrLists[nRows])
/*?*/ {
/*?*/ long nIndex = nCols + nRows * nColCnt;// long nIndex = nRows + nCols * nRowCnt;
/*?*/
-/*?*/ if (!bIsDirty)
-/*?*/ if ((pDescription [nIndex].eDescr == CHDESCR_PERCENT) ||
-/*?*/ (pDescription [nIndex].eDescr == CHDESCR_TEXTANDPERCENT))
-/*?*/ if (fTotal > 100.0000001)
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/
/*?*/ if (pDescription [nIndex].fValue != DBL_MIN)
/*?*/ if( pDescription[nIndex].pLabelObj )
/*?*/ pDescrLists[nRows]->NbcInsertObject( pDescription[nIndex].pLabelObj );
@@ -1294,20 +1221,10 @@ namespace binfilter {
/*?*/ }
/*?*/ }
/*?*/
-/*?*/ BOOL bIsDirty = FALSE;
-/*?*/
/*?*/ for (nCols = 0;nCols < nColCnt;nCols ++)
/*?*/ {
/*?*/ long nIndex = nCols + nRows * nColCnt;
/*?*/
-/*?*/ if (!bIsDirty)
-/*?*/ if ((pDescription [nIndex].eDescr == CHDESCR_PERCENT) ||
-/*?*/ (pDescription [nIndex].eDescr == CHDESCR_TEXTANDPERCENT))
-/*?*/ if (fTotal > 100.0000001)
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/
/*?*/ if (pDescription[ nIndex ].fValue != DBL_MIN)
/*?*/ if( pDescription[ nIndex ].pLabelObj )
/*?*/ pDescrLists[nRows]->NbcInsertObject( pDescription[ nIndex ].pLabelObj );
diff --git a/binfilter/bf_sch/source/core/sch_chtmod3d.cxx b/binfilter/bf_sch/source/core/sch_chtmod3d.cxx
index f502bc4..7bd40e9 100644
--- a/binfilter/bf_sch/source/core/sch_chtmod3d.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmod3d.cxx
@@ -1136,11 +1136,6 @@ namespace binfilter {
/*N*/ if (eChartStyle == CHSTYLE_3D_BAR) a3DPos.Y() += nPartWidth;
/*N*/ else a3DPos.X() += nPartWidth;
/*N*/
-/*N*/ if( pScene && bShowDataDescrLocal )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ }// end for nCol
/*N*/
/*N*/ // #109628# insert row groups into main scene only if they contain data
@@ -1311,15 +1306,6 @@ namespace binfilter {
/*N*/
/*N*/ if( (eDescr != CHDESCR_NONE) && bShowDataDescr)
/*N*/ {
- /******************************************************
- * DataDescription erforderlich
- ******************************************************/
-/*?*/ if (!pDescription)
-/*?*/ {
-/*?*/ // DataDescription noch nicht vorhanden -> erzeugen
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/
/*?*/ pDescription [nCol].eDescr = eDescr;
/*?*/ pDescription [nCol].bSymbol = ((const SfxBoolItem&)aDataPointAttr.
/*?*/ Get(SCHATTR_DATADESCR_SHOW_SYM)).GetValue();
@@ -1372,11 +1358,6 @@ namespace binfilter {
/*?*/ }
/*?*/
/*?*/ pDescription [nCol].eAdjust = CHADJUST_CENTER_CENTER;
-/*?*/
-/*?*/ if( eDescr != CHDESCR_NONE && bValidData )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
/*N*/ }
/*N*/
/*N*/ a3DPos.X() += nPartWidth;
@@ -1496,15 +1477,6 @@ namespace binfilter {
/*N*/
/*N*/ if( (eDescr != CHDESCR_NONE) && bShowDataDescr)
/*N*/ {
- /******************************************************
- * DataDescription erforderlich
- ******************************************************/
-/*?*/ if (!pDescription)
-/*?*/ {
-/*?*/ // DataDescription noch nicht vorhanden -> erzeugen
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/
/*?*/ pDescription [nRow].eDescr = eDescr;
/*?*/ pDescription [nRow].bSymbol = ((const SfxBoolItem&)aDataPointAttr.
/*N*/ Get(SCHATTR_DATADESCR_SHOW_SYM)).GetValue();
@@ -1749,18 +1721,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ // BM: moved here from Dirty3D.
-/*N*/ if( pDescription )
-/*N*/ {
-/*?*/ for (nRow = 0; nRow < nRowCnt; nRow ++)
-/*?*/ {
-/*?*/ if (pScene && pDescription[nRow].fValue != DBL_MIN)
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*N*/ }
-/*N*/ }
-/*N*/
/*N*/ if (bSwitchColRow)
/*N*/ {
/*N*/ a3DPos.Y() += nBarWidthX ? nGapY * 2 : nPartWidth;
@@ -1933,8 +1893,7 @@ namespace binfilter {
/*N*/ GetPage( 0 )->RemoveObject( 0 );
/*N*/ }
/*N*/
-/*N*/ SchE3dExtrudeObj* pObj=new SchE3dExtrudeObj(aDefltAttr3D,
-/*N*/ aPolyPolygon,nZExtrude);
+/*N*/ SchE3dExtrudeObj* pObj = new SchE3dExtrudeObj(aDefltAttr3D, aPolyPolygon,nZExtrude);
/*N*/
/*N*/ DBG_ASSERT( pObj, "couldn't create extrude object" );
/*N*/
@@ -1944,6 +1903,7 @@ namespace binfilter {
/*N*/ pObj->SetItem( Svx3DDoubleSidedItem( TRUE ));
/*N*/
/*N*/ pScene->Insert3DObj(pObj);
+/*N*/
/*N*/ pObj->InsertUserData(new SchDataPoint(nCol, nRow));
/*N*/ pObj->InsertUserData (new SchObjectId (CHOBJID_DIAGRAM_DATA));
/*N*/ pObj->SetMoveProtect(TRUE);
@@ -1956,14 +1916,6 @@ namespace binfilter {
/*N*/ Matrix4D aMatrix;
/*N*/ aMatrix.TranslateZ(-nZExtrude/2);
/*N*/ pObj->NbcSetTransform(aMatrix);
-/*N*/
-/*N*/
-/*N*/ if(aDescr.Enabled())
-/*N*/ {
-/*N*/ DataDescription* pDescr=aDescr.Insert(nCol,nRow,aDataPointAttr,Point(0,0),FALSE,CHADJUST_BOTTOM_CENTER,pChartYAxis);
-/*N*/ if(pDescr)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ }
/*N*/ }
/*N*/ }
/*N*/ aDescr.Build3D(pScene);
diff --git a/binfilter/bf_sch/source/core/sch_chtmode1.cxx b/binfilter/bf_sch/source/core/sch_chtmode1.cxx
index e78cb2d..5ae44be 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode1.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode1.cxx
@@ -69,7 +69,7 @@
#include <bf_svx/xlnwtit.hxx>
#include "pairs.hxx"
-#include "datalog.hxx"
+#include "memchrt.hxx"
#include "chaxis.hxx"
#include "chmod3d.hxx"
#include "schmod.hxx"
@@ -276,21 +276,18 @@ namespace binfilter {
/*N*/
/*N*/ SetTextAttributes (aTextAttr);
/*N*/
-/*N*/ if(IsAttrChangeNeedsBuildChart(rAttr))
-/*N*/ {
-/*N*/ // in this case a text resize/reorg might be necessary
+/*N*/ // in this case a text resize/reorg might be necessary
/*N*/
-/*N*/ Size aSize = pOutliner->CalcTextSize();
-/*N*/ aSize.Height() += TEXTHEIGHT_OFS;
-/*N*/ aSize.Width () = (aSize.Width () * 6) / 5;
+/*N*/ Size aSize = pOutliner->CalcTextSize();
+/*N*/ aSize.Height() += TEXTHEIGHT_OFS;
+/*N*/ aSize.Width () = (aSize.Width () * 6) / 5;
/*N*/
-/*N*/ OutlinerParaObject* pPara = pOutliner->CreateParaObject();
+/*N*/ OutlinerParaObject* pPara = pOutliner->CreateParaObject();
/*N*/
-/*N*/ pOutliner->Clear();
+/*N*/ pOutliner->Clear();
/*N*/
-/*N*/ rTextObj.SetOutlinerParaObject(pPara);
-/*N*/ AdjustTextSize(rTextObj, aSize);
-/*N*/ }
+/*N*/ rTextObj.SetOutlinerParaObject(pPara);
+/*N*/ AdjustTextSize(rTextObj, aSize);
/*N*/ }
/*N*/ }
/*************************************************************************
@@ -673,9 +670,6 @@ namespace binfilter {
/*N*/ {
/*N*/ if (nRowListCnt > nCnt)
/*N*/ {
-/*N*/ //bevor attribute geloescht werden, wird reorganisiert
-/*N*/ LogBookAttrData();
-/*N*/
/*N*/ //Jetzt darf erst der Ueberhang geloescht werden:
for ( i = nCnt; i < nRowListCnt; ++i )
{
@@ -709,26 +703,11 @@ namespace binfilter {
/*N*/ SetupLineColors( SETLINES_FILLCOLOR, nRowListCnt );
/*N*/ }
/*N*/ }
-/*N*/ LogBookAttrData();
/*N*/ }
/*************************************************************************
|*
-|* ggf. Attribute neu Organisieren erzeugen
-|*
-\************************************************************************/
-/*N*/ void ChartModel::LogBookAttrData()
-/*N*/ {
-/*N*/ CHART_TRACE( "ChartModel::LogBookAttrData" );
-/*N*/
-/*N*/ if(pLogBook)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-/*************************************************************************
-|*
|* RowAttr neu setzen:
|*
\************************************************************************/
@@ -979,11 +958,6 @@ void ChartModel::DestroyDefaultColors ()
/*N*/ )
/*N*/ )
/*N*/ {
-/*?*/ if ( nLines > MAXLEGENDLINES )
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*?*/ }
-/*?*/
/*?*/ ULONG nLclParaCnt = pInOutliner->GetParagraphCount();
/*?*/
/*?*/ for (ULONG i = 0; i < nLclParaCnt; i++)
@@ -993,19 +967,6 @@ void ChartModel::DestroyDefaultColors ()
/*?*/ aAttr.Put( SfxBoolItem(EE_PARA_HYPHENATE, TRUE) );
/*?*/ pInOutliner->SetParaAttribs(i, aAttr);
/*?*/ }
-/*?*/
-/*?*/ //#50395# durch Bindestriche vergrößert worden->
-/*?*/ //statt 2 werden jetzt 3 Zeilen benötigt
-/*?*/ ULONG nActLines = 0;
-/*?*/ for( USHORT n = 0; n < pInOutliner->GetParagraphCount(); n++ )
-/*?*/ {
-/*?*/ nActLines += pInOutliner->GetLineCount( n );
-/*?*/ }
-/*?*/ if(nActLines>nLines)
-/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ }
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sch/source/core/sch_chtmode2.cxx b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
index 8a1e7a0..dae98a1 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
@@ -436,10 +436,6 @@ enum ChartStyleV0
/*N*/
/*N*/ delete pSymbolAttr;
/*N*/ }
-/*N*/ else //i >= nCnt
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ // FG: Jetzt wird aTextPos fuer den naechsten Legendeneintrag gesetzt
/*N*/ if (bWide)
diff --git a/binfilter/bf_sch/source/core/sch_chtmode3.cxx b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
index 7fd18c7..f21efa6 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode3.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
@@ -45,9 +45,8 @@
#ifndef _SVX_CHRTITEM_HXX
#define ITEMID_DOUBLE 0
#define ITEMID_CHARTTEXTORIENT SCHATTR_TEXT_ORIENT
-
-
#endif
+
#define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT
#include <globfunc.hxx>
#include <bf_svx/svxids.hrc>
@@ -83,17 +82,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Entscheidung, ob BuildChart notwendig
-|*
-\************************************************************************/
-/*N*/ BOOL ChartModel::IsAttrChangeNeedsBuildChart(const SfxItemSet&)
-/*N*/ {
-/*N*/ // BM #60999# rebuild for all EE_CHAR attributes because of possibly red color for negative numbers. sorry :-(
-/*N*/ return TRUE;
-/*N*/ }
-
-/*************************************************************************
-|*
|* Achsen-Attribute ermitteln
|*
\************************************************************************/
@@ -246,15 +234,13 @@ namespace binfilter {
/*N*/ else
/*N*/ OSL_FAIL( "ChartAxis not found for Object" );
/*N*/
-/*N*/ if(IsAttrChangeNeedsBuildChart(aSet))
-/*N*/ BuildChart(FALSE,nId); //z.B. auch Texte skalieren!
+/*N*/ BuildChart(FALSE,nId); //z.B. auch Texte skalieren!
/*N*/ return TRUE;
/*N*/ }
/*N*/ }
/*N*/ else
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
- return FALSE;
+ return FALSE;
/*N*/ }
/*N*/ }
@@ -274,7 +260,6 @@ namespace binfilter {
/*N*/ {
/*N*/
/*N*/ CHART_TRACE1( "ChartModel::PutDataRowAttr %smerge", bMerge? "": "NO " );
-/*N*/ // DBG_ITEMS((SfxItemSet&)rAttr,this);
/*N*/
/*N*/ if( aDataRowAttrList.size() <= (unsigned long)nRow )
/*N*/ {
@@ -286,16 +271,8 @@ namespace binfilter {
/*?*/ aDataRowAttrList[ nRow ]->ClearItem();
/*N*/
/*N*/ PutItemSetWithNameCreation( *aDataRowAttrList[ nRow ], rAttr );
-/*N*/
-/*N*/ if(bClearPoints && (nRow < GetRowCount()))
-/*N*/ {
-/*N*/ long nCol,nColCnt=GetColCount();
-/*N*/ for(nCol=0;nCol<nColCnt;nCol++)
-/*N*/ {
-/*N*/ ClearDataPointAttr(nCol,nRow,rAttr);
-/*N*/ }
-/*N*/ }
/*N*/ }
+
/*************************************************************************
|*
|* Datenreihen-Attribute ermitteln
@@ -696,25 +673,6 @@ namespace binfilter {
/*************************************************************************
|*
-|* Datenpunkt-Attribute loeschen, die im Itemset (Argument) vorhanden sind
-|*
-\************************************************************************/
-
-/*N*/ void ChartModel::ClearDataPointAttr( long nCol, long nRow, const SfxItemSet& /*rAttr*/ )
-/*N*/ {
-/*N*/
-/*N*/ CHART_TRACE( "ChartModel::ClearDataPointAttr" );
-/*N*/
-/*N*/ ItemSetList* pAttrList = IsDataSwitched() //abhaengig vom Charttyp - statt bSwitchData
-/*N*/ ? &aSwitchDataPointAttrList
-/*N*/ : &aDataPointAttrList;
-/*N*/
-/*N*/ SfxItemSet* pItemSet = (*pAttrList)[ nCol * GetRowCount() + nRow ];
-/*N*/ if (pItemSet != NULL)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ }
-/*************************************************************************
-|*
|* Datenpunkt-Attribute setzen
|*
\************************************************************************/
@@ -971,15 +929,6 @@ namespace binfilter {
/*N*/ break;
/*N*/ }
/*N*/
-/*N*/ // if stacked is set the string contains linefeeds which have to be removed
-/*N*/ const SfxPoolItem* pPoolItem = NULL;
-/*N*/ if( pItemSet &&
-/*N*/ pItemSet->GetItemState( SCHATTR_TEXT_ORIENT, FALSE, &pPoolItem ) == SFX_ITEM_SET &&
-/*N*/ SAL_STATIC_CAST( const SvxChartTextOrientItem*, pPoolItem )->GetValue() == CHTXTORIENT_STACKED )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ if( pStrToChange )
/*N*/ *(pStrToChange) = aTitle;
/*N*/ }
@@ -1010,20 +959,15 @@ namespace binfilter {
/*N*/ case CHOBJID_DIAGRAM_SPECIAL_GROUP:
/*N*/ case CHOBJID_DIAGRAM_ROWGROUP:
/*N*/ case CHOBJID_LEGEND_SYMBOL_ROW:
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*?*/ break;
/*?*/
/*?*/ case CHOBJID_DIAGRAM_DATA:
/*?*/ case CHOBJID_LEGEND_SYMBOL_COL:
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*?*/ break;
/*?*/
/*?*/ case CHOBJID_DIAGRAM_STATISTICS_GROUP :
/*?*/ case CHOBJID_DIAGRAM_AVERAGEVALUE :
/*?*/ case CHOBJID_DIAGRAM_REGRESSION :
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*?*/ break;
/*?*/
/*N*/ case CHOBJID_DIAGRAM_WALL:
@@ -1392,7 +1336,6 @@ namespace binfilter {
/*N*/ }
/*N*/ break;
/*N*/ case CHOBJID_AREA:
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*?*/ break;
/*N*/ default:
/*N*/ GetAttr(nId,nIndex1).Put(rAttr,TRUE);
@@ -1404,7 +1347,7 @@ namespace binfilter {
/*N*/
/*N*/ if(bForceBuild || nIndex1!=-1)
/*N*/ BuildChart(FALSE);
-/*N*/ else if(bNeedChanges && IsAttrChangeNeedsBuildChart(rAttr))
+/*N*/ else if(bNeedChanges)
/*?*/ BuildChart(FALSE);
/*N*/
/*N*/ return bResult;
diff --git a/binfilter/bf_sch/source/core/sch_chtmode5.cxx b/binfilter/bf_sch/source/core/sch_chtmode5.cxx
index a82bc8b..3295557 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode5.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode5.cxx
@@ -194,15 +194,8 @@ namespace binfilter {
/*N*/ // merge old one to new one and set new one as member
/*N*/ if( pNewFormatter && pNumFormatter )
/*N*/ {
-/*N*/ SvNumberFormatterIndexTable* pTransTable =
-/*N*/ pNewFormatter->MergeFormatter( *pNumFormatter );
-/*N*/
+/*N*/ pNewFormatter->MergeFormatter( *pNumFormatter );
/*N*/ SetNumberFormatter( pNewFormatter );
-/*N*/
-/*N*/ if( pTransTable && pTransTable->Count() )
-/*N*/ {
-/*N*/ TranslateAllNumFormatIds( pTransTable );
-/*N*/ }
/*N*/ }
/*N*/ else if( pNewFormatter )
/*N*/ {
diff --git a/binfilter/bf_sch/source/core/sch_chtmode9.cxx b/binfilter/bf_sch/source/core/sch_chtmode9.cxx
index 5fcd7c0..90f3869 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode9.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode9.cxx
@@ -27,14 +27,13 @@
************************************************************************/
#ifdef _MSC_VER
#pragma optimize("",off)
-
#pragma hdrstop
#endif
+
#include <bf_svx/svdorect.hxx>
#include <bf_svx/svdopath.hxx>
-
#include <bf_svx/xlnclit.hxx>
#ifndef _ZFORLIST_HXX //autogen
@@ -43,7 +42,6 @@
#endif
#endif
-
#include <list>
#include <bf_svx/eeitem.hxx>
@@ -55,8 +53,6 @@
#define ITEMID_CHARTDATADESCR SCHATTR_DATADESCR_DESCR
#define ITEMID_CHARTTEXTORDER SCHATTR_TEXT_ORDER
#define ITEMID_CHARTTEXTORIENT SCHATTR_TEXT_ORIENT
-
-
#endif
#define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT
@@ -615,9 +611,6 @@ namespace binfilter {
/*N*/ BOOL bShow = (aObjRect.Bottom() >= aObjRect.Top());
/*N*/ aObjRect.Justify();
/*N*/
-/*N*/ if (!nCol && ((const SfxBoolItem &) rDataRowAttr.Get (SCHATTR_STAT_AVERAGE)).GetValue ())
- {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/
/*N*/ if (bShow && ((!bLogarithm && (fData != DBL_MIN)) ||
/*N*/ (bLogarithm && (fData != DBL_MIN) && (fData > 0.0))))
/*N*/ {
@@ -680,16 +673,6 @@ namespace binfilter {
/*N*/ pRowLists[nRow]->NbcInsertObject(CreateRect (aObjRect, nCol, nRow, aDataPointAttr));
/*N*/ }
/*N*/
-/*N*/ if ((SvxChartKindError)
-/*N*/ ((const SfxInt32Item &) aDataPointAttr.Get (SCHATTR_STAT_KIND_ERROR)).GetValue () !=
-/*N*/ CHERROR_NONE)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
-/*N*/ if(aDescr.Enabled())
-/*N*/ {
-/*N*/ Point aPos(bIsLine ? pLine[nRow-nLineStart][1] : aObjRect.TopCenter() );
-/*N*/ aDescr.Insert(nCol,nRow,aDataPointAttr,aPos,FALSE,CHADJUST_BOTTOM_CENTER,pAxis);
-/*N*/ }
/*N*/ }
/*N*/ else if (bIsLine)
/*N*/ {
@@ -816,13 +799,6 @@ namespace binfilter {
/*?*/ pTracePoint[nRow]=bIsDownward ? aBarRect.BottomRight() :aBarRect.TopRight();//#51471#
/*N*/ }
/*N*/ }
-/*N*/ if(aDescr.Enabled())
-/*N*/ {
-/*N*/ if(bIsLine)
-/*?*/ aDescr.Insert(nCol,nRow,aDataPointAttr,pLine[nRow-nLineStart][1],FALSE,CHADJUST_BOTTOM_CENTER,pAxis);
-/*N*/ else
-/*N*/ aDescr.Insert(nCol,nRow,aDataPointAttr,aObjRect.Center(),FALSE,CHADJUST_CENTER_CENTER,pAxis);
-/*N*/ }
/*N*/ }
/*N*/ break;
/*N*/ }
@@ -836,25 +812,16 @@ namespace binfilter {
/*N*/ BOOL bShow = (aObjRect.Right() >= aObjRect.Left());
/*N*/ aObjRect.Justify();
/*N*/
-/*N*/ if (!nCol && ((const SfxBoolItem &) rDataRowAttr.Get (SCHATTR_STAT_AVERAGE)).GetValue ())
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/
/*N*/ if ((bShow) && ((!bLogarithm && (fData != DBL_MIN)) ||
/*N*/ (bLogarithm && (fData != DBL_MIN) && (fData > 0.0))))
/*N*/ {
/*N*/ pRowLists[nRow]->NbcInsertObject(CreateRect (aObjRect, nCol, nRow, aDataPointAttr));
/*N*/
-/*N*/ if ((SvxChartKindError)
-/*N*/ ((const SfxInt32Item &) aDataPointAttr.Get (SCHATTR_STAT_KIND_ERROR)).GetValue () !=
-/*N*/ CHERROR_NONE)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
/*N*/ if(aDescr.Enabled())
/*N*/ {
/*N*/ Point aPos(aObjRect.TopRight());
/*N*/ aPos.Y()+=aObjRect.GetHeight() / 2;
/*N*/ aPos.X()+=500;
-/*N*/ aDescr.Insert(nCol,nRow,aDataPointAttr,aPos,FALSE,CHADJUST_CENTER_LEFT,pAxis);
/*N*/ }
/*N*/ }
/*N*/ pBar->NextBar();
@@ -882,9 +849,6 @@ namespace binfilter {
/*N*/ pObj = SetObjectAttr( pObj, CHOBJID_DIAGRAM_DATA, TRUE, TRUE, &aDataPointAttr );
/*N*/ pObj->InsertUserData(new SchDataPoint(nCol, nRow));
/*N*/ pRowLists[nRow]->NbcInsertObject(pObj);
-/*N*/
-/*N*/ if(aDescr.Enabled())
-/*N*/ aDescr.Insert(nCol,nRow,aDataPointAttr,aObjRect.Center(),FALSE,CHADJUST_CENTER_CENTER,pAxis);
/*N*/ }
/*N*/ break;
/*N*/ }
@@ -1136,12 +1100,6 @@ namespace binfilter {
/*N*/ pList->NbcInsertObject(pBarGroup);
/*N*/ pBarList = pBarGroup->GetSubList();
/*N*/
-/*N*/ //Statistik:
-/*N*/ if ( ((const SfxBoolItem &) rDataRowAttr.Get (SCHATTR_STAT_AVERAGE)).GetValue ())
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ for (nCol = 0; nCol < nColCnt; nCol++)
/*N*/ {
/*N*/ SfxItemSet aDataPointAttr(GetFullDataPointAttr(nCol,nRow));
@@ -1154,26 +1112,7 @@ namespace binfilter {
/*N*/ if(fData != DBL_MIN)
/*N*/ {
/*N*/ Rectangle aObjRect(Point(pBar->BarLeft(),nLow),Size(pBar->BarWidth(),nHi-nLow));
-/*N*/
/*N*/ pBarList->NbcInsertObject(CreateRect(aObjRect,nCol,nRow,aDataPointAttr));
-/*N*/
-/*N*/ if ((SvxChartKindError)
-/*N*/ ((const SfxInt32Item &) aDataPointAttr.Get (SCHATTR_STAT_KIND_ERROR)).GetValue () !=
-/*N*/ CHERROR_NONE)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
-/*N*/
-/*N*/ // ***************************** Description *****************************
-/*N*/ SvxChartDataDescr eDescr = ((const SvxChartDataDescrItem&)aDataPointAttr.
-/*N*/ Get(SCHATTR_DATADESCR_DESCR)).GetValue();
-/*N*/
-/*N*/ if((eDescr!=CHDESCR_NONE)&&bShowDataDescr)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ // ************************* end description *******************************
/*N*/ }
/*N*/ pBar->NextCol();
/*N*/ }
@@ -1280,12 +1219,6 @@ namespace binfilter {
/*N*/ pList->NbcInsertObject(pStatGroup);
/*N*/ pStatLists [nRow] = pStatGroup->GetSubList();
/*N*/
-/*N*/ if( ! bStacked )
-/*N*/ {
-/*N*/ if (((const SfxBoolItem &) rDataRowAttr.Get (SCHATTR_STAT_AVERAGE)).GetValue ())
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ }
-/*N*/
/*N*/ for (nCol = 0; nCol < nColCnt; nCol++)
/*N*/ {
/*N*/ SfxItemSet aDataPointAttr(rDataRowAttr);//#63904#
@@ -1333,23 +1266,13 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ if (!bStacked)
-/*N*/ {
-/*N*/ if ((SvxChartKindError)
-/*N*/ ((const SfxInt32Item &)aDataPointAttr.Get(SCHATTR_STAT_KIND_ERROR)).GetValue () != CHERROR_NONE)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
-/*N*/ }
-/*N*/
/*N*/ if(aDescr.Enabled())
/*N*/ {
/*N*/ Point aPos(aPolygon[nPoints-1]);
/*N*/ if(aPos.X() == aRect.Left())
/*N*/ {
/*N*/ aPos.X()+=50;
-/*N*/ aDescr.Insert(nCol,nRow,aDataPointAttr,aPos,FALSE,CHADJUST_BOTTOM_LEFT,pAxis);
/*N*/ }
-/*N*/ else
-/*N*/ aDescr.Insert(nCol,nRow,aDataPointAttr,aPos,FALSE,CHADJUST_BOTTOM_CENTER,pAxis);
/*N*/ }
/*N*/ // ************************* end description *******************************
/*N*/ }
@@ -1746,24 +1669,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void ChartModel::TranslateAllNumFormatIds( SvNumberFormatterIndexTable* pTransTable )
-/*N*/ {
-/*N*/ if( pChartXAxis->TranslateMergedNumFormat( pTransTable ) &&
-/*N*/ nXLastNumFmt >= 0 )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
-/*N*/ if( pChartYAxis->TranslateMergedNumFormat( pTransTable ) &&
-/*N*/ nYLastNumFmt >= 0 )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/
-/*N*/ pChartZAxis->TranslateMergedNumFormat( pTransTable );
-/*N*/ pChartAAxis->TranslateMergedNumFormat( pTransTable );
-/*N*/
-/*N*/ if( pChartBAxis->TranslateMergedNumFormat( pTransTable ) &&
-/*N*/ nBLastNumFmt >= 0 )
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ }
-
/*N*/ void ChartModel::SetNumLinesColChart(const long nSet, BOOL bForceStyleChange)
/*N*/ {
/*N*/ const long nOldNumLines = nNumLinesInColChart;
diff --git a/binfilter/bf_sch/source/core/sch_chtmodel.cxx b/binfilter/bf_sch/source/core/sch_chtmodel.cxx
index da4a8c2..5013ee9 100644
--- a/binfilter/bf_sch/source/core/sch_chtmodel.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmodel.cxx
@@ -102,7 +102,6 @@ class SbxArray;
#include "schresid.hxx"
#include "glob.hrc"
-#include "datalog.hxx"
#include "chaxis.hxx"
#include "chtscene.hxx"
@@ -159,7 +158,6 @@ using namespace ::com::sun::star;
/*N*/ nBarPercentWidth(100), //#50116#
/*N*/ nNumLinesInColChart(0), //#50212#
/*N*/ m_nDefaultColorSet(0), //#50037#
-/*N*/ pLogBook(NULL),
/*N*/ aChartRect (Rectangle ()),
/*N*/ aInitialSize (Size ()),
/*N*/ pChItemPool (new SchItemPool),
@@ -646,7 +644,6 @@ void ChartModel::ClearItemSetLists()
/*N*/ }
/*N*/
/*N*/ if (pTestTextObj != NULL) delete pTestTextObj;
-/*N*/ if (pLogBook) delete pLogBook;
/*N*/
/*N*/
/*N*/
@@ -658,14 +655,6 @@ void ChartModel::ClearItemSetLists()
/*N*/
/*N*/ if(m_pUndoActionFromDraw) delete m_pUndoActionFromDraw;
/*N*/ }
-/*************************************************************************
-|*
-|* Das Logbuch dient zur ReAttributierung, nachdem die DataBrowseBox
-|* aufgerufen und Daten hinzugefuegt wurden. Die BrowseBox setzt
-|* eine
-|*
-\************************************************************************/
-
/*************************************************************************
|*
diff --git a/binfilter/bf_sch/source/core/sch_datalog.cxx b/binfilter/bf_sch/source/core/sch_datalog.cxx
deleted file mode 100644
index ae1762e..0000000
--- a/binfilter/bf_sch/source/core/sch_datalog.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#include "datalog.hxx"
-namespace binfilter {
-
-/*N*/ SchDataLogBook::~SchDataLogBook()
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
index 210b577..4b5adfe 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
@@ -2566,7 +2566,6 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter
nNewKey = nCLOffset + nOffset;
if (!aFTable.Get(nNewKey)) // noch nicht da
{
-// pNewEntry = new SvNumberformat(*pFormat); // Copy reicht nicht !!!
pNewEntry = new SvNumberformat( *pFormat, *pFormatScanner );
if (!aFTable.Insert(nNewKey, pNewEntry))
delete pNewEntry;
@@ -2580,7 +2579,6 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter
}
else // benutzerdef.
{
-// pNewEntry = new SvNumberformat(*pFormat); // Copy reicht nicht !!!
pNewEntry = new SvNumberformat( *pFormat, *pFormatScanner );
nNewKey = ImpIsEntry(pNewEntry->GetFormatstring(),
nCLOffset,
diff --git a/binfilter/inc/bf_sch/axisid.hxx b/binfilter/inc/bf_sch/axisid.hxx
index 9adc6f8..93f94cc 100644
--- a/binfilter/inc/bf_sch/axisid.hxx
+++ b/binfilter/inc/bf_sch/axisid.hxx
@@ -52,7 +52,7 @@ public:
SchAxisId ();
SchAxisId (long nId);
- virtual SdrObjUserData* Clone(SdrObject *pObj) const;
+ virtual SdrObjUserData* Clone(SdrObject *pObj) const { return NULL; } // DBG_BF_ASSERT
virtual void WriteData(SvStream& ) {}
virtual void ReadData(SvStream& rIn);
diff --git a/binfilter/inc/bf_sch/chaxis.hxx b/binfilter/inc/bf_sch/chaxis.hxx
index e952269..f78b8d6 100644
--- a/binfilter/inc/bf_sch/chaxis.hxx
+++ b/binfilter/inc/bf_sch/chaxis.hxx
@@ -258,20 +258,7 @@ public:
void SetMax(double f) { mfMax = f; }
void SetMin(double f) { mfMin = f; }
BOOL IsLogarithm() const { return mbLogarithm; }
- /* Freischalten, wenn ben�tigt:
-
- BOOL IsAutoMin() const {return mbAutoMin;}
- BOOL IsAutoMax() const {return mbAutoMax;}
- BOOL IsAutoOrigin()const {return mbAutoOrigin;}
-
- void SetOrigin(double f); {mfOrigin=f;}
- void SetStep(double f); {mfStep=f;}
- void SetHelpStep(double f); {mfStepHelp=f;}
- void SetLogarithmic(BOOL b) {mbLogarithm=b;}
- void SetAutoMin(BOOL b) {mbAutoMin=b;}
- void SetAutoMax(BOOL b) {mbAutoMax=b;}
- void SetAutoOrigin(BOOL b) {mbAutoOrigin=b;}
- */
+
void Initialise(const Rectangle &rRect,BOOL bFlippedXY=FALSE,long eStackmode=CHSTACK_NONE,BOOL bPercent=FALSE,BOOL bRadial=FALSE,BOOL bPercentCol=TRUE);
void VerifySteps();
@@ -360,7 +347,6 @@ public:
//nDir ist Flag, kann sein CHAXIS_MARK_INNER und CHAXIS_MARK_OUTER (oder beides)
SdrObject *CreateMarks(long nPosition,long nLen,long nWhichTicks);
- BOOL TranslateMergedNumFormat( SvNumberFormatterIndexTable* pTransTable );
long GetUniqueId() const { return mnUId; }
/** Converts a CHOBJID into an axis UId.
diff --git a/binfilter/inc/bf_sch/chdescr.hxx b/binfilter/inc/bf_sch/chdescr.hxx
index 2dead71..e7746e2 100644
--- a/binfilter/inc/bf_sch/chdescr.hxx
+++ b/binfilter/inc/bf_sch/chdescr.hxx
@@ -101,8 +101,6 @@ public:
void Build( BOOL bRowDescr=TRUE ); // insert data description in list (i.e. page)
void Build3D( ChartScene* pScene, Matrix4D* pMatrix=NULL );
- DataDescription* Insert( long nCol, long nRow, const SfxItemSet& rAttr, Point aPos,
- BOOL bPercent, ChartAdjust eAdjust, ChartAxis* pAxis);
ChartDataDescription( long nCols, long nRows, SdrObjList *pList, ChartModel* mpModel, BOOL bEnable=TRUE );
~ChartDataDescription();
diff --git a/binfilter/inc/bf_sch/chtmodel.hxx b/binfilter/inc/bf_sch/chtmodel.hxx
index 1e4bacd..8868688 100644
--- a/binfilter/inc/bf_sch/chtmodel.hxx
+++ b/binfilter/inc/bf_sch/chtmodel.hxx
@@ -85,7 +85,6 @@ class E3dCompoundObject;
class E3dObject;
class SfxPrinter;
class E3dLabelObj;
-class SchDataLogBook;
class E3dLabelObj;
struct DataDescription;
class SchRectObj;
@@ -161,7 +160,7 @@ public:
// SdrModel
virtual void SetChanged( bool bFlag = TRUE );
- virtual SdrModel * AllocModel() const;
+ virtual SdrModel * AllocModel() const { return NULL; } // DBG_BF_ASSERT
virtual SdrPage * AllocPage( bool bMasterPage );
void NewOrLoadCompleted( USHORT eMode );
@@ -339,10 +338,6 @@ public:
double GetSigmaY( long nRow );
double GetBigErrorY( long nRow, double fError );
-
- /// returns TRUE, if change requires BuildChart - currently always TRUE !
- BOOL IsAttrChangeNeedsBuildChart( const SfxItemSet& rAttr );
-
BOOL SetBaseType( long nBaseType );
// chart features (see chtmode7.cxx)
@@ -406,7 +401,7 @@ public:
BOOL bMerge = TRUE );
const SfxItemSet & GetDataPointAttr( long nCol,long nRow ) const;
- void ClearDataPointAttr( long nCol, long nRow, const SfxItemSet & rAttr );
+
SfxItemSet GetFullDataPointAttr( long nCol, long nRow ) const;
SfxItemSet & MergeDataPointAttr( SfxItemSet & rAttr, long nCol, long nRow) const;
@@ -609,7 +604,6 @@ public:
void SetNumberFormatter( SvNumberFormatter* );
void DataRangeChanged( long _nOldRowCnt = 0, long _nOldColCnt = 0 );
- void TranslateAllNumFormatIds( SvNumberFormatterIndexTable* );
/** set new doc shell if there was no one before
returns true if new shell was set */
@@ -713,7 +707,6 @@ private:
long nNumLinesInColChart;
long m_nDefaultColorSet; // #50037#
- SchDataLogBook* pLogBook;
Rectangle aChartRect;
Size aInitialSize;
@@ -1074,7 +1067,6 @@ private:
const long nYOfs,
USHORT & rIndex );
- void LogBookAttrData();
void SetDefAttrRow( SfxItemSet* pDataRowAttr, const long i );
SdrRectObj * CreateRect( Rectangle & rRect,
diff --git a/binfilter/inc/bf_sch/datalog.hxx b/binfilter/inc/bf_sch/datalog.hxx
deleted file mode 100644
index 79fdd90..0000000
--- a/binfilter/inc/bf_sch/datalog.hxx
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SCH_DATALOG
-#define _SCH_DATALOG
-
-#include "memchrt.hxx"
-#include <float.h>
-#include <math.h>
-#define SCH_DATALOG_ANY -1
-namespace binfilter {
-
-class SchDataLogBook
-{
- long* mpRowCoordinates;
- long* mpColCoordinates;
-
- long dummy;
-
- long mnRows;
- long mnCols;
- long mnColsInitial;
- long mnRowsInitial;
-
- long mnRowsAdded;
- long mnColsAdded;
- long mnRowsLeft;
- long mnColsLeft;
-
- BOOL mbValid;
- BOOL mbRowChanged;
- BOOL mbColChanged;
- BOOL mbGetCol;
-
- void IncreaseRowCount();
- void IncreaseColCount();
-
-public:
-
- void Reset();
- ~SchDataLogBook();
-};
-
-} //namespace binfilter
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sch/modeldata.hxx b/binfilter/inc/bf_sch/modeldata.hxx
index 1438366..97a2ab9 100644
--- a/binfilter/inc/bf_sch/modeldata.hxx
+++ b/binfilter/inc/bf_sch/modeldata.hxx
@@ -56,41 +56,17 @@ private:
DescrList aYDescrList;
DescrList aZDescrList;
-// BOOL bClearDepth;
-// BOOL bNewOrLoadCompleted;
-// SfxObjectShell* pDocShell;
-// BOOL bAttrAutoStorage;
-
-// SchMemChart* pChartDataBuffered; // save data in buffer while editing chart #61907#
-
-// OutputDevice* pChartRefOutDev;
long nChartStatus;
-// Window* pAutoPilot; // #46895#
-
-// SdrObjList* pSdrObjList;
-// Matrix4D aSceneMatrix;
-// BOOL bResizePie;
-// long nPieRadius;
-
-// SvNumberFormatter* pOwnNumFormatter;
-// SvNumberFormatter* pNumFormatter; // points either to pOwnNumFormatter or calc's number formatter
-
::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > mxChartAddIn;
long nBarPercentWidth; // #50116#
long nNumLinesInColChart;
long m_nDefaultColorSet; // #50037#
-// SchDataLogBook* pLogBook;
Rectangle aChartRect;
Size aInitialSize;
-// SchItemPool* pChItemPool;
-// ChartScene* pScene;
-
-// Vector3D* aLightVec;
-
::std::auto_ptr< SchMemChart > m_apChartData;
double fMinData;
@@ -101,9 +77,6 @@ private:
Color aSpotColor;
SvxChartStyle eChartStyle;
SvxChartStyle eOldChartStyle;
-// int eChartLinePoints[ LINE_POINT_COUNT ];
-
-// List* pDefaultColors;
BOOL bTextScalable;
BOOL bIsCopied;
@@ -167,12 +140,6 @@ private:
::std::auto_ptr< SfxItemSet > m_apZAxisTitleAttr;
::std::auto_ptr< SfxItemSet > m_apAxisAttr;
-// ChartAxis* pChartXAxis;
-// ChartAxis* pChartYAxis;
-// ChartAxis* pChartZAxis;
-// ChartAxis* pChartAAxis; // secondary x axis
-// ChartAxis* pChartBAxis; // secondary y axis
-
::std::auto_ptr< SfxItemSet > m_apGridAttr;
::std::auto_ptr< SfxItemSet > m_apXGridMainAttr;
::std::auto_ptr< SfxItemSet > m_apYGridMainAttr;
@@ -190,10 +157,6 @@ private:
::std::auto_ptr< SfxItemSet > m_apStockLossAttr;
::std::auto_ptr< SfxItemSet > m_apStockPlusAttr;
-// SfxItemSet* pTmpXItems;
-// SfxItemSet* pTmpYItems;
-// SfxItemSet* pTmpZItems;
-
::std::auto_ptr< SfxItemSet > m_apChartAttr;
ItemSetList aDataRowAttrList;
@@ -203,12 +166,6 @@ private:
ItemSetList aAverageAttrList;
ItemSetList aErrorAttrList;
- // this is for 'old 3d storage' (whatever that is ;-)
-// ItemSetList aTmpDataRowAttrList;
-// ItemSetList aTmpDataPointAttrList;
-// ItemSetList aTmpSwitchDataPointAttrList;
-
-
SvxChartDataDescr eDataDescr;
BOOL bShowSym;
BOOL bSwitchData;
@@ -218,8 +175,6 @@ private:
BOOL bReadError;
BOOL mbIsInitialized;
-// SdrOutliner* pOutliner;
-
/// short: textbreak enabled
BOOL bFormatXAxisTextInMultipleLinesIfNecessary;
BOOL bFormatYAxisTextInMultipleLinesIfNecessary;
@@ -277,10 +232,6 @@ private:
Size aInitialSizefor3d;
- /** test object for calculating the height of two rows
- @see GetHeightOfnRows */
-// SdrRectObj* pTestTextObj;
-
INT32 nXLastNumFmt;
INT32 nYLastNumFmt;
INT32 nBLastNumFmt;
@@ -291,11 +242,6 @@ private:
LanguageType eLanguageCTL;
ProjectionType eProjection;
-
- /// for late loading of graphics
-// mutable SotStorage* mpDocStor;
-// mutable SotStorageRef mxPictureStorage;
-// mutable SotStorageStreamRef mxDocStream;
};
// _SCH_MODELDATA_HXX
More information about the Libreoffice-commits
mailing list