[Libreoffice-commits] .: 2 commits - binfilter/bf_sch binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Jan 4 09:16:33 PST 2011
binfilter/bf_sch/source/core/makefile.mk | 1
binfilter/bf_sch/source/core/sch_axisid.cxx | 9 --
binfilter/bf_sch/source/core/sch_chartdoc.cxx | 10 +-
binfilter/bf_sch/source/core/sch_chaxis.cxx | 4
binfilter/bf_sch/source/core/sch_chdescr.cxx | 12 +-
binfilter/bf_sch/source/core/sch_chtm3d2.cxx | 22 ++---
binfilter/bf_sch/source/core/sch_chtmod2a.cxx | 59 ++++++-------
binfilter/bf_sch/source/core/sch_chtmod3d.cxx | 82 +++++++++----------
binfilter/bf_sch/source/core/sch_chtmode1.cxx | 90 +++++++--------------
binfilter/bf_sch/source/core/sch_chtmode2.cxx | 19 ++--
binfilter/bf_sch/source/core/sch_chtmode3.cxx | 78 ++++++------------
binfilter/bf_sch/source/core/sch_chtmode4.cxx | 22 ++---
binfilter/bf_sch/source/core/sch_chtmode5.cxx | 30 +++----
binfilter/bf_sch/source/core/sch_chtmode8.cxx | 2
binfilter/bf_sch/source/core/sch_chtmode9.cxx | 52 ++++--------
binfilter/bf_sch/source/core/sch_chtmodel.cxx | 110 +++++++++++++-------------
binfilter/bf_sch/source/core/sch_chtscene.cxx | 2
binfilter/bf_sch/source/core/sch_datapoin.cxx | 4
binfilter/bf_sch/source/core/sch_datarow.cxx | 2
binfilter/bf_sch/source/core/sch_globfunc.cxx | 10 +-
binfilter/bf_sch/source/core/sch_memchrt.cxx | 40 ++++-----
binfilter/bf_sch/source/core/sch_objadj.cxx | 2
binfilter/bf_sch/source/core/sch_objid.cxx | 11 --
binfilter/bf_sch/source/core/sch_stlpool.cxx | 8 -
binfilter/bf_sch/source/core/sch_stlsheet.cxx | 10 +-
binfilter/inc/bf_sfx2/objsh.hxx | 1
26 files changed, 308 insertions(+), 384 deletions(-)
New commits:
commit 5c47ff7bbebfbad1bbac256ddbdb38912b283c01
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 4 17:06:16 2011 +0000
WaE: this dir is now warnings free
diff --git a/binfilter/bf_sch/source/core/makefile.mk b/binfilter/bf_sch/source/core/makefile.mk
index 563dd27..60a357f 100644
--- a/binfilter/bf_sch/source/core/makefile.mk
+++ b/binfilter/bf_sch/source/core/makefile.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_sch/source/core/sch_axisid.cxx b/binfilter/bf_sch/source/core/sch_axisid.cxx
index 122abec..f3fea13 100644
--- a/binfilter/bf_sch/source/core/sch_axisid.cxx
+++ b/binfilter/bf_sch/source/core/sch_axisid.cxx
@@ -76,18 +76,11 @@ namespace binfilter {
/*************************************************************************
|*
-|* Kopier-Konstruktor
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* Kopie erzeugen
|*
\************************************************************************/
-/*N*/ SdrObjUserData* SchAxisId::Clone(SdrObject *pObj) const
+/*N*/ SdrObjUserData* SchAxisId::Clone(SdrObject *) const
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SchAxisId (*this);
/*N*/ }
diff --git a/binfilter/bf_sch/source/core/sch_chartdoc.cxx b/binfilter/bf_sch/source/core/sch_chartdoc.cxx
index 1e4bde8..bfe6d8d 100644
--- a/binfilter/bf_sch/source/core/sch_chartdoc.cxx
+++ b/binfilter/bf_sch/source/core/sch_chartdoc.cxx
@@ -155,14 +155,14 @@ namespace binfilter {
/*?*/ SID_PRINTER_NOTFOUND_WARN,
/*?*/ SID_PRINTER_NOTFOUND_WARN, 0);
/*?*/ pSet->Put(aItem);
-/*?*/ SfxPrinter* pPrinter = new SfxPrinter(pSet);
+/*?*/ SfxPrinter* pLclPrinter = new SfxPrinter(pSet);
/*?*/
-/*?*/ MapMode aMapMode = pPrinter->GetMapMode();
+/*?*/ MapMode aMapMode = pLclPrinter->GetMapMode();
/*?*/ aMapMode.SetMapUnit(MAP_100TH_MM);
-/*?*/ pPrinter->SetMapMode(aMapMode);
+/*?*/ pLclPrinter->SetMapMode(aMapMode);
/*?*/
-/*?*/ pPrinter->Store(rOut);
-/*?*/ delete pPrinter;
+/*?*/ pLclPrinter->Store(rOut);
+/*?*/ delete pLclPrinter;
/*?*/ //delete pSet; bloss nicht! Killt der Printer gleich mit!
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sch/source/core/sch_chaxis.cxx b/binfilter/bf_sch/source/core/sch_chaxis.cxx
index 5845ccb..75f0f57 100644
--- a/binfilter/bf_sch/source/core/sch_chaxis.cxx
+++ b/binfilter/bf_sch/source/core/sch_chaxis.cxx
@@ -1919,7 +1919,9 @@ namespace binfilter {
/*N*/ {
/*N*/ // dann hat man mehr Platz pro Zeile (eigentlich 2 mal soviel) aber der Platz zwischen den
/*N*/ // Beschriftungen steht auch noch zur Verfuegung (jeweils 0,2 * nDescrWidth)
-/*?*/ mnMaxTextWidth = 2 * mnMaxTextWidth + 0,4 * nDescrWidth;
+// mnMaxTextWidth = 2 * mnMaxTextWidth + 0,4 * nDescrWidth;
+/*?*/ //cmc: I thought I'd leave ^^^ in for posterity, behold the , vs . :-)
+/*?*/ mnMaxTextWidth = 2 * mnMaxTextWidth + 0;
/*?*/ // Man braucht auch 2 mal soviel Platz in unten am Chart.
/*?*/ if(mbSecondary)
/*?*/ rRect.Top() += maMaxTextSize.Height() + mnTickLen;
diff --git a/binfilter/bf_sch/source/core/sch_chdescr.cxx b/binfilter/bf_sch/source/core/sch_chdescr.cxx
index 23731ec..1c4310e 100644
--- a/binfilter/bf_sch/source/core/sch_chdescr.cxx
+++ b/binfilter/bf_sch/source/core/sch_chdescr.cxx
@@ -38,11 +38,11 @@ namespace binfilter {
/*N*/ ChartModel* pModel, BOOL bEnable) :
/*N*/ mnRows(nRows),
/*N*/ mnCols(nCols),
-/*N*/ mpList(pList),
/*N*/ mpModel(pModel),
-/*N*/ mbEnable(bEnable),
/*N*/ mpDescrLists(NULL),
+/*N*/ mpList(pList),
/*N*/ mpDescrArray(NULL),
+/*N*/ mbEnable(bEnable),
/*N*/ mpDescrGroups(NULL)
/*N*/ {
/*N*/ }
@@ -101,19 +101,19 @@ namespace binfilter {
/*N*/ }
-/*N*/ DataDescription* ChartDataDescription::Insert( long nCol, long nRow, const SfxItemSet& rAttr, Point aPos,
-/*N*/ BOOL bPercent, ChartAdjust eAdjust, ChartAxis* pAxis )
+/*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"); //STRIP001 Create(nRow); //evtl. Array und Liste erstellen
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ return NULL;
/*N*/ }
-/*N*/ void ChartDataDescription::Dirty2D( BOOL bRowDescr )
+/*N*/ void ChartDataDescription::Dirty2D( BOOL /*bRowDescr*/ )
/*N*/ {
/*N*/
/*N*/ if(mpDescrLists)
diff --git a/binfilter/bf_sch/source/core/sch_chtm3d2.cxx b/binfilter/bf_sch/source/core/sch_chtm3d2.cxx
index 7a49afc..793e252 100644
--- a/binfilter/bf_sch/source/core/sch_chtm3d2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtm3d2.cxx
@@ -94,7 +94,7 @@ namespace binfilter {
/*N*/ long nCol,
/*N*/ long nRow,
/*N*/ SfxItemSet &rAttr,
-/*N*/ BOOL bIsSimple,
+/*N*/ BOOL /*bIsSimple*/,
/*N*/ double fMinPos,
/*N*/ double fOriPos,
/*N*/ double fMaxPos)
@@ -141,9 +141,9 @@ namespace binfilter {
/*N*/ a=aPos.X()-fOriPos;
/*N*/ b=aPos.X()+aSizeVec.X()-fOriPos;
/*N*/
-/*N*/ double fTmp=aSizeVec.X();
+/*N*/ double fLclTmp=aSizeVec.X();
/*N*/ aSizeVec.X()=aSizeVec.Y();
-/*N*/ aSizeVec.Y()=fTmp;
+/*N*/ aSizeVec.Y()=fLclTmp;
/*N*/ aSizeVec.Z()=-aSizeVec.Z(); //90Grad drehen
/*N*/ }
/*N*/ else
@@ -469,11 +469,11 @@ namespace binfilter {
\************************************************************************/
/*N*/ ChartScene* ChartModel::CreateScene (const Rectangle &rRect,
-/*N*/ const Vector3D &aLightVec,
-/*N*/ double fSpotIntensity,
-/*N*/ Color& rSpotColor,
-/*N*/ double fAmbientIntensity,
-/*N*/ Color& rAmbientColor)
+/*N*/ const Vector3D &/*aLightVec*/,
+/*N*/ double /*fSpotIntensity*/,
+/*N*/ Color& /*rSpotColor*/,
+/*N*/ double /*fAmbientIntensity*/,
+/*N*/ Color& /*rAmbientColor*/)
/*N*/ {
/*N*/ ChartScene *pMyScene = new ChartScene (this);
/*N*/
@@ -486,9 +486,9 @@ namespace binfilter {
/*N*/ void SchRectObj::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject)
/*N*/ {
/*N*/ SdrRectObj::NbcSetOutlinerParaObject(pTextObject);
-/*N*/ ChartModel* pModel=(ChartModel*)GetModel();
-/*N*/ if(pModel)
-/*N*/ pModel->SetTextFromObject(this,pTextObject);
+/*N*/ ChartModel* pLclModel=(ChartModel*)GetModel();
+/*N*/ if(pLclModel)
+/*N*/ pLclModel->SetTextFromObject(this,pTextObject);
/*N*/ }
//////////////////////////////////////////////////////////////////////////////
diff --git a/binfilter/bf_sch/source/core/sch_chtmod2a.cxx b/binfilter/bf_sch/source/core/sch_chtmod2a.cxx
index 1294f59..5d2c363 100644
--- a/binfilter/bf_sch/source/core/sch_chtmod2a.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmod2a.cxx
@@ -101,7 +101,6 @@ namespace binfilter {
/*N*/ DataDescription* pDescription = NULL;
/*N*/ long nCol;
/*N*/ Size aDescrOfs;
-/*N*/ BOOL bInserted = FALSE;
/*N*/
/*N*/ // Pie charts may not have titles of axes.
/*N*/ bShowXAxisTitle = FALSE;
@@ -121,8 +120,7 @@ namespace binfilter {
/*N*/ for( nCol = 0; nCol < nColCnt; nCol++ )
/*N*/ {
/*N*/ SfxItemSet aDataPointAttr( GetFullDataPointAttr( nCol, nRow ));
-/*N*/ double fData = GetData( nCol, nRow );
-/*N*/ long nIndex = nCol + nRow * nColCnt;
+/*N*/ /*double fData =*/ GetData( nCol, nRow );
/*N*/
/*N*/ nSegOfsMax = Max( PieSegOfs( nCol ), nSegOfsMax );
/*N*/
@@ -280,16 +278,16 @@ namespace binfilter {
/*N*/ pGroup->GetSubList ()->SetRectsDirty ();
/*N*/
/*N*/ // resize of pie charts is allowed proportionally only
-/*N*/ SdrObjTransformInfoRec aInfo;
-/*N*/ aInfo.bResizeFreeAllowed = FALSE;
-/*N*/ aInfo.bResizePropAllowed = TRUE;
-/*N*/ aInfo.bRotateFreeAllowed = FALSE;
-/*N*/ aInfo.bRotate90Allowed = FALSE;
-/*N*/ aInfo.bMirrorFreeAllowed = FALSE;
-/*N*/ aInfo.bMirror45Allowed = FALSE;
-/*N*/ aInfo.bMirror90Allowed = FALSE;
-/*N*/ aInfo.bShearAllowed = FALSE;
-/*N*/ pGroup->SetObjInfo(aInfo);
+/*N*/ SdrObjTransformInfoRec aLclInfo;
+/*N*/ aLclInfo.bResizeFreeAllowed = FALSE;
+/*N*/ aLclInfo.bResizePropAllowed = TRUE;
+/*N*/ aLclInfo.bRotateFreeAllowed = FALSE;
+/*N*/ aLclInfo.bRotate90Allowed = FALSE;
+/*N*/ aLclInfo.bMirrorFreeAllowed = FALSE;
+/*N*/ aLclInfo.bMirror45Allowed = FALSE;
+/*N*/ aLclInfo.bMirror90Allowed = FALSE;
+/*N*/ aLclInfo.bShearAllowed = FALSE;
+/*N*/ pGroup->SetObjInfo(aLclInfo);
/*N*/
/*N*/ Dirty2D (1, nColCnt, &pDescrList, FALSE, pDescription);
/*N*/
@@ -347,7 +345,6 @@ namespace binfilter {
/*N*/ for (nRow = 0; nRow < nRowCnt; nRow++)
/*N*/ {
/*N*/ SchObjGroup *pRowGroup = (SchObjGroup*) CreateSimpleGroup (CHOBJID_DIAGRAM_ROWGROUP, TRUE, TRUE);
-/*N*/ BOOL bInserted = FALSE;
/*N*/
/*N*/ pRowGroup->InsertUserData(new SchDataRow((short)nRow));
/*N*/ pList->NbcInsertObject(pRowGroup);
@@ -358,8 +355,7 @@ namespace binfilter {
/*N*/ for (nCol = 0; nCol < nColCnt; nCol++)
/*N*/ {
/*N*/ SfxItemSet aDataPointAttr(GetFullDataPointAttr(nCol, nRow));
-/*N*/ double fData = GetData (nCol, nRow);
-/*N*/ long nIndex = nCol + nRow * nColCnt;
+/*N*/ /*double fData =*/ GetData (nCol, nRow);
/*N*/
/*N*/ SvxChartDataDescr eDescr = ((const SvxChartDataDescrItem&)aDataPointAttr.
/*N*/ Get(SCHATTR_DATADESCR_DESCR)).GetValue();
@@ -538,18 +534,18 @@ namespace binfilter {
/*N*/ pGroup->GetSubList()->SetRectsDirty();
/*N*/
/*N*/ // Ein Kreisdiagramm soll man nur proportional Resizen koennen (vorerst)
-/*N*/ SdrObjTransformInfoRec aInfo;
-/*N*/ aInfo.bResizeFreeAllowed = FALSE;
-/*N*/ aInfo.bResizePropAllowed = TRUE;
-/*N*/ aInfo.bRotateFreeAllowed = FALSE;
-/*N*/ aInfo.bRotate90Allowed = FALSE;
-/*N*/ aInfo.bMirrorFreeAllowed = FALSE;
-/*N*/ aInfo.bMirror45Allowed = FALSE;
-/*N*/ aInfo.bMirror90Allowed = FALSE;
-/*N*/ aInfo.bShearAllowed = FALSE;
-/*N*/ pGroup->SetObjInfo(aInfo);
-/*N*/
-/*N*/ Dirty2D (nRowCnt, nColCnt, pDescrLists, TRUE, pDescription);
+/*N*/ SdrObjTransformInfoRec aLclInfo;
+/*N*/ aLclInfo.bResizeFreeAllowed = FALSE;
+/*N*/ aLclInfo.bResizePropAllowed = TRUE;
+/*N*/ aLclInfo.bRotateFreeAllowed = FALSE;
+/*N*/ aLclInfo.bRotate90Allowed = FALSE;
+/*N*/ aLclInfo.bMirrorFreeAllowed = FALSE;
+/*N*/ aLclInfo.bMirror45Allowed = FALSE;
+/*N*/ aLclInfo.bMirror90Allowed = FALSE;
+/*N*/ aLclInfo.bShearAllowed = FALSE;
+/*N*/ pGroup->SetObjInfo(aLclInfo);
+/*N*/
+/*N*/ Dirty2D (nRowCnt, nColCnt, pDescrLists, TRUE, pDescription);
/*N*/
/*N*/ delete[] pTotal;
/*N*/ delete[] pDescription;
@@ -574,7 +570,6 @@ namespace binfilter {
/*N*/
/*N*/ // ask for sorting
/*N*/
-/*N*/ BOOL bSortTable = FALSE;
/*N*/ BOOL bRepaint = FALSE;
/*N*/ if( IsXYChart() && ! ISFLAGSET( nChartStatus, CHS_USER_NOQUERY ) ) // in this case ask for sorting
@@ -666,8 +661,8 @@ namespace binfilter {
/*N*/ double fDataY = GetData(nCol, nRow, FALSE);
/*N*/ double fDataX = GetData(nCol, 0, FALSE);
/*N*/
-/*N*/ if (((fDataX != DBL_MIN) && (!bLogarithmX || bLogarithmX && (fDataX > 0.0))) &&
-/*N*/ ((fDataY != DBL_MIN) && (!bLogarithmY || bLogarithmY && (fDataY > 0.0))))
+/*N*/ if (((fDataX != DBL_MIN) && (!bLogarithmX || (bLogarithmX && (fDataX > 0.0)))) &&
+/*N*/ ((fDataY != DBL_MIN) && (!bLogarithmY || (bLogarithmY && (fDataY > 0.0)))))
/*N*/ {
/*N*/ long nXPos = pChartXAxis->GetPos(fDataX);
/*N*/ long nYPos = pAxis->GetPos(fDataY);
@@ -1427,7 +1422,7 @@ namespace binfilter {
|*
\*************************************************************/
/*N*/ SdrObject* ChartModel::CreateDonutSegment( SfxItemSet& aAttr,
-/*N*/ Rectangle& aRect, ULONG nWidth,
+/*N*/ Rectangle& aRect, ULONG /*nWidth*/,
/*N*/ long nCol, long nRow,
/*N*/ long nStartAngle, long nEndAngle,
/*N*/ long nCount)
diff --git a/binfilter/bf_sch/source/core/sch_chtmod3d.cxx b/binfilter/bf_sch/source/core/sch_chtmod3d.cxx
index 7d3e8dc..1f5a355 100644
--- a/binfilter/bf_sch/source/core/sch_chtmod3d.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmod3d.cxx
@@ -231,8 +231,6 @@ namespace binfilter {
/*N*/ // die Achsentitel gemaess dieses Parameters gesetzt werden koennen.
/*N*/ bSwitch3DColRow = bSwitchColRow;
/*N*/
-/*N*/ long nMaxTextWidth = 0;
-/*N*/
/*N*/ aXDescrList.Clear();
/*N*/ aYDescrList.Clear();
/*N*/ aZDescrList.Clear();
@@ -243,7 +241,6 @@ namespace binfilter {
/*N*/ aShift.Translate(-(aSizeVec/500.0));//Wände etwas verschieben...
/*N*/
/*N*/ const double fFloorWidth = 100.0;
-/*N*/ const double fWallWith = 50.0; // BM: unused for now
/*N*/
/*N*/ for (nV = 0; nV < 3; nV++)
/*N*/ {
@@ -285,28 +282,29 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ if( pYGridMainGroup || pYGridHelpGroup )
+/*N*/ {
/*N*/ // Y-Anteile
/*N*/ if (bSwitchColRow)
/*N*/ {
-/*N*/ Vector3D aLine3D [2] = { aRect3D [0], aRect3D [1] };
+/*N*/ Vector3D aLclLine3D [2] = { aRect3D [0], aRect3D [1] };
/*N*/ long nStepMainY = (long) aSizeVec.Y () / nColumnCnt;
/*N*/ long nStepHelpY = nStepMainY / 2;
/*N*/
/*N*/ // hauptgitter auf der X-Ebene, parallel zur X-Achse
/*N*/ for (i = 0; i <= nColumnCnt; i++)
/*N*/ {
-/*N*/ aLine3D[0].Y() =
-/*N*/ aLine3D[1].Y() = aPos.Y() + nStepMainY * i;
+/*N*/ aLclLine3D[0].Y() =
+/*N*/ aLclLine3D[1].Y() = aPos.Y() + nStepMainY * i;
/*N*/ if( pYGridMainGroup )
-/*N*/ Create3DPolyObject (pYGridMainAttr, new SchE3dPolygonObj (aDefltAttr3D, aLine3D[0], aLine3D[1]),
+/*N*/ Create3DPolyObject (pYGridMainAttr, new SchE3dPolygonObj (aDefltAttr3D, aLclLine3D[0], aLclLine3D[1]),
/*N*/ CHOBJID_DIAGRAM_Y_GRID_MAIN, pYGridMainGroup);
/*N*/
/*N*/ // hilfsgitter auf der X-Ebene, parallel zur X-Achse
/*N*/ if (pYGridHelpGroup && (i < nColumnCnt))
/*N*/ {
-/*?*/ aLine3D [0].Y () += nStepHelpY;
-/*?*/ aLine3D [1].Y () += nStepHelpY;
-/*?*/ Create3DPolyObject (pYGridHelpAttr, new SchE3dPolygonObj (aDefltAttr3D, aLine3D[0], aLine3D[1]),
+/*?*/ aLclLine3D [0].Y () += nStepHelpY;
+/*?*/ aLclLine3D [1].Y () += nStepHelpY;
+/*?*/ Create3DPolyObject (pYGridHelpAttr, new SchE3dPolygonObj (aDefltAttr3D, aLclLine3D[0], aLclLine3D[1]),
/*?*/ CHOBJID_DIAGRAM_Y_GRID_HELP, pYGridHelpGroup);
/*N*/ }
/*N*/ }
@@ -338,6 +336,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/ }
+/*N*/ }
/*N*/ }
/*N*/ else
/*N*/ {
@@ -352,37 +351,37 @@ namespace binfilter {
/*N*/ // hauptgitter auf der Z-Ebene, parallel zur Z-Achse
/*N*/ if( pZGridMainGroup || pZGridHelpGroup )
/*N*/ {
-/*N*/ Vector3D aLine3D [2] = { aRect3D[2], aRect3D[3] };
+/*N*/ Vector3D aLclLine3D [2] = { aRect3D[2], aRect3D[3] };
/*N*/ long nStepMainZ = (long) aSizeVec.Z () / nRowCnt;
/*N*/ long nStepHelpZ = nStepMainZ / 2;
/*N*/
-/*N*/ BOOL bCreateGridLine = ( (aLine3D[ 0 ].X() != aLine3D[ 1 ].X()) ||
-/*N*/ (aLine3D[ 0 ].Y() != aLine3D[ 1 ].Y()) );
+/*N*/ BOOL bCreateGridLine = ( (aLclLine3D[ 0 ].X() != aLclLine3D[ 1 ].X()) ||
+/*N*/ (aLclLine3D[ 0 ].Y() != aLclLine3D[ 1 ].Y()) );
/*N*/ // Z() values become equal in the for loop
/*N*/ // => start and end points would be equal if !bCreateGridLine
/*N*/
/*N*/ for (i = 0; i <= nRowCnt; i++)
/*N*/ {
-/*N*/ aLine3D[0].Z() =
-/*N*/ aLine3D[1].Z() = aPos.Z() + nStepMainZ * i;
+/*N*/ aLclLine3D[0].Z() =
+/*N*/ aLclLine3D[1].Z() = aPos.Z() + nStepMainZ * i;
/*N*/ if( pZGridMainGroup && bCreateGridLine )
-/*N*/ Create3DPolyObject( pZGridMainAttr, new SchE3dPolygonObj( aDefltAttr3D, aLine3D[0], aLine3D[1] ),
+/*N*/ Create3DPolyObject( pZGridMainAttr, new SchE3dPolygonObj( aDefltAttr3D, aLclLine3D[0], aLclLine3D[1] ),
/*N*/ CHOBJID_DIAGRAM_Z_GRID_MAIN, pZGridMainGroup );
/*N*/
/*N*/ // hilfsgitter auf der Z-Ebene, parallel zur Z-Achse
/*N*/ if (pZGridHelpGroup && (i < nRowCnt))
/*N*/ {
-/*?*/ aLine3D[0].Z() += nStepHelpZ;
-/*?*/ aLine3D[1].Z() += nStepHelpZ;
+/*?*/ aLclLine3D[0].Z() += nStepHelpZ;
+/*?*/ aLclLine3D[1].Z() += nStepHelpZ;
/*?*/ if( bCreateGridLine )
-/*?*/ Create3DPolyObject( pZGridHelpAttr, new SchE3dPolygonObj( aDefltAttr3D, aLine3D[0], aLine3D[1] ),
+/*?*/ Create3DPolyObject( pZGridHelpAttr, new SchE3dPolygonObj( aDefltAttr3D, aLclLine3D[0], aLclLine3D[1] ),
/*?*/ CHOBJID_DIAGRAM_Z_GRID_HELP, pZGridHelpGroup );
/*N*/ }
/*N*/ }
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ Vector3D aLine3D [2] = { aRect3D[0], aRect3D[(nV || !nV && bSwitchColRow)
+/*N*/ Vector3D aLine3D [2] = { aRect3D[0], aRect3D[(nV || (!nV && bSwitchColRow))
/*N*/ ? 3
/*N*/ : 1] };
/*N*/ double fAct = fMinValueY;
@@ -1433,7 +1432,7 @@ namespace binfilter {
/*N*/ pDataGroup[ nRow ]->InsertUserData( new SchDataRow( static_cast< short >( nRow ) ));
/*N*/ }
/*N*/
-/*N*/ for (nCol = 0; nCol < nColCnt; nCol++)
+/*N*/ for (nCol = 0; nCol < nColCnt; nCol++)
/*N*/ {
/*N*/ double fDataTop = fOriginY;
/*N*/ double fDataBottom = fOriginY;
@@ -1445,7 +1444,7 @@ namespace binfilter {
/*N*/ double fTop,fBottom,fMin,fMax,fMin2,fMax2;
/*N*/ fMin2=fMax2=fOriginY;
/*N*/
-/*N*/ for (nRow = 0; nRow < nRowCnt; nRow++)
+/*N*/ for (nRow = 0; nRow < nRowCnt; nRow++)
/*N*/ {
/*N*/ double fData=GetData(nCol, nRow, bPercent);
/*N*/ if (fData != DBL_MIN)
@@ -1525,22 +1524,22 @@ namespace binfilter {
/*N*/ case CHSTYLE_3D_FLATCOLUMN:
/*N*/ if (fData != DBL_MIN)
/*N*/ {
-/*N*/ double fTop;
-/*N*/ double fBottom;
+/*N*/ double fLclTop;
+/*N*/ double fLclBottom;
/*N*/
/*N*/ if (fData < fOriginY)
/*N*/ {
-/*?*/ fTop = fOriginY;
-/*?*/ fBottom = fData;
+/*?*/ fLclTop = fOriginY;
+/*?*/ fLclBottom = fData;
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ fTop = fData;
-/*N*/ fBottom = fOriginY;
+/*N*/ fLclTop = fData;
+/*N*/ fLclBottom = fOriginY;
/*N*/ }
/*N*/
-/*N*/ long nBottom = Max ((long) (pChartYAxis->CalcFact(fBottom) * nH),0L);
-/*N*/ long nTop = Min ((long) (pChartYAxis->CalcFact(fTop) * nH),nH);
+/*N*/ long nBottom = Max ((long) (pChartYAxis->CalcFact(fLclBottom) * nH),0L);
+/*N*/ long nTop = Min ((long) (pChartYAxis->CalcFact(fLclTop) * nH),nH);
/*N*/
/*N*/ {
/*N*/ long nBarHeight = nTop - nBottom + 1;
@@ -1640,26 +1639,26 @@ namespace binfilter {
/*N*/ case CHSTYLE_3D_PERCENTFLATCOLUMN:
/*N*/ if (fData != DBL_MIN)
/*N*/ {
-/*?*/ double fTop;
-/*?*/ double fBottom;
+/*?*/ double fLclTop;
+/*?*/ double fLclBottom;
/*?*/
/*?*/ if (fData < fOriginY)
/*?*/ {
-/*?*/ fTop = fDataBottom;
-/*?*/ if (fTop == fOriginY) fDataBottom = fData;
+/*?*/ fLclTop = fDataBottom;
+/*?*/ if (fLclTop == fOriginY) fDataBottom = fData;
/*?*/ else fDataBottom += fData;
-/*?*/ fBottom = fDataBottom;
+/*?*/ fLclBottom = fDataBottom;
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ fBottom = fDataTop;
-/*N*/ if (fBottom == fOriginY) fDataTop = fData;
+/*N*/ fLclBottom = fDataTop;
+/*N*/ if (fLclBottom == fOriginY) fDataTop = fData;
/*N*/ else fDataTop += fData;
-/*N*/ fTop = fDataTop;
+/*N*/ fLclTop = fDataTop;
/*N*/ }
/*N*/
-/*N*/ long nTop = Min((long)(pChartYAxis->CalcFact(fTop) * nH), nH);
-/*N*/ long nBottom = Max((long)(pChartYAxis->CalcFact(fBottom) * nH),0L);
+/*N*/ long nTop = Min((long)(pChartYAxis->CalcFact(fLclTop) * nH), nH);
+/*N*/ long nBottom = Max((long)(pChartYAxis->CalcFact(fLclBottom) * nH),0L);
/*N*/
/*N*/ {
/*N*/ long nBarHeight = nTop - nBottom + 1;
@@ -1976,10 +1975,9 @@ namespace binfilter {
/*N*/
/*N*/ if(aDescr.Enabled())
/*N*/ {
-/*N*/ double fZPos = (double)nZExtrude / 2.0;
/*N*/ DataDescription* pDescr=aDescr.Insert(nCol,nRow,aDataPointAttr,Point(0,0),FALSE,CHADJUST_BOTTOM_CENTER,pChartYAxis);
/*N*/ if(pDescr)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 Segment3DDescr(*pDescr,aPieRect,nStartAngle,nEndAngle,0,aPieRect.GetWidth()/2,aPieRect.GetWidth()/2,fZPos);
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*N*/ }
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sch/source/core/sch_chtmode1.cxx b/binfilter/bf_sch/source/core/sch_chtmode1.cxx
index bada5ba..a19c915 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode1.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode1.cxx
@@ -275,7 +275,7 @@ namespace binfilter {
/*N*/ void ChartModel::SetTextAttr(SdrTextObj& rTextObj,
/*N*/ const SfxItemSet& rAttr,
-/*N*/ const long nMaximumWidth)
+/*N*/ const long /*nMaximumWidth*/)
/*N*/ {
/*N*/ // #97992# calling SetItemSet results in changing the p...Attr in the ChartModel
/*N*/ // because of the implementation of SchRectObj. Maybe this is wrong, but it seemed
@@ -334,16 +334,16 @@ namespace binfilter {
/*N*/
/*N*/ BOOL bLogarithm = pCurrentXAxis->IsLogarithm();
/*N*/ short nCnt;
-/*N*/ SfxItemSet* pAxisAttr;
+/*N*/ SfxItemSet* pLclAxisAttr;
/*N*/ if (bRowDescr)
/*N*/ {
/*N*/ nCnt = GetRowCount();
-/*N*/ pAxisAttr = &GetAttr(CHOBJID_DIAGRAM_Z_AXIS);
+/*N*/ pLclAxisAttr = &GetAttr(CHOBJID_DIAGRAM_Z_AXIS);
/*N*/ }
/*N*/ else
/*N*/ {
/*N*/ nCnt = GetColCount();
-/*N*/ pAxisAttr = &GetAttr(CHOBJID_DIAGRAM_X_AXIS);
+/*N*/ pLclAxisAttr = &GetAttr(CHOBJID_DIAGRAM_X_AXIS);
/*N*/ }
/*N*/
/*N*/ pOutliner->SetUpdateMode (FALSE);
@@ -427,7 +427,7 @@ namespace binfilter {
/*N*/ // Collect the items which control the text appearence and set them to
/*N*/ // the outliner.
/*N*/ SfxItemSet aTextAttr(*pItemPool, nTextOrientWhichPairs);
-/*N*/ aTextAttr.Put(*pAxisAttr);
+/*N*/ aTextAttr.Put(*pLclAxisAttr);
/*N*/ // SetTextAttributes (aTextAttr);
/*N*/
/*N*/ for (short i = 0; i < nCnt; i++)
@@ -581,6 +581,7 @@ namespace binfilter {
/*N*/ //average attr
/*N*/ nRowListCnt = (short)aAverageAttrList.Count();
/*N*/ if (nCnt != nRowListCnt)
+/*N*/ {
/*N*/ if (nRowListCnt > nCnt)
/*N*/ {
/*N*/ aAverageAttrList.Seek((ULONG)nCnt);
@@ -613,10 +614,12 @@ namespace binfilter {
/*N*/ pAverageAttr->Put(XLineTransparenceItem());
/*N*/ }
/*N*/ }
+/*N*/ }
/*N*/
/*N*/ //error attr
/*N*/ nRowListCnt = (short)aErrorAttrList.Count();
/*N*/ if (nCnt != nRowListCnt)
+/*N*/ {
/*N*/ if (nRowListCnt > nCnt)
/*N*/ {
/*N*/ aErrorAttrList.Seek((ULONG)nCnt);
@@ -643,16 +646,15 @@ namespace binfilter {
/*N*/ pErrorAttr->Put(XLineTransparenceItem());
/*N*/ }
/*N*/ }
+/*N*/ }
/*N*/
/*N*/ // Point-Attr
/*N*/ long nPointCnt = nDataColCnt * nDataRowCnt;
/*N*/ long nPointListCnt = aDataPointAttrList.Count();
/*N*/ if (nPointCnt != nPointListCnt)
+/*N*/ {
/*N*/ if (nPointListCnt > nPointCnt)
/*N*/ {
-/*N*/ // aDataPointAttrList.Seek((ULONG)nPointCnt);
-/*N*/ // for (long i = nPointCnt; i < nPointListCnt; i++)
-/*N*/ // delete aDataPointAttrList.Remove();
/*N*/ while (nPointListCnt-- > nPointCnt)
/*N*/ {
/*N*/ aDataPointAttrList.Seek((ULONG)nPointCnt);
@@ -661,6 +663,7 @@ namespace binfilter {
/*N*/ }
/*N*/ else for (long ii = nPointListCnt; ii < nPointCnt; ii++)
/*N*/ aDataPointAttrList.Insert(NULL, LIST_APPEND);
+/*N*/ }
/*N*/
/*N*/ // Switch-Point-Attr
/*N*/ nPointListCnt = aSwitchDataPointAttrList.Count();
@@ -925,25 +928,25 @@ namespace binfilter {
// outliner.
/*N*/ Size ChartModel::CalcTextSizeOfOneText (SvxChartTextOrient eOrient,
/*N*/ SfxItemSet &rTextAttr,
-/*N*/ SdrOutliner *pOutliner,
+/*N*/ SdrOutliner *pInOutliner,
/*N*/ long MaxW,
/*N*/ BOOL bGetRotated/*=FALSE*/,
/*N*/ BOOL bUseTextAttributes)
/*N*/ {
/*N*/ long MaximumWidth=MaxW;
/*N*/
-/*N*/ pOutliner->SetUpdateMode (FALSE);
-/*N*/ ULONG nParaCnt = pOutliner->GetParagraphCount();
+/*N*/ pInOutliner->SetUpdateMode (FALSE);
+/*N*/ ULONG nParaCnt = pInOutliner->GetParagraphCount();
/*N*/
/*N*/ // FG: Jeder Absatz muss die Text-Attribute einzeln zugewiesen bekommen. (jedenfalls scheint es so)
/*N*/ // Besser waere es dass fuer alle Absaetze auf einmal setzen zu koennen.
/*N*/ if (bUseTextAttributes)
/*N*/ SetTextAttributes (rTextAttr);
/*N*/
-/*N*/ Size OldPaperSize = pOutliner->GetPaperSize();
+/*N*/ Size OldPaperSize = pInOutliner->GetPaperSize();
/*N*/
/*N*/ long nDegrees=GetTextRotation((SfxItemSet&)rTextAttr,eOrient);//#62531#
-/*N*/ double fDeg, fSin,
+/*N*/ double fDeg(0.0), fSin(0.0),
/*N*/ fCos = 1; // BM: Initialize Cos for if statement after if(nDegrees)-Block
/*N*/ BOOL bBreakOK=TRUE; //s.u.
/*N*/ if(nDegrees)
@@ -963,46 +966,15 @@ namespace binfilter {
/*N*/ fSin=fabs(sin(fDeg));
/*N*/ fCos=fabs(cos(fDeg));
/*N*/
-/*
- Hat man gedrehten Text, wird ein sinnvoller Umbruch schwierig, da
-
- 1. bei bestimmten Winkeln und bestimmter Textlänge der Text breiter und nicht schmaler wird
- 2. Diese Funktion bei Winkeln != 0 mit MaximumWidth u.U. die Höhe vorgegeben bekommt
- (Create2DBackplane tut dies bei gedrehten Texten an der X-Achse)
- untenstehender Code berechnet die vorzugebene MaxBreite, wenn der Text gedreht ist, dies
- wäre leider nur ein Teil der notwendigen Lösung, die so schon recht viel Performance schluckt:
-
- if( MaximumWidth > 0 && fCos!=0)
- {
- Size aFullSize(pOutliner->CalcTextSize()); //Textgröße ohne Umbruch
- double dW = aFullSize.Height()*fSin; //delta width je neue Zeile
- double Wf = aFullSize.Width(); //Ist-Textbreite durch Soll-Textbreite des Textes ergibt die Anzahl der Zeilen
-
- double p_halbe = (dW-(double)MaximumWidth)/(2*fCos);
- double p_halbe_quadrat = p_halbe * p_halbe;
- double q = Wf*dW/fCos;
- if(q > p_halbe_quadrat)
- {
- MaximumWidth=-1; //keine Lösung, Abbruch, nix umbrechen!
- }
- else
- {
- long nNewMax1 =(long) (- p_halbe + sqrt(p_halbe_quadrat-q) + 0.5);
- long nNewMax2 =(long) (- p_halbe - sqrt(p_halbe_quadrat-q) + 0.5);
- //Die größere Breite ist immer die bessere
- MaximumWidth=Max(nNewMax1,nNewMax2);
- }
- }
-*/
/*N*/ }
/*N*/
/*N*/ if( MaximumWidth > 0 && fCos!=0) //Kein Umbruch bei 90 und 270 Grad oder Max<=0
-/*N*/ pOutliner->SetPaperSize( Size( MaximumWidth, 0 ) );
+/*N*/ pInOutliner->SetPaperSize( Size( MaximumWidth, 0 ) );
/*N*/
/*N*/
-/*N*/ pOutliner->SetUpdateMode (TRUE);
-/*N*/ Size aSize = pOutliner->CalcTextSize();
-/*N*/ pOutliner->SetUpdateMode (FALSE);
+/*N*/ pInOutliner->SetUpdateMode (TRUE);
+/*N*/ Size aSize = pInOutliner->CalcTextSize();
+/*N*/ pInOutliner->SetUpdateMode (FALSE);
/*N*/ Size aRot(aSize);
/*N*/ if(nDegrees)
/*N*/ {
@@ -1022,9 +994,9 @@ namespace binfilter {
/*N*/ DBG_WARNING("ChartModel::CalcTextSizeOfOneText:Doch breiter?" );
/*N*/ #endif
/*N*/ ULONG nLines = 0;
-/*N*/ for( USHORT n = 0; n < pOutliner->GetParagraphCount(); n++ )
+/*N*/ for( USHORT n = 0; n < pInOutliner->GetParagraphCount(); n++ )
/*N*/ {
-/*N*/ nLines += pOutliner->GetLineCount( n );
+/*N*/ nLines += pInOutliner->GetLineCount( n );
/*N*/ }
/*N*/
/*N*/ // Silbentrennung nur bei >MAXLEGENDLINES Zeilen oder einem zu langen wort...
@@ -1032,7 +1004,7 @@ namespace binfilter {
/*N*/ && ( ( nLines > MAXLEGENDLINES )
/*N*/ || ( ( nLines >= 2 )
/*N*/ && ( nParaCnt == 1 )
-/*N*/ && ( pOutliner->GetText( pOutliner->GetParagraph( 0 ) ).Search( ' ' )
+/*N*/ && ( pInOutliner->GetText( pInOutliner->GetParagraph( 0 ) ).Search( ' ' )
/*N*/ == STRING_NOTFOUND )
/*N*/ )
/*N*/ )
@@ -1043,22 +1015,22 @@ namespace binfilter {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 long nHeightOfRows = GetHeightOfnRows (rTextAttr, MAXLEGENDLINES);//war mal 2 statt MAX...#50395#
/*?*/ }
/*?*/
-/*?*/ ULONG nParaCnt = pOutliner->GetParagraphCount();
+/*?*/ ULONG nLclParaCnt = pInOutliner->GetParagraphCount();
/*?*/
-/*?*/ for (ULONG i = 0; i < nParaCnt; i++)
+/*?*/ for (ULONG i = 0; i < nLclParaCnt; i++)
/*?*/ {
/*?*/ // Stets Silbentrennung
-/*?*/ SfxItemSet aAttr(pOutliner->GetParaAttribs(i));
+/*?*/ SfxItemSet aAttr(pInOutliner->GetParaAttribs(i));
/*?*/ aAttr.Put( SfxBoolItem(EE_PARA_HYPHENATE, TRUE) );
-/*?*/ pOutliner->SetParaAttribs(i, aAttr);
+/*?*/ 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 < pOutliner->GetParagraphCount(); n++ )
+/*?*/ for( USHORT n = 0; n < pInOutliner->GetParagraphCount(); n++ )
/*?*/ {
-/*?*/ nActLines += pOutliner->GetLineCount( n );
+/*?*/ nActLines += pInOutliner->GetLineCount( n );
/*?*/ }
/*?*/ if(nActLines>nLines)
/*?*/ {
@@ -1068,8 +1040,8 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ pOutliner->SetPaperSize(OldPaperSize);
-/*N*/ pOutliner->SetUpdateMode (TRUE);
+/*N*/ pInOutliner->SetPaperSize(OldPaperSize);
+/*N*/ pInOutliner->SetUpdateMode (TRUE);
/*N*/
/*N*/ return (bGetRotated && nDegrees) ? aRot : aSize;
/*N*/ }
diff --git a/binfilter/bf_sch/source/core/sch_chtmode2.cxx b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
index 5d143df..4433b78 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
@@ -289,7 +289,7 @@ enum ChartStyleV0
/*N*/ long nTextCols = 0;
/*N*/ long nShows = 0;
/*N*/
-/*N*/ ULONG nLegendHeight = ((SvxFontHeightItem &) pLegendAttr->Get (EE_CHAR_FONTHEIGHT)).GetHeight();
+/*N*/ long nLegendHeight = ((SvxFontHeightItem &) pLegendAttr->Get (EE_CHAR_FONTHEIGHT)).GetHeight();
/*N*/ long nLittleSpace = nLegendHeight / 3;
/*N*/
/*N*/ // FG: Hier wird berechnet wieviele Spalten und Zeilen die Legende haben soll
@@ -356,11 +356,11 @@ enum ChartStyleV0
/*N*/ nIndex, 0, (SfxItemSet &) GetDataRowAttr(nIndex), nLegendHeight, FALSE);
/*N*/ if(pObj)
/*N*/ {
-/*N*/ Rectangle aRect(pObj->GetSnapRect());
-/*N*/ if((aRect.GetHeight() > nLegendHeight) && nLegendHeight)
+/*N*/ Rectangle aLclRect(pObj->GetSnapRect());
+/*N*/ if((aLclRect.GetHeight() > nLegendHeight) && nLegendHeight)
/*N*/ {
-/*?*/ Fraction aFract(nLegendHeight,aRect.GetHeight());
-/*?*/ pObj->NbcResize(aRect.Center(),aFract,aFract);
+/*?*/ Fraction aFract(nLegendHeight,aLclRect.GetHeight());
+/*?*/ pObj->NbcResize(aLclRect.Center(),aFract,aFract);
/*N*/ }
/*N*/ }
/*N*/ else //dann Linie als Legendensymbol, sonst geht evtl. garnix mehr
@@ -791,7 +791,6 @@ enum ChartStyleV0
/*?*/ INT16 nInt16 = (INT16)CHDATAID_NONE; rOut << nInt16;
/*N*/ }
/*N*/
-/*N*/ BOOL bDummy = TRUE; // war frueher bOwnChart
/*N*/ rOut << bIsCopied;
/*N*/ rOut << fMinData;
/*N*/ rOut << (INT16)eChartStyle;
@@ -1055,6 +1054,7 @@ enum ChartStyleV0
/*N*/ rOut << nMoreData;
/*N*/
/*N*/ if (nMoreData >= 2)
+/*N*/ {
/*N*/ if (pChartData)
/*N*/ {
/*N*/ rOut.WriteByteString( pChartData->SomeData1() );
@@ -1071,6 +1071,7 @@ enum ChartStyleV0
/*?*/ rOut.WriteByteString( aEmpty );
/*?*/ rOut.WriteByteString( aEmpty );
/*N*/ }
+/*N*/ }
/*N*/
/*N*/ if (nMoreData >= 3) rOut << fSpotIntensity;
/*N*/
@@ -1832,9 +1833,9 @@ enum ChartStyleV0
/*N*/
/*N*/ if (nMoreData >= 6)
/*N*/ {
-/*N*/ INT32 nInt32;
-/*N*/ rIn >> nInt32; nSplineDepth = nInt32;
-/*N*/ rIn >> nInt32; nGranularity = nInt32;
+/*N*/ INT32 nLclInt32;
+/*N*/ rIn >> nLclInt32; nSplineDepth = nLclInt32;
+/*N*/ rIn >> nLclInt32; nGranularity = nLclInt32;
/*N*/ }
/*N*/
/*N*/ if (nMoreData >= 7)
diff --git a/binfilter/bf_sch/source/core/sch_chtmode3.cxx b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
index fcb9582..75f40af 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode3.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
@@ -91,42 +91,10 @@ namespace binfilter {
|* Entscheidung, ob BuildChart notwendig
|*
\************************************************************************/
-/*N*/ BOOL ChartModel::IsAttrChangeNeedsBuildChart(const SfxItemSet& rAttr)
+/*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;
-
- /*
- BOOL bNeedBuild=FALSE;
-
- SfxWhichIter aWhichIter(rAttr);
- USHORT nWhich = aWhichIter.FirstWhich();
- while (nWhich != 0)
- {
- if (rAttr.GetItemState(nWhich) == SFX_ITEM_SET)
- {
- if(nWhich < XATTR_LINE_FIRST || nWhich > XATTR_FILL_LAST)
- {
-
- switch(nWhich)
- {
-
- case EE_CHAR_COLOR:
- case EE_CHAR_UNDERLINE:
- case EE_CHAR_STRIKEOUT:
- break;
-
- default:
-
- bNeedBuild=TRUE;
- break;
- }
- }
- }
- nWhich = aWhichIter.NextWhich();
- }
- return bNeedBuild;
-*/
/*N*/ }
/*************************************************************************
@@ -183,6 +151,7 @@ namespace binfilter {
/*N*/ bool bIsFirst = true;
/*N*/
/*N*/ if( ! bOnlyInserted || HasAxis( CHOBJID_DIAGRAM_X_AXIS ))
+/*N*/ {
/*N*/ if( bIsFirst )
/*N*/ {
/*N*/ pAxisAttr->Set( GetAttr( CHOBJID_DIAGRAM_X_AXIS ));
@@ -190,8 +159,10 @@ namespace binfilter {
/*N*/ }
/*N*/ else
/*?*/ IntersectSets( GetAttr( CHOBJID_DIAGRAM_X_AXIS ), *pAxisAttr );
+/*N*/ }
/*N*/
/*N*/ if( ! bOnlyInserted || HasAxis( CHOBJID_DIAGRAM_Y_AXIS ))
+/*N*/ {
/*N*/ if( bIsFirst )
/*N*/ {
/*?*/ pAxisAttr->Set( GetAttr( CHOBJID_DIAGRAM_Y_AXIS ));
@@ -199,8 +170,10 @@ namespace binfilter {
/*N*/ }
/*N*/ else
/*N*/ IntersectSets( GetAttr( CHOBJID_DIAGRAM_Y_AXIS ), *pAxisAttr );
+/*N*/ }
/*N*/
/*N*/ if( ! bOnlyInserted || (Is3DChart() && HasAxis( CHOBJID_DIAGRAM_Z_AXIS )))
+/*N*/ {
/*N*/ if( bIsFirst )
/*N*/ {
/*?*/ pAxisAttr->Set( GetAttr( CHOBJID_DIAGRAM_Z_AXIS ));
@@ -208,8 +181,10 @@ namespace binfilter {
/*N*/ }
/*N*/ else
/*N*/ IntersectSets( GetAttr( CHOBJID_DIAGRAM_Z_AXIS ), *pAxisAttr );
+/*N*/ }
/*N*/
/*N*/ if( ! bOnlyInserted || HasAxis( CHOBJID_DIAGRAM_A_AXIS ))
+/*N*/ {
/*?*/ if( bIsFirst )
/*?*/ {
/*?*/ pAxisAttr->Set( GetAttr( CHOBJID_DIAGRAM_A_AXIS ));
@@ -217,8 +192,10 @@ namespace binfilter {
/*?*/ }
/*?*/ else
/*?*/ IntersectSets( GetAttr( CHOBJID_DIAGRAM_A_AXIS ), *pAxisAttr );
+/*N*/ }
/*N*/
/*N*/ if( ! bOnlyInserted || HasAxis( CHOBJID_DIAGRAM_B_AXIS ))
+/*N*/ {
/*?*/ if( bIsFirst )
/*?*/ {
/*?*/ pAxisAttr->Set( GetAttr( CHOBJID_DIAGRAM_B_AXIS ));
@@ -226,6 +203,7 @@ namespace binfilter {
/*?*/ }
/*?*/ else
/*?*/ IntersectSets( GetAttr( CHOBJID_DIAGRAM_B_AXIS ), *pAxisAttr );
+/*N*/ }
/*N*/ }
/*N*/
/*N*/ // if( bOnlyInserted )
@@ -449,26 +427,26 @@ namespace binfilter {
/*?*/ {
/*?*/ CHART_TRACE( "creating SVX_SYMBOLTYPE_BRUSHITEM" );
/*?*/ const Graphic* pGraphic = ((const SvxBrushItem *)pPoolItem)->GetGraphic();
-/*?*/ Size aSize;
+/*?*/ Size aLclSize;
/*?*/
/*?*/ if( pGraphic )
/*?*/ {
/*?*/ if(!pObj && aDataAttr.GetItemState(SCHATTR_SYMBOL_SIZE,TRUE,&pPoolItem)==SFX_ITEM_SET)
/*?*/ {
/*?*/ CHART_TRACE( "Size by Item" );
-/*?*/ aSize=((const SvxSizeItem*)pPoolItem)->GetSize();
+/*?*/ aLclSize=((const SvxSizeItem*)pPoolItem)->GetSize();
/*?*/ }
/*?*/ else
/*?*/ {
/*?*/ CHART_TRACE( "Size by Graphic" );
/*?*/ if( pGraphic )
-/*?*/ aSize = ( OutputDevice::LogicToLogic( pGraphic->GetPrefSize(),
+/*?*/ aLclSize = ( OutputDevice::LogicToLogic( pGraphic->GetPrefSize(),
/*?*/ pGraphic->GetPrefMapMode(),
/*?*/ MAP_100TH_MM ));
/*?*/ }
/*?*/
-/*?*/ Rectangle aRect(aPoint.X()-aSize.Width()/2,aPoint.Y()-aSize.Height()/2
-/*?*/ ,aPoint.X()+aSize.Width()/2,aPoint.Y()+aSize.Height()/2);
+/*?*/ Rectangle aRect(aPoint.X()-aLclSize.Width()/2,aPoint.Y()-aLclSize.Height()/2
+/*?*/ ,aPoint.X()+aLclSize.Width()/2,aPoint.Y()+aLclSize.Height()/2);
/*?*/ pObj = new SdrGrafObj(*pGraphic);
/*?*/ GetPage(0)->NbcInsertObject(pObj,0);
/*?*/ pObj->NbcSetSnapRect(aRect);
@@ -492,10 +470,10 @@ namespace binfilter {
/*N*/
/*N*/ if(!pObj && aDataAttr.GetItemState(SCHATTR_SYMBOL_SIZE,TRUE,&pPoolItem)==SFX_ITEM_SET)
/*N*/ {
-/*?*/ Size aSize=((const SvxSizeItem*)pPoolItem)->GetSize();
-/*?*/ nHalfSymbolSizeX = aSize.Width() / 2;
-/*?*/ nHalfSymbolSizeY = aSize.Height() / 2;
-/*?*/ CHART_TRACE2( "reading SCHATTR_SYMBOL_SIZE -> Size = (%ld, %ld)", aSize.Width(), aSize.Height() );
+/*?*/ Size aLclSize=((const SvxSizeItem*)pPoolItem)->GetSize();
+/*?*/ nHalfSymbolSizeX = aLclSize.Width() / 2;
+/*?*/ nHalfSymbolSizeY = aLclSize.Height() / 2;
+/*?*/ CHART_TRACE2( "reading SCHATTR_SYMBOL_SIZE -> Size = (%ld, %ld)", aLclSize.Width(), aLclSize.Height() );
/*N*/ }
/*N*/
/*N*/ if(!pObj) //dann default generieren
@@ -730,7 +708,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ void ChartModel::ClearDataPointAttr( long nCol, long nRow, const SfxItemSet& rAttr )
+/*N*/ void ChartModel::ClearDataPointAttr( long nCol, long nRow, const SfxItemSet& /*rAttr*/ )
/*N*/ {
/*N*/
/*N*/ CHART_TRACE( "ChartModel::ClearDataPointAttr" );
@@ -741,7 +719,7 @@ namespace binfilter {
/*N*/
/*N*/ SfxItemSet* pItemSet = pAttrList->GetObject(nCol * GetRowCount() + nRow);
/*N*/ if (pItemSet != NULL)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 ClearDblItems(rAttr,*pItemSet);
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*N*/ }
/*************************************************************************
|*
@@ -959,7 +937,7 @@ namespace binfilter {
/*N*/ void ChartModel::SetTextFromObject( SdrTextObj* pObj,OutlinerParaObject* pTextObject )
/*N*/ {
/*N*/ DBG_ASSERT( pObj, "ChartModel::SetTextFromObject: Object is NULL" );
-/*N*/ if( !bAttrAutoStorage && pTextObject // not during BuildChart
+/*N*/ if( (!bAttrAutoStorage && pTextObject) // not during BuildChart
/*N*/ || !pObj )
/*N*/ return;
/*N*/
@@ -1071,10 +1049,10 @@ namespace binfilter {
/*N*/ case CHOBJID_DIAGRAM_WALL:
/*N*/ {
/*N*/ //Spezialfall, 2.Wand suchen
-/*N*/ ChartScene* pScene=GetScene();
-/*N*/ if(pScene)
+/*N*/ ChartScene* pLclScene=GetScene();
+/*N*/ if(pLclScene)
/*N*/ {
-/*N*/ SdrObjListIter aIterator(*pScene->GetSubList(), IM_FLAT);
+/*N*/ SdrObjListIter aIterator(*pLclScene->GetSubList(), IM_FLAT);
/*N*/ while (aIterator.IsMore())
/*N*/ {
/*N*/ SdrObject *pO = aIterator.Next();
@@ -1213,7 +1191,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ SdrObject* ChartModel::GetObjectWithId(const long nId,const long nCol,const long nRow)
+/*N*/ SdrObject* ChartModel::GetObjectWithId(const long nId,const long /*nCol*/,const long /*nRow*/)
/*N*/ {
/*N*/ //ToDo: Das hier könnte man auch schöner machen (kein DEEP!)
/*N*/ SdrObject* pObj=(GetObjWithId ((USHORT)nId,*GetPage(0),0,IM_DEEPWITHGROUPS));
@@ -1474,7 +1452,6 @@ Fehlen evtl. noch in GetAttr(ID):
/*N*/ case CHOBJID_DIAGRAM_B_AXIS:
/*N*/ case CHOBJID_DIAGRAM_Z_AXIS:
/*N*/ {
-/*N*/ const SfxPoolItem *pPoolItem;
/*N*/ if(pObj)
/*N*/ {
/*N*/ ChangeAxisAttr(rAttr,(SdrObjGroup*)pObj);
@@ -1497,6 +1474,7 @@ Fehlen evtl. noch in GetAttr(ID):
/*N*/
/*N*/ }
/*N*/
+/*N*/ const SfxPoolItem *pPoolItem;
/*N*/ if( SFX_ITEM_SET == rAttr.GetItemState( SID_TEXTBREAK, TRUE, &pPoolItem ) )
/*N*/ {
/*N*/ switch(nId)
diff --git a/binfilter/bf_sch/source/core/sch_chtmode4.cxx b/binfilter/bf_sch/source/core/sch_chtmode4.cxx
index a2dd9f1..7e180dc 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode4.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode4.cxx
@@ -296,10 +296,9 @@ namespace binfilter {
/*?*/ rAttr.Put(SfxInt32Item(SCHATTR_STYLE_SHAPE,nTmp));
/*N*/ }
/*N*/
-/*N*/ ChartScene *pScene=GetScene();
-/*N*/ if(pScene)
-/*N*/ //-/ pScene->TakeAttributes(rAttr,TRUE,FALSE);
-/*N*/ rAttr.Put(pScene->GetItemSet());
+/*N*/ ChartScene *pLclScene=GetScene();
+/*N*/ if(pLclScene)
+/*N*/ rAttr.Put(pLclScene->GetItemSet());
/*N*/
/*N*/ if( pChartAttr->GetItemState( SCHATTR_USER_DEFINED_ATTR, TRUE, &pPoolItem ) == SFX_ITEM_SET )
/*N*/ {
@@ -548,14 +547,13 @@ namespace binfilter {
/*?*/ }
/*N*/ }
/*N*/
-/*N*/ ChartScene *pScene=GetScene();
-/*N*/ if(pScene) //ToDo: Ist das hier nötig??? warum nicht direkt rAttr? #63904#
+/*N*/ ChartScene *pLclScene=GetScene();
+/*N*/ if(pLclScene) //ToDo: Ist das hier nötig??? warum nicht direkt rAttr? #63904#
/*N*/ {
/*N*/ SfxItemSet aSceneSet(*pItemPool,nRowWhichPairs);
/*N*/ aSceneSet.Put(rAttr);
/*N*/
-/*N*/ //-/ pScene->NbcSetAttributes(aSceneSet,FALSE);
-/*N*/ pScene->SetItemSet(aSceneSet);
+/*N*/ pLclScene->SetItemSet(aSceneSet);
/*N*/
/*N*/ }
/*N*/
@@ -783,7 +781,7 @@ namespace binfilter {
/*N*/ if (pObj)
/*N*/ {
/*N*/ Rectangle aRect = pObj->GetLogicRect();
-/*N*/ ChartAdjust eAdjust;
+/*N*/ ChartAdjust eAdjust(CHADJUST_TOP_LEFT);
/*N*/
/*N*/ Point aLegendPosition;
/*N*/ if (bUseRelativePositionsForChartGroups && (aLegendTopLeft.X() >= 0) &&
@@ -824,6 +822,8 @@ namespace binfilter {
/*?*/ eAdjust = CHADJUST_TOP_LEFT;
/*?*/ aChartRect.Bottom() -= aRect.GetHeight() + nYOfs;
/*?*/ break;
+/*?*/ default:
+/*?*/ break;
/*N*/ }
/*N*/ }
/*N*/ // #96418# why shifting the legend nXOfs/nYOfs away from the
@@ -871,6 +871,8 @@ namespace binfilter {
/*?*/ eAdjust = CHADJUST_BOTTOM_CENTER;
/*?*/ aChartRect.Bottom() -= aRect.GetHeight() + nYOfs;
/*?*/ break;
+/*N*/ default:
+/*?*/ break;
/*N*/ }
/*N*/ }
/*N*/
@@ -973,7 +975,7 @@ namespace binfilter {
/*N*/ void ChartModel::DeleteChartObjects()
/*N*/ {
/*N*/ SdrPage* pPage=GetPage(0);
-/*N*/ BOOL bResize = (aInitialSize != pPage->GetSize());
+/*N*/ /*BOOL bResize = (aInitialSize != */pPage->GetSize()/*)*/;
/*N*/
/*N*/ // FG: Bevor die Objekte geloescht und neu aufgebaut werden, merkt man sich deren
/*N*/ // Position. Da in InitalSize die urspruengliche Seitengroesse steht, kann
diff --git a/binfilter/bf_sch/source/core/sch_chtmode5.cxx b/binfilter/bf_sch/source/core/sch_chtmode5.cxx
index 7454490..f02c697 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode5.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode5.cxx
@@ -249,7 +249,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ SdrTextObj *ChartModel::CreateTitle (SfxItemSet *pTitleAttr,
+/*N*/ SdrTextObj *ChartModel::CreateTitle (SfxItemSet *pInTitleAttr,
/*N*/ short nID,
/*N*/ BOOL bSwitchColRow,
/*N*/ const String &rText,
@@ -260,7 +260,7 @@ namespace binfilter {
/*N*/ if (pTextDirection == NULL) return NULL; //FG: sonst Absturz
/*N*/
/*N*/ SfxItemSet aTextAttr(*pItemPool, nTitleWhichPairs);
-/*N*/ SvxChartTextOrient eOrient = ((const SvxChartTextOrientItem&)pTitleAttr->Get(SCHATTR_TEXT_ORIENT)).GetValue();
+/*N*/ SvxChartTextOrient eOrient = ((const SvxChartTextOrientItem&)pInTitleAttr->Get(SCHATTR_TEXT_ORIENT)).GetValue();
/*N*/
/*N*/ if (bVert)
/*N*/ {
@@ -284,7 +284,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ aTextAttr.Put(*pTitleAttr);
+/*N*/ aTextAttr.Put(*pInTitleAttr);
/*N*/ aTextAttr.Put(SvxChartTextOrientItem(eOrient));
/*N*/
/*N*/ // Seit 4/1998 koennen Texte frei gedreht werden: SCHATTR_TEXT_DEGREES
@@ -314,65 +314,65 @@ namespace binfilter {
/*N*/ PutDataRowAttr( nRow, rInAttrs );
/*N*/
/*N*/ const SfxPoolItem *pPoolItem = NULL;
-/*N*/ BOOL bChanged = FALSE;
+/*N*/ BOOL bLclChanged = FALSE;
/*N*/
/*N*/ if (rInAttrs.GetItemState(SCHATTR_STAT_AVERAGE, TRUE, &pPoolItem) == SFX_ITEM_SET)
/*N*/ {
/*N*/ bShowAverage = ((const SfxBoolItem*) pPoolItem)->GetValue();
-/*N*/ bChanged = TRUE;
+/*N*/ bLclChanged = TRUE;
/*N*/ }
/*N*/
/*N*/ if (rInAttrs.GetItemState(SCHATTR_STAT_KIND_ERROR, TRUE, &pPoolItem) == SFX_ITEM_SET)
/*N*/ {
/*N*/ eErrorKind = (SvxChartKindError) ((const SfxInt32Item*) pPoolItem)->GetValue();
-/*N*/ bChanged = TRUE;
+/*N*/ bLclChanged = TRUE;
/*N*/ }
/*N*/
/*N*/ if (rInAttrs.GetItemState(SCHATTR_STAT_PERCENT, TRUE, &pPoolItem) == SFX_ITEM_SET)
/*N*/ {
/*N*/ fIndicatePercent = ((const SvxDoubleItem*) pPoolItem)->GetValue();
-/*N*/ bChanged = TRUE;
+/*N*/ bLclChanged = TRUE;
/*N*/ }
/*N*/
/*N*/ if (rInAttrs.GetItemState(SCHATTR_STAT_BIGERROR, TRUE, &pPoolItem) == SFX_ITEM_SET)
/*N*/ {
/*N*/ fIndicateBigError = ((const SvxDoubleItem*) pPoolItem)->GetValue();
-/*N*/ bChanged = TRUE;
+/*N*/ bLclChanged = TRUE;
/*N*/ }
/*N*/
/*N*/ if (rInAttrs.GetItemState(SCHATTR_STAT_CONSTPLUS, TRUE, &pPoolItem) == SFX_ITEM_SET)
/*N*/ {
/*N*/ fIndicatePlus = ((const SvxDoubleItem*) pPoolItem)->GetValue();
-/*N*/ bChanged = TRUE;
+/*N*/ bLclChanged = TRUE;
/*N*/ }
/*N*/
/*N*/ if (rInAttrs.GetItemState(SCHATTR_STAT_CONSTMINUS, TRUE, &pPoolItem) == SFX_ITEM_SET)
/*N*/ {
/*N*/ fIndicateMinus = ((const SvxDoubleItem*) pPoolItem)->GetValue();
-/*N*/ bChanged = TRUE;
+/*N*/ bLclChanged = TRUE;
/*N*/ }
/*N*/
/*N*/ if (rInAttrs.GetItemState(SCHATTR_STAT_INDICATE, TRUE, &pPoolItem) == SFX_ITEM_SET)
/*N*/ {
/*?*/ eIndicate = (SvxChartIndicate) ((const SfxInt32Item*) pPoolItem)->GetValue();
-/*?*/ bChanged = TRUE;
+/*?*/ bLclChanged = TRUE;
/*N*/ }
/*N*/
/*N*/ if (rInAttrs.GetItemState(SCHATTR_STAT_REGRESSTYPE, TRUE, &pPoolItem) == SFX_ITEM_SET)
/*N*/ {
/*N*/ eRegression = (SvxChartRegress) ((const SfxInt32Item*) pPoolItem)->GetValue();
-/*N*/ bChanged = TRUE;
+/*N*/ bLclChanged = TRUE;
/*N*/ }
/*N*/
-/*N*/ if( bChanged )
+/*N*/ if( bLclChanged )
/*N*/ {
/*N*/ BuildChart( FALSE );
/*N*/ }
/*N*/
-/*N*/ return bChanged;
+/*N*/ return bLclChanged;
/*N*/ }
-/*N*/ void ChartModel::DataRangeChanged( long _nOldRowCnt , long _nOldColCnt )
+/*N*/ void ChartModel::DataRangeChanged( long /*_nOldRowCnt*/ , long /*_nOldColCnt*/ )
/*N*/ {
/*N*/ if( Is3DChart() )
/*N*/ {
diff --git a/binfilter/bf_sch/source/core/sch_chtmode8.cxx b/binfilter/bf_sch/source/core/sch_chtmode8.cxx
index 4ec91fe..b602ad4 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode8.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode8.cxx
@@ -352,7 +352,7 @@ CHSTYLE_2D_LINE_STACKEDCOLUMN Column+1_Line - x - - - - - x x - - - */
/*N*/ }
/*N*/ }
-/*N*/ BOOL ChartModel::IsArea(long nRow)
+/*N*/ BOOL ChartModel::IsArea(long /*nRow*/)
/*N*/ {
/*N*/ switch( eChartStyle )
/*N*/ {
diff --git a/binfilter/bf_sch/source/core/sch_chtmode9.cxx b/binfilter/bf_sch/source/core/sch_chtmode9.cxx
index a371e3f..51d9e34 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode9.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode9.cxx
@@ -311,7 +311,7 @@ namespace binfilter {
/*N*/ pChartAAxis->SetArea(rRect);
/*N*/ pChartBAxis->SetArea(rRect);
/*N*/
-/*N*/ long nStepPartWidth=pChartXAxis->GetDescrWidth(); //Warum nochmal? sollte noch immer identisch nDescrWidth sein!
+/*N*/ /*long nStepPartWidth=*/pChartXAxis->GetDescrWidth(); //Warum nochmal? sollte noch immer identisch nDescrWidth sein!
/*N*/
/*N*/ Position2DAxisTitles(rRect,bSwitchColRow,nTitleLeft,nTitleBottom);
/*N*/
@@ -327,7 +327,6 @@ namespace binfilter {
/*N*/ SdrObjList* pYGridMainList = NULL;
/*N*/ SdrObjList* pXGridHelpList = NULL;
/*N*/ SdrObjList* pYGridHelpList = NULL;
-/*N*/ SdrObjList* pBAxisList = NULL;
/*N*/
/*N*/
/*N*/ BOOL bXAxis = (pChartXAxis->IsVisible() && pChartYAxis->IsOriginInRange());
@@ -546,7 +545,7 @@ namespace binfilter {
/*N*/
/*N*/
/*N*/ XPolygon *pLine = new XPolygon[nLines]; //#50149#
-/*N*/ BOOL bStartPointIsValid; // Indicates wether the first point of a line
+/*N*/ BOOL bStartPointIsValid(FALSE); // Indicates wether the first point of a line
/*N*/ // segment is valid.
/*N*/
/*N*/ for (nCol = 0; nCol < nColCnt; nCol++)
@@ -600,7 +599,6 @@ namespace binfilter {
/*N*/ pStatLists [nRow] = pStatGroup->GetSubList ();
/*N*/ }
/*N*/
-/*N*/ long nIndex = nCol + nRow * nColCnt;
/*N*/ double fData = GetData(nCol, nRow, bPercent);
/*N*/
/*N*/ BOOL bLogarithm = pAxis->IsLogarithm();
@@ -662,13 +660,13 @@ namespace binfilter {
/*N*/ aResult );
/*N*/ if( aResult.Count())
/*N*/ {
-/*N*/ SdrPathObj* pObj = new SdrPathObj( OBJ_PLIN, aResult );
-/*N*/ pObj->InsertUserData( new SchObjectId( CHOBJID_DIAGRAM_ROWSLINE ));
-/*N*/ pObj->InsertUserData( new SchDataRow( nRow ));
-/*N*/ pRowLists[ nRow ]->NbcInsertObject( pObj, 0 );
+/*N*/ SdrPathObj* pLclObj = new SdrPathObj( OBJ_PLIN, aResult );
+/*N*/ pLclObj->InsertUserData( new SchObjectId( CHOBJID_DIAGRAM_ROWSLINE ));
+/*N*/ pLclObj->InsertUserData( new SchDataRow( nRow ));
+/*N*/ pRowLists[ nRow ]->NbcInsertObject( pLclObj, 0 );
/*N*/
/*N*/ // Set the line's attributes.
-/*N*/ pObj->SetItemSet( rDataRowAttr );
+/*N*/ pLclObj->SetItemSet( rDataRowAttr );
/*N*/ }
/*N*/ }
/*N*/
@@ -770,13 +768,13 @@ namespace binfilter {
/*?*/ aResult );
/*?*/ if( aResult.Count())
/*?*/ {
-/*?*/ SdrPathObj* pObj = new SdrPathObj( OBJ_PLIN, aResult );
-/*?*/ pObj->InsertUserData( new SchObjectId( CHOBJID_DIAGRAM_ROWSLINE ));
-/*?*/ pObj->InsertUserData( new SchDataRow( nRow ));
-/*?*/ pRowLists[ nRow ]->NbcInsertObject( pObj, 0 );
+/*?*/ SdrPathObj* pLclObj = new SdrPathObj( OBJ_PLIN, aResult );
+/*?*/ pLclObj->InsertUserData( new SchObjectId( CHOBJID_DIAGRAM_ROWSLINE ));
+/*?*/ pLclObj->InsertUserData( new SchDataRow( nRow ));
+/*?*/ pRowLists[ nRow ]->NbcInsertObject( pLclObj, 0 );
/*?*/
/*?*/ // Set the line's attributes.
-/*?*/ pObj->SetItemSet( rDataRowAttr );
+/*?*/ pLclObj->SetItemSet( rDataRowAttr );
/*?*/ }
/*?*/
/*?*/ // Anfangspunkt des naechsten Datenpunkts =
@@ -807,13 +805,13 @@ namespace binfilter {
/*?*/ if(nCol != 0)
/*?*/ {
/*?*/ Point aEndPoint=bIsDownward ? aBarRect.BottomLeft() : aBarRect.TopLeft();//#51471#
-/*?*/ SdrPathObj* pObj = new SdrPathObj(pTracePoint[nRow],aEndPoint);
-/*?*/ pObj->InsertUserData(new SchObjectId (0));
-/*?*/ pList->NbcInsertObject(pObj);//immer vorne, egal welche Achse
+/*?*/ SdrPathObj* pLclObj = new SdrPathObj(pTracePoint[nRow],aEndPoint);
+/*?*/ pLclObj->InsertUserData(new SchObjectId (0));
+/*?*/ pList->NbcInsertObject(pLclObj);//immer vorne, egal welche Achse
/*?*/ // Linie attributieren
/*?*/
-/*?*/ //-/ pObj->NbcSetAttributes(rDataRowAttr, FALSE);
-/*?*/ pObj->SetItemSet(rDataRowAttr);
+/*?*/ //-/ pLclObj->NbcSetAttributes(rDataRowAttr, FALSE);
+/*?*/ pLclObj->SetItemSet(rDataRowAttr);
/*?*/
/*?*/ }
/*?*/ pTracePoint[nRow]=bIsDownward ? aBarRect.BottomRight() :aBarRect.TopRight();//#51471#
@@ -1132,22 +1130,13 @@ namespace binfilter {
/*N*/ break;
/*N*/ }
/*N*/
-/*N*/
-/*N*/
-/*N*/ SchObjGroup *pStatGroup=NULL;
-/*N*/
-/*N*/
/*N*/ if(GetRowCount()&&HasStockBars())
/*N*/ {
-/*N*/ SdrObjList* pDescrList = NULL;
-/*N*/
/*N*/ ChartAxis *pAxis=GetAxisByUID(((const SfxInt32Item &)rDataRowAttr.Get(SCHATTR_AXIS)).GetValue());
/*N*/ long nCol;
/*N*/
/*N*/ SdrObjList *pBarList;
/*N*/
-/*N*/ SdrObjList* pStatList = NULL;
-/*N*/
/*N*/ SchObjGroup *pBarGroup;
/*N*/
/*N*/ pBarGroup =(SchObjGroup*)CreateSimpleGroup(CHOBJID_DIAGRAM_ROWGROUP,TRUE, TRUE);
@@ -1159,7 +1148,7 @@ namespace binfilter {
/*N*/ //Statistik:
/*N*/ if ( ((const SfxBoolItem &) rDataRowAttr.Get (SCHATTR_STAT_AVERAGE)).GetValue ())
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if(!pStatList)
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/
/*N*/ for (nCol = 0; nCol < nColCnt; nCol++)
@@ -1181,7 +1170,7 @@ namespace binfilter {
/*N*/ ((const SfxInt32Item &) aDataPointAttr.Get (SCHATTR_STAT_KIND_ERROR)).GetValue () !=
/*N*/ CHERROR_NONE)
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if(!pStatList)
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/
/*N*/
@@ -1315,7 +1304,7 @@ namespace binfilter {
/*N*/ double fData = GetData(nCol, nRow, bPercent);
/*N*/
/*N*/ BOOL bLogarithm = pAxis->IsLogarithm();
-/*N*/ BOOL bValidData=((fData!=DBL_MIN)&&(!bLogarithm||bLogarithm&&(fData>0.0)));
+/*N*/ BOOL bValidData=((fData!=DBL_MIN)&&(!bLogarithm||(bLogarithm&&(fData>0.0))));
/*N*/
/*N*/ if(!bValidData && bStacked)
/*N*/ {
@@ -1912,6 +1901,7 @@ namespace binfilter {
/*N*/ long nRowCnt = GetRowCount();
/*N*/
/*N*/ DBG_ASSERT( nSize == ( nRowCnt * nColCnt ), "Data-Point list has invalid size!" );
+/*N*/ (void)nSize;
/*N*/
/*N*/ // the 'outer' sequence contains one sequence for each series
/*N*/ uno::Sequence< uno::Sequence< sal_Int32 > > aResult( nRowCnt );
diff --git a/binfilter/bf_sch/source/core/sch_chtmodel.cxx b/binfilter/bf_sch/source/core/sch_chtmodel.cxx
index 1af1da6..ddcce64 100644
--- a/binfilter/bf_sch/source/core/sch_chtmodel.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmodel.cxx
@@ -142,14 +142,39 @@ using namespace ::com::sun::star::linguistic2;
using namespace ::com::sun::star;
/*N*/ ChartModel::ChartModel( const String& rPalettePath, SfxObjectShell* pDocSh ) :
-/*N*/ pChartDataBuffered(NULL),
-/*N*/ pAutoPilot(NULL),//#46895#
+/*N*/ SdrModel( rPalettePath, NULL, SAL_STATIC_CAST( SvPersist*, pDocSh )),
/*N*/ bClearDepth(FALSE),
/*N*/ bNewOrLoadCompleted(FALSE),//aus SchChartDocument::
+/*N*/ pDocShell(pDocSh), //aus SchChartDocument::
+/*N*/ bAttrAutoStorage(FALSE),
+/*N*/ pChartDataBuffered(NULL),
+/*N*/ pChartRefOutDev(NULL),
/*N*/ nChartStatus( CHS_USER_QUERY ),
-/*N*/ SdrModel( rPalettePath, NULL, SAL_STATIC_CAST( SvPersist*, pDocSh )),
+/*N*/ pAutoPilot(NULL),//#46895#
+/*N*/ pSdrObjList(NULL),
+/*N*/ bResizePie(TRUE),
+/*N*/ nPieRadius(0),
+/*N*/ pOwnNumFormatter(FALSE),
+/*N*/ pNumFormatter(NULL),
+/*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),
+/*N*/ pScene (0),
+/*N*/ aLightVec (new Vector3D (1, 1, 1)), // old: aLightVec (new Vector3D (0, 0, 1)),
+/*N*/ pChartData (0),
+/*N*/ fMinData (0.0),
+/*N*/ fMaxData (0.0),
+/*N*/ fAmbientIntensity(0.6),
+/*N*/ aAmbientColor(RGBColor(COL_WHITE)),
+/*N*/ fSpotIntensity (0.6),
+/*N*/ aSpotColor(RGBColor(COL_WHITE)),
+/*N*/ eChartStyle (CHSTYLE_2D_COLUMN),
+/*N*/ eOldChartStyle (CHSTYLE_3D_XYZSYMBOLS),
+/*N*/ pDefaultColors (0),
/*N*/ bTextScalable (TRUE),
/*N*/ bIsCopied (FALSE),
/*N*/ bLegendVisible (TRUE),
@@ -166,19 +191,6 @@ using namespace ::com::sun::star;
/*N*/ bSwitch3DColRow (FALSE), // FG: reiner Zwischenspeicher, damit die ChartScene das nicht als Parameter bekommt
/*N*/ // ist immer gleich bSwitchRowCol, das aber wird durchs Chart als Parameter
/*N*/ // durchgereicht.
-/*N*/ pChItemPool (new SchItemPool),
-/*N*/ pScene (0),
-/*N*/ aLightVec (new Vector3D (1, 1, 1)), // old: aLightVec (new Vector3D (0, 0, 1)),
-/*N*/ pChartData (0),
-/*N*/ fMinData (0.0),
-/*N*/ fMaxData (0.0),
-/*N*/ fAmbientIntensity(0.6),
-/*N*/ aAmbientColor(RGBColor(COL_WHITE)),
-/*N*/ fSpotIntensity (0.6),
-/*N*/ aSpotColor(RGBColor(COL_WHITE)),
-/*N*/ eChartStyle (CHSTYLE_2D_COLUMN),
-/*N*/ eOldChartStyle (CHSTYLE_3D_XYZSYMBOLS),
-/*N*/ pDefaultColors (0),
/*N*/ nMarkLen (100),
/*N*/ nPieHeight (20),
/*N*/ pPieSegOfs (0),
@@ -188,14 +200,14 @@ using namespace ::com::sun::star;
/*N*/ nZAngle (0),
/*N*/ bCanRebuild (TRUE),
/*N*/ bShowMainTitle (TRUE),
-/*N*/ aMainTitle (String ()),
/*N*/ bShowSubTitle (FALSE),
-/*N*/ aSubTitle (String ()),
/*N*/ bShowXAxisTitle (FALSE),
-/*N*/ aXAxisTitle (String ()),
/*N*/ bShowYAxisTitle (FALSE),
-/*N*/ aYAxisTitle (String ()),
/*N*/ bShowZAxisTitle (FALSE),
+/*N*/ aMainTitle (String ()),
+/*N*/ aSubTitle (String ()),
+/*N*/ aXAxisTitle (String ()),
+/*N*/ aYAxisTitle (String ()),
/*N*/ aZAxisTitle (String ()),
/*N*/ bShowXGridMain (TRUE),
/*N*/ bShowXGridHelp (FALSE),
@@ -203,6 +215,15 @@ using namespace ::com::sun::star;
/*N*/ bShowYGridHelp (FALSE),
/*N*/ bShowZGridMain (FALSE),
/*N*/ bShowZGridHelp (FALSE),
+/*N*/ bShowDataDescr(TRUE),
+/*N*/ pChartXAxis(NULL),
+/*N*/ pChartYAxis(NULL),
+/*N*/ pChartZAxis(NULL),
+/*N*/ pChartAAxis(NULL),
+/*N*/ pChartBAxis(NULL),
+/*N*/ pTmpXItems(NULL),
+/*N*/ pTmpYItems(NULL),
+/*N*/ pTmpZItems(NULL),
/*N*/ eDataDescr (CHDESCR_NONE),
/*N*/ bShowSym (FALSE),
/*N*/ bSwitchData (TRUE),
@@ -210,7 +231,6 @@ using namespace ::com::sun::star;
/*N*/ bShouldBuildChart( TRUE ),
/*N*/ bReadError (FALSE),
/*N*/ mbIsInitialized(FALSE),
-/*N*/ pOwnNumFormatter(FALSE),
/*N*/ pOutliner(NULL),
/*N*/ // FG: nMoreData >=12
/*N*/ bFormatXAxisTextInMultipleLinesIfNecessary (TRUE),
@@ -229,10 +249,10 @@ using namespace ::com::sun::star;
/*N*/ aLastDiagramRectangle(-1,-1,-1,-1),
/*N*/ aLegendTopLeft(-1,-1),
/*N*/ aTitleXAxisPosition (-1,-1),
-/*N*/ eAdjustXAxesTitle(CHADJUST_TOP_CENTER),
/*N*/ aTitleYAxisPosition(-1,-1),
-/*N*/ eAdjustYAxesTitle(CHADJUST_TOP_CENTER),
/*N*/ aTitleZAxisPosition (-1,-1),
+/*N*/ eAdjustXAxesTitle(CHADJUST_TOP_CENTER),
+/*N*/ eAdjustYAxesTitle(CHADJUST_TOP_CENTER),
/*N*/ eAdjustZAxesTitle(CHADJUST_TOP_CENTER),
/*N*/ bUseRelativePositionsForChartGroups(FALSE),
/*N*/ bAdjustMarginsForLegend(TRUE),
@@ -250,36 +270,16 @@ using namespace ::com::sun::star;
/*N*/ bZAxisTitleHasBeenMoved(FALSE),
/*N*/ aInitialSizefor3d (-1,-1), // FG: Zwischenspeicher fuer InitalSize (siehe chtmod3d.cxx, Position3DAxisTitles
/*N*/ pTestTextObj(NULL), // FG: fuer GetHeightOfnRows, ein Dummy-Textpointer
-/*N*/ pLogBook(NULL),
-/*N*/ bShowDataDescr(TRUE),
/*N*/
-/*N*/ pDocShell(pDocSh), //aus SchChartDocument::
/*N*/ // bFreshLoaded (FALSE),
-/*N*/ m_nDefaultColorSet(0), //#50037#
-/*N*/ nBarPercentWidth(100), //#50116#
-/*N*/ nNumLinesInColChart(0), //#50212#
-/*N*/ bAttrAutoStorage(FALSE),
-/*N*/ pChartRefOutDev(NULL),
-/*N*/ pChartXAxis(NULL),
-/*N*/ pChartYAxis(NULL),
-/*N*/ pChartZAxis(NULL),
-/*N*/ pChartBAxis(NULL),
-/*N*/ pChartAAxis(NULL),
-/*N*/ pTmpXItems(NULL),
-/*N*/ pTmpYItems(NULL),
-/*N*/ pTmpZItems(NULL),
-/*N*/ pSdrObjList(NULL),
-/*N*/ eProjection(PR_PERSPECTIVE),
-/*N*/ bResizePie(TRUE),
-/*N*/ nPieRadius(0),
-/*N*/ pNumFormatter(NULL),
/*N*/ nXLastNumFmt(-1),
/*N*/ nYLastNumFmt(-1),
/*N*/ nBLastNumFmt(-1),
/*N*/ eLanguage( LANGUAGE_SYSTEM ),
/*N*/ eLanguageCJK( LANGUAGE_SYSTEM ),
/*N*/ eLanguageCTL( LANGUAGE_SYSTEM ),
-/*N*/ mpDocStor( NULL ),
+/*N*/ eProjection(PR_PERSPECTIVE),
+/*N*/ mpDocStor( NULL ),
/*N*/ m_pUndoActionFromDraw(NULL),
/*N*/ m_bDeleteUndoActionNotificationFromDraw(TRUE)
/*N*/ {
@@ -324,7 +324,7 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ // get current language
/*N*/ pOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this);
-/*N*/ SdrOutliner& rDrawOutliner = GetDrawOutliner();
+/*N*/ /*SdrOutliner& rDrawOutliner =*/ GetDrawOutliner();
/*N*/
/*N*/ try
/*N*/ {
@@ -662,7 +662,7 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ SdrObject *pObj;
/*N*/ while(pSdrObjList->GetObjCount())
-/*?*/ if(pObj=pSdrObjList->RemoveObject(0))
+/*?*/ if((pObj=pSdrObjList->RemoveObject(0)))
/*?*/ delete pObj;
/*N*/ delete pSdrObjList;
/*N*/
@@ -914,7 +914,7 @@ using namespace ::com::sun::star;
/*N*/ BOOL bOldIs3D=IsReal3D();
/*N*/ BOOL bOldHadStockBars=HasStockBars();
/*N*/ BOOL bOldXY = IsXYChart();
-/*N*/ BOOL bOldNet = IsNetChart();
+/*N*/ /*BOOL bOldNet =*/ IsNetChart();
/*N*/ BOOL bOldPie = IsPieChart();
/*N*/ BOOL bOldDonut = IsDonutChart();
/*N*/
@@ -1046,7 +1046,7 @@ using namespace ::com::sun::star;
/*?*/ pAttributes->ClearItem(XATTR_LINESTYLE);
/*?*/ }
/*?*/ }
-/*N*/ if(!bOldIsStock && HasStockLines() || (!bOldIs3D && bNewIs3D) )
+/*N*/ if( (!bOldIsStock && HasStockLines()) || (!bOldIs3D && bNewIs3D) )
/*N*/ {
long n=0;
/*N*/ for(n=0;n<nRowCnt;n++)
@@ -1254,30 +1254,30 @@ using namespace ::com::sun::star;
/*N*/ void ChartModel::SetLanguage( const LanguageType eLang, const USHORT nId )
/*N*/ {
-/*N*/ BOOL bChanged = FALSE;
+/*N*/ BOOL bLclChanged = FALSE;
/*N*/
/*N*/ if( nId == EE_CHAR_LANGUAGE && eLanguage != eLang )
/*N*/ {
/*N*/ eLanguage = eLang;
-/*N*/ bChanged = TRUE;
+/*N*/ bLclChanged = TRUE;
/*N*/ }
/*N*/ else if( nId == EE_CHAR_LANGUAGE_CJK && eLanguageCJK != eLang )
/*N*/ {
/*N*/ eLanguageCJK = eLang;
-/*N*/ bChanged = TRUE;
+/*N*/ bLclChanged = TRUE;
/*N*/ }
/*N*/ else if( nId == EE_CHAR_LANGUAGE_CTL && eLanguageCTL != eLang )
/*N*/ {
/*N*/ eLanguageCTL = eLang;
-/*N*/ bChanged = TRUE;
+/*N*/ bLclChanged = TRUE;
/*N*/ }
/*N*/
-/*N*/ if( bChanged )
+/*N*/ if( bLclChanged )
/*N*/ {
/*N*/ GetDrawOutliner().SetDefaultLanguage( eLang );
/*N*/ pOutliner->SetDefaultLanguage( eLang );
/*N*/ pItemPool->SetPoolDefaultItem( SvxLanguageItem( eLang, nId ) );
-/*N*/ SetChanged( bChanged );
+/*N*/ SetChanged( bLclChanged );
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sch/source/core/sch_chtscene.cxx b/binfilter/bf_sch/source/core/sch_chtscene.cxx
index 5bc1276..7d06884 100644
--- a/binfilter/bf_sch/source/core/sch_chtscene.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtscene.cxx
@@ -147,7 +147,7 @@ namespace binfilter {
\************************************************************************/
/*N*/ void ChartScene::InsertAllTitleText (DescrList &rList,
-/*N*/ E3dObject *pGroup,
+/*N*/ E3dObject * /*pGroup*/,
/*N*/ long nAxisId)
/*N*/ {
/*N*/ Rectangle aOldRect;
diff --git a/binfilter/bf_sch/source/core/sch_datapoin.cxx b/binfilter/bf_sch/source/core/sch_datapoin.cxx
index 2c30495..e69be80 100644
--- a/binfilter/bf_sch/source/core/sch_datapoin.cxx
+++ b/binfilter/bf_sch/source/core/sch_datapoin.cxx
@@ -125,9 +125,9 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ SdrObjUserData* SchDataPoint::Clone(SdrObject *pObj) const
+/*N*/ SdrObjUserData* SchDataPoint::Clone(SdrObject *) const
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL; //STRIP001 return new SchDataPoint(*this);
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ }
/*************************************************************************
diff --git a/binfilter/bf_sch/source/core/sch_datarow.cxx b/binfilter/bf_sch/source/core/sch_datarow.cxx
index d8b6693..29fa8c0 100644
--- a/binfilter/bf_sch/source/core/sch_datarow.cxx
+++ b/binfilter/bf_sch/source/core/sch_datarow.cxx
@@ -121,7 +121,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ SdrObjUserData* SchDataRow::Clone(SdrObject *pObj) const
+/*N*/ SdrObjUserData* SchDataRow::Clone(SdrObject *) const
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SchDataRow(*this);
/*N*/ }
diff --git a/binfilter/bf_sch/source/core/sch_globfunc.cxx b/binfilter/bf_sch/source/core/sch_globfunc.cxx
index b1605dd..ce88232 100644
--- a/binfilter/bf_sch/source/core/sch_globfunc.cxx
+++ b/binfilter/bf_sch/source/core/sch_globfunc.cxx
@@ -709,6 +709,9 @@ namespace binfilter {
/*N*/ case CHTXTORIENT_STANDARD:
/*N*/ case CHTXTORIENT_STACKED:
/*N*/ break;
+/*N*/
+/*N*/ default:
+/*N*/ break;
/*N*/ }
/*N*/
/*N*/ return nDegrees;
@@ -761,6 +764,8 @@ namespace binfilter {
/*N*/ case CHADJUST_BOTTOM_RIGHT:
/*N*/ rAdjust = CHADJUST_BOTTOM_LEFT;
/*N*/ break;
+/*N*/ default:
+/*N*/ break;
/*N*/ }
/*N*/ break;
/*N*/
@@ -798,6 +803,8 @@ namespace binfilter {
/*N*/ case CHADJUST_BOTTOM_RIGHT:
/*N*/ rAdjust = CHADJUST_TOP_RIGHT;
/*N*/ break;
+/*N*/ default:
+/*N*/ break;
/*N*/ }
/*N*/ break;
/*N*/ default:
@@ -988,7 +995,7 @@ namespace binfilter {
//neue in alte Achsenattr konvertieren
/*N*/ void AxisAttrNew2Old(SfxItemSet &rDestSet,long nId,BOOL bClear)
/*N*/ {
-/*N*/ USHORT nOff;
+/*N*/ USHORT nOff(0);
/*N*/ double f;
/*N*/ BOOL b;
/*N*/ SfxItemSet aSet(rDestSet); //Kopie
@@ -1285,7 +1292,6 @@ namespace binfilter {
/*N*/ // factor. The horizontal size can therefore not be stored there. But as the font is scaled
/*N*/ // uniformly, the horizontal size depends uniquely on the vertical size.
/*N*/ long nFontHeight = static_cast<const SvxFontHeightItem&>(rSet.Get(EE_CHAR_FONTHEIGHT)).GetHeight();
-/*N*/ const double fSevenPoint = (1000/*scale*/ * 2.54/*cm per inch*/ / 72/*point per inch*/ * 7 /*pt*/);
/*N*/ long nFontWidth = 0; // #89001# use default font width
/*N*/ rFont.SetSize (Size (nFontWidth, nFontHeight));
/*N*/ // Old line.
diff --git a/binfilter/bf_sch/source/core/sch_memchrt.cxx b/binfilter/bf_sch/source/core/sch_memchrt.cxx
index 71d5af6..f076ec1 100644
--- a/binfilter/bf_sch/source/core/sch_memchrt.cxx
+++ b/binfilter/bf_sch/source/core/sch_memchrt.cxx
@@ -118,10 +118,11 @@ namespace binfilter {
\************************************************************************/
/*N*/ SchMemChart::SchMemChart(ChartDataId nMyID) :
-/*N*/ nTranslated(TRANS_NONE),
+/*N*/ nLastSelInfoReturn(0),
/*N*/ nRefCount (0),
/*N*/ mpColNameBuffer(NULL),
/*N*/ mpRowNameBuffer(NULL),
+/*N*/ nTranslated(TRANS_NONE),
/*N*/ nRowCnt (0),
/*N*/ nColCnt (0),
/*N*/ eDataType(NUMBERFORMAT_NUMBER),
@@ -134,8 +135,7 @@ namespace binfilter {
/*N*/ pColNumFmtId(NULL),
/*N*/ pRowTable(NULL),
/*N*/ pColTable(NULL),
-/*N*/ bReadOnly(FALSE),
-/*N*/ nLastSelInfoReturn(0)
+/*N*/ bReadOnly(FALSE)
/*N*/ {
/*N*/ }
@@ -146,10 +146,11 @@ namespace binfilter {
\************************************************************************/
/*N*/ SchMemChart::SchMemChart(short nCols, short nRows) :
-/*N*/ nTranslated(TRANS_NONE),
+/*N*/ nLastSelInfoReturn(0),
/*N*/ nRefCount (0),
/*N*/ mpColNameBuffer(NULL),
/*N*/ mpRowNameBuffer(NULL),
+/*N*/ nTranslated(TRANS_NONE),
/*N*/ eDataType(NUMBERFORMAT_NUMBER),
/*N*/ pData (0),
/*N*/ pColText (0),
@@ -160,8 +161,7 @@ namespace binfilter {
/*N*/ pColNumFmtId(NULL),
/*N*/ pRowTable(NULL),
/*N*/ pColTable(NULL),
-/*N*/ bReadOnly(FALSE),
-/*N*/ nLastSelInfoReturn(0)
+/*N*/ bReadOnly(FALSE)
/*N*/ {
/*N*/ nRowCnt = nRows;
/*N*/ nColCnt = nCols;
@@ -225,10 +225,10 @@ namespace binfilter {
\************************************************************************/
/*N*/ SchMemChart::SchMemChart(const SchMemChart& rMemChart) :
-/*N*/ nTranslated(TRANS_NONE),
/*N*/ nRefCount (0),
/*N*/ mpColNameBuffer(NULL),
/*N*/ mpRowNameBuffer(NULL),
+/*N*/ nTranslated(TRANS_NONE),
/*N*/ myID (CHDATAID_MEMCHART_PLUS),
/*N*/ mpNumFormatter(NULL),
/*N*/ pRowNumFmtId(NULL),
@@ -259,13 +259,12 @@ namespace binfilter {
/*N*/ nLastSelInfoReturn = rMemChart.nLastSelInfoReturn;
/*N*/
/*N*/ nTranslated = rMemChart.nTranslated;
-/*N*/ long i;
-/*N*/ for(i=0;i<nColCnt;i++)
+/*N*/ for(long i=0;i<nColCnt;i++)
/*N*/ {
/*N*/ pColTable[i] = rMemChart.pColTable[i];
/*N*/ pColNumFmtId[i] = rMemChart.pColNumFmtId[i];
/*N*/ }
-/*N*/ for(i=0;i<nRowCnt;i++)
+/*N*/ for(long i=0;i<nRowCnt;i++)
/*N*/ {
/*N*/ pRowTable[i] = rMemChart.pRowTable[i];
/*N*/ pRowNumFmtId[i] = rMemChart.pRowNumFmtId[i];
@@ -284,12 +283,12 @@ namespace binfilter {
/*N*/
/*N*/ pColText = new String[nColCnt];
/*N*/
-/*N*/ for (i = 0; i < nColCnt; i++)
+/*N*/ for (long i = 0; i < nColCnt; i++)
/*N*/ pColText[i] = rMemChart.pColText[i];
/*N*/
/*N*/ pRowText = new String[nRowCnt];
/*N*/
-/*N*/ for (i = 0; i < nRowCnt; i++)
+/*N*/ for (long i = 0; i < nRowCnt; i++)
/*N*/ pRowText[i] = rMemChart.pRowText[i];
/*N*/
/*N*/ bReadOnly = rMemChart.bReadOnly; // bm #69410#
@@ -526,8 +525,7 @@ namespace binfilter {
/*N*/
/*N*/ double *pIn = rMemChart.pData;
/*N*/
-/*N*/ short i;
-/*N*/ for (i = 0; i < rMemChart.nColCnt; i++)
+/*N*/ for (short i = 0; i < rMemChart.nColCnt; i++)
/*N*/ for (short j = 0; j < rMemChart.nRowCnt; j++)
/*N*/ rIn >> *(pIn ++);
/*N*/
@@ -546,14 +544,14 @@ namespace binfilter {
/*N*/
/*N*/ rMemChart.pColText = new String[rMemChart.nColCnt];
/*N*/
-/*N*/ for (i = 0; i < rMemChart.nColCnt; i++)
+/*N*/ for (short i = 0; i < rMemChart.nColCnt; i++)
/*N*/ {
/*N*/ rIn.ReadByteString( rMemChart.pColText[ i ] );
/*N*/ }
/*N*/
/*N*/ rMemChart.pRowText = new String[rMemChart.nRowCnt];
/*N*/
-/*N*/ for (i = 0; i < rMemChart.nRowCnt; i++)
+/*N*/ for (short i = 0; i < rMemChart.nRowCnt; i++)
/*N*/ {
/*N*/ rIn.ReadByteString( rMemChart.pRowText[ i ] );
/*N*/ }
@@ -567,11 +565,10 @@ namespace binfilter {
/*N*/
/*N*/ if(aIO.GetVersion()>=1)
/*N*/ {
-/*N*/ long i;
-/*N*/ for (i = 0; i < rMemChart.nColCnt; i++)
+/*N*/ for (long i = 0; i < rMemChart.nColCnt; i++)
/*N*/ rIn >> rMemChart.pColTable[i];
/*N*/
-/*N*/ for (i = 0; i < rMemChart.nRowCnt; i++)
+/*N*/ for (long i = 0; i < rMemChart.nRowCnt; i++)
/*N*/ rIn >> rMemChart.pRowTable[i];
/*N*/
/*N*/ if(aIO.GetVersion()>=2)
@@ -948,7 +945,6 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ static const sal_Unicode aSpace( ' ' );
/*N*/ static const sal_Unicode aQuote( '\'' );
-/*N*/ static const sal_Unicode aDoubleQuote( '\"' );
/*N*/ static const sal_Unicode aDollar( '$' );
/*N*/ static const sal_Unicode aBackslash( '\\' );
/*N*/
@@ -1105,11 +1101,11 @@ using namespace ::com::sun::star;
// methods to modify SchChartRange
// -------------------------------
-/*N*/ static sal_Int32 lcl_GetWriterBoxNum( String& rStr, BOOL bFirst )
+/*N*/ static sal_Int32 lcl_GetWriterBoxNum( String& rStr, BOOL bInFirst )
/*N*/ {
/*N*/ sal_Int32 nRet = 0;
/*N*/ xub_StrLen nPos = 0;
-/*N*/ if( bFirst )
+/*N*/ if( bInFirst )
/*N*/ {
/*N*/ // the first box starts with a letter
/*N*/ sal_Unicode cChar;
diff --git a/binfilter/bf_sch/source/core/sch_objadj.cxx b/binfilter/bf_sch/source/core/sch_objadj.cxx
index 9a41ce7..463d588 100644
--- a/binfilter/bf_sch/source/core/sch_objadj.cxx
+++ b/binfilter/bf_sch/source/core/sch_objadj.cxx
@@ -98,7 +98,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ SdrObjUserData* SchObjectAdjust::Clone(SdrObject *pObj) const
+/*N*/ SdrObjUserData* SchObjectAdjust::Clone(SdrObject *) const
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SchObjectAdjust(*this);
/*N*/ }
diff --git a/binfilter/bf_sch/source/core/sch_objid.cxx b/binfilter/bf_sch/source/core/sch_objid.cxx
index 64aeda9..49a7478 100644
--- a/binfilter/bf_sch/source/core/sch_objid.cxx
+++ b/binfilter/bf_sch/source/core/sch_objid.cxx
@@ -118,20 +118,13 @@ namespace binfilter {
/*************************************************************************
|*
-|* Kopier-Konstruktor
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* Kopie erzeugen
|*
\************************************************************************/
-/*N*/ SdrObjUserData* SchObjectId::Clone(SdrObject *pObj) const
+/*N*/ SdrObjUserData* SchObjectId::Clone(SdrObject *) const
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001 return new SchObjectId(*this);
+/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ }
/*************************************************************************
diff --git a/binfilter/bf_sch/source/core/sch_stlpool.cxx b/binfilter/bf_sch/source/core/sch_stlpool.cxx
index 20e0da5..a784bcd 100644
--- a/binfilter/bf_sch/source/core/sch_stlpool.cxx
+++ b/binfilter/bf_sch/source/core/sch_stlpool.cxx
@@ -42,8 +42,8 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ SchStyleSheetPool::SchStyleSheetPool(SfxItemPool& rPool) :
-/*N*/ SfxStyleSheetPool(rPool),
+/*N*/ SchStyleSheetPool::SchStyleSheetPool(SfxItemPool& rInPool) :
+/*N*/ SfxStyleSheetPool(rInPool),
/*N*/ pActualStyleSheet(NULL)
/*N*/ {
/*N*/ }
@@ -66,9 +66,9 @@ namespace binfilter {
/*N*/ SfxStyleSheetBase* SchStyleSheetPool::Create(const String& rName,
/*N*/ SfxStyleFamily eFamily,
-/*N*/ USHORT nMask )
+/*N*/ USHORT nInMask )
/*N*/ {
-/*N*/ return new SchStyleSheet(rName, *this, eFamily, nMask);
+/*N*/ return new SchStyleSheet(rName, *this, eFamily, nInMask);
/*N*/ }
diff --git a/binfilter/bf_sch/source/core/sch_stlsheet.cxx b/binfilter/bf_sch/source/core/sch_stlsheet.cxx
index c7697b3..66a59cb 100644
--- a/binfilter/bf_sch/source/core/sch_stlsheet.cxx
+++ b/binfilter/bf_sch/source/core/sch_stlsheet.cxx
@@ -51,9 +51,9 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ SchStyleSheet::SchStyleSheet(const String& rName, SfxStyleSheetBasePool& rPool,
-/*N*/ SfxStyleFamily eFamily, USHORT nMask) :
-/*N*/ SfxStyleSheet(rName, rPool, eFamily, nMask)
+/*N*/ SchStyleSheet::SchStyleSheet(const String& rName, SfxStyleSheetBasePool& rInPool,
+/*N*/ SfxStyleFamily eFamily, USHORT nInMask) :
+/*N*/ SfxStyleSheet(rName, rInPool, eFamily, nInMask)
/*N*/ {
/*N*/ }
@@ -73,7 +73,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ void SchStyleSheet::Load (SvStream& rIn, USHORT nVersion)
+/*N*/ void SchStyleSheet::Load (SvStream&, USHORT)
/*N*/ {
/*N*/ }
@@ -83,7 +83,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ void SchStyleSheet::Store(SvStream& rOut)
+/*N*/ void SchStyleSheet::Store(SvStream&)
/*N*/ {
/*N*/ }
commit 4b767867c924a9a80411e9e454c2a1edf6179022
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 4 15:13:01 2011 +0000
unused method SetHasName
diff --git a/binfilter/inc/bf_sfx2/objsh.hxx b/binfilter/inc/bf_sfx2/objsh.hxx
index d4dbd4a..a06e1d5 100644
--- a/binfilter/inc/bf_sfx2/objsh.hxx
+++ b/binfilter/inc/bf_sfx2/objsh.hxx
@@ -213,7 +213,6 @@ public:
void FlushDocInfo();
sal_Bool HasName() const { return bHasName; }
virtual String GetAPIName() const;
- void SetHasName( sal_Bool bSet = sal_True ) { bHasName = bSet; }
sal_Bool IsReadOnly() const;
sal_Bool IsReadOnlyMedium() const;
sal_Bool IsReadOnlyUI() const;
More information about the Libreoffice-commits
mailing list