[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_svx
binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx |1
binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx | 92 ---
2 files changed, 93 deletions(-)
New commits:
commit cd968e8471dbe6f4c1433a2d2867770aa6e20a41
Author: Matteo Casalin
Date: Sat Dec 17 11:14:28 2011 +0100
Removed COMPRESSMODE_FULL support from SvStream
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
b/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
index de5f206..a7dfa74 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
@@ -1894,7 +1894,6 @@ USHORT GraphicFilter::ExportGraphic( const Graphic&
rGraphic, const String& rPat
SvMemoryStream aMemStm( 65535, 65535 );
-aMemStm.SetCompressMode( COMPRESSMODE_FULL );
( (GDIMetaFile&) aGraphic.GetGDIMetaFile()
).Write( aMemStm );
xActiveDataSource->setOutputStream(
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >(
diff --git a/binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx
b/binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx
index d7124a2..081ea9f 100644
--- a/binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx
@@ -969,39 +969,6 @@ namespace binfilter {
/*N*/ else
/*N*/ rXPoly.pImpXPolygon->Resize( nMerkPoints );
/*N*/
-/*N*/ // Je nach CompressMode das Polygon einlesen
-/*N*/ if ( rIStream.GetCompressMode() == COMPRESSMODE_FULL )
-/*N*/ {
-/*?*/ i = 0;
-/*?*/ while ( i < nReadPoints )
-/*?*/ {
-/*?*/ rIStream >> bShort >> nCurPoints;
-/*?*/
-/*?*/ if ( bShort )
-/*?*/ {
-/*?*/ for ( nStart = i; i < nStart+nCurPoints; i++ )
-/*?*/ {
-/*?*/ rIStream >> nShortX >> nShortY;
-/*?*/ if (ipPointAry[i].X() = nShortX;
-/*?*/ rXPoly.pImpXPolygon->pPointAry[i].Y() = nShortY;
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*?*/ else
-/*?*/ {
-/*?*/ for ( nStart = i; i < nStart+nCurPoints; i++ )
-/*?*/ {
-/*?*/ rIStream >> nLongX >> nLongY;
-/*?*/ if (ipPointAry[i].X() = nLongX;
-/*?*/ rXPoly.pImpXPolygon->pPointAry[i].Y() = nLongY;
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*?*/ }
-/*N*/ }
-/*N*/ else
/*N*/ {
// Feststellen, ob ueber die Operatoren gelesen werden muss
#if (__SIZEOFLONG) != 4
@@ -1065,65 +1032,6 @@ namespace binfilter {
/*N*/ // Anzahl der Punkte rausschreiben
/*N*/ rOStream << nPoints;
/*N*/
-/*N*/ // Je nach CompressMode das Polygon rausschreiben
-/*N*/ if ( rOStream.GetCompressMode() == COMPRESSMODE_FULL )
-/*N*/ {
-/*?*/ i = 0;
-/*?*/ while ( i < nPoints )
-/*?*/ {
-/*?*/ nStart = i;
-/*?*/
-/*?*/ // Feststellen, welcher Typ geschrieben werden soll
-/*?*/ if ( ((rXPoly.pImpXPolygon->pPointAry[nStart].X() >= SHRT_MIN)
&&
-/*?*/ (rXPoly.pImpXPolygon->pPointAry[nStart].X() <=
SHRT_MAX)) &&
-/*?*/((rXPoly.pImpXPolygon->pPointAry[nStart].Y() >= SHRT_MIN)
&&
-/*?*/ (rXPoly.pImpXPolygon->pPointAry[nStart].Y() <=
SHRT_MAX)) )
-/*?*/ bShort = TRUE;
-/*?*/ else
-/*?*/ bShort = FALSE;
-/*?*/ while ( i < nPoints )
-/*?*/ {
-/*?*/ // Feststellen, welcher Typ geschrieben werden soll
-/*?*/ if ( ((rXPoly.pImpXPolygon->pPointAry[nStart].X() >=
SHRT_MIN) &&
-/*?*/ (rXPoly.pImpXPolygon->pPointAry[nStart].X() <=
SHRT_MAX)) &&
-/*?*/((rXPoly.pImpXPolygon->pPointAry[nStart].Y() >=
SHRT_MIN) &&
-/*?*/ (rXPoly.pImpXPolygon->pPointAry[nStart].Y() <=
SHRT_MAX)) )
-/*?*/ bCurShort = TRUE;
-/*?*/ else
-/*?*/ bCurShort = FALSE;
-/*?*/
-/*?*/ // Wenn sich die Werte in einen anderen Bereich begeben,
-/*?*/ // muessen wir neu rausschreiben
-/*?*/ if ( bCurShort != bShort )
-/*?*/ {
-/*?*/ bShort = bCurShort;
-/*?*/ break;
-/*?*/ }
-/*?*/
-/*?*/ i++;
-/*?*/ }
-/*?*/
-/*?*/ rOStream << bShort << (USHORT)(i-nStart);
-/*?*/
-/*?*/ if ( bShort )
-/*?*/ {
-/*?*/ for( ; nStart < i; nStart++ )
-/*?*/ {
-/*?*/ rOStream <<
(short)rXPoly.pImpXPolygon->pPointAry[nStart].X()
-/*?*/<<
(short)rXPoly.pImpXPolygon->pPointAry[nStart].Y();
-/*?*/ }
-/*?*/ }
-/*?*/ else
-
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_svx
binfilter/bf_svtools/source/items1/svt_poolio.cxx |7 ---
binfilter/bf_svx/source/xoutdev/svx_xattr.cxx |1 -
2 files changed, 8 deletions(-)
New commits:
commit e8c71c5ae20d33f8aa3bf67296b71c955fd11b34
Author: Stephan Bergmann
Date: Mon Oct 24 13:02:29 2011 +0200
Removed erroneously pushed debug printfs.
diff --git a/binfilter/bf_svtools/source/items1/svt_poolio.cxx
b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
index 98c5cce..0d453dc 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolio.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
@@ -114,7 +114,6 @@ 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 );
@@ -137,7 +136,6 @@ void SfxItemPool::readTheItems (
USHORT nRef(0);
rStream >> nRef;
-/*SB*/fprintf(stderr,"... X\n");
pItem = pDefItem->Create(rStream, nVersion);
pNewArr->C40_INSERT(SfxPoolItem, pItem, nSurrogate);
@@ -371,10 +369,8 @@ 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;
@@ -1163,7 +1159,6 @@ 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 )
@@ -1193,7 +1188,6 @@ 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),
@@ -1227,7 +1221,6 @@ 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/xoutdev/svx_xattr.cxx
b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
index 5c2f357..3f11fd3 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
@@ -3880,7 +3880,6 @@ 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 );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_svx binfilter/inc
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
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 binf
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_svx binfilter/inc
binfilter/bf_svtools/source/config/svt_lingucfg.cxx |6
binfilter/bf_svx/source/engine3d/svx_obj3d.cxx | 27
binfilter/inc/bf_svtools/lingucfg.hxx |6
binfilter/inc/bf_svx/obj3d.hxx |3 --
4 files changed, 42 deletions(-)
New commits:
commit d7c2e1c96df02cc99c5b7608fd9b79d31411d7d8
Author: Caolán McNamara
Date: Fri Sep 16 13:31:39 2011 +0100
callgrind: remove freshly unused methods
diff --git a/binfilter/bf_svtools/source/config/svt_lingucfg.cxx
b/binfilter/bf_svtools/source/config/svt_lingucfg.cxx
index 92735af..67b0514 100644
--- a/binfilter/bf_svtools/source/config/svt_lingucfg.cxx
+++ b/binfilter/bf_svtools/source/config/svt_lingucfg.cxx
@@ -539,12 +539,6 @@ SvtLinguConfigItem & SvtLinguConfig::GetConfigItem()
}
-Sequence< OUString > SvtLinguConfig::GetNodeNames( const OUString &rNode )
-{
-return GetConfigItem().GetNodeNames( rNode );
-}
-
-
BOOL SvtLinguConfig::GetOptions( SvtLinguOptions &rOptions ) const
{
return GetConfigItem().GetOptions( rOptions );
diff --git a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
index 9414202..f9a477e 100644
--- a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
@@ -1947,33 +1947,6 @@ namespace binfilter {
/*
|*
-|* Schattenattribute holen
-|*
-\/
-
-/*N*/ BOOL E3dCompoundObject::DoDrawShadow()
-/*N*/ {
-/*N*/ const SfxItemSet& rSet = GetItemSet();
-/*N*/ BOOL bRetval(FALSE);
-/*N*/ BOOL bShadOn = ((SdrShadowItem&)(rSet.Get(SDRATTR_SHADOW))).GetValue();
-/*N*/
-/*N*/ if(bShadOn)
-/*N*/ {
-/*?*/ bRetval = TRUE;
-/*?*/
-/*?*/ if(((XFillStyleItem&)(rSet.Get(XATTR_FILLSTYLE))).GetValue() ==
XFILL_NONE)
-/*?*/ {
-/*?*/ if(((XLineStyleItem&)(rSet.Get(XATTR_LINESTYLE))).GetValue()
== XLINE_NONE)
-/*?*/ {
-/*?*/ bRetval = FALSE;
-/*?*/ }
-/*?*/ }
-/*N*/ }
-/*N*/ return bRetval;
-/*N*/ }
-
-/*
-|*
|* Create vertical polygons for line polygon
|*
\/
diff --git a/binfilter/inc/bf_svtools/lingucfg.hxx
b/binfilter/inc/bf_svtools/lingucfg.hxx
index 7137094..e66f7af 100644
--- a/binfilter/inc/bf_svtools/lingucfg.hxx
+++ b/binfilter/inc/bf_svtools/lingucfg.hxx
@@ -151,12 +151,6 @@ public:
SvtLinguConfig();
virtual ~SvtLinguConfig();
-//
-// borrowed from utl::ConfigItem
-//
-com::sun::star::uno::Sequence< rtl::OUString >
-GetNodeNames( const rtl::OUString &rNode );
-
BOOLGetOptions( SvtLinguOptions &rOptions ) const;
};
diff --git a/binfilter/inc/bf_svx/obj3d.hxx b/binfilter/inc/bf_svx/obj3d.hxx
index 4920f36..53d7e7f 100644
--- a/binfilter/inc/bf_svx/obj3d.hxx
+++ b/binfilter/inc/bf_svx/obj3d.hxx
@@ -498,9 +498,6 @@ public:
// DisplayGeometry rausruecken
B3dGeometry& GetDisplayGeometry();
-// Schattenattribute holen
-BOOL DoDrawShadow();
-
private:
void SetInvertNormals(BOOL bNew);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
