[Libreoffice-commits] .: 3 commits - binfilter/bf_svx binfilter/bf_sw
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jan 17 03:14:10 PST 2011
binfilter/bf_svx/source/engine3d/svx_cube3d.cxx | 13 ---
binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx | 2
binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx | 14 +--
binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx | 6 -
binfilter/bf_svx/source/engine3d/svx_light3d.cxx | 30 -------
binfilter/bf_svx/source/engine3d/svx_obj3d.cxx | 81 ++++++++------------
binfilter/bf_svx/source/engine3d/svx_poly3d.cxx | 2
binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx | 4
binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx | 10 +-
binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx | 50 ------------
binfilter/bf_svx/source/engine3d/svx_scene3d.cxx | 10 +-
binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx | 35 +-------
binfilter/bf_svx/source/engine3d/svx_svx3ditems.cxx | 52 ++++++------
binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx | 13 +--
binfilter/bf_svx/source/svdraw/svx_svdetc.cxx | 38 ---------
binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx | 4
16 files changed, 110 insertions(+), 254 deletions(-)
New commits:
commit 764eba713623e947a1124ffbd65f788517832248
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 17 10:02:05 2011 +0000
cppcheck: unused variable
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx b/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
index 0ee8681..b9fa9cd 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
@@ -543,43 +543,7 @@ namespace binfilter {
/*N*/ SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pModel )
/*N*/ {
-/*N*/ SdrEngineDefaults& rDefaults = SdrEngineDefaults::GetDefaults();
-
-/*
- MapUnit eUn( (pMod==NULL) ? rDefaults.eMapUnit : pMod->GetScaleUnit());
- Fraction aFr( *((pMod==NULL) ? &rDefaults.aMapFraction : &pMod->GetScaleFraction()));
-
- if ( pMod->GetRefDevice() )
- pOutl->SetRefDevice( pMod->GetRefDevice() );
- else
- {
- MapMode aMapMode(eUn,Point(0,0),aFr,aFr);
- pOutl->SetRefMapMode( aMapMode );
- }
-
- SfxItemSet aSet(pOutl->GetEmptyItemSet());
- aSet.Put(SvxFontItem(rDefaults.eFontFamily, rDefaults.aFontName, String(), PITCH_DONTKNOW, gsl_getSystemTextEncoding() ) );
- aSet.Put(SvxColorItem(rDefaults.aFontColor));
- ULONG nHgt=rDefaults.nFontHeight;
- bool bDifUn=(eUn!=rDefaults.eMapUnit); // different MapUnits
- bool bDifFr=(aFr!=rDefaults.aMapFraction); // different MapFractions
- if (bDifUn || bDifFr) { // Wenn pMod!=NULL und pMod->Map!=rDef.Map
- long nTmpLong=long(nHgt); // caasting im Ctor bringt unter MSVC sehr merkwuerdige Fehlermeldungen
- BigInt aHgt1(nTmpLong); // umrechnen von DefMap in ModMap
- FrPair aUnitMul(GetMapFactor(rDefaults.eMapUnit,eUn));
-
- if (bDifUn) aHgt1*=aUnitMul.Y().GetNumerator();
- if (bDifFr) aHgt1*=aFr.GetNumerator();
- if (bDifFr) aHgt1*=rDefaults.aMapFraction.GetDenominator();
- if (bDifUn) aHgt1/=aUnitMul.Y().GetDenominator();
- if (bDifFr) aHgt1/=aFr.GetDenominator();
- if (bDifFr) aHgt1/=rDefaults.aMapFraction.GetNumerator();
-
- nHgt=ULONG(long(aHgt1));
- }
- aSet.Put(SvxFontHeightItem(nHgt));
- pOutl->SetDefaults(aSet);
-*/
+/*N*/ /*SdrEngineDefaults& rDefaults =*/ SdrEngineDefaults::GetDefaults();
/*N*/ SfxItemPool* pPool = &pModel->GetItemPool();
/*N*/ SdrOutliner* pOutl = new SdrOutliner( pPool, nOutlinerMode );
commit 8b6d9d6da84b84d3210873127fa1756139d894f0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 17 10:00:12 2011 +0000
cppcheck: unused variable
diff --git a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
index e248839..f9d0c61 100644
--- a/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
+++ b/binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx
@@ -5544,10 +5544,8 @@ SwSw6Parser::SwSw6Parser(SwDoc *pSwDoc,const SwPaM &rSwPaM,
pPaM=new SwPaM( *(rSwPaM.GetPoint() ) );
SetDocInfo(&pDat->DocInfo);
- SwTxtNode *pTxtNode=0;
-
// Ist das ein SwPaM auf einen TextNode?
- if (0==(pTxtNode=pDoc->GetNodes()[pPaM->GetPoint()->nNode]->GetTxtNode()))
+ if (0==pDoc->GetNodes()[pPaM->GetPoint()->nNode]->GetTxtNode())
{
// Ist keiner, dann machen wir uns einen
pDoc->GetNodes().MakeTxtNode(
commit e3079f063f894f5f5a303589cc75a3a6b14c8d5d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 17 09:44:32 2011 +0000
WaE: throw out some warnings
diff --git a/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx b/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx
index 4f561ce..308470d 100644
--- a/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_cube3d.cxx
@@ -72,20 +72,13 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ SdrObject *E3dCubeObj::DoConvertToPolyObj(BOOL bBezier) const
+/*N*/ SdrObject *E3dCubeObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
/*N*/ {
/*N*/ return NULL;
/*N*/ }
/*************************************************************************
|*
-|* Give out simple line geometry
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* Geometrieerzeugung
|*
\************************************************************************/
@@ -311,8 +304,8 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void E3dCubeObj::SetPosIsCenter(BOOL bNew)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void E3dCubeObj::SetPosIsCenter(BOOL /*bNew*/)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
diff --git a/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx b/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx
index 07e861d..49ee76c 100644
--- a/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx
@@ -98,7 +98,7 @@ namespace binfilter {
\************************************************************************/
/*?*/ bool E3dDistantLight::CalcLighting(Color& rNewColor,
-/*?*/ const Vector3D& rPnt,
+/*?*/ const Vector3D& /*rPnt*/,
/*?*/ const Vector3D& rPntNormal,
/*?*/ const Color& rPntColor)
/*?*/ {
diff --git a/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx b/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx
index 18f3dc1..b10d45b 100644
--- a/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_extrud3d.cxx
@@ -280,7 +280,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ void E3dExtrudeObj::CreateWireframe(Polygon3D& rWirePoly, const Matrix4D* pTf,
+/*N*/ void E3dExtrudeObj::CreateWireframe(Polygon3D& /*rWirePoly*/, const Matrix4D* /*pTf*/,
/*N*/ E3dDragDetail eDetail)
/*N*/ {
/*N*/ if ( eDetail == E3DDETAIL_ALLLINES ||
@@ -291,7 +291,7 @@ namespace binfilter {
/*N*/ else
/*N*/ {
/*N*/ // call parent
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 E3dObject::CreateWireframe(rWirePoly, pTf, eDetail);
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
@@ -390,13 +390,13 @@ namespace binfilter {
/*N*/ {
/*N*/ // Ab Version 513a (5.2.99): Parameter fuer das
/*N*/ // Erzeugen der Vorder/Rueckwand
-/*N*/ BOOL bTmp;
+/*N*/ BOOL bLclTmp;
/*N*/
-/*N*/ rIn >> bTmp; // #107245# bExtrudeCloseFront = bTmp;
-/*N*/ mpObjectItemSet->Put(Svx3DCloseFrontItem(bTmp));
+/*N*/ rIn >> bLclTmp; // #107245# bExtrudeCloseFront = bLclTmp;
+/*N*/ mpObjectItemSet->Put(Svx3DCloseFrontItem(bLclTmp));
/*N*/
-/*N*/ rIn >> bTmp; // #107245# bExtrudeCloseBack = bTmp;
-/*N*/ mpObjectItemSet->Put(Svx3DCloseBackItem(bTmp));
+/*N*/ rIn >> bLclTmp; // #107245# bExtrudeCloseBack = bLclTmp;
+/*N*/ mpObjectItemSet->Put(Svx3DCloseBackItem(bLclTmp));
/*N*/ }
/*N*/ else
/*N*/ {
diff --git a/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx b/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx
index de39747..4df9e5a 100644
--- a/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_lathe3d.cxx
@@ -188,7 +188,7 @@ namespace binfilter {
/*N*/ Matrix4D aRotMat;
/*N*/
/*N*/ // Skalierung vorbereiten
-/*N*/ double fScalePerStep;
+/*N*/ double fScalePerStep(0.0);
/*N*/ if(GetBackScale() != 100)
/*N*/ fScalePerStep = (((double)GetBackScale() - 100.0) / 100.0) / (double)GetHorizontalSegments();
/*N*/
@@ -353,7 +353,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ void E3dLatheObj::CreateWireframe(Polygon3D& rWirePoly, const Matrix4D* pTf,
+/*N*/ void E3dLatheObj::CreateWireframe(Polygon3D& /*rWirePoly*/, const Matrix4D* /*pTf*/,
/*N*/ E3dDragDetail eDetail)
/*N*/ {
/*N*/ // Nur selbst erzeugen, wenn alle Linien angezeigt werden sollen
@@ -365,7 +365,7 @@ namespace binfilter {
/*N*/ else
/*N*/ {
/*N*/ // call parent
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 E3dObject::CreateWireframe(rWirePoly, pTf, eDetail);
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_svx/source/engine3d/svx_light3d.cxx b/binfilter/bf_svx/source/engine3d/svx_light3d.cxx
index 4bf175f..e6f79fc 100644
--- a/binfilter/bf_svx/source/engine3d/svx_light3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_light3d.cxx
@@ -62,13 +62,11 @@ namespace binfilter {
/*N*/ E3dLight::E3dLight() :
/*N*/ E3dPointObj(Vector3D()),
-/*N*/
/*N*/ aColor(255, 255, 255),
-/*N*/
+/*N*/ fIntensity(1.0),
/*N*/ fRed(1.0),
/*N*/ fGreen(1.0),
/*N*/ fBlue(1.0),
-/*N*/ fIntensity(1.0),
/*N*/ bOn(TRUE),
/*N*/ bVisible(FALSE)
/*N*/ {
@@ -140,8 +138,8 @@ namespace binfilter {
\************************************************************************/
/*N*/ bool E3dLight::CalcLighting(Color& rNewColor,
-/*N*/ const Vector3D& rPnt,
-/*N*/ const Vector3D& rPntNormal,
+/*N*/ const Vector3D& /*rPnt*/,
+/*N*/ const Vector3D& /*rPntNormal*/,
/*N*/ const Color& rPntColor)
/*N*/ {
/*N*/ return ImpCalcLighting(rNewColor, rPntColor, fRed, fGreen, fBlue);
@@ -276,27 +274,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*************************************************************************
-|*
-|* Zuweisungsoperator
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Attribute setzen
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Attribute setzen
-|*
-\************************************************************************/
-
-/*N*/ void E3dLight::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
+/*N*/ void E3dLight::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/)
/*N*/ {
/*N*/ }
diff --git a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
index bf9643f..04198a9 100644
--- a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
@@ -135,7 +135,7 @@ namespace binfilter {
/*N*/ {
/*N*/ // Owner holen
/*N*/ DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Entfernen 3DObject aus Parent != 3DObject");
-/*N*/ E3dObject* pOwner = (E3dObject*)GetOwnerObj();
+/*N*/ /*E3dObject* pOwner =*/ (E3dObject*)GetOwnerObj();
/*N*/
/*N*/ // call parent
/*N*/ SdrObject* pRetval = SdrObjList::RemoveObject(nObjNum);
@@ -158,8 +158,8 @@ namespace binfilter {
/*N*/ E3dObject::E3dObject() :
/*N*/ nLogicalGroup(0),
/*N*/ nObjTreeLevel(0),
-/*N*/ eDragDetail(E3DDETAIL_ONEBOX),
/*N*/ nPartOfParent(0),
+/*N*/ eDragDetail(E3DDETAIL_ONEBOX),
/*N*/ bTfHasChanged(TRUE),
/*N*/ bBoundVolValid(TRUE),
/*N*/ bIsSelected(FALSE)
@@ -1171,7 +1171,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ void E3dObject::ReadOnlyOwnMembers(const SdrObjIOHeader& rHead, SvStream& rIn)
+/*N*/ void E3dObject::ReadOnlyOwnMembers(const SdrObjIOHeader& /*rHead*/, SvStream& rIn)
/*N*/ {
/*N*/ // Fuer Abwaertskompatibilitaet (Lesen neuer Daten mit altem Code)
/*N*/ SdrDownCompat aCompat(rIn, STREAM_READ);
@@ -1576,7 +1576,6 @@ namespace binfilter {
/*N*/ if (aCompat.GetBytesLeft () >= sizeof (BOOL))
/*N*/ {
/*N*/ BOOL bTmp, bTmp2;
-/*N*/ sal_uInt16 nTmp;
/*N*/
/*N*/ rIn >> bTmp;
/*N*/ mpObjectItemSet->Put(Svx3DDoubleSidedItem(bTmp));
@@ -1584,6 +1583,8 @@ namespace binfilter {
/*N*/ // neue Parameter zur Geometrieerzeugung
/*N*/ if (aCompat.GetBytesLeft () >= sizeof (BOOL))
/*N*/ {
+/*N*/ sal_uInt16 nTmp;
+/*N*/
/*N*/ rIn >> bTmp;
/*N*/ bCreateNormals = bTmp;
/*N*/
@@ -1936,13 +1937,13 @@ namespace binfilter {
/*N*/ void E3dCompoundObject::CreateFront(
/*N*/ const PolyPolygon3D& rPolyPoly3D,
/*N*/ const PolyPolygon3D& rFrontNormals,
-/*N*/ BOOL bCreateNormals,
-/*N*/ BOOL bCreateTexture)
+/*N*/ BOOL bInCreateNormals,
+/*N*/ BOOL bInCreateTexture)
/*N*/ {
/*N*/ // Vorderseite
-/*N*/ if(bCreateNormals)
+/*N*/ if(bInCreateNormals)
/*N*/ {
-/*N*/ if(bCreateTexture)
+/*N*/ if(bInCreateTexture)
/*N*/ {
/*N*/ // Polygon fuer die Textur erzeugen
/*N*/ PolyPolygon3D aPolyTexture = rPolyPoly3D;
@@ -2004,19 +2005,19 @@ namespace binfilter {
/*N*/ void E3dCompoundObject::CreateBack(
/*N*/ const PolyPolygon3D& rPolyPoly3D,
/*N*/ const PolyPolygon3D& rBackNormals,
-/*N*/ BOOL bCreateNormals,
-/*N*/ BOOL bCreateTexture)
+/*N*/ BOOL bInCreateNormals,
+/*N*/ BOOL bInCreateTexture)
/*N*/ {
/*N*/ // PolyPolygon umdrehen
/*N*/ PolyPolygon3D aLocalPoly = rPolyPoly3D;
/*N*/ aLocalPoly.FlipDirections();
/*N*/
/*N*/ // Rueckseite
-/*N*/ if(bCreateNormals)
+/*N*/ if(bInCreateNormals)
/*N*/ {
/*N*/ PolyPolygon3D aLocalNormals = rBackNormals;
/*N*/ aLocalNormals.FlipDirections();
-/*N*/ if(bCreateTexture)
+/*N*/ if(bInCreateTexture)
/*N*/ {
/*N*/ // Polygon fuer die Textur erzeugen
/*N*/ PolyPolygon3D aPolyTexture(aLocalPoly);
@@ -2082,19 +2083,19 @@ namespace binfilter {
/*N*/ const PolyPolygon3D& rPolyPolyBack,
/*N*/ const PolyPolygon3D& rFrontNormals,
/*N*/ const PolyPolygon3D& rBackNormals,
-/*N*/ BOOL bCreateNormals,
+/*N*/ BOOL bInCreateNormals,
/*N*/ double fSurroundFactor,
/*N*/ double fTextureStart,
/*N*/ double fTextureDepth,
/*N*/ BOOL bRotateTexture90)
/*N*/ {
/*N*/ USHORT nPolyCnt = rPolyPolyFront.Count();
-/*N*/ BOOL bCreateTexture = (fTextureDepth == 0.0) ? FALSE : TRUE;
-/*N*/ double fPolyLength, fPolyPos;
-/*N*/ USHORT nLastIndex;
+/*N*/ BOOL bLclCreateTexture = (fTextureDepth == 0.0) ? FALSE : TRUE;
+/*N*/ double fPolyLength(0.0), fPolyPos(0.0);
+/*N*/ USHORT nLastIndex(0);
/*N*/
/*N*/ // Verbindungsstuecke
-/*N*/ if(bCreateNormals)
+/*N*/ if(bInCreateNormals)
/*N*/ {
/*N*/ for(UINT16 a=0;a<nPolyCnt;a++)
/*N*/ {
@@ -2115,7 +2116,7 @@ namespace binfilter {
/*N*/ aNormal3D[3] = rPolyNormalsFront[nPrefillIndex];
/*N*/ aNormal3D[2] = rPolyNormalsBack[nPrefillIndex];
/*N*/
-/*N*/ if(bCreateTexture)
+/*N*/ if(bLclCreateTexture)
/*N*/ {
/*N*/ fPolyLength = rPoly3DFront.GetLength();
/*N*/ fPolyPos = 0.0;
@@ -2154,7 +2155,7 @@ namespace binfilter {
/*N*/ aNormal3D[3] = rPolyNormalsFront[i];
/*N*/ aNormal3D[2] = rPolyNormalsBack[i];
/*N*/
-/*N*/ if(bCreateTexture)
+/*N*/ if(bLclCreateTexture)
/*N*/ {
/*N*/ // Texturkoordinaten ermitteln
/*N*/ Vector3D aPart = rPoly3DFront[i] - rPoly3DFront[nLastIndex];
@@ -2302,28 +2303,12 @@ namespace binfilter {
/*************************************************************************
|*
-|* Copy-Operator
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Ausgabeparameter an 3D-Kontext setzen
-|*
-\************************************************************************/
-
-
-
-
-/*************************************************************************
-|*
|* Hittest fuer 3D-Objekte, wird an Geometrie weitergegeben
|*
\************************************************************************/
/*N*/ SdrObject* E3dCompoundObject::CheckHit(const Point& rPnt, USHORT nTol,
-/*N*/ const SetOfByte* pVisiLayer) const
+/*N*/ const SetOfByte* /*pVisiLayer*/) const
/*N*/ {
/*N*/ E3dPolyScene* pScene = (E3dPolyScene*)GetScene();
/*N*/ if(pScene)
@@ -2509,8 +2494,8 @@ namespace binfilter {
/*N*/ double fSurroundFactor, // Wertebereich der Texturkoordinaten im Umlauf
/*N*/ double fTextureStart, // TexCoor ueber Extrude-Tiefe
/*N*/ double fTextureDepth, // TexCoor ueber Extrude-Tiefe
-/*N*/ BOOL bCreateTexture,
-/*N*/ BOOL bCreateNormals,
+/*N*/ BOOL bInCreateTexture,
+/*N*/ BOOL bInCreateNormals,
/*N*/ BOOL bCharacterExtrude, // FALSE=exakt, TRUE=ohne Ueberschneidungen
/*N*/ BOOL bRotateTexture90, // Textur der Seitenflaechen um 90 Grad kippen
/*N*/ PolyPolygon3D* pLineGeometry // For creation of line geometry
@@ -2546,11 +2531,11 @@ namespace binfilter {
/*N*/ AddFrontNormals(rFront, aNormalsFront, aOffset);
/*N*/
/*N*/ if(!bSmoothFrontBack)
-/*N*/ CreateFront(rFront, aNormalsFront, bCreateNormals, bCreateTexture);
+/*N*/ CreateFront(rFront, aNormalsFront, bInCreateNormals, bInCreateTexture);
/*N*/ if(bSmoothLeft)
/*N*/ AddFrontNormals(rFront, aNormalsLeft, aOffset);
/*N*/ if(bSmoothFrontBack)
-/*?*/ CreateFront(rFront, aNormalsLeft, bCreateNormals, bCreateTexture);
+/*?*/ CreateFront(rFront, aNormalsLeft, bInCreateNormals, bInCreateTexture);
/*N*/ }
/*N*/ else
/*N*/ {
@@ -2565,11 +2550,11 @@ namespace binfilter {
/*N*/ AddBackNormals(rBack, aNormalsBack, aOffset);
/*N*/
/*N*/ if(!bSmoothFrontBack)
-/*N*/ CreateBack(rBack, aNormalsBack, bCreateNormals, bCreateTexture);
+/*N*/ CreateBack(rBack, aNormalsBack, bInCreateNormals, bInCreateTexture);
/*N*/ if(bSmoothRight)
/*N*/ AddBackNormals(rBack, aNormalsRight, aOffset);
/*N*/ if(bSmoothFrontBack)
-/*?*/ CreateBack(rBack, aNormalsRight, bCreateNormals, bCreateTexture);
+/*?*/ CreateBack(rBack, aNormalsRight, bInCreateNormals, bInCreateTexture);
/*N*/ }
/*N*/ else
/*N*/ {
@@ -2580,7 +2565,7 @@ namespace binfilter {
/*N*/ // eigentliches Zwischenstueck
/*N*/ CreateInBetween(rFront, rBack,
/*N*/ aNormalsLeft, aNormalsRight,
-/*N*/ bCreateNormals,
+/*N*/ bInCreateNormals,
/*N*/ fSurroundFactor,
/*N*/ fTextureStart,
/*N*/ fTextureDepth,
@@ -2700,14 +2685,14 @@ namespace binfilter {
/*N*/ // vordere Zwischenstuecke erzeugen
/*N*/ CreateInBetween(aOuterFront, aLocalFront,
/*N*/ aNormalsOuterFront, aNormalsLeft,
-/*N*/ bCreateNormals,
+/*N*/ bInCreateNormals,
/*N*/ fSurroundFactor,
/*N*/ fTextureStart,
/*N*/ fTextureDepth * fPercentDiag,
/*N*/ bRotateTexture90);
/*N*/
/*N*/ // Vorderseite erzeugen
-/*N*/ CreateFront(aOuterFront, aNormalsOuterFront, bCreateNormals, bCreateTexture);
+/*N*/ CreateFront(aOuterFront, aNormalsOuterFront, bInCreateNormals, bInCreateTexture);
/*N*/
/*N*/ // Weitere Texturwerte setzen
/*N*/ fTexMidStart += fTextureDepth * fPercentDiag;
@@ -2809,14 +2794,14 @@ namespace binfilter {
/*N*/ // hintere Zwischenstuecke erzeugen
/*N*/ CreateInBetween(aLocalBack, aOuterBack,
/*N*/ aNormalsRight, aNormalsOuterBack,
-/*N*/ bCreateNormals,
+/*N*/ bInCreateNormals,
/*N*/ fSurroundFactor,
/*N*/ fTextureStart + (fTextureDepth * (1.0 - fPercentDiag)),
/*N*/ fTextureDepth * fPercentDiag,
/*N*/ bRotateTexture90);
/*N*/
/*N*/ // Rueckseite erzeugen
-/*N*/ CreateBack(aOuterBack, aNormalsOuterBack, bCreateNormals, bCreateTexture);
+/*N*/ CreateBack(aOuterBack, aNormalsOuterBack, bInCreateNormals, bInCreateTexture);
/*N*/
/*N*/ // Weitere Texturwerte setzen
/*N*/ fTexMidDepth -= fTextureDepth * fPercentDiag;
@@ -2830,7 +2815,7 @@ namespace binfilter {
/*N*/ // eigentliches Zwischenstueck
/*N*/ CreateInBetween(aLocalFront, aLocalBack,
/*N*/ aNormalsLeft, aNormalsRight,
-/*N*/ bCreateNormals,
+/*N*/ bInCreateNormals,
/*N*/ fSurroundFactor,
/*N*/ fTexMidStart,
/*N*/ fTexMidDepth,
diff --git a/binfilter/bf_svx/source/engine3d/svx_poly3d.cxx b/binfilter/bf_svx/source/engine3d/svx_poly3d.cxx
index 0858f1b..e5d1d2d 100644
--- a/binfilter/bf_svx/source/engine3d/svx_poly3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_poly3d.cxx
@@ -1679,7 +1679,7 @@ typedef ::std::vector< Polygon3D* > Polygon3DList;
/*N*/ // es gibt welche, nDoneStart ist gesetzt. Erzeuge (und
/*N*/ // setze) nDoneEnd
/*N*/ UINT16 nDoneEnd(nDoneStart);
-/*N*/ UINT16 nStartLoop;
+/*N*/ UINT16 nStartLoop(0);
/*N*/ BOOL bInLoop(FALSE);
/*N*/
/*N*/ // einen step mehr in der Schleife, um Loops abzuschliessen
diff --git a/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx b/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx
index a4333ab..c6577fc 100644
--- a/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_polygn3d.cxx
@@ -417,8 +417,8 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ void E3dPolygonObj::SetLineOnly(BOOL bNew)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void E3dPolygonObj::SetLineOnly(BOOL /*bNew*/)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
}
diff --git a/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx b/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx
index a53d4e7..c2283a0 100644
--- a/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx
@@ -280,7 +280,7 @@ namespace binfilter {
|*
|* sichern: zur 356 wurde das Fileformat freigegeben 11.2.1997 FG
|*
-/*************************************************************************/
+**************************************************************************/
/*N*/ void E3dPolyObj::WriteData(SvStream& rOut) const
/*N*/ {
@@ -296,16 +296,16 @@ namespace binfilter {
/*N*/ aCompat.SetID("E3dPolyObj");
/*N*/ #endif
/*N*/ {
-/*N*/ SdrDownCompat aCompat (rOut, STREAM_WRITE);
+/*N*/ SdrDownCompat aInnerCompat (rOut, STREAM_WRITE);
/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("PolyPolygon3D");
+/*N*/ aInnerCompat.SetID("PolyPolygon3D");
/*N*/ #endif
/*N*/ rOut << aPolyPoly3D;
/*N*/ }
/*N*/ {
-/*N*/ SdrDownCompat aCompat (rOut, STREAM_WRITE);
+/*N*/ SdrDownCompat aInnerCompat (rOut, STREAM_WRITE);
/*N*/ #ifdef DBG_UTIL
-/*N*/ aCompat.SetID("PolyPolygon3D");
+/*N*/ aInnerCompat.SetID("PolyPolygon3D");
/*N*/ #endif
/*N*/ rOut << aNormal;
/*N*/ }
diff --git a/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx b/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx
index 3b79f06..cab78ad 100644
--- a/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx
@@ -77,59 +77,15 @@ namespace binfilter {
/*************************************************************************
|*
-|* Die Kontur fuer TextToContour
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Objekt als Kontur in das Polygon einfuegen
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* Paint
|*
\************************************************************************/
-/*N*/ bool E3dPolyScene::Paint(ExtOutputDevice& rOut,
-/*N*/ const SdrPaintInfoRec& rInfoRec) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
+/*N*/ bool E3dPolyScene::Paint(ExtOutputDevice& /*rOut*/,
+/*N*/ const SdrPaintInfoRec& /*rInfoRec*/) const
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*N*/ }
-
-/*************************************************************************
-|*
-|* Geometrie zeichnen mit clipping Beruecksichtigung
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Zeichenroutine fuer 3D
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Schatten aller Objekte zeichnen
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Verminderte Darstellungsqualitaet, zeichne als WireFrame OHNE renderer
-|*
-\************************************************************************/
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
index 7f83367..c5522b8 100644
--- a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
@@ -67,13 +67,13 @@ namespace binfilter {
/*N*/ E3dScene::E3dScene()
/*N*/ : E3dObject(),
/*N*/ aCamera(Vector3D(0,0,4), Vector3D()),
-/*N*/ bDoubleBuffered(FALSE),
-/*N*/ bClipping(FALSE),
/*N*/ nSaveStatus (0),
/*N*/ nRestStatus (0),
-/*N*/ bFitInSnapRect(TRUE),
/*N*/ aPaintTime(),
/*N*/ nDisplayQuality(255),
+/*N*/ bDoubleBuffered(FALSE),
+/*N*/ bClipping(FALSE),
+/*N*/ bFitInSnapRect(TRUE),
/*N*/ bDrawOnlySelected(FALSE)
/*N*/ {
/*N*/ // Defaults setzen
@@ -722,7 +722,7 @@ namespace binfilter {
/*N*/ {
/*N*/ // zuerst loeschen
/*N*/ aLabelList.Clear();
-/*N*/ SdrLayerID nLayerID = GetLayer();
+/*N*/ SdrLayerID nLclLayerID = GetLayer();
/*N*/
/*N*/ SdrObjListIter a3DIterator(*pSub, IM_FLAT);
/*N*/
@@ -730,7 +730,7 @@ namespace binfilter {
/*N*/ while ( a3DIterator.IsMore() )
/*N*/ {
/*N*/ E3dObject* p3DObj = (E3dObject*) a3DIterator.Next();
-/*N*/ p3DObj->NbcSetLayer(nLayerID);
+/*N*/ p3DObj->NbcSetLayer(nLclLayerID);
/*N*/ NewObjectInserted(p3DObj);
/*N*/ }
/*N*/
diff --git a/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx b/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx
index 25b2616..60f73f2 100644
--- a/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_sphere3d.cxx
@@ -57,7 +57,7 @@ namespace binfilter {
// laden von Dokumenten. Hier braucht man keinen CreateSphere-Aufruf, denn die wirkliche
// Anzahl Segmente ist ja noch nicht bekannt. Dies war bis zum 10.2.97 ein (kleines)
// Speicherleck.
-/*N*/ E3dSphereObj::E3dSphereObj(int dummy) // den Parameter braucht es um unterscheiden zu koennen, welcher
+/*N*/ E3dSphereObj::E3dSphereObj(int /*dummy*/) // den Parameter braucht es um unterscheiden zu koennen, welcher
/*N*/ { // der beiden Konstruktoren gemeint ist. Der obige halt per Default
/*N*/ // Defaults setzen
/*N*/ E3dDefaultAttributes aDefault;
@@ -279,25 +279,11 @@ namespace binfilter {
/*************************************************************************
|*
-|* Identifier zurueckgeben
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
-|* Wireframe erzeugen
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* Wandle das Objekt in ein Gruppenobjekt bestehend aus n Polygonen
|*
\************************************************************************/
-/*N*/ SdrObject *E3dSphereObj::DoConvertToPolyObj(BOOL bBezier) const
+/*N*/ SdrObject *E3dSphereObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
/*N*/ {
/*N*/ return NULL;
/*N*/ }
@@ -435,7 +421,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ void E3dSphereObj::ReadData31(const SdrObjIOHeader& rHead, SvStream& rIn)
+/*N*/ void E3dSphereObj::ReadData31(const SdrObjIOHeader& /*rHead*/, SvStream& rIn)
/*N*/ {
/*N*/ SdrDownCompat aCompat(rIn, STREAM_READ);
/*N*/ #ifdef DBG_UTIL
@@ -640,23 +626,16 @@ namespace binfilter {
/*************************************************************************
|*
-|* Zuweisungsoperator
-|*
-\************************************************************************/
-
-
-/*************************************************************************
-|*
|* Lokale Parameter setzen mit Geometrieneuerzeugung
|*
\************************************************************************/
-/*N*/ void E3dSphereObj::SetCenter(const Vector3D& rNew)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void E3dSphereObj::SetCenter(const Vector3D& /*rNew*/)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/ void E3dSphereObj::SetSize(const Vector3D& rNew)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void E3dSphereObj::SetSize(const Vector3D& /*rNew*/)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
//////////////////////////////////////////////////////////////////////////////
diff --git a/binfilter/bf_svx/source/engine3d/svx_svx3ditems.cxx b/binfilter/bf_svx/source/engine3d/svx_svx3ditems.cxx
index fb5c44d..1bd91cb 100644
--- a/binfilter/bf_svx/source/engine3d/svx_svx3ditems.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_svx3ditems.cxx
@@ -258,7 +258,7 @@ using namespace ::com::sun::star;
/*N*/ : SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal)
/*N*/ {}
-/*N*/ sal_uInt16 Svx3DSmoothNormalsItem::GetVersion(sal_uInt16 nFileFormatVersion) const
+/*N*/ sal_uInt16 Svx3DSmoothNormalsItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const
/*N*/ {
/*N*/ return 1;
/*N*/ }
@@ -283,7 +283,7 @@ using namespace ::com::sun::star;
/*N*/ : SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_LIDS, bVal)
/*N*/ {}
-/*N*/ sal_uInt16 Svx3DSmoothLidsItem::GetVersion(sal_uInt16 nFileFormatVersion) const
+/*N*/ sal_uInt16 Svx3DSmoothLidsItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const
/*N*/ {
/*N*/ return 1;
/*N*/ }
@@ -308,7 +308,7 @@ using namespace ::com::sun::star;
/*N*/ : SfxBoolItem(SDRATTR_3DOBJ_CHARACTER_MODE, bVal)
/*N*/ {}
-/*N*/ sal_uInt16 Svx3DCharacterModeItem::GetVersion(sal_uInt16 nFileFormatVersion) const
+/*N*/ sal_uInt16 Svx3DCharacterModeItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const
/*N*/ {
/*N*/ return 1;
/*N*/ }
@@ -333,7 +333,7 @@ using namespace ::com::sun::star;
/*N*/ : SfxBoolItem(SDRATTR_3DOBJ_CLOSE_FRONT, bVal)
/*N*/ {}
-/*N*/ sal_uInt16 Svx3DCloseFrontItem::GetVersion(sal_uInt16 nFileFormatVersion) const
+/*N*/ sal_uInt16 Svx3DCloseFrontItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const
/*N*/ {
/*N*/ return 1;
/*N*/ }
@@ -358,7 +358,7 @@ using namespace ::com::sun::star;
/*N*/ : SfxBoolItem(SDRATTR_3DOBJ_CLOSE_BACK, bVal)
/*N*/ {}
-/*N*/ sal_uInt16 Svx3DCloseBackItem::GetVersion(sal_uInt16 nFileFormatVersion) const
+/*N*/ sal_uInt16 Svx3DCloseBackItem::GetVersion(sal_uInt16 /*nFileFormatVersion*/) const
/*N*/ {
/*N*/ return 1;
/*N*/ }
@@ -379,13 +379,13 @@ using namespace ::com::sun::star;
//////////////////////////////////////////////////////////////////////////////
// Svx3DNormalsKindItem: use drawing::NormalsKind
-/*N*/ bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
+/*N*/ bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
/*N*/ {
/*N*/ rVal <<= (drawing::NormalsKind)GetValue();
/*N*/ return true;
/*N*/ }
-/*N*/ bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
+/*N*/ bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
/*N*/ {
/*N*/ drawing::NormalsKind eVar;
/*N*/ if(!(rVal >>= eVar))
@@ -394,19 +394,19 @@ using namespace ::com::sun::star;
/*N*/ return true;
/*N*/ }
-/*N*/ SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new Svx3DNormalsKindItem(*this);
/*N*/ }
// Svx3DTextureProjectionXItem: use drawing::TextureProjectionMode
-/*N*/ bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
+/*N*/ bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
/*N*/ {
/*N*/ rVal <<= (drawing::TextureProjectionMode)GetValue();
/*N*/ return true;
/*N*/ }
-/*N*/ bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
+/*N*/ bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
/*N*/ {
/*N*/ drawing::TextureProjectionMode eVar;
/*N*/ if(!(rVal >>= eVar))
@@ -415,19 +415,19 @@ using namespace ::com::sun::star;
/*N*/ return true;
/*N*/ }
-/*N*/ SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new Svx3DTextureProjectionXItem(*this);
/*N*/ }
// Svx3DTextureProjectionYItem: use drawing::TextureProjectionMode
-/*N*/ bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
+/*N*/ bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
/*N*/ {
/*N*/ rVal <<= (drawing::TextureProjectionMode)GetValue();
/*N*/ return true;
/*N*/ }
-/*N*/ bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
+/*N*/ bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
/*N*/ {
/*N*/ drawing::TextureProjectionMode eVar;
/*N*/ if(!(rVal >>= eVar))
@@ -436,19 +436,19 @@ using namespace ::com::sun::star;
/*N*/ return true;
/*N*/ }
-/*N*/ SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new Svx3DTextureProjectionYItem(*this);
/*N*/ }
// Svx3DTextureKindItem: use drawing::TextureKind
-/*N*/ bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
+/*N*/ bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
/*N*/ {
/*N*/ rVal <<= (drawing::TextureKind)GetValue();
/*N*/ return true;
/*N*/ }
-/*N*/ bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
+/*N*/ bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
/*N*/ {
/*N*/ drawing::TextureKind eVar;
/*N*/ if(!(rVal >>= eVar))
@@ -457,19 +457,19 @@ using namespace ::com::sun::star;
/*N*/ return true;
/*N*/ }
-/*N*/ SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new Svx3DTextureKindItem(*this);
/*N*/ }
// Svx3DTextureModeItem: use drawing:TextureMode
-/*N*/ bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
+/*N*/ bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
/*N*/ {
/*N*/ rVal <<= (drawing::TextureMode)GetValue();
/*N*/ return true;
/*N*/ }
-/*N*/ bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
+/*N*/ bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
/*N*/ {
/*N*/ drawing::TextureMode eVar;
/*N*/ if(!(rVal >>= eVar))
@@ -478,19 +478,19 @@ using namespace ::com::sun::star;
/*N*/ return true;
/*N*/ }
-/*N*/ SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new Svx3DTextureModeItem(*this);
/*N*/ }
// Svx3DPerspectiveItem: use drawing::ProjectionMode
-/*N*/ bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
+/*N*/ bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
/*N*/ {
/*N*/ rVal <<= (drawing::ProjectionMode)GetValue();
/*N*/ return true;
/*N*/ }
-/*N*/ bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
+/*N*/ bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
/*N*/ {
/*N*/ drawing::ProjectionMode eVar;
/*N*/ if(!(rVal >>= eVar))
@@ -499,19 +499,19 @@ using namespace ::com::sun::star;
/*N*/ return true;
/*N*/ }
-/*N*/ SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new Svx3DPerspectiveItem(*this);
/*N*/ }
// Svx3DShadeModeItem: use drawing::ShadeMode
-/*N*/ bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, BYTE nMemberId) const
+/*N*/ bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
/*N*/ {
/*N*/ rVal <<= (drawing::ShadeMode)GetValue();
/*N*/ return true;
/*N*/ }
-/*N*/ bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
+/*N*/ bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
/*N*/ {
/*N*/ drawing::ShadeMode eVar;
/*N*/ if(!(rVal >>= eVar))
@@ -520,7 +520,7 @@ using namespace ::com::sun::star;
/*N*/ return true;
/*N*/ }
-/*N*/ SfxPoolItem* Svx3DShadeModeItem::Clone(SfxItemPool* pPool) const
+/*N*/ SfxPoolItem* Svx3DShadeModeItem::Clone(SfxItemPool* /*pPool*/) const
/*N*/ {
/*N*/ return new Svx3DShadeModeItem(*this);
/*N*/ }
diff --git a/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx b/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx
index fe2ddfd..d90de62 100644
--- a/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_viewpt3d.cxx
@@ -45,16 +45,16 @@ namespace binfilter {
/*N*/ aVUV(0, 1, 1),
/*N*/ aPRP(0, 0, 2),
/*N*/ fVPD(-3),
-/*N*/ aViewPoint (0, 0, 5000),
/*N*/ fNearClipDist (0.0),
/*N*/ fFarClipDist (0.0),
-/*N*/ fWRatio (1.0),
-/*N*/ fHRatio (1.0),
/*N*/ eProjection(PR_PERSPECTIVE),
/*N*/ eAspectMapping(AS_NO_MAPPING),
-/*N*/ bTfValid(0),
/*N*/ // DeviceRect-Groesse < 0 -> ungueltig
-/*N*/ aDeviceRect(Point(0,0), Size(-1,-1))
+/*N*/ aDeviceRect(Point(0,0), Size(-1,-1)),
+/*N*/ aViewPoint (0, 0, 5000),
+/*N*/ bTfValid(0),
+/*N*/ fWRatio (1.0),
+/*N*/ fHRatio (1.0)
/*N*/ {
/*N*/ aViewWin.X = -1; aViewWin.Y = -1;
/*N*/ aViewWin.W = 2; aViewWin.H = 2;
@@ -195,6 +195,9 @@ namespace binfilter {
/*N*/ aViewWin.W = aViewWin.H * fRatio;
/*N*/ aViewWin.X = aViewWin.X * aViewWin.W / fTmp;
/*N*/ break;
+/*N*/
+/*N*/ default:
+/*N*/ break;
/*N*/ }
/*N*/ fWRatio = nNewW / aViewWin.W;
/*N*/ fHRatio = nNewH / aViewWin.H;
More information about the Libreoffice-commits
mailing list