binfilter/bf_svtools/source/items1/svt_poolio.cxx | 7 +++++++ binfilter/bf_svx/source/form/svx_fmobj.cxx | 2 +- binfilter/bf_svx/source/svdraw/svx_svdobj.cxx | 2 +- binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx | 6 ++---- binfilter/bf_svx/source/svdraw/svx_svdouno.cxx | 2 +- binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx | 2 +- binfilter/bf_svx/source/xoutdev/svx__ximp.cxx | 6 +++--- binfilter/bf_svx/source/xoutdev/svx_xattr.cxx | 1 + binfilter/inc/bf_svx/svdouno.hxx | 2 +- binfilter/inc/bf_svx/svdpntv.hxx | 2 +- binfilter/inc/bf_svx/xoutx.hxx | 2 +- 11 files changed, 20 insertions(+), 14 deletions(-)
New commits: commit 61a94140d55feca593ba6a85984d40678f9de2ac Author: Stephan Bergmann <sberg...@redhat.com> Date: Sat Oct 15 11:23:34 2011 +0200 Some more warning cleanup. diff --git a/binfilter/bf_svtools/source/items1/svt_poolio.cxx b/binfilter/bf_svtools/source/items1/svt_poolio.cxx index 0d453dc..98c5cce 100644 --- a/binfilter/bf_svtools/source/items1/svt_poolio.cxx +++ b/binfilter/bf_svtools/source/items1/svt_poolio.cxx @@ -114,6 +114,7 @@ void SfxItemPool::readTheItems ( SvStream & rStream, USHORT nItemCount, USHORT nVersion, SfxPoolItem * pDefItem, SfxPoolItemArray_Impl ** ppArr) { +/*SB*/fprintf(stderr,"SfxItemPool::readTheItems %d %d\n",(int)nItemCount,(int)nVersion); SfxMultiRecordReader aItemsRec( &rStream, SFX_ITEMPOOL_REC_ITEMS ); SfxPoolItemArray_Impl *pNewArr = new SfxPoolItemArray_Impl( nItemCount ); @@ -136,6 +137,7 @@ void SfxItemPool::readTheItems ( USHORT nRef(0); rStream >> nRef; +/*SB*/fprintf(stderr,"... X\n"); pItem = pDefItem->Create(rStream, nVersion); pNewArr->C40_INSERT(SfxPoolItem, pItem, nSurrogate); @@ -369,8 +371,10 @@ SvStream &SfxItemPool::Load(SvStream &rStream) nWhich = GetNewWhich( nWhich ); // unbekanntes Item aus neuerer Version +/*SB*/fprintf(stderr,"nWhich = %d\n",(int)nWhich); if ( !IsInRange(nWhich) ) continue; +/*SB*/fprintf(stderr," ,,,\n"); rStream >> nVersion; rStream >> nCount; @@ -1159,6 +1163,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, bool bDirect, { USHORT nWhich=0, nSlot=0; // nSurrogate; rStream >> nWhich >> nSlot; +/*SB*/fprintf(stderr,"A nWhich = %d\n",(int)nWhich); BOOL bDontPut = (SfxItemPool*)-1 == pRefPool; if ( bDontPut || !pRefPool ) @@ -1188,6 +1193,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, bool bDirect, if ( !bCurVersion ) // Which-Id auf neue Version mappen nWhich = pRefPool->GetNewWhich( nWhich ); +/*SB*/fprintf(stderr,"B nWhich = %d\n",(int)nWhich); DBG_ASSERT( !nWhich || !pImp->bInSetItem || !pRefPool->ppStaticDefaults[pRefPool->GetIndex_Impl(nWhich)]->ISA(SfxSetItem), @@ -1221,6 +1227,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, bool bDirect, // Item direkt laden SfxPoolItem *pNewItem = pRefPool->GetDefaultItem(nWhich).Create(rStream, nVersion); +/*SB*/fprintf(stderr,"C nWhich = %d, pNewItem = %p\n",(int)nWhich,pNewItem); if ( bDontPut ) pItem = pNewItem; else diff --git a/binfilter/bf_svx/source/form/svx_fmobj.cxx b/binfilter/bf_svx/source/form/svx_fmobj.cxx index 76f2b23..4033a9a 100644 --- a/binfilter/bf_svx/source/form/svx_fmobj.cxx +++ b/binfilter/bf_svx/source/form/svx_fmobj.cxx @@ -56,7 +56,7 @@ using namespace ::binfilter::svxform; //------------------------------------------------------------------ /*N*/ FmFormObj::FmFormObj(sal_Int32 _nType) -/*N*/ :SdrUnoObj(String(), sal_False) +/*N*/ :SdrUnoObj(sal_False) /*N*/ ,pTempView(0) /*N*/ ,nEvent(0) /*N*/ ,nPos(-1) diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx index ce31226..48bf941 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx @@ -2966,7 +2966,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP /*?*/ case USHORT(OBJ_FRAME ): pObj=new SdrOle2Obj(TRUE); break; /*N*/ case USHORT(OBJ_CAPTION ): pObj=new SdrCaptionObj; break; /*N*/ case USHORT(OBJ_PAGE ): pObj=new SdrPageObj; break; -/*?*/ case USHORT(OBJ_UNO ): pObj=new SdrUnoObj(String()); break; +/*?*/ case USHORT(OBJ_UNO ): pObj=new SdrUnoObj; break; /*N*/ } /*N*/ } diff --git a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx index d48b9a1..36ed782 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx @@ -352,12 +352,10 @@ namespace binfilter { /*N*/ void SdrObjGroup::NbcSetSnapRect(const Rectangle& rRect) /*N*/ { /*N*/ Rectangle aOld(GetSnapRect()); -/*N*/ long nMulX=rRect.Right()-rRect.Left(); /*N*/ long nDivX=aOld.Right()-aOld.Left(); -/*N*/ long nMulY=rRect.Bottom()-rRect.Top(); /*N*/ long nDivY=aOld.Bottom()-aOld.Top(); -/*N*/ if (nDivX==0) { nMulX=1; nDivX=1; } -/*N*/ if (nDivY==0) { nMulY=1; nDivY=1; } +/*N*/ if (nDivX==0) { nDivX=1; } +/*N*/ if (nDivY==0) { nDivY=1; } /*N*/ if (rRect.Left()!=aOld.Left() || rRect.Top()!=aOld.Top()) { /*N*/ NbcMove(Size(rRect.Left()-aOld.Left(),rRect.Top()-aOld.Top())); /*N*/ } diff --git a/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx b/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx index 21502b8..e5b246a 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx @@ -156,7 +156,7 @@ namespace binfilter { /*N*/ TYPEINIT1(SdrUnoObj, SdrRectObj); -/*N*/ SdrUnoObj::SdrUnoObj(const String& rModelName, BOOL _bOwnUnoControlModel) +/*N*/ SdrUnoObj::SdrUnoObj(BOOL _bOwnUnoControlModel) /*N*/ : bOwnUnoControlModel(_bOwnUnoControlModel) /*N*/ { /*N*/ bIsUnoObj = TRUE; diff --git a/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx index 4856781..d51bad5 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx @@ -465,7 +465,7 @@ IMPL_LINK_INLINE_START(SdrPaintView,ImpUserMarkerAnimatorHdl,AutoTimer*,EMPTYARG /*N*/ } /*N*/ } -/*N*/ void SdrPaintView::SetMasterPagePaintCaching( BOOL bOn, ULONG nCacheMode ) +/*N*/ void SdrPaintView::SetMasterPagePaintCaching( BOOL bOn ) /*N*/ { /*N*/ bMasterBmp = bOn; /*N*/ } diff --git a/binfilter/bf_svx/source/xoutdev/svx__ximp.cxx b/binfilter/bf_svx/source/xoutdev/svx__ximp.cxx index e74b84c..d8740d9 100644 --- a/binfilter/bf_svx/source/xoutdev/svx__ximp.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx__ximp.cxx @@ -63,7 +63,7 @@ namespace binfilter { /*?*/ aVDev.SetFont( pOldOut->GetFont() ); /*?*/ aVDev.SetDrawMode( pOldOut->GetDrawMode() ); /*?*/ aVDev.SetRefPoint( pOldOut->GetRefPoint() ); -/*?*/ ImpDrawFillPolyPolygon( rPolyPoly, bRect, pOldOut->GetOutDevType() == OUTDEV_PRINTER ); +/*?*/ ImpDrawFillPolyPolygon( rPolyPoly, bRect ); /*?*/ aMtf.Stop(); /*?*/ aMtf.WindStart(); /*?*/ aMap.SetOrigin( aBound.TopLeft() ); @@ -85,12 +85,12 @@ namespace binfilter { /*?*/ pOut->DrawTransparent( aMtf, aBound.TopLeft(), aBound.GetSize(), aVCLGradient ); /*N*/ } /*N*/ else -/*N*/ ImpDrawFillPolyPolygon( rPolyPoly, bRect, pOut->GetOutDevType() == OUTDEV_PRINTER ); +/*N*/ ImpDrawFillPolyPolygon( rPolyPoly, bRect ); /*N*/ } // ------------------------------------------------------------------------ -/*N*/ void XOutputDevice::ImpDrawFillPolyPolygon( const PolyPolygon& rPolyPoly, BOOL bRect, BOOL bPrinter ) +/*N*/ void XOutputDevice::ImpDrawFillPolyPolygon( const PolyPolygon& rPolyPoly, BOOL bRect ) /*N*/ { /*N*/ if( eFillStyle != XFILL_NONE ) /*N*/ { diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx index 3f11fd3..5c2f357 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx @@ -3880,6 +3880,7 @@ const XHatch& XFillHatchItem::GetValue() const /*N*/ SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/ ) const /*N*/ { +/*SB*/fprintf(stderr,"XFillAttrSetItem::Create\n"); /*N*/ SfxItemSet* _pSet = new SfxItemSet( *GetItemSet().GetPool(), /*N*/ XATTR_FILL_FIRST, XATTR_FILL_LAST); /*N*/ _pSet->Load( rStream ); diff --git a/binfilter/inc/bf_svx/svdouno.hxx b/binfilter/inc/bf_svx/svdouno.hxx index 1dac766..c4a8a90 100644 --- a/binfilter/inc/bf_svx/svdouno.hxx +++ b/binfilter/inc/bf_svx/svdouno.hxx @@ -68,7 +68,7 @@ private: public: TYPEINFO(); - SdrUnoObj(const String& rModelName, BOOL bOwnsModel = TRUE); + SdrUnoObj(BOOL bOwnsModel = TRUE); virtual ~SdrUnoObj(); using SdrRectObj::operator=; diff --git a/binfilter/inc/bf_svx/svdpntv.hxx b/binfilter/inc/bf_svx/svdpntv.hxx index 7df73d7..8db4978 100644 --- a/binfilter/inc/bf_svx/svdpntv.hxx +++ b/binfilter/inc/bf_svx/svdpntv.hxx @@ -397,7 +397,7 @@ public: // Painten der MasterPage mit 'ner Bitmap BOOL IsMasterPagePaintCaching() { return bMasterBmp; } - void SetMasterPagePaintCaching( BOOL bOn, ULONG nCacheMode = SDR_MASTERPAGECACHE_DEFAULT ); + void SetMasterPagePaintCaching( BOOL bOn ); // use this mode as mode to draw all internal GraphicManager objects with ULONG GetGraphicManagerDrawMode() const { return nGraphicManagerDrawMode; } diff --git a/binfilter/inc/bf_svx/xoutx.hxx b/binfilter/inc/bf_svx/xoutx.hxx index 1eef851..0049d4c 100644 --- a/binfilter/inc/bf_svx/xoutx.hxx +++ b/binfilter/inc/bf_svx/xoutx.hxx @@ -166,7 +166,7 @@ private: // umschliessendes Rechteck der Formtext-Effekte Rectangle aFormTextBoundRect; - void ImpDrawFillPolyPolygon( const PolyPolygon& rPoly, BOOL bRect, BOOL bPrinter ); + void ImpDrawFillPolyPolygon( const PolyPolygon& rPoly, BOOL bRect ); void ImpDrawLinePolygon(const Polygon& rPoly, BOOL bClosePoly); protected: _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits