summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-01-26 13:38:52 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-01-26 13:44:00 +0000
commit673c7d0d483a07b2580852e58a15905d85c17ae8 (patch)
tree2fe87f5dc6acfc9bc92f223e8c78242522c38f80
parenta70df88b2c909228eef492da32672149b808eb48 (diff)
WaE: gcc 4.6.0 various warnings
-rw-r--r--svx/source/engine3d/view3d.cxx4
-rw-r--r--svx/source/svdraw/svdedtv1.cxx2
-rw-r--r--svx/source/svdraw/svdibrow.cxx4
-rw-r--r--svx/source/svdraw/svdoashp.cxx2
-rw-r--r--svx/source/svdraw/svdoole2.cxx4
-rw-r--r--svx/source/svdraw/svdpoev.cxx2
-rw-r--r--svx/source/svdraw/svdsnpv.cxx2
-rw-r--r--svx/source/svdraw/svdview.cxx2
8 files changed, 0 insertions, 22 deletions
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index e1b3102f16..185d5ed098 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -295,9 +295,6 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
}
}
- // bei allen direkt selektierten Objekten auf selektiert setzen
- SdrMark* pM = NULL;
-
for(nObjs = 0;nObjs < nCnt;nObjs++)
{
SdrObject *pObj = GetMarkedObjectByIndex(nObjs);
@@ -307,7 +304,6 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
E3dObject* p3DObj = (E3dObject*)pObj;
p3DObj->SetSelected(TRUE);
pScene = p3DObj->GetScene();
- pM = GetSdrMarkByIndex(nObjs);
}
}
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 1d2b1c4684..f85ccb5765 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -1377,7 +1377,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
BOOL bChgPos=FALSE;
BOOL bChgSiz=FALSE;
- BOOL bChgHgt=FALSE;
BOOL bRotate=FALSE;
BOOL bShear =FALSE;
@@ -1403,7 +1402,6 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,TRUE,&pPoolItem)) {
nSizY=((const SfxUInt32Item*)pPoolItem)->GetValue();
bChgSiz=TRUE;
- bChgHgt=TRUE;
}
if (bChgSiz) {
eSizePoint=(RECT_POINT)((const SfxAllEnumItem&)rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT)).GetValue();
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index e9126ab580..97509fde30 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -485,8 +485,6 @@ void _SdrItemBrowserControl::ImpRestoreWhich()
{
if (nLastWhich!=0) {
bool bFnd = false;
- USHORT nBestMinWh=0,nBestMaxWh=0xFFFF; // not implemented yet
- ULONG nBestMinPos=0,nBestMaxPos=0xFFFFFFFF; // not implemented yet
ULONG nAnz=aList.Count();
ULONG nNum;
for (nNum=0; nNum<nAnz && !bFnd; nNum++) {
@@ -494,8 +492,6 @@ void _SdrItemBrowserControl::ImpRestoreWhich()
if (!pEntry->bComment) {
USHORT nWh=pEntry->nWhichId;
if (nWh==nLastWhich) bFnd = true;
- else if (nWh<nLastWhich && nWh>nBestMinWh) nBestMinPos=nNum;
- else if (nWh>nLastWhich && nWh<nBestMaxWh) nBestMaxPos=nNum;
}
}
if (bFnd) {
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 3a8cc98a71..b1c7e952e0 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -508,7 +508,6 @@ sal_Bool SdrObjCustomShape::GetTextBounds( Rectangle& rTextBound ) const
basegfx::B2DPolyPolygon SdrObjCustomShape::GetLineGeometry( const SdrObjCustomShape* pCustomShape, const sal_Bool bBezierAllowed )
{
basegfx::B2DPolyPolygon aRetval;
- sal_Bool bRet = sal_False;
Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine( pCustomShape ) );
if ( xCustomShapeEngine.is() )
{
@@ -520,7 +519,6 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::GetLineGeometry( const SdrObjCustomSh
{
aRetval = basegfx::tools::adaptiveSubdivideByAngle(aRetval);
}
- bRet = sal_True;
}
catch ( const com::sun::star::lang::IllegalArgumentException )
{
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 4768311f7f..eaf7a2496d 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -183,10 +183,6 @@ SdrLightEmbeddedClient_Impl::SdrLightEmbeddedClient_Impl( SdrOle2Obj* pObj )
}
Rectangle SdrLightEmbeddedClient_Impl::impl_getScaledRect_nothrow() const
{
- MapUnit aContainerMapUnit( MAP_100TH_MM );
- uno::Reference< embed::XVisualObject > xParentVis( mpObj->GetParentXModel(), uno::UNO_QUERY );
- if ( xParentVis.is() )
- aContainerMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xParentVis->getMapUnit( mpObj->GetAspect() ) );
Rectangle aLogicRect( mpObj->GetLogicRect() );
// apply scaling to object area and convert to pixels
aLogicRect.SetSize( Size( Fraction( aLogicRect.GetWidth() ) * m_aScaleWidth,
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index da65557898..13bd3956ed 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -384,7 +384,6 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
sal_Bool bKorregFlag(sal_False);
- sal_Bool bInsAny(sal_False);
sal_uInt32 nMarkPtsAnz(pPts->GetCount());
sal_uInt32 nMax(pObj->GetHdlCount());
@@ -396,7 +395,6 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
if(pNeuObj)
{
- bInsAny = sal_True;
SdrInsertReason aReason(SDRREASON_VIEWCALL, pObj);
pM->GetPageView()->GetObjList()->InsertObject(pNeuObj, pObj->GetOrdNum() + 1, &aReason);
if( bUndo )
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index c4d699d2c5..e67e36402d 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -321,11 +321,9 @@ Point SdrSnapView::GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const
USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
{
if (!bSnapEnab) return SDRSNAP_NOTSNAPPED;
- BOOL bPVOfs=FALSE;
long x=rPnt.X();
long y=rPnt.Y();
if (pPV==NULL) {
- bPVOfs=TRUE;
pPV=GetSdrPageView();
if (pPV==NULL) return SDRSNAP_NOTSNAPPED;
}
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 718f75610b..9ed21088d0 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -372,7 +372,6 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
USHORT nHitPassNum=0;
USHORT nHlplIdx=0;
USHORT nGlueId=0;
- BOOL bUnmarkedObjHit=FALSE;
if (bTextEditHit || bTextEditSel)
{
eHit=SDRHIT_TEXTEDIT;
@@ -430,7 +429,6 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
break;
}
}
- bUnmarkedObjHit=TRUE;
}
else if (bEditMode && IsHlplVisible() && !IsHlplFront() && pOut!=NULL && PickHelpLine(aLocalLogicPosition,nHitTolLog,*pOut,nHlplIdx,pPV))
{