[Libreoffice-commits] .: 5 commits - binfilter/bf_sd binfilter/bf_svx binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Jan 21 03:17:17 PST 2011
binfilter/bf_sd/util/makefile.mk | 1
binfilter/bf_svx/source/engine3d/makefile.mk | 2
binfilter/bf_svx/source/engine3d/svx_obj3d.cxx | 2
binfilter/bf_svx/source/svdraw/makefile.mk | 2
binfilter/bf_svx/source/svdraw/svx_impgrfll.cxx | 8
binfilter/bf_svx/source/svdraw/svx_svdattr.cxx | 265 +++++++++++-------------
binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svddrag.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdedtv2.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdedxv.cxx | 26 --
binfilter/bf_svx/source/svdraw/svx_svdetc.cxx | 12 -
binfilter/bf_svx/source/svdraw/svx_svdglue.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx | 32 --
binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdmark.cxx | 34 ---
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx | 48 +---
binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx | 10
binfilter/bf_svx/source/svdraw/svx_svdmrkv1.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx | 8
binfilter/bf_svx/source/svdraw/svx_svdobj.cxx | 144 ++++---------
binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx | 5
binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx | 78 +++----
binfilter/bf_svx/source/svdraw/svx_svdograf.cxx | 12 -
binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx | 14 -
binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx | 105 +++------
binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdopage.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdopath.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdorect.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdotext.cxx | 68 ++----
binfilter/bf_svx/source/svdraw/svx_svdotxat.cxx | 14 -
binfilter/bf_svx/source/svdraw/svx_svdotxed.cxx | 8
binfilter/bf_svx/source/svdraw/svx_svdotxfl.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx | 6
binfilter/bf_svx/source/svdraw/svx_svdouno.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdoutl.cxx | 6
binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx | 14 -
binfilter/bf_svx/source/svdraw/svx_svdpage.cxx | 22 -
binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx | 78 +++----
binfilter/bf_svx/source/svdraw/svx_svdtouch.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdtrans.cxx | 3
binfilter/bf_svx/source/svdraw/svx_svdundo.cxx | 6
binfilter/bf_svx/source/svdraw/svx_svdxcgv.cxx | 4
binfilter/bf_svx/util/makefile.mk | 2
binfilter/inc/bf_svx/svddrag.hxx | 6
46 files changed, 443 insertions(+), 646 deletions(-)
New commits:
commit 9992e2e20dc99f02f9a446f1603fa575aaa86197
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 20 12:06:06 2011 +0000
WaE: throw out some warnings
diff --git a/binfilter/inc/bf_svx/svddrag.hxx b/binfilter/inc/bf_svx/svddrag.hxx
index 6b06627..fc7031d 100644
--- a/binfilter/inc/bf_svx/svddrag.hxx
+++ b/binfilter/inc/bf_svx/svddrag.hxx
@@ -95,9 +95,7 @@ protected:
void Clear(bool bLeaveOne);
Point& Pnt(ULONG nNum) { return *((Point*)aPnts.GetObject(nNum)); }
public:
- void* pUser; // Userdata
-public:
- SdrDragStat(): aPnts(1024,16,16) { pUser=NULL; Reset(); }
+ SdrDragStat(): aPnts(1024,16,16) { Reset(); }
~SdrDragStat() { Clear(FALSE); }
void Reset();
SdrView* GetView() const { return pView; }
@@ -122,8 +120,6 @@ public:
Point& Ref2() { return aRef2; }
const SdrHdl* GetHdl() const { return pHdl; }
void SetHdl(SdrHdl* pH) { pHdl=pH; }
- void* GetUser() const { return pUser; }
- void SetUser(void* pU) { pUser=pU; }
bool IsShown() const { return bShown; }
void SetShown(bool bOn) { bShown=bOn; }
commit 27356cd61e57b7ac3b9c646208ce3dd485758df9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 20 12:05:19 2011 +0000
WaE: set this dir as warnings free
diff --git a/binfilter/bf_sd/util/makefile.mk b/binfilter/bf_sd/util/makefile.mk
index fd57e31..3debbb0 100644
--- a/binfilter/bf_sd/util/makefile.mk
+++ b/binfilter/bf_sd/util/makefile.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
PRJ=..$/..
BFPRJ=..
commit c83d0accca40dc0dffbbfe46bd9d4b6d347e53e7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 20 12:04:17 2011 +0000
WaE: set this dir as warnings free
diff --git a/binfilter/bf_svx/util/makefile.mk b/binfilter/bf_svx/util/makefile.mk
index 26bca9c..289fadd 100644
--- a/binfilter/bf_svx/util/makefile.mk
+++ b/binfilter/bf_svx/util/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..
BFPRJ=..
commit dcf60d2f829613cd84c0a59ddf3c61616b18979c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 20 12:03:59 2011 +0000
WaE: set this dir as warnings free
diff --git a/binfilter/bf_svx/source/svdraw/makefile.mk b/binfilter/bf_svx/source/svdraw/makefile.mk
index 2b8c398..a358b08 100644
--- a/binfilter/bf_svx/source/svdraw/makefile.mk
+++ b/binfilter/bf_svx/source/svdraw/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
index d782fa2..3713d4f 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
@@ -96,16 +96,16 @@ SdrItemPool::SdrItemPool(USHORT nAttrStart, USHORT nAttrEnd, bool bLoadRefCounts
Ctor(NULL,nAttrStart,nAttrEnd);
}
-SdrItemPool::SdrItemPool(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd, bool bLoadRefCounts):
- XOutdevItemPool(pMaster,nAttrStart,nAttrEnd,bLoadRefCounts)
+SdrItemPool::SdrItemPool(SfxItemPool* pInMaster, USHORT nAttrStart, USHORT nAttrEnd, bool bLoadRefCounts):
+ XOutdevItemPool(pInMaster,nAttrStart,nAttrEnd,bLoadRefCounts)
{
- Ctor(pMaster,nAttrStart,nAttrEnd);
+ Ctor(pInMaster,nAttrStart,nAttrEnd);
}
-void SdrItemPool::Ctor(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd)
+void SdrItemPool::Ctor(SfxItemPool* pInMaster, USHORT nAttrStart, USHORT nAttrEnd)
{
- if (pMaster==NULL) {
- pMaster=this;
+ if (pInMaster==NULL) {
+ pInMaster=this;
}
Color aNullCol(RGB_Color(COL_BLACK));
@@ -127,7 +127,7 @@ void SdrItemPool::Ctor(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd)
ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
}
- ppPoolDefaults[SDRATTRSET_SHADOW-SDRATTR_START]=new SdrShadowSetItem(pMaster);
+ ppPoolDefaults[SDRATTRSET_SHADOW-SDRATTR_START]=new SdrShadowSetItem(pInMaster);
// SID_ATTR_FILL_SHADOW = SID_SVX_START+299 = SID_LIB_START+299 = 10299
pItemInfos[SDRATTR_SHADOW-SDRATTR_START]._nSID=SID_ATTR_FILL_SHADOW;
@@ -146,10 +146,10 @@ void SdrItemPool::Ctor(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd)
for (i=SDRATTR_CAPTIONRESERVE1; i<=SDRATTR_CAPTIONRESERVE5; i++) {
ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
}
- ppPoolDefaults[SDRATTRSET_CAPTION-SDRATTR_START]=new SdrCaptionSetItem(pMaster);
+ ppPoolDefaults[SDRATTRSET_CAPTION-SDRATTR_START]=new SdrCaptionSetItem(pInMaster);
// Outliner-Attribute
- ppPoolDefaults[SDRATTRSET_OUTLINER-SDRATTR_START]=new SdrOutlinerSetItem(pMaster);
+ ppPoolDefaults[SDRATTRSET_OUTLINER-SDRATTR_START]=new SdrOutlinerSetItem(pInMaster);
// Misc-Attribute
ppPoolDefaults[SDRATTR_ECKENRADIUS -SDRATTR_START]=new SdrEckenradiusItem;
@@ -184,7 +184,7 @@ void SdrItemPool::Ctor(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd)
for (i=SDRATTR_RESERVE15; i<=SDRATTR_RESERVE19; i++) {
ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
}
- ppPoolDefaults[SDRATTRSET_MISC-SDRATTR_START]=new SdrMiscSetItem(pMaster);
+ ppPoolDefaults[SDRATTRSET_MISC-SDRATTR_START]=new SdrMiscSetItem(pInMaster);
pItemInfos[SDRATTR_TEXT_FITTOSIZE-SDRATTR_START]._nSID=SID_ATTR_TEXT_FITTOSIZE;
@@ -204,7 +204,7 @@ void SdrItemPool::Ctor(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd)
for (i=SDRATTR_EDGERESERVE02; i<=SDRATTR_EDGERESERVE09; i++) {
ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
}
- ppPoolDefaults[SDRATTRSET_EDGE-SDRATTR_START]=new SdrEdgeSetItem(pMaster);
+ ppPoolDefaults[SDRATTRSET_EDGE-SDRATTR_START]=new SdrEdgeSetItem(pInMaster);
// Bemassungsobjekt
ppPoolDefaults[SDRATTR_MEASUREKIND -SDRATTR_START]=new SdrMeasureKindItem;
@@ -231,7 +231,7 @@ void SdrItemPool::Ctor(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd)
for (i=SDRATTR_MEASURERESERVE05; i<=SDRATTR_MEASURERESERVE07; i++) {
ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
}
- ppPoolDefaults[SDRATTRSET_MEASURE-SDRATTR_START]=new SdrMeasureSetItem(pMaster);
+ ppPoolDefaults[SDRATTRSET_MEASURE-SDRATTR_START]=new SdrMeasureSetItem(pInMaster);
// Kreis
ppPoolDefaults[SDRATTR_CIRCKIND -SDRATTR_START]=new SdrCircKindItem;
@@ -240,7 +240,7 @@ void SdrItemPool::Ctor(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd)
for (i=SDRATTR_CIRCRESERVE0; i<=SDRATTR_CIRCRESERVE3; i++) {
ppPoolDefaults[i-SDRATTR_START]=new SfxVoidItem(i);
}
- ppPoolDefaults[SDRATTRSET_CIRC-SDRATTR_START]=new SdrCircSetItem(pMaster);
+ ppPoolDefaults[SDRATTRSET_CIRC-SDRATTR_START]=new SdrCircSetItem(pInMaster);
// Nichtpersistente-Items
ppPoolDefaults[SDRATTR_OBJMOVEPROTECT -SDRATTR_START]=new SdrObjMoveProtectItem;
@@ -296,7 +296,7 @@ void SdrItemPool::Ctor(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd)
ppPoolDefaults[ SDRATTR_GRAFCROP - SDRATTR_START] = new SdrGrafCropItem;
for( i = SDRATTR_GRAFRESERVE3; i <= SDRATTR_GRAFRESERVE6; i++ )
ppPoolDefaults[ i - SDRATTR_START ] = new SfxVoidItem( i );
- ppPoolDefaults[ SDRATTRSET_GRAF - SDRATTR_START ] = new SdrGrafSetItem( pMaster );
+ ppPoolDefaults[ SDRATTRSET_GRAF - SDRATTR_START ] = new SdrGrafSetItem( pInMaster );
pItemInfos[SDRATTR_GRAFCROP-SDRATTR_START]._nSID=SID_ATTR_GRAF_CROP;
// 3D Object Attr (28092000 AW)
@@ -440,9 +440,9 @@ SdrItemPool::~SdrItemPool()
Delete(); // erstmal den 'dtor' des SfxItemPools rufen
// und nun meine eigenen statischen Defaults abraeumen
if (ppPoolDefaults!=NULL) {
- unsigned nBeg=SDRATTR_SHADOW-SDRATTR_START;
- unsigned nEnd=SDRATTR_END-SDRATTR_START;
- for (unsigned i=nBeg; i<=nEnd; i++) {
+ unsigned nLclBeg=SDRATTR_SHADOW-SDRATTR_START;
+ unsigned nLclEnd=SDRATTR_END-SDRATTR_START;
+ for (unsigned i=nLclBeg; i<=nLclEnd; i++) {
SetRefCount(*ppPoolDefaults[i],0);
delete ppPoolDefaults[i];
ppPoolDefaults[i]=NULL;
@@ -478,14 +478,14 @@ int SdrFractionItem::operator==(const SfxPoolItem& rCmp) const
-SvStream& SdrFractionItem::Store(SvStream& rOut, USHORT nItemVers) const
+SvStream& SdrFractionItem::Store(SvStream& rOut, USHORT /*nItemVers*/) const
{
rOut<<INT32(nValue.GetNumerator());
rOut<<INT32(nValue.GetDenominator());
return rOut;
}
-SfxPoolItem* SdrFractionItem::Clone(SfxItemPool *pPool) const
+SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const
{
return new SdrFractionItem(Which(),GetValue());
}
@@ -505,12 +505,12 @@ int SdrFractionItem::IsPoolable() const
TYPEINIT1_AUTOFACTORY(SdrScaleItem,SdrFractionItem);
-SfxPoolItem* SdrScaleItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* SdrScaleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
{
return new SdrScaleItem(Which(),rIn);
}
-SfxPoolItem* SdrScaleItem::Clone(SfxItemPool *pPool) const
+SfxPoolItem* SdrScaleItem::Clone(SfxItemPool * /*pPool*/) const
{
return new SdrScaleItem(Which(),GetValue());
}
@@ -521,12 +521,12 @@ SfxPoolItem* SdrScaleItem::Clone(SfxItemPool *pPool) const
TYPEINIT1_AUTOFACTORY(SdrOnOffItem,SfxBoolItem);
-SfxPoolItem* SdrOnOffItem::Clone(SfxItemPool* pPool) const
+SfxPoolItem* SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const
{
return new SdrOnOffItem(Which(),GetValue());
}
-SfxPoolItem* SdrOnOffItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* SdrOnOffItem::Create(SvStream& rIn, USHORT /*nVer*/) const
{
return new SdrOnOffItem(Which(),rIn);
}
@@ -543,12 +543,12 @@ int SdrOnOffItem::IsPoolable() const
TYPEINIT1_AUTOFACTORY(SdrYesNoItem,SfxBoolItem);
-SfxPoolItem* SdrYesNoItem::Clone(SfxItemPool* pPool) const
+SfxPoolItem* SdrYesNoItem::Clone(SfxItemPool* /*pPool*/) const
{
return new SdrYesNoItem(Which(),GetValue());
}
-SfxPoolItem* SdrYesNoItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* SdrYesNoItem::Create(SvStream& rIn, USHORT /*nVer*/) const
{
return new SdrYesNoItem(Which(),rIn);
}
@@ -569,12 +569,12 @@ int SdrYesNoItem::IsPoolable() const
TYPEINIT1_AUTOFACTORY(SdrPercentItem,SfxUInt16Item);
-SfxPoolItem* SdrPercentItem::Clone(SfxItemPool* pPool) const
+SfxPoolItem* SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const
{
return new SdrPercentItem(Which(),GetValue());
}
-SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, USHORT /*nVer*/) const
{
return new SdrPercentItem(Which(),rIn);
}
@@ -594,12 +594,12 @@ int SdrPercentItem::IsPoolable() const
TYPEINIT1_AUTOFACTORY(SdrAngleItem,SfxInt32Item);
-SfxPoolItem* SdrAngleItem::Clone(SfxItemPool* pPool) const
+SfxPoolItem* SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const
{
return new SdrAngleItem(Which(),GetValue());
}
-SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
{
return new SdrAngleItem(Which(),rIn);
}
@@ -619,12 +619,12 @@ int SdrAngleItem::IsPoolable() const
TYPEINIT1_AUTOFACTORY(SdrMetricItem,SfxInt32Item);
-SfxPoolItem* SdrMetricItem::Clone(SfxItemPool* pPool) const
+SfxPoolItem* SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const
{
return new SdrMetricItem(Which(),GetValue());
}
-SfxPoolItem* SdrMetricItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* SdrMetricItem::Create(SvStream& rIn, USHORT /*nVer*/) const
{
return new SdrMetricItem(Which(),rIn);
}
@@ -661,12 +661,12 @@ SfxPoolItem* SdrShadowSetItem::Clone(SfxItemPool* pToPool) const
return new SdrShadowSetItem(*this,pToPool);
}
-SfxPoolItem* SdrShadowSetItem::Create(SvStream& rStream, USHORT nVersion) const
+SfxPoolItem* SdrShadowSetItem::Create(SvStream& rStream, USHORT /*nVersion*/) const
{
- SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
+ SfxItemSet *pLclSet = new SfxItemSet(*GetItemSet().GetPool(),
SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST);
- pSet->Load(rStream);
- return new SdrShadowSetItem(pSet);
+ pLclSet->Load(rStream);
+ return new SdrShadowSetItem(pLclSet);
}
////////////////////////////////////////////////////////////////////////////////
@@ -675,9 +675,9 @@ SfxPoolItem* SdrShadowSetItem::Create(SvStream& rStream, USHORT nVersion) const
TYPEINIT1_AUTOFACTORY(SdrCaptionTypeItem,SfxEnumItem);
-SfxPoolItem* SdrCaptionTypeItem::Clone(SfxItemPool* pPool) const { return new SdrCaptionTypeItem(*this); }
+SfxPoolItem* SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionTypeItem(*this); }
-SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrCaptionTypeItem(rIn); }
+SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrCaptionTypeItem(rIn); }
USHORT SdrCaptionTypeItem::GetValueCount() const { return 4; }
@@ -685,9 +685,9 @@ USHORT SdrCaptionTypeItem::GetValueCount() const { return 4; }
TYPEINIT1_AUTOFACTORY(SdrCaptionEscDirItem,SfxEnumItem);
-SfxPoolItem* SdrCaptionEscDirItem::Clone(SfxItemPool* pPool) const { return new SdrCaptionEscDirItem(*this); }
+SfxPoolItem* SdrCaptionEscDirItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionEscDirItem(*this); }
-SfxPoolItem* SdrCaptionEscDirItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrCaptionEscDirItem(rIn); }
+SfxPoolItem* SdrCaptionEscDirItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrCaptionEscDirItem(rIn); }
USHORT SdrCaptionEscDirItem::GetValueCount() const { return 3; }
@@ -704,12 +704,12 @@ SfxPoolItem* SdrCaptionSetItem::Clone(SfxItemPool* pToPool) const
return new SdrCaptionSetItem(*this,pToPool);
}
-SfxPoolItem* SdrCaptionSetItem::Create(SvStream& rStream, USHORT nVersion) const
+SfxPoolItem* SdrCaptionSetItem::Create(SvStream& rStream, USHORT /*nVersion*/) const
{
- SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
+ SfxItemSet *pLclSet = new SfxItemSet(*GetItemSet().GetPool(),
SDRATTR_CAPTION_FIRST, SDRATTR_CAPTION_LAST);
- pSet->Load(rStream);
- return new SdrCaptionSetItem(pSet);
+ pLclSet->Load(rStream);
+ return new SdrCaptionSetItem(pLclSet);
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -728,12 +728,12 @@ SfxPoolItem* SdrOutlinerSetItem::Clone(SfxItemPool* pToPool) const
return new SdrOutlinerSetItem(*this,pToPool);
}
-SfxPoolItem* SdrOutlinerSetItem::Create(SvStream& rStream, USHORT nVersion) const
+SfxPoolItem* SdrOutlinerSetItem::Create(SvStream& rStream, USHORT /*nVersion*/) const
{
- SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
+ SfxItemSet *pLclSet = new SfxItemSet(*GetItemSet().GetPool(),
EE_ITEMS_START, EE_ITEMS_END);
- pSet->Load(rStream);
- return new SdrOutlinerSetItem(pSet);
+ pLclSet->Load(rStream);
+ return new SdrOutlinerSetItem(pLclSet);
}
////////////////////////////////////////////////////////////////////////////////
@@ -743,14 +743,14 @@ SfxPoolItem* SdrOutlinerSetItem::Create(SvStream& rStream, USHORT nVersion) cons
// FitToSize
TYPEINIT1_AUTOFACTORY(SdrTextFitToSizeTypeItem,SfxEnumItem);
-SfxPoolItem* SdrTextFitToSizeTypeItem::Clone(SfxItemPool* pPool) const { return new SdrTextFitToSizeTypeItem(*this); }
+SfxPoolItem* SdrTextFitToSizeTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextFitToSizeTypeItem(*this); }
-SfxPoolItem* SdrTextFitToSizeTypeItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrTextFitToSizeTypeItem(rIn); }
+SfxPoolItem* SdrTextFitToSizeTypeItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextFitToSizeTypeItem(rIn); }
USHORT SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; }
-bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
drawing::TextFitToSizeType eFS = (drawing::TextFitToSizeType)GetValue();
rVal <<= eFS;
@@ -758,7 +758,7 @@ bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) cons
return true;
}
-bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
drawing::TextFitToSizeType eFS;
if(!(rVal >>= eFS))
@@ -777,21 +777,21 @@ bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
TYPEINIT1_AUTOFACTORY(SdrTextVertAdjustItem,SfxEnumItem);
-SfxPoolItem* SdrTextVertAdjustItem::Clone(SfxItemPool* pPool) const { return new SdrTextVertAdjustItem(*this); }
+SfxPoolItem* SdrTextVertAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextVertAdjustItem(*this); }
-SfxPoolItem* SdrTextVertAdjustItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrTextVertAdjustItem(rIn); }
+SfxPoolItem* SdrTextVertAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextVertAdjustItem(rIn); }
USHORT SdrTextVertAdjustItem::GetValueCount() const { return 5; }
-bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
rVal <<= (drawing::TextVerticalAdjust)GetValue();
return true;
}
-bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
drawing::TextVerticalAdjust eAdj;
if(!(rVal >>= eAdj))
@@ -810,24 +810,24 @@ bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
TYPEINIT1_AUTOFACTORY(SdrTextHorzAdjustItem,SfxEnumItem);
-SfxPoolItem* SdrTextHorzAdjustItem::Clone(SfxItemPool* pPool) const { return new SdrTextHorzAdjustItem(*this); }
+SfxPoolItem* SdrTextHorzAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextHorzAdjustItem(*this); }
-SfxPoolItem* SdrTextHorzAdjustItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrTextHorzAdjustItem(rIn); }
+SfxPoolItem* SdrTextHorzAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextHorzAdjustItem(rIn); }
USHORT SdrTextHorzAdjustItem::GetValueCount() const { return 5; }
-XubString SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const
-{DBG_BF_ASSERT(0, "STRIP");XubString a; return a; //STRIP001
+XubString SdrTextHorzAdjustItem::GetValueTextByPos(USHORT /*nPos*/) const
+{DBG_BF_ASSERT(0, "STRIP");XubString a; return a;
}
-bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
rVal <<= (drawing::TextHorizontalAdjust)GetValue();
return sal_True;
}
-bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
drawing::TextHorizontalAdjust eAdj;
if(!(rVal >>= eAdj))
@@ -846,21 +846,21 @@ bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
TYPEINIT1_AUTOFACTORY(SdrTextAniKindItem,SfxEnumItem);
-SfxPoolItem* SdrTextAniKindItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniKindItem(*this); }
+SfxPoolItem* SdrTextAniKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniKindItem(*this); }
-SfxPoolItem* SdrTextAniKindItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrTextAniKindItem(rIn); }
+SfxPoolItem* SdrTextAniKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniKindItem(rIn); }
USHORT SdrTextAniKindItem::GetValueCount() const { return 5; }
-bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
rVal <<= (drawing::TextAnimationKind)GetValue();
return true;
}
-bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
drawing::TextAnimationKind eKind;
if(!(rVal >>= eKind))
@@ -878,21 +878,21 @@ bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
TYPEINIT1_AUTOFACTORY(SdrTextAniDirectionItem,SfxEnumItem);
-SfxPoolItem* SdrTextAniDirectionItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniDirectionItem(*this); }
+SfxPoolItem* SdrTextAniDirectionItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDirectionItem(*this); }
-SfxPoolItem* SdrTextAniDirectionItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrTextAniDirectionItem(rIn); }
+SfxPoolItem* SdrTextAniDirectionItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniDirectionItem(rIn); }
USHORT SdrTextAniDirectionItem::GetValueCount() const { return 4; }
-bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
rVal <<= (drawing::TextAnimationDirection)GetValue();
return true;
}
-bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
drawing::TextAnimationDirection eDir;
if(!(rVal >>= eDir))
@@ -911,16 +911,16 @@ bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
TYPEINIT1_AUTOFACTORY(SdrTextAniDelayItem,SfxUInt16Item);
-SfxPoolItem* SdrTextAniDelayItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniDelayItem(*this); }
+SfxPoolItem* SdrTextAniDelayItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDelayItem(*this); }
-SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrTextAniDelayItem(rIn); }
+SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniDelayItem(rIn); }
TYPEINIT1_AUTOFACTORY(SdrTextAniAmountItem,SfxInt16Item);
-SfxPoolItem* SdrTextAniAmountItem::Clone(SfxItemPool* pPool) const { return new SdrTextAniAmountItem(*this); }
+SfxPoolItem* SdrTextAniAmountItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniAmountItem(*this); }
-SfxPoolItem* SdrTextAniAmountItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrTextAniAmountItem(rIn); }
+SfxPoolItem* SdrTextAniAmountItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniAmountItem(rIn); }
@@ -936,7 +936,6 @@ SdrAutoShapeAdjustmentItem::SdrAutoShapeAdjustmentItem( SvStream& rIn, sal_uInt1
{
if ( nVersion )
{
- SdrAutoShapeAdjustmentValue aVal;
sal_uInt32 i, nCount;
rIn >> nCount;
for ( i = 0; i < nCount; i++ )
@@ -987,7 +986,7 @@ SvStream& SdrAutoShapeAdjustmentItem::Store( SvStream& rOut, sal_uInt16 nItemVer
return rOut;
}
-SfxPoolItem* SdrAutoShapeAdjustmentItem::Clone( SfxItemPool *pPool ) const
+SfxPoolItem* SdrAutoShapeAdjustmentItem::Clone( SfxItemPool * /*pPool*/ ) const
{
sal_uInt32 i;
SdrAutoShapeAdjustmentItem* pItem = new SdrAutoShapeAdjustmentItem;
@@ -1006,7 +1005,7 @@ int SdrAutoShapeAdjustmentItem::IsPoolable() const
#endif
-sal_uInt16 SdrAutoShapeAdjustmentItem::GetVersion( sal_uInt16 nFileFormatVersion ) const
+sal_uInt16 SdrAutoShapeAdjustmentItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const
{
return 1;
}
@@ -1022,12 +1021,12 @@ SfxPoolItem* SdrMiscSetItem::Clone(SfxItemPool* pToPool) const
return new SdrMiscSetItem(*this,pToPool);
}
-SfxPoolItem* SdrMiscSetItem::Create(SvStream& rStream, USHORT nVersion) const
+SfxPoolItem* SdrMiscSetItem::Create(SvStream& rStream, USHORT /*nVersion*/) const
{
- SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
+ SfxItemSet *pLclSet = new SfxItemSet(*GetItemSet().GetPool(),
SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST);
- pSet->Load(rStream);
- return new SdrMiscSetItem(pSet);
+ pLclSet->Load(rStream);
+ return new SdrMiscSetItem(pLclSet);
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1037,15 +1036,15 @@ SfxPoolItem* SdrMiscSetItem::Create(SvStream& rStream, USHORT nVersion) const
// EdgeKind
TYPEINIT1_AUTOFACTORY(SdrEdgeKindItem,SfxEnumItem);
-SfxPoolItem* SdrEdgeKindItem::Clone(SfxItemPool* pPool) const { return new SdrEdgeKindItem(*this); }
+SfxPoolItem* SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeKindItem(*this); }
-SfxPoolItem* SdrEdgeKindItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrEdgeKindItem(rIn); }
+SfxPoolItem* SdrEdgeKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrEdgeKindItem(rIn); }
USHORT SdrEdgeKindItem::GetValueCount() const { return 4; }
-bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
drawing::ConnectorType eCT = drawing::ConnectorType_STANDARD;
@@ -1065,7 +1064,7 @@ bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
-bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
drawing::ConnectorType eCT;
if(!(rVal >>= eCT))
@@ -1103,12 +1102,12 @@ SfxPoolItem* SdrEdgeSetItem::Clone(SfxItemPool* pToPool) const
return new SdrEdgeSetItem(*this,pToPool);
}
-SfxPoolItem* SdrEdgeSetItem::Create(SvStream& rStream, USHORT nVersion) const
+SfxPoolItem* SdrEdgeSetItem::Create(SvStream& rStream, USHORT /*nVersion*/) const
{
- SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
+ SfxItemSet *pLclSet = new SfxItemSet(*GetItemSet().GetPool(),
SDRATTR_EDGE_FIRST, SDRATTR_EDGE_LAST);
- pSet->Load(rStream);
- return new SdrEdgeSetItem(pSet);
+ pLclSet->Load(rStream);
+ return new SdrEdgeSetItem(pLclSet);
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1118,9 +1117,9 @@ SfxPoolItem* SdrEdgeSetItem::Create(SvStream& rStream, USHORT nVersion) const
// MeasureKind
TYPEINIT1_AUTOFACTORY(SdrMeasureKindItem,SfxEnumItem);
-SfxPoolItem* SdrMeasureKindItem::Clone(SfxItemPool* pPool) const { return new SdrMeasureKindItem(*this); }
+SfxPoolItem* SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureKindItem(*this); }
-SfxPoolItem* SdrMeasureKindItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrMeasureKindItem(rIn); }
+SfxPoolItem* SdrMeasureKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureKindItem(rIn); }
USHORT SdrMeasureKindItem::GetValueCount() const { return 2; }
@@ -1130,18 +1129,18 @@ USHORT SdrMeasureKindItem::GetValueCount() const { return 2; }
TYPEINIT1_AUTOFACTORY(SdrMeasureTextHPosItem,SfxEnumItem);
-SfxPoolItem* SdrMeasureTextHPosItem::Clone(SfxItemPool* pPool) const { return new SdrMeasureTextHPosItem(*this); }
+SfxPoolItem* SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextHPosItem(*this); }
-SfxPoolItem* SdrMeasureTextHPosItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrMeasureTextHPosItem(rIn); }
+SfxPoolItem* SdrMeasureTextHPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureTextHPosItem(rIn); }
USHORT SdrMeasureTextHPosItem::GetValueCount() const { return 4; }
TYPEINIT1_AUTOFACTORY(SdrMeasureTextVPosItem,SfxEnumItem);
-SfxPoolItem* SdrMeasureTextVPosItem::Clone(SfxItemPool* pPool) const { return new SdrMeasureTextVPosItem(*this); }
+SfxPoolItem* SdrMeasureTextVPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextVPosItem(*this); }
-SfxPoolItem* SdrMeasureTextVPosItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrMeasureTextVPosItem(rIn); }
+SfxPoolItem* SdrMeasureTextVPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureTextVPosItem(rIn); }
USHORT SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
@@ -1151,9 +1150,9 @@ USHORT SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
TYPEINIT1_AUTOFACTORY(SdrMeasureUnitItem,SfxEnumItem);
-SfxPoolItem* SdrMeasureUnitItem::Clone(SfxItemPool* pPool) const { return new SdrMeasureUnitItem(*this); }
+SfxPoolItem* SdrMeasureUnitItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureUnitItem(*this); }
-SfxPoolItem* SdrMeasureUnitItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrMeasureUnitItem(rIn); }
+SfxPoolItem* SdrMeasureUnitItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureUnitItem(rIn); }
USHORT SdrMeasureUnitItem::GetValueCount() const { return 14; }
@@ -1172,12 +1171,12 @@ SfxPoolItem* SdrMeasureSetItem::Clone(SfxItemPool* pToPool) const
return new SdrMeasureSetItem(*this,pToPool);
}
-SfxPoolItem* SdrMeasureSetItem::Create(SvStream& rStream, USHORT nVersion) const
+SfxPoolItem* SdrMeasureSetItem::Create(SvStream& rStream, USHORT /*nVersion*/) const
{
- SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
+ SfxItemSet *pLclSet = new SfxItemSet(*GetItemSet().GetPool(),
SDRATTR_MEASURE_FIRST, SDRATTR_MEASURE_LAST);
- pSet->Load(rStream);
- return new SdrMeasureSetItem(pSet);
+ pLclSet->Load(rStream);
+ return new SdrMeasureSetItem(pLclSet);
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1187,14 +1186,14 @@ SfxPoolItem* SdrMeasureSetItem::Create(SvStream& rStream, USHORT nVersion) const
// CircKind
TYPEINIT1_AUTOFACTORY(SdrCircKindItem,SfxEnumItem);
-SfxPoolItem* SdrCircKindItem::Clone(SfxItemPool* pPool) const { return new SdrCircKindItem(*this); }
+SfxPoolItem* SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCircKindItem(*this); }
-SfxPoolItem* SdrCircKindItem::Create(SvStream& rIn, USHORT nVer) const { return new SdrCircKindItem(rIn); }
+SfxPoolItem* SdrCircKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrCircKindItem(rIn); }
USHORT SdrCircKindItem::GetValueCount() const { return 4; }
-bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
drawing::CircleKind eKind;
if(!(rVal >>= eKind))
@@ -1221,12 +1220,12 @@ SfxPoolItem* SdrCircSetItem::Clone(SfxItemPool* pToPool) const
return new SdrCircSetItem(*this,pToPool);
}
-SfxPoolItem* SdrCircSetItem::Create(SvStream& rStream, USHORT nVersion) const
+SfxPoolItem* SdrCircSetItem::Create(SvStream& rStream, USHORT /*nVersion*/) const
{
- SfxItemSet *pSet = new SfxItemSet(*GetItemSet().GetPool(),
+ SfxItemSet *pLclSet = new SfxItemSet(*GetItemSet().GetPool(),
SDRATTR_CIRC_FIRST, SDRATTR_CIRC_LAST);
- pSet->Load(rStream);
- return new SdrCircSetItem(pSet);
+ pLclSet->Load(rStream);
+ return new SdrCircSetItem(pLclSet);
}
//------------------------------------------------------------
@@ -1255,12 +1254,12 @@ SfxPoolItem* SdrGrafSetItem::Clone( SfxItemPool* pToPool ) const
return new SdrGrafSetItem( *this, pToPool );
}
-SfxPoolItem* SdrGrafSetItem::Create( SvStream& rStream, USHORT nVersion ) const
+SfxPoolItem* SdrGrafSetItem::Create( SvStream& rStream, USHORT /*nVersion*/ ) const
{
- SfxItemSet* pSet = new SfxItemSet(*GetItemSet().GetPool(),
+ SfxItemSet* pLclSet = new SfxItemSet(*GetItemSet().GetPool(),
SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST );
- pSet->Load( rStream );
- return new SdrGrafSetItem( pSet );
+ pLclSet->Load( rStream );
+ return new SdrGrafSetItem( pLclSet );
}
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1269,12 +1268,12 @@ SfxPoolItem* SdrGrafSetItem::Create( SvStream& rStream, USHORT nVersion ) const
TYPEINIT1( SdrGrafRedItem, SdrSignedPercentItem );
-SfxPoolItem* SdrGrafRedItem::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SdrGrafRedItem( *this );
}
-SfxPoolItem* SdrGrafRedItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* SdrGrafRedItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
{
return new SdrGrafRedItem( rIn );
}
@@ -1285,12 +1284,12 @@ SfxPoolItem* SdrGrafRedItem::Create( SvStream& rIn, USHORT nVer ) const
TYPEINIT1( SdrGrafGreenItem, SdrSignedPercentItem );
-SfxPoolItem* SdrGrafGreenItem::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SdrGrafGreenItem( *this );
}
-SfxPoolItem* SdrGrafGreenItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* SdrGrafGreenItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
{
return new SdrGrafGreenItem( rIn );
}
@@ -1301,12 +1300,12 @@ SfxPoolItem* SdrGrafGreenItem::Create( SvStream& rIn, USHORT nVer ) const
TYPEINIT1( SdrGrafBlueItem, SdrSignedPercentItem );
-SfxPoolItem* SdrGrafBlueItem::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SdrGrafBlueItem( *this );
}
-SfxPoolItem* SdrGrafBlueItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* SdrGrafBlueItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
{
return new SdrGrafBlueItem( rIn );
}
@@ -1317,12 +1316,12 @@ SfxPoolItem* SdrGrafBlueItem::Create( SvStream& rIn, USHORT nVer ) const
TYPEINIT1( SdrGrafLuminanceItem, SdrSignedPercentItem );
-SfxPoolItem* SdrGrafLuminanceItem::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SdrGrafLuminanceItem( *this );
}
-SfxPoolItem* SdrGrafLuminanceItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* SdrGrafLuminanceItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
{
return new SdrGrafLuminanceItem( rIn );
}
@@ -1333,12 +1332,12 @@ SfxPoolItem* SdrGrafLuminanceItem::Create( SvStream& rIn, USHORT nVer ) const
TYPEINIT1( SdrGrafContrastItem, SdrSignedPercentItem );
-SfxPoolItem* SdrGrafContrastItem::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SdrGrafContrastItem( *this );
}
-SfxPoolItem* SdrGrafContrastItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* SdrGrafContrastItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
{
return new SdrGrafContrastItem( rIn );
}
@@ -1349,23 +1348,23 @@ SfxPoolItem* SdrGrafContrastItem::Create( SvStream& rIn, USHORT nVer ) const
TYPEINIT1( SdrGrafGamma100Item, SfxUInt32Item );
-SfxPoolItem* SdrGrafGamma100Item::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SdrGrafGamma100Item( *this );
}
-SfxPoolItem* SdrGrafGamma100Item::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* SdrGrafGamma100Item::Create( SvStream& rIn, USHORT /*nVer*/ ) const
{
return new SdrGrafGamma100Item( rIn );
}
-bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
{
rVal <<= ((double)GetValue()) / 100.0;
return true;
}
-bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
{
double nGamma;
if(!(rVal >>= nGamma))
@@ -1381,12 +1380,12 @@ bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, BYTE nMemberId )
TYPEINIT1( SdrGrafInvertItem, SdrOnOffItem );
-SfxPoolItem* SdrGrafInvertItem::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SdrGrafInvertItem::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SdrGrafInvertItem( *this );
}
-SfxPoolItem* SdrGrafInvertItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* SdrGrafInvertItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
{
return new SdrGrafInvertItem( rIn );
}
@@ -1397,12 +1396,12 @@ SfxPoolItem* SdrGrafInvertItem::Create( SvStream& rIn, USHORT nVer ) const
TYPEINIT1( SdrGrafTransparenceItem, SdrPercentItem );
-SfxPoolItem* SdrGrafTransparenceItem::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SdrGrafTransparenceItem( *this );
}
-SfxPoolItem* SdrGrafTransparenceItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* SdrGrafTransparenceItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
{
return new SdrGrafTransparenceItem( rIn );
}
@@ -1413,12 +1412,12 @@ SfxPoolItem* SdrGrafTransparenceItem::Create( SvStream& rIn, USHORT nVer ) const
TYPEINIT1( SdrGrafModeItem, SfxEnumItem );
-SfxPoolItem* SdrGrafModeItem::Clone(SfxItemPool* pPool) const
+SfxPoolItem* SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const
{
return new SdrGrafModeItem( *this );
}
-SfxPoolItem* SdrGrafModeItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* SdrGrafModeItem::Create( SvStream& rIn, USHORT /*nVer*/ ) const
{
return new SdrGrafModeItem( rIn );
}
@@ -1436,7 +1435,7 @@ USHORT SdrGrafModeItem::GetValueCount() const
TYPEINIT1( SdrGrafCropItem, SvxGrfCrop );
-SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* pPool ) const
+SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* /*pPool*/ ) const
{
return new SdrGrafCropItem( *this );
}
@@ -1446,7 +1445,7 @@ SfxPoolItem* SdrGrafCropItem::Create( SvStream& rIn, USHORT nVer ) const
return( ( 0 == nVer ) ? Clone( NULL ) : SvxGrfCrop::Create( rIn, nVer ) );
}
-USHORT SdrGrafCropItem::GetVersion( USHORT nFileVersion ) const
+USHORT SdrGrafCropItem::GetVersion( USHORT /*nFileVersion*/ ) const
{
// GRFCROP_VERSION_MOVETOSVX is 1
return GRFCROP_VERSION_MOVETOSVX;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx
index a2f11ad..4414b62 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdcrtv.cxx
@@ -44,7 +44,7 @@ namespace binfilter {
/*N*/
/*N*/ public:
-/*N*/ ImpSdrConnectMarker(SdrCreateView* pView): SdrViewUserMarker(pView),pAktObj(NULL),pAktPV(NULL) {}
+/*N*/ ImpSdrConnectMarker(SdrCreateView* pInView): SdrViewUserMarker(pInView),pAktObj(NULL),pAktPV(NULL) {}
/*N*/ ~ImpSdrConnectMarker() {}
/*N*/ void SetTargetObject(const SdrObject* pObj);
/*N*/ }; // svdvmark
diff --git a/binfilter/bf_svx/source/svdraw/svx_svddrag.cxx b/binfilter/bf_svx/source/svdraw/svx_svddrag.cxx
index 638050a..ee8b637 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svddrag.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svddrag.cxx
@@ -36,8 +36,6 @@ namespace binfilter {
/*N*/ delete (Point*)pP;
/*N*/ pP=aPnts.Next();
/*N*/ }
-/*N*/ if (pUser!=NULL) delete pUser;
-/*N*/ pUser=NULL;
/*N*/ aPnts.Clear();
/*N*/ if (bLeaveOne) {
/*N*/ aPnts.Insert(new Point,CONTAINER_APPEND);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdedtv2.cxx b/binfilter/bf_svx/source/svdraw/svx_svdedtv2.cxx
index 6319bae..fc501f5 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdedtv2.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdedtv2.cxx
@@ -82,8 +82,8 @@ namespace binfilter {
//
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void SdrEditView::GroupMarked(const SdrObject* /*pUserGrp*/)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdedxv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdedxv.cxx
index 45d5452..0f918d5 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdedxv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdedxv.cxx
@@ -125,31 +125,13 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// @@@@@@ @@@@@ @@ @@ @@@@@@ @@@@@ @@@@@ @@ @@@@@@
-// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@
-// @@ @@@@ @@@ @@ @@@@ @@ @@ @@ @@
-// @@ @@ @@@@@ @@ @@ @@ @@ @@ @@
-// @@ @@ @@@ @@@ @@ @@ @@ @@ @@ @@
-// @@ @@@@@ @@ @@ @@ @@@@@ @@@@@ @@ @@
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-/*N*/ BOOL SdrObjEditView::BegTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin,
-/*N*/ SdrOutliner* pGivenOutliner, OutlinerView* pGivenOutlinerView,
-/*N*/ BOOL bDontDeleteOutliner, BOOL bOnlyOneView)
+/*N*/ BOOL SdrObjEditView::BegTextEdit(SdrObject*, SdrPageView*, Window*,
+/*N*/ SdrOutliner*, OutlinerView*,
+/*N*/ BOOL, BOOL)
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
/*N*/ }
-/*N*/ SdrEndTextEditKind SdrObjEditView::EndTextEdit(BOOL bDontDeleteReally)
+/*N*/ SdrEndTextEditKind SdrObjEditView::EndTextEdit(BOOL)
/*N*/ {DBG_BF_ASSERT(0, "STRIP");SdrEndTextEditKind eRet=SDRENDTEXTEDIT_UNCHANGED; return eRet; //STRIP001
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx b/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
index ad198c1..ed6a335 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
@@ -178,7 +178,7 @@ namespace binfilter {
/*N*/ return bUnloaded;
/*N*/ }
-/*N*/ IMPL_LINK(OLEObjCache, UnloadCheckHdl, AutoTimer*, pTim)
+/*N*/ IMPL_LINK(OLEObjCache, UnloadCheckHdl, AutoTimer*, EMPTYARG)
/*N*/ {
/*N*/ if (nSize <= Count())
/*N*/ {
@@ -483,13 +483,13 @@ namespace binfilter {
/*?*/ {
/*?*/ for(sal_uInt32 nX(0L); nX < nWidth; nX += nXStep)
/*?*/ {
-/*?*/ const BitmapColor& rCol = (pAccess->HasPalette())
+/*?*/ const BitmapColor& rLclCol = (pAccess->HasPalette())
/*?*/ ? pAccess->GetPaletteColor((BYTE)pAccess->GetPixel(nY, nX))
/*?*/ : pAccess->GetPixel(nY, nX);
-/*?*/
-/*?*/ nRt += rCol.GetRed();
-/*?*/ nGn += rCol.GetGreen();
-/*?*/ nBl += rCol.GetBlue();
+/*?*/
+/*?*/ nRt += rLclCol.GetRed();
+/*?*/ nGn += rLclCol.GetGreen();
+/*?*/ nBl += rLclCol.GetBlue();
/*?*/ nAnz++;
/*?*/ }
/*?*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdglue.cxx b/binfilter/bf_svx/source/svdraw/svx_svdglue.cxx
index 0e292b3..7ddc7af 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdglue.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdglue.cxx
@@ -148,8 +148,8 @@ namespace binfilter {
/*N*/ } else {
/*N*/ bool bBrk=FALSE;
/*N*/ for (USHORT nNum=0; nNum<nAnz && !bBrk; nNum++) {
-/*N*/ const SdrGluePoint* pGP=GetObject(nNum);
-/*N*/ USHORT nTmpId=pGP->GetId();
+/*N*/ const SdrGluePoint* pLclGP=GetObject(nNum);
+/*N*/ USHORT nTmpId=pLclGP->GetId();
/*N*/ if (nTmpId==nId) {
/*N*/ nId=nLastId+1; // bereits vorhanden
/*N*/ bBrk=TRUE;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx b/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
index 2db4156..5f16a19 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
@@ -46,24 +46,12 @@ namespace binfilter {
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/*N*/ class ImpSdrHdlListSorter: public ContainerSorter {
-/*N*/ public:
-/*N*/ ImpSdrHdlListSorter(Container& rNewCont): ContainerSorter(rNewCont) {}
-/*N*/ virtual int Compare(const void* pElem1, const void* pElem2) const;
-/*N*/ };
-
-/*N*/ int ImpSdrHdlListSorter::Compare(const void*, const void*) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
// #97016# II
/*N*/ class ImplHdlListData
/*N*/ {
/*N*/ public:
-/*N*/ sal_uInt32 mnFocusIndex;
+/*N*/ ULONG mnFocusIndex;
/*N*/ SdrMarkView* pView;
/*N*/
/*N*/ ImplHdlListData(SdrMarkView* pV): mnFocusIndex(CONTAINER_ENTRY_NOTFOUND), pView(pV) {}
@@ -86,7 +74,7 @@ struct ImplHdlAndIndex
/*N*/ SdrHdl* SdrHdlList::GetFocusHdl() const
/*N*/ {
-/*N*/ if(pImpl->mnFocusIndex != CONTAINER_ENTRY_NOTFOUND && pImpl->mnFocusIndex < GetHdlCount())
+/*N*/ if (pImpl->mnFocusIndex != CONTAINER_ENTRY_NOTFOUND && pImpl->mnFocusIndex < GetHdlCount())
/*?*/ return GetHdl(pImpl->mnFocusIndex);
/*N*/ else
/*?*/ return 0L;
@@ -95,8 +83,8 @@ struct ImplHdlAndIndex
////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ SdrHdlList::SdrHdlList(SdrMarkView* pV)
-/*N*/ : aList(1024,32,32),
-/*N*/ pImpl(new ImplHdlListData(pV))
+/*N*/ : pImpl(new ImplHdlListData(pV))
+/*N*/ , aList(1024,32,32)
/*N*/ //#97016# II
/*N*/ //pView(pV)
/*N*/ {
@@ -158,18 +146,6 @@ struct ImplHdlAndIndex
/*N*/ void SdrHdlList::Sort()
/*N*/ {
-/*N*/ // #97016# II: remember current focused handle
-/*N*/ SdrHdl* pPrev = GetFocusHdl();
-/*N*/
-/*N*/ ImpSdrHdlListSorter aSort(aList);
-/*N*/ aSort.DoSort();
-
- // #97016# II: get now and compare
-/*N*/ SdrHdl* pNow = GetFocusHdl();
-/*N*/
-/*N*/ if(pPrev != pNow)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
-/*N*/ }
/*N*/ }
}
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx b/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
index 8a92990..cb41103 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
@@ -303,7 +303,7 @@ namespace binfilter {
-/*N*/ const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, bool bInherited) const
+/*N*/ const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, bool /*bInherited*/) const
/*N*/ {
/*N*/ UINT16 i(0);
/*N*/ const SdrLayer* pLay = NULL;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
index d7a9fbe..776930c 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
@@ -111,42 +111,12 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ return CONTAINER_ENTRY_NOTFOUND;
-
- /*
- ForceSort();
- if (pObj==NULL || aList.Count()==0) return CONTAINER_ENTRY_NOTFOUND;
- const SdrObjList* pOL=pObj->GetObjList();
- ULONG nObjOrd=pObj->GetOrdNum();
- ULONG nL=0;
- ULONG nR=aList.Count();
- if (GetMark(nL)->GetObj()==pObj) return nL;
- while (nL+1<nR) { // Der Gesuchte befindet sich zwischen, nicht auf den Grenzen!
- ULONG nMid=(nL+nR)/2;
- const SdrObject* pMidObj=GetMark(nMid)->GetObj();
- if (pMidObj==pObj) return nMid; // Hurra, gefunden!
- const SdrObjList* pMidOL=pMidObj!=NULL ? pMidObj->GetObjList() : NULL;
- ULONG nMidObjOrd=pMidObj!=NULL ? pMidObj->GetOrdNum() : 0;
- if (pMidOL==pOL) {
- if (nMidObjOrd<nObjOrd) nL=nMid;
- else if (nMidObjOrd>nObjOrd) nR=nMid;
- else {
- DBG_ASSERT(FALSE,"SdrMarkList::FindObject(): Anderes Objekt mit gleicher OrdNum gefunden!");
- return CONTAINER_ENTRY_NOTFOUND;
- }
- } else if ((long)pMidOL<(long)pOL) nL=nMid;
- else nR=nMid;
- }
- return CONTAINER_ENTRY_NOTFOUND;
- */
/*N*/ }
-/*N*/ void SdrMarkList::InsertEntry(const SdrMark& rMark, bool bChkSort)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void SdrMarkList::InsertEntry(const SdrMark& /*rMark*/, bool /*bChkSort*/)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-
-
-
/*N*/ bool SdrMarkList::DeletePageView(const SdrPageView& rPV)
/*N*/ {
/*N*/ bool bChgd=FALSE;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
index a35af2d..64cf6f4 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
@@ -352,8 +352,8 @@ using namespace ::com::sun::star;
/*N*/ SdrModel::SdrModel(SfxItemPool* pPool, SvPersist* pPers, INT32 bLoadRefCounts):
/*N*/ aInfo(TRUE),
-/*N*/ aPages(1024,32,32),
-/*N*/ aMaPag(1024,32,32)
+/*N*/ aMaPag(1024,32,32),
+/*N*/ aPages(1024,32,32)
/*N*/ {
/*N*/ #ifdef TIMELOG
/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "svx", "aw93748", "SdrModel::SdrModel(...)" );
@@ -365,8 +365,8 @@ using namespace ::com::sun::star;
/*N*/ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, INT32 bLoadRefCounts):
/*N*/ aInfo(TRUE),
-/*N*/ aPages(1024,32,32),
/*N*/ aMaPag(1024,32,32),
+/*N*/ aPages(1024,32,32),
/*N*/ aTablePath(rPath)
/*N*/ {
/*N*/ #ifdef TIMELOG
@@ -379,8 +379,8 @@ using namespace ::com::sun::star;
/*N*/ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, bool bUseExtColorTable, INT32 bLoadRefCounts):
/*N*/ aInfo(TRUE),
-/*N*/ aPages(1024,32,32),
/*N*/ aMaPag(1024,32,32),
+/*N*/ aPages(1024,32,32),
/*N*/ aTablePath(rPath)
/*N*/ {
/*N*/ #ifdef TIMELOG
@@ -391,9 +391,10 @@ using namespace ::com::sun::star;
/*N*/ ImpCtor(pPool,pPers,bUseExtColorTable, (bool)bLoadRefCounts);
/*N*/ }
-/*N*/ SdrModel::SdrModel(const SdrModel& rSrcModel):
-/*N*/ aPages(1024,32,32),
-/*N*/ aMaPag(1024,32,32)
+/*N*/ SdrModel::SdrModel(const SdrModel& /*rSrcModel*/):
+/*N*/ SfxBroadcaster(),
+/*N*/ aMaPag(1024,32,32),
+/*N*/ aPages(1024,32,32)
/*N*/ {
/*N*/ #ifdef TIMELOG
/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "svx", "aw93748", "SdrModel::SdrModel(...)" );
@@ -503,13 +504,13 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ if (aIOProgressLink.IsSet()) {
/*N*/ if (nVal==0) { // Anfang
-/*N*/ USHORT nVal=0;
-/*N*/ aIOProgressLink.Call(&nVal);
+/*N*/ USHORT nLclVal=0;
+/*N*/ aIOProgressLink.Call(&nLclVal);
/*N*/ nProgressPercent=0;
/*N*/ nProgressAkt=0;
/*N*/ } else if (nVal==0xFFFFFFFF) { // Ende
-/*N*/ USHORT nVal=100;
-/*N*/ aIOProgressLink.Call(&nVal);
+/*N*/ USHORT nLclVal=100;
+/*N*/ aIOProgressLink.Call(&nLclVal);
/*N*/ nProgressPercent=100;
/*N*/ nProgressAkt=nProgressMax;
/*N*/ } else if (nVal!=nProgressAkt && nProgressMax!=0) { // dazwischen
@@ -563,19 +564,8 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ }
-
-
-
-
-
-
-
-
-
-
-
-/*N*/ void SdrModel::AddUndo(SdrUndoAction* pUndo)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void SdrModel::AddUndo(SdrUndoAction* /*pUndo*/)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -767,7 +757,7 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ }
-/*N*/ SvStream* SdrModel::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) const
+/*N*/ SvStream* SdrModel::GetDocumentStream(SdrDocumentStreamInfo& /*rStreamInfo*/) const
/*N*/ {
/*N*/ return NULL;
/*N*/ }
@@ -828,6 +818,7 @@ using namespace ::com::sun::star;
/*N*/ case MAP_SYSFONT : break;
/*N*/ case MAP_APPFONT : break;
/*N*/ case MAP_RELATIVE : break;
+/*N*/ default : break;
/*N*/ } // switch
/*N*/
/*N*/ // 1 mile = 8 furlong = 63.360" = 1.609.344,0mm
@@ -854,6 +845,7 @@ using namespace ::com::sun::star;
/*N*/ // sonstiges
/*N*/ case FUNIT_CUSTOM : break;
/*N*/ case FUNIT_PERCENT: nUIUnitKomma+=2; break;
+/*N*/ default: break;
/*N*/ } // switch
/*N*/
/*N*/ if (bMapInch && bUIMetr) {
@@ -1258,7 +1250,6 @@ using namespace ::com::sun::star;
/*N*/ void SdrModel::WriteData(SvStream& rOut) const
/*N*/ {
-/*N*/ const sal_uInt32 nOldCompressMode = nStreamCompressMode;
/*N*/ sal_uInt32 nNewCompressMode = nStreamCompressMode;
/*N*/
/*N*/ if( SOFFICE_FILEFORMAT_40 <= rOut.GetVersion() )
@@ -1723,8 +1714,6 @@ using namespace ::com::sun::star;
/*N*/ while(!rIn.GetError() && !rIn.IsEof() && !bEnde)
/*N*/ {
/*N*/ SdrIOHeaderLookAhead aHead(rIn);
-/*N*/ //ULONG nPos0=rIn.Tell();
-/*N*/ //rIn>>aHead;
/*N*/
/*N*/ if(!aHead.IsMagic())
/*N*/ {
@@ -1736,7 +1725,6 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ if(!aHead.IsEnde())
/*N*/ {
-/*N*/ //rIn.Seek(nPos0); // Die Headers wollen alle selbst lesen
/*N*/ if(aHead.IsID(SdrIOPageID))
/*N*/ {
/*N*/ if(!bStarDrawPreviewMode || GetPageCount() < 3)
@@ -1797,7 +1785,6 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ // aha, das wil keiner. Also ueberlesen.
/*N*/ aHead.SkipRecord();
-/*N*/ //rIn.Seek(nPos0+aHead.nBlkSize);
/*N*/ }
/*N*/ }
/*N*/ else
@@ -1920,7 +1907,6 @@ using namespace ::com::sun::star;
/*N*/ ((SdrModel*)&rMod)->nProgressOfs=0;
/*N*/ ((SdrModel*)&rMod)->nProgressMax=rMod.ImpCountAllSteamComponents(); // Hier passenden Wert einsetzen
/*N*/ ((SdrModel*)&rMod)->DoProgress(0);
-/*N*/ ULONG nPos0=rOut.Tell();
/*N*/ SdrIOHeader aHead(rOut,STREAM_WRITE,SdrIOModlID);
/*N*/ USHORT nCompressMerk=rOut.GetCompressMode(); // Der CompressMode wird von SdrModel::ReadData() gesetzt
/*N*/ rMod.WriteData(rOut);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
index 4026bcb..b8b3b91 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
@@ -311,7 +311,7 @@ namespace binfilter {
// } while (pOut==NULL && nWinNum<nWinAnz);
//}
-/*N*/ void SdrMarkView::ImpShowMarkHdl(OutputDevice* pOut, const Region* pRegion, BOOL bNoRefHdl)
+/*N*/ void SdrMarkView::ImpShowMarkHdl(OutputDevice* /*pOut*/, const Region* /*pRegion*/, BOOL bNoRefHdl)
/*N*/ {
// if (IsSolidMarkHdl())
/*N*/ bNoRefHdl=FALSE; // geht leider erstmal nicht anders
@@ -349,7 +349,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ void SdrMarkView::HideMarkHdl(OutputDevice* pOut, BOOL bNoRefHdl)
+/*N*/ void SdrMarkView::HideMarkHdl(OutputDevice* /*pOut*/, BOOL bNoRefHdl)
/*N*/ {
// if (IsSolidMarkHdl())
/*N*/ bNoRefHdl=FALSE; // geht leider erstmal nicht anders
@@ -399,8 +399,8 @@ namespace binfilter {
// RefreshAllIAOManagers();
/*N*/ }
-/*N*/ void SdrMarkView::SetMarkHdlHidden(BOOL bOn)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void SdrMarkView::SetMarkHdlHidden(BOOL /*bOn*/)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ BOOL SdrMarkView::ImpIsFrameHandles() const
@@ -496,7 +496,7 @@ namespace binfilter {
/*N*/ // add custom handles (used by other apps, e.g. AnchorPos)
/*N*/ }
-/*N*/ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
+/*N*/ void SdrMarkView::AddDragModeHdl(SdrDragMode /*eMode*/)
/*N*/ {
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmrkv1.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmrkv1.cxx
index 3cf6534..1d4bdeb 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmrkv1.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmrkv1.cxx
@@ -98,8 +98,8 @@ namespace binfilter {
/*N*/ }
-/*N*/ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
+/*N*/ BOOL SdrMarkView::MarkGluePoints(const Rectangle* /*pRect*/, BOOL /*bUnmark*/)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;
/*N*/ }
}
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
index 1ca8f12..6ca6888 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
@@ -270,10 +270,10 @@ namespace binfilter {
/*N*/ DBG_ASSERT(pModel, "SdrAttrObj::ReadData(): pModel=NULL, StyleSheet kann nicht gesetzt werden!");
/*N*/ if(pModel)
/*N*/ {
-/*N*/ SfxStyleSheetBasePool *pPool = pModel->GetStyleSheetPool();
-/*N*/ if(pPool)
+/*N*/ SfxStyleSheetBasePool *pLclPool = pModel->GetStyleSheetPool();
+/*N*/ if(pLclPool)
/*N*/ {
-/*N*/ SfxStyleSheet *pTmpStyleSheet = (SfxStyleSheet*)pPool->Find(aStyleSheetName, eFamily);
+/*N*/ SfxStyleSheet *pTmpStyleSheet = (SfxStyleSheet*)pLclPool->Find(aStyleSheetName, eFamily);
/*N*/ DBG_ASSERT(pTmpStyleSheet, "SdrAttrObj::ReadData(): StyleSheet nicht gefunden");
/*N*/
/*N*/ if(pTmpStyleSheet)
@@ -583,7 +583,7 @@ namespace binfilter {
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ void SdrAttrObj::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType,
+/*N*/ void SdrAttrObj::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& /*rBCType*/,
/*N*/ const SfxHint& rHint, const TypeId& rHintType)
/*N*/ {
/*N*/ SfxSimpleHint *pSimple = PTR_CAST(SfxSimpleHint, &rHint);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
index 3037f80..3bf8c09 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
@@ -137,7 +137,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ {
/*N*/ }
-/*N*/ bool SdrObjUserData::HasMacro(const SdrObject* pObj) const
+/*N*/ bool SdrObjUserData::HasMacro(const SdrObject* /*pObj*/) const
/*N*/ {
/*N*/ return FALSE;
/*N*/ }
@@ -1581,21 +1581,21 @@ class ImpSkeleton;
/*N*/ bool bMtfCommentWritten( false );
/*N*/ if( (pMtf=rXOut.GetOutDev()->GetConnectMetaFile()) )
/*N*/ {
-/*N*/ XPolyPolygon aPolyPoly;
-/*N*/ TakeXorPoly(aPolyPoly, TRUE);
+/*N*/ XPolyPolygon aLclPolyPoly;
+/*N*/ TakeXorPoly(aLclPolyPoly, TRUE);
/*N*/
/*N*/ // #103692# Offset original geometry, too
/*N*/ if( nDX || nDY )
/*N*/ {
/*?*/ // transformation necessary
-/*?*/ aPolyPoly.Move( nDX, nDY );
+/*?*/ aLclPolyPoly.Move( nDX, nDY );
/*N*/ }
/*N*/
/*N*/ // for geometries with more than one polygon, dashing, arrows
/*N*/ // etc. become ambiguous (e.g. measure objects have no arrows
/*N*/ // on the end line), thus refrain from writing the comment
/*N*/ // here.
-/*N*/ if( aPolyPoly.Count() == 1 )
+/*N*/ if( aLclPolyPoly.Count() == 1 )
/*N*/ {
/*N*/ // add completely superfluous color action (gets overwritten
/*N*/ // below), to store our line color reliably
@@ -1652,7 +1652,7 @@ class ImpSkeleton;
/*?*/ aEndPoly.Translate( Point(0, -aEndPoly.GetBoundRect().GetHeight() / 2) );
/*?*/ }
/*N*/
-/*N*/ SvtGraphicStroke aStroke( XOutCreatePolygonBezier( aPolyPoly[0], rXOut.GetOutDev() ),
+/*N*/ SvtGraphicStroke aStroke( XOutCreatePolygonBezier( aLclPolyPoly[0], rXOut.GetOutDev() ),
/*N*/ XOutCreatePolygonBezier( aStartPoly, rXOut.GetOutDev() ),
/*N*/ XOutCreatePolygonBezier( aEndPoly, rXOut.GetOutDev() ),
/*N*/ nTransparence / 100.0,
@@ -1853,10 +1853,10 @@ class ImpSkeleton;
/*?*/ if( aLine.GetLength() > 16000 )
/*?*/ {
/*?*/ Point aPoint;
-/*?*/ Rectangle aOutRect( aPoint, rXOut.GetOutDev()->GetOutputSizePixel() );
+/*?*/ Rectangle aLclOutRect( aPoint, rXOut.GetOutDev()->GetOutputSizePixel() );
/*?*/ Line aIntersection;
/*?*/
-/*?*/ if( aLine.Intersection( aOutRect, aIntersection ) )
+/*?*/ if( aLine.Intersection( aLclOutRect, aIntersection ) )
/*?*/ {
/*?*/ rXOut.GetOutDev()->DrawLine( rXOut.GetOutDev()->PixelToLogic( aIntersection.GetStart() ),
/*?*/ rXOut.GetOutDev()->PixelToLogic( aIntersection.GetEnd() ) );
@@ -1883,8 +1883,8 @@ class ImpSkeleton;
///////////////////////////////////////////////////////////////////////////////
-/*N*/ SdrObject* SdrObject::CheckHit(const Point& rPnt, USHORT nTol, const SetOfByte* pVisiLayer) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001
+/*N*/ SdrObject* SdrObject::CheckHit(const Point& /*rPnt*/, USHORT /*nTol*/, const SetOfByte* /*pVisiLayer*/) const
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ }
/*N*/ SdrObject* SdrObject::Clone() const
@@ -2021,11 +2021,11 @@ class ImpSkeleton;
/*?*/
/*N*/ case META_POLYGON_ACTION:
/*N*/ {
-/*N*/ const Polygon& rPoly = ( (const MetaPolygonAction&) rAct ).GetPolygon();
+/*N*/ const Polygon& rLclPoly = ( (const MetaPolygonAction&) rAct ).GetPolygon();
/*N*/
-/*N*/ if( rPoly.GetSize() > 2 )
+/*N*/ if( rLclPoly.GetSize() > 2 )
/*N*/ {
-/*N*/ aXPoly = rPoly;
+/*N*/ aXPoly = rLclPoly;
/*N*/ bXPoly = TRUE;
/*N*/ }
/*N*/ }
@@ -2038,11 +2038,11 @@ class ImpSkeleton;
/*?*/
/*N*/ case META_POLYLINE_ACTION:
/*N*/ {
-/*N*/ const Polygon& rPoly = ( (const MetaPolyLineAction&) rAct ).GetPolygon();
+/*N*/ const Polygon& rLclPoly = ( (const MetaPolyLineAction&) rAct ).GetPolygon();
/*N*/
-/*N*/ if( rPoly.GetSize() > 1 )
+/*N*/ if( rLclPoly.GetSize() > 1 )
/*N*/ {
-/*N*/ aXPoly = rPoly;
+/*N*/ aXPoly = rLclPoly;
/*N*/ bXPoly = TRUE;
/*N*/ }
/*N*/ }
@@ -2319,7 +2319,7 @@ class ImpSkeleton;
/*N*/ return 0;
/*N*/ }
-/*N*/ long SdrObject::GetShearAngle(bool bVertical) const
+/*N*/ long SdrObject::GetShearAngle(bool /*bVertical*/) const
/*N*/ {
/*N*/ return 0;
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdtouch.cxx b/binfilter/bf_svx/source/svdraw/svx_svdtouch.cxx
index c8c5278..6cddd55 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdtouch.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdtouch.cxx
@@ -237,7 +237,7 @@ namespace binfilter {
/*N*/ if ((aP1.Y()>aP2.Y()) || ((aP1.Y()==aP2.Y()) && (aP1.X()>aP2.X()))) { Point aTmp(aP1); aP1=aP2; aP2=aTmp; }
/*N*/ bEdge=((aP1.X()==aP2.X()) && (rHit.X()==aP1.X()) && (rHit.Y()>=aP1.Y()) && (rHit.Y()<=aP2.Y())) ||
/*N*/ ((aP1.Y()==aP2.Y()) && (rHit.Y()==aP1.Y()) && (rHit.X()>=aP1.X()) && (rHit.X()<=aP2.X())) ||
-/*N*/ (rHit.X()==aP1.X()) && (rHit.Y()==aP1.Y());
+/*N*/ ((rHit.X()==aP1.X()) && (rHit.Y()==aP1.Y()));
/*N*/ if (!bEdge && aP1.Y()<=rHit.Y() && aP2.Y()>rHit.Y()) { // Nur wer die Scanline schneidet
/*N*/ bool bx1=aP1.X()<rHit.X();
/*N*/ bool bx2=aP2.X()<rHit.X();
commit 3f9e04d3106a639665b2eafdc4e669d882a7d4e3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 19 21:23:48 2011 +0000
WaE: throw out some warnings, and mark a dir a WaE free
diff --git a/binfilter/bf_svx/source/engine3d/makefile.mk b/binfilter/bf_svx/source/engine3d/makefile.mk
index 03b7fce..5c97951 100644
--- a/binfilter/bf_svx/source/engine3d/makefile.mk
+++ b/binfilter/bf_svx/source/engine3d/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
index 04198a9..cf8bf5e 100644
--- a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
@@ -2366,7 +2366,7 @@ namespace binfilter {
/*N*/
/*N*/ // 3D Volumes schneiden sich, teste in der Geometrie
/*N*/ // auf Basis der Projektion weiter
-/*N*/ if(((E3dCompoundObject*)this)->aDisplayGeometry.CheckHit(aFront, aBack, nTol) != -1L)
+/*N*/ if(((E3dCompoundObject*)this)->aDisplayGeometry.CheckHit(aFront, aBack, nTol) == sal_True)
/*?*/ return ((E3dCompoundObject*)this);
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_impgrfll.cxx b/binfilter/bf_svx/source/svdraw/svx_impgrfll.cxx
index be79bc9..a3134ad 100644
--- a/binfilter/bf_svx/source/svdraw/svx_impgrfll.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_impgrfll.cxx
@@ -56,21 +56,17 @@ namespace binfilter {
/*N*/ ImpGraphicFill::ImpGraphicFill( const SdrObject& rObj,
/*N*/ const ExtOutputDevice& rXOut,
/*N*/ const SfxItemSet& rFillItemSet,
-/*N*/ bool bIsShadow ) :
+/*N*/ bool /*bIsShadow*/ ) :
/*N*/ mrObj( rObj ),
/*N*/ mrXOut( rXOut ),
/*N*/ mbCommentWritten( false )
/*N*/ {
-/*N*/ const SfxItemSet& rSet = rObj.GetItemSet();
/*N*/ XFillStyle eFillStyle( ITEMVALUE( rFillItemSet, XATTR_FILLSTYLE, XFillStyleItem ) );
/*N*/ XGradient aGradient( ITEMVALUE( rFillItemSet, XATTR_FILLGRADIENT, XFillGradientItem ) );
/*N*/ XHatch aHatch( ITEMVALUE( rFillItemSet, XATTR_FILLHATCH, XFillHatchItem ) );
/*N*/
-/*N*/ sal_Int32 nDX( ((SdrShadowXDistItem&)(rSet.Get(SDRATTR_SHADOWXDIST))).GetValue() );
-/*N*/ sal_Int32 nDY( ((SdrShadowYDistItem&)(rSet.Get(SDRATTR_SHADOWYDIST))).GetValue() );
-/*N*/
/*N*/ if( eFillStyle != XFILL_NONE && mrXOut.GetOutDev()->GetConnectMetaFile() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001
+/*?*/ {DBG_BF_ASSERT(0, "STRIP");
/*?*/ }
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx b/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
index e71b483..2db4156 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
@@ -53,8 +53,8 @@ namespace binfilter {
/*N*/ virtual int Compare(const void* pElem1, const void* pElem2) const;
/*N*/ };
-/*N*/ int ImpSdrHdlListSorter::Compare(const void* pElem1, const void* pElem2) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001
+/*N*/ int ImpSdrHdlListSorter::Compare(const void*, const void*) const
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
index 8ea1cbe..3037f80 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
@@ -104,7 +104,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ {
/*N*/ }
-/*N*/ void SdrObjUserCall::Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect)
+/*N*/ void SdrObjUserCall::Changed(const SdrObject& /*rObj*/, SdrUserCallType /*eType*/, const Rectangle& /*rOldBoundRect*/)
/*N*/ {
/*N*/ }
@@ -2070,34 +2070,10 @@ class ImpSkeleton;
/*N*/ rPoly.Clear();
/*N*/ }
-/*?*/ void SdrObject::TakeContour(XPolyPolygon& rXPoly, SdrContourType eType) const
+/*?*/ void SdrObject::TakeContour(XPolyPolygon& /*rXPoly*/, SdrContourType /*eType*/) const
/*?*/ {
/*?*/ }
-// Handles
-
-
-
-
-
-
-// Drag
-
-
-
-
-
-
-
-
-
-// Create
-
-
-
-
-
-
/*N*/ Pointer SdrObject::GetCreatePointer() const
/*N*/ {
/*N*/ return Pointer(POINTER_CROSS);
@@ -2360,7 +2336,7 @@ class ImpSkeleton;
/*?*/ return 0;
/*?*/ }
-/*?*/ const Point& SdrObject::GetPoint(USHORT i) const
+/*?*/ const Point& SdrObject::GetPoint(USHORT /*i*/) const
/*?*/ {
/*?*/ return *((Point*)NULL);
/*?*/ }
@@ -2375,22 +2351,10 @@ class ImpSkeleton;
/*N*/ SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
/*N*/ }
-/*N*/ void SdrObject::NbcSetPoint(const Point& rPnt, USHORT i)
+/*N*/ void SdrObject::NbcSetPoint(const Point& /*rPnt*/, USHORT /*i*/)
/*N*/ {
/*N*/ }
-
-
-
-
-
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
/*N*/ bool SdrObject::HasTextEdit() const
/*N*/ {
/*N*/ return FALSE;
@@ -2401,12 +2365,12 @@ class ImpSkeleton;
/*N*/ return CheckHit(rPnt,nTol,pVisiLayer);
/*N*/ }
-/*N*/ bool SdrObject::BegTextEdit(SdrOutliner& rOutl)
+/*N*/ bool SdrObject::BegTextEdit(SdrOutliner& /*rOutl*/)
/*N*/ {
/*N*/ return FALSE;
/*N*/ }
-/*N*/ void SdrObject::EndTextEdit(SdrOutliner& rOutl)
+/*N*/ void SdrObject::EndTextEdit(SdrOutliner& /*rOutl*/)
/*N*/ {
/*N*/ }
@@ -2422,7 +2386,7 @@ class ImpSkeleton;
/*N*/ }
/*N*/ }
-/*N*/ void SdrObject::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject)
+/*N*/ void SdrObject::NbcSetOutlinerParaObject(OutlinerParaObject* /*pTextObject*/)
/*N*/ {
/*N*/ }
@@ -2448,7 +2412,7 @@ class ImpSkeleton;
/*N*/ }
-/*N*/ void SdrObject::RestartAnimation(SdrPageView* pPageView) const
+/*N*/ void SdrObject::RestartAnimation(SdrPageView* /*pPageView*/) const
/*N*/ {
/*N*/ }
@@ -2507,8 +2471,8 @@ class ImpSkeleton;
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ void SdrObject::RestGeoData(const SdrObjGeoData& rGeo)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void SdrObject::RestGeoData(const SdrObjGeoData& /*rGeo*/)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ SdrObjGeoData* SdrObject::GetGeoData() const
@@ -2607,7 +2571,7 @@ class ImpSkeleton;
/*N*/ ////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/ // ItemSet was changed, maybe user wants to react
/*N*/
-/*N*/ void SdrObject::ItemSetChanged(const SfxItemSet& rSet)
+/*N*/ void SdrObject::ItemSetChanged(const SfxItemSet& /*rSet*/)
/*N*/ {
/*N*/ }
/*N*/
@@ -2654,17 +2618,17 @@ class ImpSkeleton;
////////////////////////////////////////////////////////////////////////////////////////////////////
// private support routines for ItemSet access
-/*N*/ BOOL SdrObject::AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem) const
+/*N*/ BOOL SdrObject::AllowItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) const
/*N*/ {
/*N*/ return TRUE;
/*N*/ }
-/*N*/ void SdrObject::ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem)
+/*N*/ void SdrObject::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
/*N*/ {
/*N*/ DBG_ASSERT(FALSE,"SdrObject::ItemChange() should never be called, SdrObject has no Items");
/*N*/ }
-/*N*/ void SdrObject::PostItemChange(const sal_uInt16 nWhich)
+/*N*/ void SdrObject::PostItemChange(const sal_uInt16 /*nWhich*/)
/*N*/ {
/*N*/ }
@@ -2681,14 +2645,14 @@ class ImpSkeleton;
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ void SdrObject::ApplyNotPersistAttr(const SfxItemSet& rAttr)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void SdrObject::ApplyNotPersistAttr(const SfxItemSet& /*rAttr*/)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void SdrObject::TakeNotPersistAttr(SfxItemSet& /*rAttr*/, bool /*bMerge*/) const
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ SfxStyleSheet* SdrObject::GetStyleSheet() const
@@ -2697,11 +2661,11 @@ class ImpSkeleton;
/*N*/ return NULL;
/*N*/ }
-/*N*/ void SdrObject::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
+/*N*/ void SdrObject::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/)
/*N*/ {
/*N*/ }
-/*N*/ void SdrObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
+/*N*/ void SdrObject::NbcSetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/)
/*N*/ {
/*N*/ }
@@ -2746,7 +2710,7 @@ class ImpSkeleton;
/*N*/ return pPlusData->pGluePoints;
/*N*/ }
-/*N*/ void SdrObject::SetGlueReallyAbsolute(bool bOn)
+/*N*/ void SdrObject::SetGlueReallyAbsolute(bool /*bOn*/)
/*N*/ {
/*N*/ // erst Const-Aufruf um zu sehen, ob
/*N*/ // ueberhaupt Klebepunkte da sind
@@ -2755,45 +2719,41 @@ class ImpSkeleton;
/*N*/ }
/*N*/ }
-/*N*/ void SdrObject::NbcRotateGluePoints(const Point& rRef, long nWink, double sn, double cs)
+/*N*/ void SdrObject::NbcRotateGluePoints(const Point& /*rRef*/, long /*nWink*/, double /*sn*/, double /*cs*/)
/*N*/ {
/*N*/ // erst Const-Aufruf um zu sehen, ob
/*N*/ // ueberhaupt Klebepunkte da sind
/*N*/ // const-Aufruf erzwingen!
-/*N*/ if (GetGluePointList()!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ if (GetGluePointList()!=NULL) {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
-/*N*/ void SdrObject::NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2)
+/*N*/ void SdrObject::NbcMirrorGluePoints(const Point& /*rRef1*/, const Point& /*rRef2*/)
/*N*/ {
/*N*/ // erst Const-Aufruf um zu sehen, ob
/*N*/ // ueberhaupt Klebepunkte da sind
/*N*/ // const-Aufruf erzwingen!
-/*N*/ if (GetGluePointList()!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ if (GetGluePointList()!=NULL) {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
-/*N*/ void SdrObject::NbcShearGluePoints(const Point& rRef, long nWink, double tn, bool bVShear)
+/*N*/ void SdrObject::NbcShearGluePoints(const Point& /*rRef*/, long /*nWink*/, double /*tn*/, bool /*bVShear*/)
/*N*/ {
/*N*/ // erst Const-Aufruf um zu sehen, ob
/*N*/ // ueberhaupt Klebepunkte da sind
/*N*/ // const-Aufruf erzwingen!
-/*N*/ if (GetGluePointList()!=NULL) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ if (GetGluePointList()!=NULL) {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
-
-
-
-/*N*/ void SdrObject::ConnectToNode(bool bTail1, SdrObject* pObj)
+/*N*/ void SdrObject::ConnectToNode(bool /*bTail1*/, SdrObject* /*pObj*/)
/*N*/ {
/*N*/ }
-/*N*/ void SdrObject::DisconnectFromNode(bool bTail1)
+/*N*/ void SdrObject::DisconnectFromNode(bool /*bTail1*/)
/*N*/ {
/*N*/ }
-
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2814,7 +2774,7 @@ class ImpSkeleton;
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ SdrObject* SdrObject::DoConvertToPolyObj(BOOL bBezier) const
+/*N*/ SdrObject* SdrObject::DoConvertToPolyObj(BOOL /*bBezier*/) const
/*N*/ {
/*N*/ return NULL;
/*N*/ }
@@ -3069,8 +3029,8 @@ class ImpSkeleton;
/*N*/ }
/*N*/ }
-/*N*/ void SdrObject::SetPrintable(bool bPrn)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void SdrObject::SetPrintable(bool /*bPrn*/)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -3165,7 +3125,7 @@ class ImpSkeleton;
/*N*/ }
// ItemPool fuer dieses Objekt wechseln
-/*N*/ void SdrObject::MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel)
+/*N*/ void SdrObject::MigrateItemPool(SfxItemPool*, SfxItemPool*, SdrModel*)
/*N*/ {
/*N*/ // Hier passiert erst was in SdrAttrObj und in SdrObjGroup
/*N*/ }
@@ -3204,7 +3164,7 @@ class ImpSkeleton;
////////////////////////////////////////////////////////////////////////////////////////////////////
// gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon
// with the base geometry and returns TRUE. Otherwise it returns FALSE.
-/*N*/ BOOL SdrObject::TRGetBaseGeometry(Matrix3D& rMat, XPolyPolygon& rPolyPolygon) const
+/*N*/ BOOL SdrObject::TRGetBaseGeometry(Matrix3D& rMat, XPolyPolygon& /*rPolyPolygon*/) const
/*N*/ {
/*N*/ // any kind of SdrObject, just use SnapRect
/*N*/ Rectangle aRectangle(GetSnapRect());
@@ -3260,7 +3220,7 @@ class ImpSkeleton;
// sets the base geometry of the object using infos contained in the homogen 3x3 matrix.
// If it's an SdrPathObj it will use the provided geometry information. The Polygon has
// to use (0,0) as upper left and will be scaled to the given size in the matrix.
-/*N*/ void SdrObject::TRSetBaseGeometry(const Matrix3D& rMat, const XPolyPolygon& rPolyPolygon)
+/*N*/ void SdrObject::TRSetBaseGeometry(const Matrix3D& rMat, const XPolyPolygon& /*rPolyPolygon*/)
/*N*/ {
/*N*/ // break up matrix
/*N*/ Vector2D aScale, aTranslate;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
index 7c8de2e..77c3fb3 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
@@ -225,7 +225,7 @@ namespace binfilter {
/*N*/ }
/*N*/ if (eKind==OBJ_SECT) { // Der Sektor soll Start/Ende im Zentrum haben
/*N*/ // Polygon um einen Punkt rotieren (Punkte im Array verschieben)
-/*N*/ unsigned nPointAnz=aXPoly.GetPointCount();
+/*N*/ /*unsigned nPointAnz=*/aXPoly.GetPointCount();
/*N*/ aXPoly.Insert(0,rRect1.Center(),XPOLY_NORMAL);
/*N*/ aXPoly[aXPoly.GetPointCount()]=rRect1.Center();
/*N*/ }
@@ -416,7 +416,7 @@ namespace binfilter {
/*N*/ aPnt2 = ((SdrCircObj&)rObj).aPnt2;
/*N*/ }
-/*N*/ void SdrCircObj::TakeXorPoly(XPolyPolygon& rPoly, bool bDetail) const
+/*N*/ void SdrCircObj::TakeXorPoly(XPolyPolygon& rPoly, bool /*bDetail*/) const
/*N*/ {
/*N*/ XPolygon aP(ImpCalcXPoly(aRect,nStartWink,nEndWink));
/*N*/ if (!bXPolyIsLine) { // Polygon schliessen
@@ -773,7 +773,6 @@ namespace binfilter {
/*N*/ SdrObject* SdrCircObj::DoConvertToPolyObj(BOOL bBezier) const
/*N*/ {
/*N*/ XPolygon aXP(ImpCalcXPoly(aRect,nStartWink,nEndWink));
-/*N*/ SdrObjKind ePathKind=OBJ_PATHFILL;
/*N*/ bool bFill=TRUE;
/*N*/ if (eKind==OBJ_CARC) bFill=FALSE;
/*N*/ SdrObject* pRet=ImpConvertMakeObj(XPolyPolygon(aXP),bFill,bBezier);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
index 915fd93..32f2f3d 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
@@ -1054,7 +1054,7 @@ namespace binfilter {
/*N*/ if (bCase29) {
/*N*/ // und nun noch dafuer sorgen, dass das
/*N*/ // umzingelte Obj nicht durchquert wird
-/*N*/ if (aBewR1.Center().Y()<aBewR2.Center().Y() != bObenLang) {
+/*N*/ if ((aBewR1.Center().Y()<aBewR2.Center().Y()) != bObenLang) {
/*N*/ aMeeting.X()=aBewR2.Right();
/*N*/ } else {
/*N*/ aMeeting.X()=aBewR1.Left();
@@ -1112,7 +1112,7 @@ namespace binfilter {
/*N*/ if (bCase29) {
/*N*/ // und nun noch dafuer sorgen, dass das
/*N*/ // umzingelte Obj nicht durchquert wird
-/*N*/ if (aBewR1.Center().X()<aBewR2.Center().X() != bLinksLang) {
+/*N*/ if ((aBewR1.Center().X()<aBewR2.Center().X()) != bLinksLang) {
/*N*/ aMeeting.Y()=aBewR2.Bottom();
/*N*/ } else {
/*N*/ aMeeting.Y()=aBewR1.Top();
@@ -1227,7 +1227,7 @@ namespace binfilter {
/*N*/ bool bInsMeetingPoint=aEP1.X()!=aEP2.X() && aEP1.Y()!=aEP2.Y();
/*N*/ bool bHorzE1=aEP1.Y()==aXP1[nXP1Anz-2].Y(); // letzte Linie von XP1 horizontal?
/*N*/ bool bHorzE2=aEP2.Y()==aXP2[nXP2Anz-2].Y(); // letzte Linie von XP2 horizontal?
-/*N*/ if (aEP1==aEP2 && (bHorzE1 && bHorzE2 && aEP1.Y()==aEP2.Y()) || (!bHorzE1 && !bHorzE2 && aEP1.X()==aEP2.X())) {
+/*N*/ if (aEP1==aEP2 && ((bHorzE1 && bHorzE2 && aEP1.Y()==aEP2.Y()) || (!bHorzE1 && !bHorzE2 && aEP1.X()==aEP2.X()))) {
/*N*/ // Sonderbehandlung fuer 'I'-Verbinder
/*N*/ nXP1Anz--; aXP1.Remove(nXP1Anz,1);
/*N*/ nXP2Anz--; aXP2.Remove(nXP2Anz,1);
@@ -1281,10 +1281,10 @@ namespace binfilter {
/*N*/ Point aP3(aXP1[3]);
/*N*/ Point aP4(aXP1[4]);
/*N*/ if (aP1.Y()==aP2.Y()) { // beide Linien Horz
-/*N*/ if (aP1.X()<aP2.X()==aP3.X()<aP4.X()) cForm='S';
+/*N*/ if ((aP1.X()<aP2.X())==(aP3.X()<aP4.X())) cForm='S';
/*N*/ else cForm='C';
/*N*/ } else { // sonst beide Linien Vert
-/*N*/ if (aP1.Y()<aP2.Y()==aP3.Y()<aP4.Y()) cForm='S';
+/*N*/ if ((aP1.Y()<aP2.Y())==(aP3.Y()<aP4.Y())) cForm='S';
/*N*/ else cForm='C';
/*N*/ }
/*N*/ } else cForm='4'; // sonst der 3. Fall mit 5 Linien
@@ -1313,11 +1313,11 @@ namespace binfilter {
/*N*/ bool bOverflow=FALSE;
/*N*/ Point aPt0(aXP1[0]);
/*N*/ for (USHORT nPntNum=1; nPntNum<nPntAnz; nPntNum++) {
-/*N*/ Point aPt1(aXP1[nPntNum]);
-/*N*/ nQual+=Abs(aPt1.X()-aPt0.X())+Abs(aPt1.Y()-aPt0.Y());
+/*N*/ Point aLclPt1(aXP1[nPntNum]);
+/*N*/ nQual+=Abs(aLclPt1.X()-aPt0.X())+Abs(aLclPt1.Y()-aPt0.Y());
/*N*/ if (nQual<nQual0) bOverflow=TRUE;
/*N*/ nQual0=nQual;
-/*N*/ aPt0=aPt1;
+/*N*/ aPt0=aLclPt1;
/*N*/ }
/*N*/
/*N*/ USHORT nTmp=nPntAnz;
@@ -1359,11 +1359,11 @@ namespace binfilter {
/*N*/ aBewareRect2=rBewareRect2;
/*N*/
/*N*/ for (USHORT i=0; i<nPntAnz; i++) {
-/*N*/ Point aPt1(aXP1[i]);
-/*N*/ bool b1=aPt1.X()>aBewareRect1.Left() && aPt1.X()<aBewareRect1.Right() &&
-/*N*/ aPt1.Y()>aBewareRect1.Top() && aPt1.Y()<aBewareRect1.Bottom();
-/*N*/ bool b2=aPt1.X()>aBewareRect2.Left() && aPt1.X()<aBewareRect2.Right() &&
-/*N*/ aPt1.Y()>aBewareRect2.Top() && aPt1.Y()<aBewareRect2.Bottom();
+/*N*/ Point aLclPt1(aXP1[i]);
+/*N*/ bool b1=aLclPt1.X()>aBewareRect1.Left() && aLclPt1.X()<aBewareRect1.Right() &&
+/*N*/ aLclPt1.Y()>aBewareRect1.Top() && aLclPt1.Y()<aBewareRect1.Bottom();
+/*N*/ bool b2=aLclPt1.X()>aBewareRect2.Left() && aLclPt1.X()<aBewareRect2.Right() &&
+/*N*/ aLclPt1.Y()>aBewareRect2.Top() && aLclPt1.Y()<aBewareRect2.Bottom();
/*N*/ USHORT nInt0=nIntersections;
/*N*/ if (i==0 || i==nPntAnz-1) {
/*N*/ if (b1 && b2) nIntersections++;
@@ -1373,23 +1373,23 @@ namespace binfilter {
/*N*/ }
/*N*/ // und nun noch auf Ueberschneidungen checken
/*N*/ if (i>0 && nInt0==nIntersections) {
-/*N*/ if (aPt0.Y()==aPt1.Y()) { // Horizontale Linie
+/*N*/ if (aPt0.Y()==aLclPt1.Y()) { // Horizontale Linie
/*N*/ if (aPt0.Y()>aBewareRect1.Top() && aPt0.Y()<aBewareRect1.Bottom() &&
-/*N*/ ((aPt0.X()<=aBewareRect1.Left() && aPt1.X()>=aBewareRect1.Right()) ||
-/*N*/ (aPt1.X()<=aBewareRect1.Left() && aPt0.X()>=aBewareRect1.Right()))) nIntersections++;
+/*N*/ ((aPt0.X()<=aBewareRect1.Left() && aLclPt1.X()>=aBewareRect1.Right()) ||
+/*N*/ (aLclPt1.X()<=aBewareRect1.Left() && aPt0.X()>=aBewareRect1.Right()))) nIntersections++;
/*N*/ if (aPt0.Y()>aBewareRect2.Top() && aPt0.Y()<aBewareRect2.Bottom() &&
-/*N*/ ((aPt0.X()<=aBewareRect2.Left() && aPt1.X()>=aBewareRect2.Right()) ||
-/*N*/ (aPt1.X()<=aBewareRect2.Left() && aPt0.X()>=aBewareRect2.Right()))) nIntersections++;
+/*N*/ ((aPt0.X()<=aBewareRect2.Left() && aLclPt1.X()>=aBewareRect2.Right()) ||
+/*N*/ (aLclPt1.X()<=aBewareRect2.Left() && aPt0.X()>=aBewareRect2.Right()))) nIntersections++;
/*N*/ } else { // Vertikale Linie
/*N*/ if (aPt0.X()>aBewareRect1.Left() && aPt0.X()<aBewareRect1.Right() &&
-/*N*/ ((aPt0.Y()<=aBewareRect1.Top() && aPt1.Y()>=aBewareRect1.Bottom()) ||
-/*N*/ (aPt1.Y()<=aBewareRect1.Top() && aPt0.Y()>=aBewareRect1.Bottom()))) nIntersections++;
+/*N*/ ((aPt0.Y()<=aBewareRect1.Top() && aLclPt1.Y()>=aBewareRect1.Bottom()) ||
+/*N*/ (aLclPt1.Y()<=aBewareRect1.Top() && aPt0.Y()>=aBewareRect1.Bottom()))) nIntersections++;
/*N*/ if (aPt0.X()>aBewareRect2.Left() && aPt0.X()<aBewareRect2.Right() &&
-/*N*/ ((aPt0.Y()<=aBewareRect2.Top() && aPt1.Y()>=aBewareRect2.Bottom()) ||
-/*N*/ (aPt1.Y()<=aBewareRect2.Top() && aPt0.Y()>=aBewareRect2.Bottom()))) nIntersections++;
+/*N*/ ((aPt0.Y()<=aBewareRect2.Top() && aLclPt1.Y()>=aBewareRect2.Bottom()) ||
+/*N*/ (aLclPt1.Y()<=aBewareRect2.Top() && aPt0.Y()>=aBewareRect2.Bottom()))) nIntersections++;
/*N*/ }
/*N*/ }
-/*N*/ aPt0=aPt1;
+/*N*/ aPt0=aLclPt1;
/*N*/ }
/*N*/ if (nPntAnz<=1) nIntersections++;
/*N*/ nQual0=nQual;
@@ -1489,27 +1489,27 @@ namespace binfilter {
/*?*/ // Vor und hinter dem Mittelpunkt jeweils
/*?*/ // noch einen Kontrollpunkt einfuegen
/*?*/ Point aCenter(aXP1[2]);
-/*?*/ long dx1=aCenter.X()-aXP1[1].X();
-/*?*/ long dy1=aCenter.Y()-aXP1[1].Y();
-/*?*/ long dx2=aCenter.X()-aXP1[3].X();
-/*?*/ long dy2=aCenter.Y()-aXP1[3].Y();
+/*?*/ long lcldx1=aCenter.X()-aXP1[1].X();
+/*?*/ long lcldy1=aCenter.Y()-aXP1[1].Y();
+/*?*/ long lcldx2=aCenter.X()-aXP1[3].X();
+/*?*/ long lcldy2=aCenter.Y()-aXP1[3].Y();
/*?*/ aXP1.Insert(2,aCenter,XPOLY_CONTROL);
/*?*/ aXP1.SetFlags(3,XPOLY_SYMMTR);
/*?*/ aXP1.Insert(4,aCenter,XPOLY_CONTROL);
-/*?*/ aXP1[2].X()-=dx1/2;
-/*?*/ aXP1[2].Y()-=dy1/2;
-/*?*/ aXP1[3].X()-=(dx1+dx2)/4;
-/*?*/ aXP1[3].Y()-=(dy1+dy2)/4;
-/*?*/ aXP1[4].X()-=dx2/2;
-/*?*/ aXP1[4].Y()-=dy2/2;
+/*?*/ aXP1[2].X()-=lcldx1/2;
+/*?*/ aXP1[2].Y()-=lcldy1/2;
+/*?*/ aXP1[3].X()-=(lcldx1+lcldx2)/4;
+/*?*/ aXP1[3].Y()-=(lcldy1+lcldy2)/4;
+/*?*/ aXP1[4].X()-=lcldx2/2;
+/*?*/ aXP1[4].Y()-=lcldy2/2;
/*?*/ }
/*?*/ if (nPntAnz==6) {
-/*?*/ Point aPt1(aXP1[2]);
-/*?*/ Point aPt2(aXP1[3]);
-/*?*/ aXP1.Insert(2,aPt1,XPOLY_CONTROL);
-/*?*/ aXP1.Insert(5,aPt2,XPOLY_CONTROL);
-/*?*/ long dx=aPt1.X()-aPt2.X();
-/*?*/ long dy=aPt1.Y()-aPt2.Y();
+/*?*/ Point aLclPt1(aXP1[2]);
+/*?*/ Point aLclPt2(aXP1[3]);
+/*?*/ aXP1.Insert(2,aLclPt1,XPOLY_CONTROL);
+/*?*/ aXP1.Insert(5,aLclPt2,XPOLY_CONTROL);
+/*?*/ long dx=aLclPt1.X()-aLclPt2.X();
+/*?*/ long dy=aLclPt1.Y()-aLclPt2.Y();
/*?*/ aXP1[3].X()-=dx/2;
/*?*/ aXP1[3].Y()-=dy/2;
/*?*/ aXP1.SetFlags(3,XPOLY_SYMMTR);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
index 8cd9591..eb16dfa 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
@@ -187,8 +187,8 @@ namespace binfilter {
// -----------------------------------------------------------------------------
/*N*/ SdrGrafObj::SdrGrafObj():
-/*N*/ bMirrored ( FALSE ),
-/*N*/ pGraphicLink ( NULL )
+/*N*/ pGraphicLink ( NULL ),
+/*N*/ bMirrored ( FALSE )
/*N*/ {
/*N*/ pGraphic = new BfGraphicObject;
/*N*/ pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), 20000 );
@@ -200,8 +200,8 @@ namespace binfilter {
// -----------------------------------------------------------------------------
/*?*/ SdrGrafObj::SdrGrafObj( const Graphic& rGrf ):
-/*?*/ bMirrored ( FALSE ),
-/*?*/ pGraphicLink ( NULL )
+/*?*/ pGraphicLink ( NULL ),
+/*?*/ bMirrored ( FALSE )
/*?*/ {
/*?*/ pGraphic = new BfGraphicObject( rGrf );
/*?*/ pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), 20000 );
@@ -686,7 +686,7 @@ namespace binfilter {
/*N*/ bool bSwappedOut = pGraphic->IsSwappedOut() || ( pGraphic->GetType() == GRAPHIC_NONE );
/*N*/ bool bLoading = FALSE;
/*N*/ OutputDevice* pOutDev = rOut.GetOutDev();
-/*N*/ GDIMetaFile* pRecMetaFile = pOutDev->GetConnectMetaFile();
+/*N*/ /*GDIMetaFile* pRecMetaFile =*/ pOutDev->GetConnectMetaFile();
/*N*/ const SdrView* pView = ( rInfoRec.pPV ? &rInfoRec.pPV->GetView() : NULL );
/*N*/
/*N*/ if( bSwappedOut && !bDraft )
@@ -1143,7 +1143,7 @@ namespace binfilter {
/*?*/ if( pIStm )
/*?*/ {
/*?*/ GraphicFilter* pFilter = GetGrfFilter();
-/*?*/ USHORT nError = pFilter->ImportGraphic( aGraphic, aFileURLStr, *pIStm );
+/*?*/ /*USHORT nError =*/ pFilter->ImportGraphic( aGraphic, aFileURLStr, *pIStm );
/*?*/
/*?*/ SetGraphicLink( aFileURLStr, aFilterName );
/*?*/
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
index c177863..cc345a6 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
@@ -526,24 +526,16 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-
-
-
-
-
-
/*N*/ long SdrObjGroup::GetRotateAngle() const
/*N*/ {
/*N*/ return nDrehWink;
/*N*/ }
-
-/*N*/ long SdrObjGroup::GetShearAngle(bool bVertical) const
+/*N*/ long SdrObjGroup::GetShearAngle(bool /*bVertical*/) const
/*N*/ {
/*N*/ return nShearWink;
/*N*/ }
-
/*N*/ void SdrObjGroup::NbcSetSnapRect(const Rectangle& rRect)
/*N*/ {
/*N*/ Rectangle aOld(GetSnapRect());
@@ -933,12 +925,12 @@ namespace binfilter {
/*N*/ }
-/*N*/ void SdrObjGroup::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
+/*N*/ void SdrObjGroup::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/)
/*N*/ {
/*N*/ if (!IsLinkedGroup()) {
/*N*/ SdrObjList* pOL=pSub;
/*N*/ ULONG nObjAnz=pOL->GetObjCount();
-/*N*/ for (ULONG i=0; i<nObjAnz; i++) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ for (ULONG i=0; i<nObjAnz; i++) {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
index 87d665c..df6d606 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
@@ -170,18 +170,18 @@ namespace binfilter {
/*?*/
/*?*/ if(rStr.Search(cDec) != STRING_NOTFOUND)
/*?*/ {
-/*?*/ xub_StrLen nLen(rStr.Len() - 1);
+/*?*/ xub_StrLen nLen2(rStr.Len() - 1);
/*?*/
-/*?*/ while(rStr.GetChar(nLen) == sal_Unicode('0'))
+/*?*/ while(rStr.GetChar(nLen2) == sal_Unicode('0'))
/*?*/ {
-/*?*/ rStr.Erase(nLen);
-/*?*/ nLen--;
+/*?*/ rStr.Erase(nLen2);
+/*?*/ nLen2--;
/*?*/ }
/*?*/
-/*?*/ if(rStr.GetChar(nLen) == cDec)
+/*?*/ if(rStr.GetChar(nLen2) == cDec)
/*?*/ {
-/*?*/ rStr.Erase(nLen);
-/*?*/ nLen--;
+/*?*/ rStr.Erase(nLen2);
+/*?*/ nLen2--;
/*?*/ }
/*?*/
/*?*/ if(!rStr.Len())
@@ -623,13 +623,13 @@ namespace binfilter {
/*N*/ ImpCalcGeometrics(aRec,aMPol);
/*N*/
/*N*/ // TextSize ermitteln inkl. Textrahmenabstaende
-/*N*/ Size aTextSize(aMPol.aTextSize);
-/*N*/ if (aTextSize.Width()<1) aTextSize.Width()=1;
-/*N*/ if (aTextSize.Height()<1) aTextSize.Height()=1;
-/*N*/ aTextSize.Width()+=GetTextLeftDistance()+GetTextRightDistance();
-/*N*/ aTextSize.Height()+=GetTextUpperDistance()+GetTextLowerDistance();
+/*N*/ Size aLclTextSize(aMPol.aTextSize);
+/*N*/ if (aLclTextSize.Width()<1) aLclTextSize.Width()=1;
+/*N*/ if (aLclTextSize.Height()<1) aLclTextSize.Height()=1;
+/*N*/ aLclTextSize.Width()+=GetTextLeftDistance()+GetTextRightDistance();
+/*N*/ aLclTextSize.Height()+=GetTextUpperDistance()+GetTextLowerDistance();
/*N*/
-/*N*/ Point aPt1(aMPol.aMainline1.aP1);
+/*N*/ Point aLclPt1(aMPol.aMainline1.aP1);
/*N*/ long nLen=aMPol.nLineLen;
/*N*/ long nLWdt=aMPol.nLineWdt2;
/*N*/ long nArr1Len=aMPol.nArrow1Len;
@@ -649,56 +649,56 @@ namespace binfilter {
/*N*/ SdrMeasureTextVPos eMV=aMPol.eUsedTextVPos;
/*N*/ if (!bRota90) {
/*N*/ switch (eMH) {
-/*N*/ case SDRMEASURE_TEXTLEFTOUTSIDE: aTextPos.X()=aPt1.X()-aTextSize.Width()-nArr1Len-nLWdt; break;
-/*N*/ case SDRMEASURE_TEXTRIGHTOUTSIDE: aTextPos.X()=aPt1.X()+nLen+nArr2Len+nLWdt; break;
-/*N*/ default: aTextPos.X()=aPt1.X(); aTextSize.Width()=nLen;
+/*N*/ case SDRMEASURE_TEXTLEFTOUTSIDE: aTextPos.X()=aLclPt1.X()-aLclTextSize.Width()-nArr1Len-nLWdt; break;
+/*N*/ case SDRMEASURE_TEXTRIGHTOUTSIDE: aTextPos.X()=aLclPt1.X()+nLen+nArr2Len+nLWdt; break;
+/*N*/ default: aTextPos.X()=aLclPt1.X(); aLclTextSize.Width()=nLen;
/*N*/ }
/*N*/ switch (eMV) {
/*N*/ case SDRMEASURETEXT_VERTICALCENTERED:
-/*N*/ case SDRMEASURETEXT_BREAKEDLINE: aTextPos.Y()=aPt1.Y()-aTextSize.Height()/2; break;
+/*N*/ case SDRMEASURETEXT_BREAKEDLINE: aTextPos.Y()=aLclPt1.Y()-aLclTextSize.Height()/2; break;
/*N*/ case SDRMEASURE_BELOW: {
-/*N*/ if (!bUpsideDown) aTextPos.Y()=aPt1.Y()+nLWdt;
-/*N*/ else aTextPos.Y()=aPt1.Y()-aTextSize.Height()-nLWdt;
+/*N*/ if (!bUpsideDown) aTextPos.Y()=aLclPt1.Y()+nLWdt;
+/*N*/ else aTextPos.Y()=aLclPt1.Y()-aLclTextSize.Height()-nLWdt;
/*N*/ } break;
/*N*/ default: {
-/*N*/ if (!bUpsideDown) aTextPos.Y()=aPt1.Y()-aTextSize.Height()-nLWdt;
-/*N*/ else aTextPos.Y()=aPt1.Y()+nLWdt;
+/*N*/ if (!bUpsideDown) aTextPos.Y()=aLclPt1.Y()-aLclTextSize.Height()-nLWdt;
+/*N*/ else aTextPos.Y()=aLclPt1.Y()+nLWdt;
/*N*/ }
/*N*/ }
/*N*/ if (bUpsideDown) {
-/*N*/ aTextPos.X()+=aTextSize.Width();
-/*N*/ aTextPos.Y()+=aTextSize.Height();
+/*N*/ aTextPos.X()+=aLclTextSize.Width();
+/*N*/ aTextPos.Y()+=aLclTextSize.Height();
/*N*/ }
/*N*/ } else { // also wenn bTextRota90==TRUE
/*N*/ switch (eMH) {
-/*N*/ case SDRMEASURE_TEXTLEFTOUTSIDE: aTextPos.X()=aPt1.X()-aTextSize.Height()-nArr1Len; break;
-/*N*/ case SDRMEASURE_TEXTRIGHTOUTSIDE: aTextPos.X()=aPt1.X()+nLen+nArr2Len; break;
-/*N*/ default: aTextPos.X()=aPt1.X(); aTextSize.Height()=nLen;
+/*N*/ case SDRMEASURE_TEXTLEFTOUTSIDE: aTextPos.X()=aLclPt1.X()-aLclTextSize.Height()-nArr1Len; break;
+/*N*/ case SDRMEASURE_TEXTRIGHTOUTSIDE: aTextPos.X()=aLclPt1.X()+nLen+nArr2Len; break;
+/*N*/ default: aTextPos.X()=aLclPt1.X(); aLclTextSize.Height()=nLen;
/*N*/ }
/*N*/ switch (eMV) {
/*N*/ case SDRMEASURETEXT_VERTICALCENTERED:
-/*N*/ case SDRMEASURETEXT_BREAKEDLINE: aTextPos.Y()=aPt1.Y()+aTextSize.Width()/2; break;
+/*N*/ case SDRMEASURETEXT_BREAKEDLINE: aTextPos.Y()=aLclPt1.Y()+aLclTextSize.Width()/2; break;
/*N*/ case SDRMEASURE_BELOW: {
-/*N*/ if (!bBelowRefEdge) aTextPos.Y()=aPt1.Y()+aTextSize.Width()+nLWdt;
-/*N*/ else aTextPos.Y()=aPt1.Y()-nLWdt;
+/*N*/ if (!bBelowRefEdge) aTextPos.Y()=aLclPt1.Y()+aLclTextSize.Width()+nLWdt;
+/*N*/ else aTextPos.Y()=aLclPt1.Y()-nLWdt;
/*N*/ } break;
/*N*/ default: {
-/*N*/ if (!bBelowRefEdge) aTextPos.Y()=aPt1.Y()-nLWdt;
-/*N*/ else aTextPos.Y()=aPt1.Y()+aTextSize.Width()+nLWdt;
+/*N*/ if (!bBelowRefEdge) aTextPos.Y()=aLclPt1.Y()-nLWdt;
+/*N*/ else aTextPos.Y()=aLclPt1.Y()+aLclTextSize.Width()+nLWdt;
/*N*/ }
/*N*/ }
/*N*/ if (bUpsideDown) {
-/*N*/ aTextPos.X()+=aTextSize.Height();
-/*N*/ aTextPos.Y()-=aTextSize.Width();
+/*N*/ aTextPos.X()+=aLclTextSize.Height();
+/*N*/ aTextPos.Y()-=aLclTextSize.Width();
/*N*/ }
/*N*/ }
/*N*/ if (aMPol.nTextWink!=aGeo.nDrehWink) {
/*N*/ ((SdrMeasureObj*)this)->aGeo.nDrehWink=aMPol.nTextWink;
/*N*/ ((SdrMeasureObj*)this)->aGeo.RecalcSinCos();
/*N*/ }
-/*N*/ RotatePoint(aTextPos,aPt1,aMPol.nLineSin,aMPol.nLineCos);
-/*N*/ aTextSize.Width()++; aTextSize.Height()++; // wg. des komischen Verhaltens beim Rect-Ctor
-/*N*/ rRect=Rectangle(aTextPos,aTextSize);
+/*N*/ RotatePoint(aTextPos,aLclPt1,aMPol.nLineSin,aMPol.nLineCos);
+/*N*/ aLclTextSize.Width()++; aLclTextSize.Height()++; // wg. des komischen Verhaltens beim Rect-Ctor
+/*N*/ rRect=Rectangle(aTextPos,aLclTextSize);
/*N*/ rRect.Justify();
/*N*/ ((SdrMeasureObj*)this)->aRect=rRect;
/*N*/
@@ -708,30 +708,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
/*N*/ void SdrMeasureObj::NbcMove(const Size& rSiz)
/*N*/ {
/*N*/ SdrTextObj::NbcMove(rSiz);
@@ -820,13 +796,8 @@ namespace binfilter {
/*N*/ SetTextDirty();
/*N*/ }
-
-
-
-
-
-/*N*/ bool SdrMeasureObj::BegTextEdit(SdrOutliner& rOutl)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP");return FALSE; //STRIP001
+/*N*/ bool SdrMeasureObj::BegTextEdit(SdrOutliner& /*rOutl*/)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");return FALSE;
/*N*/ }
/*N*/ void SdrMeasureObj::EndTextEdit(SdrOutliner& rOutl)
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx
index be5a77f..cd7e00a 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx
@@ -112,9 +112,9 @@ SO2_DECL_REF(SvInPlaceObject)
// -----------------------------------------------------------------------------
-/*N*/ SdrOle2Obj::SdrOle2Obj(const SvInPlaceObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, bool bFrame_):
+/*N*/ SdrOle2Obj::SdrOle2Obj(const SvInPlaceObjectRef& /*rNewObjRef*/, const XubString& /*rNewObjName*/, const Rectangle& rNewRect, bool /*bFrame_*/) :
/*N*/ SdrRectObj(rNewRect)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
// -----------------------------------------------------------------------------
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdopage.cxx b/binfilter/bf_svx/source/svdraw/svx_svdopage.cxx
index 10c6771..0d02949 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdopage.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdopage.cxx
@@ -69,14 +69,14 @@ namespace binfilter {
/*N*/ return new SfxItemSet(rPool);
/*N*/ }
-/*N*/ void SdrPageObj::ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem)
+/*N*/ void SdrPageObj::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
/*N*/ {
/*N*/ // #86481# simply ignore item setting on page objects
/*N*/ }
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ void SdrPageObj::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId&, const SfxHint& rHint, const TypeId&)
+/*N*/ void SdrPageObj::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId&, const SfxHint& rHint, const TypeId&)
/*N*/ {
/*N*/ SdrHint* pSdrHint = PTR_CAST(SdrHint, &rHint);
/*N*/
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx b/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
index 620c50d..4742392 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
@@ -388,7 +388,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
-/*N*/ void SdrPathObj::TakeXorPoly(XPolyPolygon& rXPolyPoly, bool bDetail) const
+/*N*/ void SdrPathObj::TakeXorPoly(XPolyPolygon& rXPolyPoly, bool /*bDetail*/) const
/*N*/ {
/*N*/ rXPolyPoly=aPathPolygon;
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx b/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx
index 29cc6e4..a01d13e 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdorect.cxx
@@ -394,7 +394,7 @@ namespace binfilter {
/*N*/ SdrTextObj::operator=(rObj);
/*N*/ }
-/*N*/ void SdrRectObj::TakeXorPoly(XPolyPolygon& rPoly, bool bDetail) const
+/*N*/ void SdrRectObj::TakeXorPoly(XPolyPolygon& rPoly, bool /*bDetail*/) const
/*N*/ {
/*N*/ rPoly=XPolyPolygon(ImpCalcXPoly(aRect,GetEckenradius()));
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx b/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx
index b799eb2..e56eb4b 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdotext.cxx
@@ -86,10 +86,10 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ TYPEINIT1(SdrTextObj,SdrAttrObj);
/*N*/ SdrTextObj::SdrTextObj():
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list