[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_svx filter/source
Joseph Powers
jpowers at kemper.freedesktop.org
Tue May 10 07:42:00 PDT 2011
binfilter/bf_svtools/source/filter.vcl/wmf/svt_emfwr.cxx | 62 +++---
binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx | 24 +-
binfilter/bf_svx/source/svdraw/svx_svdobj.cxx | 6
binfilter/bf_svx/source/svxlink/svx_fileobj.cxx | 116 ++++++------
binfilter/bf_svx/source/xoutdev/svx_xline.cxx | 118 ++++++------
filter/source/flash/swfexporter.cxx | 25 +-
filter/source/flash/swfwriter1.cxx | 140 +++++++--------
filter/source/graphicfilter/eos2met/eos2met.cxx | 30 +--
filter/source/graphicfilter/epict/epict.cxx | 42 ++--
filter/source/graphicfilter/eps/eps.cxx | 64 +++---
filter/source/pdf/pdfexport.cxx | 10 -
filter/source/svg/svgexport.cxx | 130 ++++++-------
filter/source/svg/svgfontexport.cxx | 16 -
filter/source/svg/svgwriter.cxx | 116 ++++++------
14 files changed, 449 insertions(+), 450 deletions(-)
New commits:
commit 8a3a6fb95c81c065f5ccd16e51bf74cb7a54d067
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue May 10 05:39:27 2011 -0700
GDIMetaFile cleanup
Plus trailing white space cleanup.
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_emfwr.cxx b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_emfwr.cxx
index d8c6c98..c61b8a4 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_emfwr.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_emfwr.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -162,7 +162,7 @@ BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfig
mnHandleCount = mnLastPercent = mnRecordPos = mnRecordCount = 0;
mnLineHandle = mnFillHandle = mnTextHandle = HANDLE_INVALID;
mbRecordOpen = FALSE;
-
+
mpStm = &rOStm;
maVDev.EnableOutput( FALSE );
maVDev.SetMapMode( rMtf.GetPrefMapMode() );
@@ -170,7 +170,7 @@ BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfig
const Size aMtfSizePix( maVDev.LogicToPixel( rMtf.GetPrefSize(), rMtf.GetPrefMapMode() ) );
const Size aMtfSizeLog( maVDev.LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_100TH_MM ) );
-
+
// seek over header
rOStm.SeekRel( 100 );
@@ -201,7 +201,7 @@ BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfig
// write header
const ULONG nEndPos = mpStm->Tell(); mpStm->Seek( nHeaderPos );
-
+
(*mpStm) << (UINT32) 0x00000001 << (UINT32) 100;
(*mpStm) << (INT32) 0 << (INT32) 0 << (INT32) ( aMtfSizePix.Width() - 1 ) << (INT32) ( aMtfSizePix.Height() - 1 );
(*mpStm) << (INT32) 0 << (INT32) 0 << (INT32) ( aMtfSizeLog.Width() - 1 ) << (INT32) ( aMtfSizeLog.Height() - 1 );
@@ -212,7 +212,7 @@ BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfig
(*mpStm) << (UINT32) 0 << (UINT32) 0 << (UINT32) 0;
mpStm->Seek( nEndPos );
- delete[] mpHandlesUsed;
+ delete[] mpHandlesUsed;
return( mpStm->GetError() == ERRCODE_NONE );
}
@@ -293,7 +293,7 @@ BOOL EMFWriter::ImplPrepareHandleSelect( sal_uInt32& rHandle, ULONG nSelectType
{
UINT32 nStockObject = 0x80000000;
- if( LINE_SELECT == nSelectType )
+ if( LINE_SELECT == nSelectType )
nStockObject |= 0x00000007;
else if( FILL_SELECT == nSelectType )
nStockObject |= 0x00000001;
@@ -304,13 +304,13 @@ BOOL EMFWriter::ImplPrepareHandleSelect( sal_uInt32& rHandle, ULONG nSelectType
ImplBeginRecord( WIN_EMR_SELECTOBJECT );
( *mpStm ) << nStockObject;
ImplEndRecord();
-
+
// destroy handle of created object
ImplBeginRecord( WIN_EMR_DELETEOBJECT );
( *mpStm ) << rHandle;
ImplEndRecord();
- // mark handle as free
+ // mark handle as free
ImplReleaseHandle( rHandle );
}
@@ -378,7 +378,7 @@ void EMFWriter::ImplCheckTextAttr()
ImplWriteExtent( rFont.GetSize().Width() );
(*mpStm) << (INT32) rFont.GetOrientation() << (INT32) rFont.GetOrientation();
- switch( rFont.GetWeight() )
+ switch( rFont.GetWeight() )
{
case WEIGHT_THIN: nWeight = 100; break;
case WEIGHT_ULTRALIGHT: nWeight = 200; break;
@@ -392,7 +392,7 @@ void EMFWriter::ImplCheckTextAttr()
case WEIGHT_BLACK: nWeight = 900; break;
default: nWeight = 0; break;
}
-
+
(*mpStm) << nWeight;
(*mpStm) << (BYTE) ( ( ITALIC_NONE == rFont.GetItalic() ) ? 0 : 1 );
(*mpStm) << (BYTE) ( ( UNDERLINE_NONE == rFont.GetUnderline() ) ? 0 : 1 );
@@ -400,14 +400,14 @@ void EMFWriter::ImplCheckTextAttr()
(*mpStm) << (BYTE) ( ( RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet() ) ? 2 : 0 );
(*mpStm) << (BYTE) 0 << (BYTE) 0 << (BYTE) 0;
- switch( rFont.GetPitch() )
+ switch( rFont.GetPitch() )
{
case PITCH_FIXED: nPitchAndFamily = 0x01; break;
case PITCH_VARIABLE: nPitchAndFamily = 0x02; break;
default: nPitchAndFamily = 0x00; break;
}
- switch( rFont.GetFamily() )
+ switch( rFont.GetFamily() )
{
case FAMILY_DECORATIVE: nPitchAndFamily |= 0x50; break;
case FAMILY_MODERN: nPitchAndFamily |= 0x30; break;
@@ -515,7 +515,7 @@ void EMFWriter::ImplWriteExtent( long nExtent )
void EMFWriter::ImplWritePoint( const Point& rPoint )
{
const Point aPoint( maVDev.LogicToPixel( rPoint ) );
-
+
(*mpStm) << (INT32) aPoint.X() << (INT32) aPoint.Y();
}
@@ -524,7 +524,7 @@ void EMFWriter::ImplWritePoint( const Point& rPoint )
void EMFWriter::ImplWriteSize( const Size& rSize)
{
const Size aSize( maVDev.LogicToPixel( rSize ) );
-
+
(*mpStm) << (INT32) aSize.Width() << (INT32) aSize.Height();
}
@@ -660,12 +660,12 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed )
nPoints++;
ImplBeginRecord( WIN_EMR_MOVETOEX );
ImplWritePoint( rPoly[ n ] );
- ImplEndRecord();
+ ImplEndRecord();
if ( nPoints > 1 )
{
ImplBeginRecord( WIN_EMR_POLYLINETO );
Polygon aNewPoly( nPoints );
- aNewPoly[ 0 ] = rPoly[ n ];
+ aNewPoly[ 0 ] = rPoly[ n ];
for ( o = 1; o < nPoints; o++ )
aNewPoly[ o ] = rPoly[ n + o ];
ImplWriteRect( aNewPoly.GetBoundRect() );
@@ -691,7 +691,7 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed )
// -----------------------------------------------------------------------------
-void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt,
+void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt,
const Size& rSz, UINT32 nROP )
{
if( !!rBmp )
@@ -703,7 +703,7 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt,
ImplWriteRect( Rectangle( rPt, rSz ) );
ImplWritePoint( rPt );
(*mpStm) << (INT32) 0 << (INT32) 0 << (INT32) aBmpSizePixel.Width() << (INT32) aBmpSizePixel.Height();
-
+
// write offset positions and sizes later
const ULONG nOffPos = mpStm->Tell();
mpStm->SeekRel( 16 );
@@ -724,7 +724,7 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt,
aMemStm.SeekRel( 8 );
aMemStm >> nColsUsed;
- nPalCount = ( nBitCount <= 8 ) ? ( nColsUsed ? nColsUsed : ( 1 << (UINT32) nBitCount ) ) :
+ nPalCount = ( nBitCount <= 8 ) ? ( nColsUsed ? nColsUsed : ( 1 << (UINT32) nBitCount ) ) :
( ( 3 == nCompression ) ? 12 : 0 );
mpStm->Write( aMemStm.GetData(), nDIBSize );
@@ -759,7 +759,7 @@ void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, cons
pDX = (sal_Int32*) pDXArray;
}
else
- {
+ {
pOwnArray = new sal_Int32[ nLen ];
nNormWidth = maVDev.GetTextArray( rText, pOwnArray );
pDX = pOwnArray;
@@ -817,7 +817,7 @@ void EMFWriter::ImplWriteTextRecord( const Point& rPos, const String rText, cons
void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
{
- for( ULONG j = 0, nActionCount = rMtf.GetActionCount(); j < nActionCount; j++ )
+ for( size_t j = 0, nActionCount = rMtf.GetActionSize(); j < nActionCount; j++ )
{
const MetaAction* pAction = rMtf.GetAction( j );
const USHORT nType = pAction->GetType();
@@ -858,7 +858,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
const MetaLineAction* pA = (const MetaLineAction*) pAction;
ImplCheckLineAttr();
-
+
ImplBeginRecord( WIN_EMR_MOVETOEX );
ImplWritePoint( pA->GetStartPoint() );
ImplEndRecord();
@@ -955,7 +955,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
aPoly = Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_CHORD );
}
break;
-
+
case( META_POLYGON_ACTION ):
aPoly = ( (const MetaPolygonAction*) pAction )->GetPolygon();
break;
@@ -1011,7 +1011,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
case META_FLOATTRANSPARENT_ACTION:
{
const MetaFloatTransparentAction* pA = (const MetaFloatTransparentAction*) pAction;
-
+
GDIMetaFile aTmpMtf( pA->GetGDIMetaFile() );
Point aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() );
const Size aSrcSize( aTmpMtf.GetPrefSize() );
@@ -1044,7 +1044,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
const MetaEPSAction* pA = (const MetaEPSAction*) pAction;
const GDIMetaFile aSubstitute( pA->GetSubstitute() );
- for( ULONG i = 0, nCount = aSubstitute.GetActionCount(); i < nCount; i++ )
+ for( size_t i = 0, nCount = aSubstitute.GetActionSize(); i < nCount; i++ )
{
const MetaAction* pSubstAct = aSubstitute.GetAction( i );
if( pSubstAct->GetType() == META_BMPSCALE_ACTION )
@@ -1190,14 +1190,14 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
ImplWriteTextRecord( pA->GetPoint(), aText, NULL, pA->GetWidth() );
}
break;
-
+
case( META_LINECOLOR_ACTION ):
{
( (MetaAction*) pAction )->Execute( &maVDev );
mbLineChanged = TRUE;
}
break;
-
+
case( META_FILLCOLOR_ACTION ):
{
( (MetaAction*) pAction )->Execute( &maVDev );
@@ -1219,7 +1219,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
case( META_ISECTRECTCLIPREGION_ACTION ):
{
( (MetaAction*) pAction )->Execute( &maVDev );
-
+
ImplBeginRecord( WIN_EMR_INTERSECTCLIPRECT );
ImplWriteRect( ( (MetaISectRectClipRegionAction*) pAction )->GetRect() );
ImplEndRecord();
@@ -1242,7 +1242,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
case( META_PUSH_ACTION ):
{
( (MetaAction*) pAction )->Execute( &maVDev );
-
+
ImplBeginRecord( WIN_EMR_SAVEDC );
ImplEndRecord();
}
@@ -1251,11 +1251,11 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
case( META_POP_ACTION ):
{
( (MetaAction*) pAction )->Execute( &maVDev );
-
+
ImplBeginRecord( WIN_EMR_RESTOREDC );
(*mpStm) << (INT32) -1;
ImplEndRecord();
-
+
ImplWriteRasterOp( maVDev.GetRasterOp() );
mbLineChanged = mbFillChanged = mbTextChanged = TRUE;
}
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx
index 6cc9502..bd65824 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -271,9 +271,9 @@ void WMFWriter::MayCallback()
void WMFWriter::CountActionsAndBitmaps( const GDIMetaFile & rMTF )
{
- ULONG nAction, nActionCount;
+ size_t nAction, nActionCount;
- nActionCount = rMTF.GetActionCount();
+ nActionCount = rMTF.GetActionSize();
for ( nAction=0; nAction<nActionCount; nAction++ )
{
@@ -636,7 +636,7 @@ void WMFWriter::WMFRecord_ExtTextOut( const Point & rPoint,
TrueExtTextOut(rPoint,rString,aByteString,pDXAry);
}
-void WMFWriter::TrueExtTextOut( const Point & rPoint, const String & rString,
+void WMFWriter::TrueExtTextOut( const Point & rPoint, const String & rString,
const ByteString & rByteString, const sal_Int32 * pDXAry )
{
WriteRecordHeader( 0, W_META_EXTTEXTOUT );
@@ -1078,12 +1078,12 @@ void WMFWriter::SetAllAttr()
void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
{
- ULONG nA, nACount;
- MetaAction* pMA;
+ size_t nA, nACount;
+ MetaAction* pMA;
if( bStatus )
{
- nACount = rMTF.GetActionCount();
+ nACount = rMTF.GetActionSize();
WMFRecord_SetStretchBltMode();
@@ -1232,7 +1232,7 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
case META_TEXTARRAY_ACTION:
{
const MetaTextArrayAction* pA = (const MetaTextArrayAction*) pMA;
-
+
String aTemp( pA->GetText(), pA->GetIndex(), pA->GetLen() );
aSrcLineInfo = LineInfo();
SetAllAttr();
@@ -1572,8 +1572,8 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
const MetaEPSAction* pA = (const MetaEPSAction*)pMA;
const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
- INT32 nCount = aGDIMetaFile.GetActionCount();
- for ( INT32 i = 0; i < nCount; i++ )
+ size_t nCount = aGDIMetaFile.GetActionSize();
+ for ( size_t i = 0; i < nCount; i++ )
{
const MetaAction* pMetaAct = aGDIMetaFile.GetAction( i );
if ( pMetaAct->GetType() == META_BMPSCALE_ACTION )
@@ -1604,7 +1604,7 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
case META_FLOATTRANSPARENT_ACTION:
{
const MetaFloatTransparentAction* pA = (const MetaFloatTransparentAction*) pMA;
-
+
GDIMetaFile aTmpMtf( pA->GetGDIMetaFile() );
Point aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() );
const Size aSrcSize( aTmpMtf.GetPrefSize() );
@@ -1843,7 +1843,7 @@ BOOL WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
if ( xStatusIndicator.is() )
xStatusIndicator->end();
-
+
return bStatus;
}
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
index 219d4e6..6ae5c54 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -1975,7 +1975,7 @@ class ImpSkeleton;
/*N*/ aMtf.WindStart();
/*N*/ rPoly.Clear();
/*N*/
-/*N*/ for( ULONG nActionNum = 0, nActionAnz = aMtf.GetActionCount(); nActionNum < nActionAnz; nActionNum++ )
+/*N*/ for( size_t nActionNum = 0, nActionAnz = aMtf.GetActionSize(); nActionNum < nActionAnz; nActionNum++ )
/*N*/ {
/*N*/ const MetaAction& rAct = *aMtf.GetAction( nActionNum );
/*N*/ BOOL bXPoly = FALSE;
@@ -3273,7 +3273,7 @@ class ImpSkeleton;
/*N*/ else if(pModel != NULL)
/*?*/ pObj->SetModel(pModel);
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return pObj;
/*N*/ }
diff --git a/binfilter/bf_svx/source/svxlink/svx_fileobj.cxx b/binfilter/bf_svx/source/svxlink/svx_fileobj.cxx
index 750264e..0f45395 100644
--- a/binfilter/bf_svx/source/svxlink/svx_fileobj.cxx
+++ b/binfilter/bf_svx/source/svxlink/svx_fileobj.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -57,7 +57,7 @@ using namespace ::com::sun::star::uno;
/*N*/ {
/*N*/ Graphic aGrf;
/*N*/ Timer aTimer;
-/*N*/
+/*N*/
/*N*/ Impl_DownLoadData( const Link& rLink )
/*N*/ {
/*N*/ aTimer.SetTimeout( 100 );
@@ -108,7 +108,7 @@ using namespace ::com::sun::star::uno;
/*N*/ // relativen Datei Links aufzuloesen!!!! Wird ueber den
/*N*/ // LinkManager und damit von dessen Storage erledigt.
/*N*/ rData <<= ::rtl::OUString( sFileNm );
-/*N*/
+/*N*/
/*
===========================================================================
noch eine Baustelle:
@@ -141,24 +141,24 @@ noch eine Baustelle:
*/
/*N*/ }
/*N*/ break;
-/*N*/
+/*N*/
/*N*/ case FILETYPE_GRF:
/*?*/ if( !bLoadError )
/*?*/ {
/*?*/ SfxMediumRef xTmpMed;
-/*?*/
+/*?*/
/*?*/ if( FORMAT_GDIMETAFILE == nFmt || FORMAT_BITMAP == nFmt ||
/*?*/ SOT_FORMATSTR_ID_SVXB == nFmt )
/*?*/ {
/*?*/ Graphic aGrf;
-/*?*/
+/*?*/
/*?*/ // falls das Nativformat doch erwuenscht ist, muss am
/*?*/ // Ende das Flag zurueckgesetzt werden.
/*?*/ // wird einzig und allein im sw/ndgrf.cxx benutzt, wenn der Link vom
/*?*/ // GraphicNode entfernt wird.
/*?*/ BOOL bOldNativFormat = bNativFormat;
/*?*/ //!!?? bNativFormat = 0 != (ASPECT_ICON & pSvData->GetAspect());
-/*?*/
+/*?*/
/*?*/ // falls gedruckt werden soll, warten wir bis die
/*?*/ // Daten vorhanden sind
/*?*/ if( bGetSynchron )
@@ -172,24 +172,24 @@ noch eine Baustelle:
/*?*/ // dann mit der hoechsten Prioritaet
/*?*/ xMed->SetTransferPriority( SFX_TFPRIO_VISIBLE_LOWRES_GRAPHIC );
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if( !bInCallDownLoad )
/*?*/ {
/*?*/ xTmpMed = xMed;
/*?*/ while( bWaitForData )
/*?*/ Application::Reschedule();
-/*?*/
+/*?*/
/*?*/ xMed = xTmpMed;
/*?*/ bClearMedium = TRUE;
/*?*/ }
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if( pDownLoadData ||
/*?*/ ( !bWaitForData && ( xMed.Is() || // wurde als URL geladen
/*?*/ ( bSynchron && LoadFile_Impl() && xMed.Is() ) )) )
/*?*/ {
/*?*/ // falls
-/*?*/
+/*?*/
/*?*/ // falls es uebers Internet gesogen wurde, nicht
/*?*/ // wieder versuchen
/*?*/ if( !bGetSynchron )
@@ -203,12 +203,12 @@ noch eine Baustelle:
/*?*/ break;
/*?*/ aGrf.SetDefaultType();
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if( SOT_FORMATSTR_ID_SVXB != nFmt )
/*?*/ nFmt = (bLoadError || GRAPHIC_BITMAP == aGrf.GetType())
/*?*/ ? FORMAT_BITMAP
/*?*/ : FORMAT_GDIMETAFILE;
-/*?*/
+/*?*/
/*?*/ SvMemoryStream aMemStm( 0, 65535 );
/*?*/ switch ( nFmt )
/*?*/ {
@@ -219,14 +219,14 @@ noch eine Baustelle:
/*?*/ aMemStm << aGrf;
/*?*/ }
/*?*/ break;
-/*?*/
+/*?*/
/*?*/ case FORMAT_BITMAP:
/*?*/ if( !aGrf.GetBitmap().IsEmpty())
/*?*/ aMemStm << aGrf.GetBitmap();
/*?*/ break;
-/*?*/
+/*?*/
/*?*/ default:
-/*?*/ if( aGrf.GetGDIMetaFile().GetActionCount() )
+/*?*/ if( aGrf.GetGDIMetaFile().GetActionSize() )
/*?*/ {
/*?*/ GDIMetaFile aMeta( aGrf.GetGDIMetaFile() );
/*?*/ aMeta.Write( aMemStm );
@@ -234,9 +234,9 @@ noch eine Baustelle:
/*?*/ }
/*?*/ rData <<= Sequence< sal_Int8 >( (sal_Int8*) aMemStm.GetData(),
/*?*/ aMemStm.Seek( STREAM_SEEK_TO_END ) );
-/*?*/
+/*?*/
/*?*/ bNativFormat = bOldNativFormat;
-/*?*/
+/*?*/
/*?*/ // alles fertig?
/*?*/ if( xMed.Is() && !bSynchron && bClearMedium )
/*?*/ {
@@ -257,16 +257,16 @@ noch eine Baustelle:
/*N*/ {
/*N*/ if( !pLink || !pLink->GetLinkManager() )
/*N*/ return FALSE;
-/*N*/
+/*N*/
/*N*/ // teste doch mal, ob nicht ein anderer Link mit der gleichen
/*N*/ // Verbindung schon existiert
/*N*/ pLink->GetLinkManager()->GetDisplayNames( pLink, 0, &sFileNm, 0, &sFilter );
-/*N*/
+/*N*/
/*N*/ if( OBJECT_CLIENT_GRF == pLink->GetObjType() )
/*N*/ {
/*?*/ if( !pLink->IsUseCache() )
/*?*/ bMedUseCache = FALSE;
-/*?*/
+/*?*/
/*?*/ // Reload-Erkennung ???
/*?*/ SvInPlaceObjectRef aRef( pLink->GetLinkManager()->GetPersist() );
/*?*/ if( aRef.Is() )
@@ -274,32 +274,32 @@ noch eine Baustelle:
/*?*/ SfxObjectShell* pShell = ((SfxInPlaceObject*)&aRef)->GetObjectShell();
/*?*/ if( pShell->IsAbortingImport() )
/*?*/ return FALSE;
-/*?*/
+/*?*/
/*?*/ if( pShell->IsReloading() )
/*?*/ bMedUseCache = FALSE;
-/*?*/
+/*?*/
/*?*/ if( pShell->GetMedium() )
/*?*/ sReferer = pShell->GetMedium()->GetName();
/*?*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ switch( pLink->GetObjType() )
/*N*/ {
/*N*/ case OBJECT_CLIENT_GRF:
/*?*/ nType = FILETYPE_GRF;
/*?*/ bSynchron = pLink->IsSynchron();
/*?*/ break;
-/*N*/
+/*N*/
/*N*/ case OBJECT_CLIENT_FILE:
/*N*/ nType = FILETYPE_TEXT;
/*N*/ break;
-/*N*/
+/*N*/
/*N*/ default:
/*N*/ return FALSE;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ SetUpdateTimeout( 0 );
-/*N*/
+/*N*/
/*N*/ // und jetzt bei diesem oder gefundenem Pseudo-Object anmelden
/*N*/ AddDataAdvise( pLink, SotExchange::GetFormatMimeType( pLink->GetContentType() ), 0 );
/*N*/ return TRUE;
@@ -311,7 +311,7 @@ noch eine Baustelle:
/*?*/ // wir sind noch im Laden!!
/*?*/ if( bWaitForData || !bLoadAgain || xMed.Is() || pDownLoadData )
/*?*/ return FALSE;
-/*?*/
+/*?*/
/*?*/ // z.Z. nur auf die aktuelle DocShell
/*?*/ xMed = new SfxMedium( sFileNm, STREAM_STD_READ, TRUE );
/*?*/ // Keinen Eintrag im Roter Button Menu
@@ -321,34 +321,34 @@ noch eine Baustelle:
/*?*/ xMed->SetReferer( sReferer );
/*?*/ // erstmal mit der niedrigsten Prioritaet
/*?*/ xMed->SetTransferPriority( SFX_TFPRIO_INVISIBLE_HIGHRES_GRAPHIC );
-/*?*/
+/*?*/
/*?*/ if( !bSynchron )
/*?*/ {
/*?*/ bLoadAgain = bDataReady = bInNewData = FALSE;
/*?*/ bWaitForData = TRUE;
-/*?*/
+/*?*/
/*?*/ SfxMediumRef xTmpMed = xMed;
/*?*/ xMed->SetDataAvailableLink( STATIC_LINK( this, SvFileObject, LoadGrfNewData_Impl ) );
/*?*/ bInCallDownLoad = TRUE;
/*?*/ xMed->DownLoad( STATIC_LINK( this, SvFileObject, LoadGrfReady_Impl ) );
/*?*/ bInCallDownLoad = FALSE;
-/*?*/
+/*?*/
/*?*/ bClearMedium = !xMed.Is();
/*?*/ if( bClearMedium )
/*?*/ xMed = xTmpMed; // falls gleich im DownLoad schon schluss ist
/*?*/ return bDataReady;
/*?*/ }
-/*?*/
+/*?*/
/*?*/ bWaitForData = TRUE;
/*?*/ bDataReady = bInNewData = FALSE;
/*?*/ xMed->DownLoad();
/*?*/ bLoadAgain = !xMed->IsRemote();
/*?*/ bWaitForData = FALSE;
-/*?*/
+/*?*/
/*?*/ // Grafik ist fertig, also DataChanged von der Statusaederung schicken:
/*?*/ SendStateChg_Impl( xMed->GetInStream() && xMed->GetInStream()->GetError()
/*?*/ ? STATE_LOAD_ERROR : STATE_LOAD_OK );
-/*?*/
+/*?*/
/*?*/ return TRUE;
/*?*/ }
@@ -359,15 +359,15 @@ noch eine Baustelle:
/*?*/ const int nFilter = sFilter.Len() && pGF->GetImportFormatCount()
/*?*/ ? pGF->GetImportFormatNumber( sFilter )
/*?*/ : GRFILTER_FORMAT_DONTKNOW;
-/*?*/
+/*?*/
/*?*/ String aEmptyStr;
/*?*/ int nRes;
-/*?*/
+/*?*/
/*?*/ // vermeiden, dass ein native Link angelegt wird
/*?*/ if( ( !pStream || !pDownLoadData ) && !rGrf.IsLink() &&
/*?*/ !rGrf.GetContext() && !bNativFormat )
/*?*/ rGrf.SetLink( GfxLink() );
-/*?*/
+/*?*/
/*?*/ if( !pStream )
/*?*/ nRes = xMed.Is() ? GRFILTER_OPENERROR
/*?*/ : pGF->ImportGraphic( rGrf, INetURLObject(sFileNm), nFilter );
@@ -380,14 +380,14 @@ noch eine Baustelle:
/*?*/ {
/*?*/ nRes = pGF->ImportGraphic( pDownLoadData->aGrf, aEmptyStr,
/*?*/ *pStream, nFilter );
-/*?*/
+/*?*/
/*?*/ if( pDownLoadData )
/*?*/ {
/*?*/ rGrf = pDownLoadData->aGrf;
/*?*/ if( GRAPHIC_NONE == rGrf.GetType() )
/*?*/ rGrf.SetDefaultType();
-/*?*/
-/*?*/
+/*?*/
+/*?*/
/*?*/ if( !pDownLoadData->aGrf.GetContext() )
/*?*/ {
/*?*/ xMed->SetDataAvailableLink( Link() );
@@ -403,10 +403,10 @@ noch eine Baustelle:
/*?*/ }
/*?*/ }
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if( pStream && ERRCODE_IO_PENDING == pStream->GetError() )
/*?*/ pStream->ResetError();
-/*?*/
+/*?*/
/*?*/ #ifdef DBG_UTIL
/*?*/ if( nRes )
/*?*/ {
@@ -424,7 +424,7 @@ noch eine Baustelle:
/*?*/ }
/*?*/ }
/*?*/ #endif
-/*?*/
+/*?*/
/*?*/ return GRFILTER_OK == nRes;
/*?*/ }
@@ -437,18 +437,18 @@ noch eine Baustelle:
/*?*/ pThis->bLoadError = FALSE;
/*?*/ pThis->bWaitForData = FALSE;
/*?*/ pThis->bInCallDownLoad = FALSE;
-/*?*/
+/*?*/
/*?*/ if( !pThis->bInNewData && !pThis->bDataReady )
/*?*/ {
/*?*/ // Grafik ist fertig, also DataChanged von der Status-
/*?*/ // aederung schicken:
/*?*/ pThis->bDataReady = TRUE;
/*?*/ pThis->SendStateChg_Impl( STATE_LOAD_OK );
-/*?*/
+/*?*/
/*?*/ // und dann nochmal die Daten senden
/*?*/ pThis->NotifyDataChanged();
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if( pThis->bDataReady )
/*?*/ {
/*?*/ pThis->bLoadAgain = TRUE;
@@ -456,7 +456,7 @@ noch eine Baustelle:
/*?*/ {
/*?*/ pThis->xMed->SetDataAvailableLink( Link() );
/*?*/ pThis->xMed->SetDoneLink( Link() );
-/*?*/
+/*?*/
/*?*/ Application::PostUserEvent(
/*?*/ STATIC_LINK( pThis, SvFileObject, DelMedium_Impl ),
/*?*/ new SfxMediumRef( pThis->xMed ));
@@ -465,7 +465,7 @@ noch eine Baustelle:
/*?*/ if( pThis->pDownLoadData )
/*?*/ delete pThis->pDownLoadData, pThis->pDownLoadData = 0;
/*?*/ }
-/*?*/
+/*?*/
/*?*/ return 0;
/*?*/ }
@@ -481,15 +481,15 @@ noch eine Baustelle:
/*?*/ // wenn wir von hier kommen, kann es kein Fehler mehr sein
/*?*/ if( pThis->bInNewData )
/*?*/ return 0;
-/*?*/
+/*?*/
/*?*/ pThis->bInNewData = TRUE;
/*?*/ pThis->bLoadError = FALSE;
-/*?*/
+/*?*/
/*?*/ if( !pThis->pDownLoadData )
/*?*/ {
/*?*/ pThis->pDownLoadData = new Impl_DownLoadData(
/*?*/ STATIC_LINK( pThis, SvFileObject, LoadGrfNewData_Impl ) );
-/*?*/
+/*?*/
/*?*/ // Null-Link setzen, damit keine temporaeren Grafiken
/*?*/ // rausgeswapt werden; der Filter prueft, ob schon
/*?*/ // ein Link gesetzt ist => falls dies zutrifft, wird
@@ -502,22 +502,22 @@ noch eine Baustelle:
/*?*/ pThis->pDownLoadData->aGrf.SetLink( aDummyLink );
/*?*/ }
/*?*/ }
-/*?*/
+/*?*/
/*?*/ pThis->NotifyDataChanged();
-/*?*/
+/*?*/
/*?*/ SvStream* pStrm = pThis->xMed.Is() ? pThis->xMed->GetInStream() : 0;
/*?*/ if( pStrm && pStrm->GetError() )
/*?*/ {
/*?*/ if( ERRCODE_IO_PENDING == pStrm->GetError() )
/*?*/ pStrm->ResetError();
-/*?*/
+/*?*/
/*?*/ // im DataChanged ein DataReady?
/*?*/ else if( pThis->bWaitForData && pThis->pDownLoadData )
/*?*/ {
/*?*/ pThis->bLoadError = TRUE;
/*?*/ }
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if( pThis->bDataReady )
/*?*/ {
/*?*/ // Grafik ist fertig, also DataChanged von der Status-
@@ -525,7 +525,7 @@ noch eine Baustelle:
/*?*/ pThis->SendStateChg_Impl( pStrm->GetError() ? STATE_LOAD_ERROR
/*?*/ : STATE_LOAD_OK );
/*?*/ }
-/*?*/
+/*?*/
/*?*/ pThis->bInNewData = FALSE;
/*?*/ return 0;
/*?*/ }
@@ -547,7 +547,7 @@ noch eine Baustelle:
/*N*/ {
/*N*/ if( xMed.Is() )
/*?*/ xMed->CancelTransfers();
-/*N*/
+/*N*/
/*N*/ // und aus dem Cache austragen, wenn man mitten im Laden ist
/*N*/ if( !bDataReady )
/*N*/ {
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xline.cxx b/binfilter/bf_svx/source/xoutdev/svx_xline.cxx
index 83932b4..fa26dae 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xline.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xline.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -84,30 +84,30 @@ namespace binfilter {
/*N*/ nAbsDY.Abs();
/*N*/ BigInt nMax(nAbsDX > nAbsDY ? nAbsDX : nAbsDY);
/*N*/ BigInt nCompare;
-/*N*/
+/*N*/
/*N*/ // Kontrollpunkte auf der (unendlichen) Linie durch P3 und P0?
/*N*/ nCompare = DY * BigInt(X1-X0) - DX * BigInt(Y1-Y0);
/*N*/ nCompare.Abs();
/*N*/ if ( nCompare >= nMax )
/*N*/ return FALSE;
-/*N*/
+/*N*/
/*N*/ nCompare = DY * BigInt(X2-X0) - DX * BigInt(Y2-Y0);
/*N*/ nCompare.Abs();
/*N*/ if ( nCompare >= nMax )
/*N*/ return FALSE;
-/*N*/
+/*N*/
/*N*/ // ____
/*N*/ // wenn ja, dann pruefen, ob ausserhalb der Strecke P3P0
/*N*/ if ( (X3 < X0 && X0 < X1) || (Y3 < Y0 && Y0 < Y1) ) return FALSE;
/*N*/ if ( (X1 < X0 && X0 < X3) || (Y1 < Y0 && Y0 < Y3) ) return FALSE;
/*N*/ if ( (X0 < X3 && X3 < X1) || (Y0 < Y3 && Y3 < Y1) ) return FALSE;
/*N*/ if ( (X1 < X3 && X3 < X0) || (Y1 < Y3 && Y3 < Y3) ) return FALSE;
-/*N*/
+/*N*/
/*N*/ if ( (X3 < X0 && X0 < X2) || (Y3 < Y0 && Y0 < Y2) ) return FALSE;
/*N*/ if ( (X2 < X0 && X0 < X3) || (Y2 < Y0 && Y0 < Y3) ) return FALSE;
/*N*/ if ( (X0 < X3 && X3 < X2) || (Y0 < Y3 && Y3 < Y2) ) return FALSE;
/*N*/ if ( (X2 < X3 && X3 < X0) || (Y2 < Y3 && Y3 < Y3) ) return FALSE;
-/*N*/
+/*N*/
/*N*/ return TRUE;
/*N*/ }
@@ -122,7 +122,7 @@ namespace binfilter {
/*N*/ // Das Folgende Statement ist Optimierung
/*N*/ if (rRect.IsInside(rBez[0]) && rRect.IsInside(rBez[1]) &&
/*N*/ rRect.IsInside(rBez[2]) && rRect.IsInside(rBez[3])) return;
-/*N*/
+/*N*/
/*N*/ if ( nMaxDepth == 0 || IsBezierStraight(rBez) )
/*N*/ {
/*N*/ long nX = rBez[3].X(),
@@ -135,7 +135,7 @@ namespace binfilter {
/*N*/ else
/*N*/ {
/*N*/ XPolygon aSplitBez(4);
-/*N*/
+/*N*/
/*N*/ nMaxDepth--;
/*N*/ SplitBezier(rBez, aSplitBez, TRUE);
/*N*/ XOutIterateBezier(aSplitBez, rRect, nMaxDepth);
@@ -155,10 +155,10 @@ namespace binfilter {
/*N*/ {
/*N*/ if ( rXPoly.GetPointCount() == 0 )
/*?*/ return Rectangle();
-/*N*/
+/*N*/
/*N*/ USHORT i;
/*N*/ USHORT nPntMax=rXPoly.GetPointCount()-1;
-/*N*/
+/*N*/
/*N*/ bool bHasBezier=FALSE;
/*N*/ Rectangle aRect(rXPoly[0],rXPoly[0]);
/*N*/ // zunaechst das Rect der Stuetzstellen (ohne Kontrollpunkte) bestimmen
@@ -173,7 +173,7 @@ namespace binfilter {
/*N*/ } else bHasBezier=TRUE;
/*N*/ }
/*N*/ if (!bHasBezier) return aRect;
-/*N*/
+/*N*/
/*N*/ if (pOut!=NULL)
/*?*/ aRect = pOut->LogicToPixel(aRect);
/*N*/ i=0;
@@ -182,7 +182,7 @@ namespace binfilter {
/*N*/ if ( i <= nPntMax - 3 && rXPoly.GetFlags(i+1) == XPOLY_CONTROL )
/*N*/ {
/*N*/ XPolygon aBez(4);
-/*N*/
+/*N*/
/*N*/ if ( pOut )
/*N*/ {
/*?*/ aBez[0] = pOut->LogicToPixel(rXPoly[i]);
@@ -205,7 +205,7 @@ namespace binfilter {
/*N*/ Point aPnt(rXPoly[++i]);
/*N*/ if ( pOut )
/*?*/ aPnt = pOut->LogicToPixel(aPnt);
-/*N*/
+/*N*/
/*N*/ aRect.Left() = Min(aPnt.X(), aRect.Left());
/*N*/ aRect.Right() = Max(aPnt.X(), aRect.Right());
/*N*/ aRect.Top() = Min(aPnt.Y(), aRect.Top());
@@ -227,7 +227,7 @@ namespace binfilter {
/*N*/ OutputDevice* pOut, USHORT nRough )
/*N*/ {
/*N*/ long nSteps;
-/*N*/
+/*N*/
/*N*/ if( pOut || nRough )
/*N*/ {
/*N*/ const Point& aPt = rXPoly[ nIndex++ ];
@@ -240,7 +240,7 @@ namespace binfilter {
/*N*/ long nDy2 = Abs( aPt3.Y() - aPt2.Y() ) * 2;
/*N*/ long nDxHndl = Abs( aPt2.X() - aPt1.X() );
/*N*/ long nDyHndl = Abs( aPt2.Y() - aPt1.Y() );
-/*N*/
+/*N*/
/*N*/ long nDelta = Max(Max(nDx1, nDy1), Max(nDx2, nDy2));
/*N*/ nDelta = Max(nDelta, Max(nDxHndl, nDyHndl));
/*N*/ if( pOut )
@@ -251,7 +251,7 @@ namespace binfilter {
/*N*/ nSteps = nDelta / 25 + 4;
/*N*/ }
/*N*/ else nSteps = 10;
-/*N*/
+/*N*/
/*N*/ return nSteps;
/*N*/ }
@@ -269,16 +269,16 @@ namespace binfilter {
/*N*/ {
/*N*/ return;
/*N*/ }
-/*N*/
+/*N*/
/*N*/ double nX;
/*N*/ double nY;
/*N*/ double nX0, nX1, nX2, nX3;
/*N*/ double nY0, nY1, nY2, nY3;
-/*N*/
+/*N*/
/*N*/ long nDiff = nSteps - 1;
/*N*/ long nDiv = nSteps * nSteps * nSteps;
/*N*/ rPoly[nPolyIndex++] = rXPoly[nBezIndex];
-/*N*/
+/*N*/
/*N*/ nX0 = rXPoly[nBezIndex ].X();
/*N*/ nY0 = rXPoly[nBezIndex++].Y();
/*N*/ nX1 = rXPoly[nBezIndex ].X() * 3;
@@ -287,11 +287,11 @@ namespace binfilter {
/*N*/ nY2 = rXPoly[nBezIndex++].Y() * 3;
/*N*/ nX3 = rXPoly[nBezIndex ].X();
/*N*/ nY3 = rXPoly[nBezIndex ].Y();
-/*N*/
+/*N*/
/*N*/ for (long nStep = 1; nStep < nSteps; nStep++, nDiff--, nPolyIndex++)
/*N*/ {
/*N*/ long nAcc = nDiff * nDiff * nDiff;
-/*N*/
+/*N*/
/*N*/ nX = nX0 * nAcc;
/*N*/ nY = nY0 * nAcc;
/*N*/ nAcc = nAcc / nDiff * nStep;
@@ -303,7 +303,7 @@ namespace binfilter {
/*N*/ nAcc = nAcc / nDiff * nStep;
/*N*/ nX += nX3 * nAcc;
/*N*/ nY += nY3 * nAcc;
-/*N*/
+/*N*/
/*N*/ rPoly[nPolyIndex].X() = (long) (nX / nDiv);
/*N*/ rPoly[nPolyIndex].Y() = (long) (nY / nDiv);
/*N*/ }
@@ -321,11 +321,11 @@ namespace binfilter {
/*N*/ {
/*N*/ if ( rXPoly.GetPointCount() == 0 )
/*N*/ return Polygon(0);
-/*N*/
+/*N*/
/*N*/ USHORT i = 0;
/*N*/ ULONG nPolySize = 1;
/*N*/ USHORT nPntMax = rXPoly.GetPointCount()-1;
-/*N*/
+/*N*/
/*N*/ while (i<nPntMax) {
/*N*/ if (i+3<=nPntMax && rXPoly.IsControl(i+1)) {
/*N*/ #ifdef DGB_UTIL
@@ -350,24 +350,24 @@ namespace binfilter {
/*N*/ i++;
/*N*/ }
/*N*/ }
-/*N*/
+/*N*/
/*N*/ if ( nPolySize > XPOLY_MAXPOINTS )
/*N*/ nPolySize = XPOLY_MAXPOINTS;
-/*N*/
+/*N*/
/*N*/ Polygon aPoly( (USHORT) nPolySize );
/*N*/ USHORT nPolyPos = 0, nPolyPosMax = nPolySize - 1;
-/*N*/
+/*N*/
/*N*/ aPoly[ 0 ] = rXPoly[ i = 0 ];
-/*N*/
+/*N*/
/*N*/ while( i < nPntMax && nPolyPos < nPolySize )
/*N*/ {
/*N*/ if( i + 3 <= nPntMax && rXPoly.GetFlags( i + 1 ) == XPOLY_CONTROL )
/*N*/ {
/*N*/ USHORT nSteps = (USHORT) XOutCalcBezierStepCount( rXPoly, i, pOut, nRough );
-/*N*/
+/*N*/
/*N*/ if( nPolyPos + nSteps >= (USHORT) nPolySize )
/*N*/ nSteps = (USHORT)( nPolySize - nPolyPos - 1 );
-/*N*/
+/*N*/
/*N*/ XOutCalcBezier( rXPoly, i, aPoly, nPolyPos, nSteps );
/*N*/ nPolyPos += (USHORT) nSteps;
/*N*/ i += 3;
@@ -375,7 +375,7 @@ namespace binfilter {
/*N*/ else if( nPolyPos < nPolyPosMax )
/*N*/ aPoly[ ++nPolyPos ] = rXPoly[ ++i ];
/*N*/ }
-/*N*/
+/*N*/
/*N*/ return aPoly;
/*N*/ }
@@ -408,16 +408,16 @@ namespace binfilter {
/*N*/ double fLength;
/*N*/ long nLineDx, nLineDy;
/*N*/ long nDxW, nDyW;
-/*N*/
+/*N*/
/*N*/ XLineParam() {}
-/*N*/
+/*N*/
/*N*/ void Init(const Point& rP1, const Point& rP2, long nWidth);
/*N*/ };
/*N*/ void XLineParam::Init(const Point& rP1, const Point& rP2, long nWidth)
/*N*/ {
/*N*/ double fWidth = 0.0, fRound;
-/*N*/
+/*N*/
/*N*/ nPatSeg = -1;
/*N*/ nPatRemain = 0;
/*N*/ bHasJoin = FALSE;
@@ -433,7 +433,7 @@ namespace binfilter {
/*N*/ if ( nLineDx >= 0 ) fRound = 0.5;
/*N*/ else fRound = -0.5;
/*N*/ nDyW = - (long) (fWidth * nLineDx + fRound);
-/*N*/
+/*N*/
/*N*/ aJoin1.X() = rP2.X() + nDxW / 2;
/*N*/ aJoin1.Y() = rP2.Y() + nDyW / 2;
/*N*/ aJoin2 = aJoin1;
@@ -507,7 +507,7 @@ namespace binfilter {
/*?*/ const BYTE cTrans = nLineTransparence * 255 / 100;
/*?*/ const Color aTrans( cTrans, cTrans, cTrans );
/*?*/ Gradient aTransGradient( GRADIENT_LINEAR, aTrans, aTrans );
-/*?*/
+/*?*/
/*?*/ pOut = &aVDev;
/*?*/ aVDev.EnableOutput( FALSE );
/*?*/ aVDev.SetMapMode( pOldOut->GetMapMode() );
@@ -520,9 +520,9 @@ namespace binfilter {
/*?*/ ImpDrawLinePolygon( rPoly, bClosePoly );
/*?*/ aMtf.Stop();
/*?*/ pOut = pOldOut;
-/*?*/
+/*?*/
/*?*/ Rectangle aBound;
-/*?*/
+/*?*/
/*?*/ for( MetaAction* pAct = aMtf.FirstAction(); pAct; pAct = aMtf.NextAction() )
/*?*/ {
/*?*/ if( pAct->GetType() == META_POLYGON_ACTION )
@@ -536,21 +536,21 @@ namespace binfilter {
/*?*/ aBound.Union( Rectangle( aStart, aEnd ) );
/*?*/ }
/*?*/ }
-/*?*/
-/*?*/ if( aMtf.GetActionCount() )
+/*?*/
+/*?*/ if( aMtf.GetActionSize() )
/*?*/ {
/*?*/ Size aSizeLog( aBound.GetSize() );
/*?*/ const Size aMinSizeLog( pOut->PixelToLogic( Size( 1, 1 ) ) );
/*?*/ const Size aSizePix( pOut->LogicToPixel( aSizeLog ) );
-/*?*/
+/*?*/
/*?*/ // watch for minimum width
/*?*/ if( !aSizePix.Width() )
/*?*/ aSizeLog.Width() = aMinSizeLog.Width();
-/*?*/
+/*?*/
/*?*/ // watch for minimum width
/*?*/ if( !aSizePix.Height() )
/*?*/ aSizeLog.Height() = aMinSizeLog.Height();
-/*?*/
+/*?*/
/*?*/ aMap.SetOrigin( aBound.TopLeft() );
/*?*/ aMtf.SetPrefMapMode( aMap );
/*?*/ aMtf.SetPrefSize( aBound.GetSize() );
@@ -570,7 +570,7 @@ namespace binfilter {
/*N*/ Point aLineStartPos, aLineEndPos;
/*N*/ XLineParam aLParam, aStartParam, aEndParam;
/*N*/ USHORT nPntMax = aPoly.GetSize() - 1;
-/*N*/
+/*N*/
/*N*/ if( nPntMax >= 1 )
/*N*/ {
/*N*/ if( bHair || ( ( XLINE_SOLID == eLineStyle ) && ( nLineWidth == 0 ) ) )
@@ -583,28 +583,28 @@ namespace binfilter {
/*?*/ Point aDiff;
/*?*/ const ULONG nOldDrawMode = pOut->GetDrawMode();
/*?*/ USHORT i = 0;
-/*?*/
+/*?*/
/*?*/ if( !nLineWidth )
/*?*/ {
/*?*/ aOldLineColor = pOut->GetLineColor();
/*?*/ pOut->SetLineColor( aLineColor );
/*?*/ }
-/*?*/
+/*?*/
/*?*/ aOldFillColor = pOut->GetFillColor();
-/*?*/
+/*?*/
/*?*/ if( nOldDrawMode & DRAWMODE_WHITEFILL )
/*?*/ {
/*?*/ ULONG nNewDrawMode = nOldDrawMode;
-/*?*/
+/*?*/
/*?*/ nNewDrawMode &= ~DRAWMODE_WHITEFILL;
/*?*/ nNewDrawMode |= DRAWMODE_BLACKFILL;
/*?*/ pOut->SetDrawMode( nNewDrawMode );
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if( nOldDrawMode & DRAWMODE_BLACKLINE )
/*?*/ {
/*?*/ const Color aBlack( COL_BLACK );
-/*?*/
+/*?*/
/*?*/ pOut->SetDrawMode( pOut->GetDrawMode() & (~DRAWMODE_SETTINGSFILL) );
/*?*/ pOut->SetFillColor( aBlack );
/*?*/ }
@@ -617,7 +617,7 @@ namespace binfilter {
/*?*/ }
/*?*/ else
/*?*/ pOut->SetFillColor( aLineColor );
-/*?*/
+/*?*/
/*?*/ // bei einfachen Linien darf das Polygon nicht geschlossen sein (#24000)
/*?*/ if ( aPoly[ nPntMax ] == aPoly[ 0 ] )
/*?*/ {
@@ -629,12 +629,12 @@ namespace binfilter {
/*?*/ else if ( 2 == nPntMax )
/*?*/ bClosePoly = FALSE;
/*?*/ }
-/*?*/
+/*?*/
/*?*/ // Linien mit Laenge 0 nicht beruecksichtigen
/*?*/ while ( i < nPntMax )
/*?*/ {
/*?*/ aDiff = aPoly[i+1] - aPoly[0];
-/*?*/
+/*?*/
/*?*/ if ( bLineStart && !bClosePoly )
/*?*/ {
/*?*/ long nSqLen = aDiff.X() * aDiff.X() + aDiff.Y() * aDiff.Y();
@@ -655,7 +655,7 @@ namespace binfilter {
/*?*/ i++;
/*?*/ }
/*?*/ USHORT nLastPnt = nPntMax;
-/*?*/
+/*?*/
/*?*/ while ( nPntMax > i )
/*?*/ {
/*?*/ aDiff = aPoly[nPntMax-1] - aPoly[nLastPnt];
@@ -678,7 +678,7 @@ namespace binfilter {
/*?*/ break;
/*?*/ nPntMax--;
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if ( bClosePoly )
/*?*/ {
/*?*/ aDiff = aPoly[nPntMax] - aPoly[i];
@@ -690,7 +690,7 @@ namespace binfilter {
/*?*/ }
/*?*/ else
/*?*/ aLParam.Init(aPoly[i], aPoly[i+1], nLineWidth);
-/*?*/
+/*?*/
/*?*/ while ( i < nPntMax )
/*?*/ {
/*?*/ USHORT nPos = i + 1;
@@ -701,7 +701,7 @@ namespace binfilter {
/*?*/ break;
/*?*/ nPos++;
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if ( nLineWidth > 0 )
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*?*/ else
@@ -724,10 +724,10 @@ namespace binfilter {
/*?*/ if ( bLineEnd )
/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*?*/ }
-/*?*/
+/*?*/
/*?*/ if( nLineWidth == 0 )
/*?*/ pOut->SetLineColor( aOldLineColor );
-/*?*/
+/*?*/
/*?*/ pOut->SetFillColor( aOldFillColor );
/*?*/ pOut->SetDrawMode( nOldDrawMode );
/*N*/ }
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index b26664b..ddfb90e 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -202,7 +202,7 @@ sal_Bool FlashExporter::exportAll( Reference< XComponent > xDoc, Reference< XOut
// AS: If the background is different than the previous slide,
// we have to remove the old one and place the new one.
- if (nPage)
+ if (nPage)
{
if (maPagesMap[nPage].mnBackgroundID != maPagesMap[nPage-1].mnBackgroundID)
{
@@ -426,7 +426,7 @@ sal_uInt16 FlashExporter::exportDrawPageBackground(sal_uInt16 nPage, Reference<
// the previous index.
if (gPrivateCache.end() != it)
{
- maPagesMap[nPage].mnBackgroundID =
+ maPagesMap[nPage].mnBackgroundID =
maPagesMap[it->second].mnBackgroundID;
return it->second;
}
@@ -448,7 +448,7 @@ sal_uInt16 FlashExporter::exportDrawPageBackground(sal_uInt16 nPage, Reference<
if (gMasterCache.end() != it)
{
- maPagesMap[nPage].mnBackgroundID =
+ maPagesMap[nPage].mnBackgroundID =
maPagesMap[it->second].mnBackgroundID;
return it->second; // AS: Yes, so don't export it again.
@@ -473,14 +473,14 @@ sal_uInt16 FlashExporter::exportMasterPageObjects(sal_uInt16 nPage, Reference< X
if (gObjectCache.end() != it)
{
- maPagesMap[nPage].mnObjectsID =
+ maPagesMap[nPage].mnObjectsID =
maPagesMap[it->second].mnObjectsID;
return it->second; // AS: Yes, so don't export it again.
}
gObjectCache[shapesum] = nPage;
-
+
sal_uInt16 rObjectsID = mpWriter->startSprite();
exportDrawPageContents( xMasterPage, false, true );
mpWriter->endSprite();
@@ -521,7 +521,7 @@ void FlashExporter::exportShapes( Reference< XShapes >& xShapes, bool bStream, b
{
Reference< XShapes > xShapes2( xShape, UNO_QUERY );
if( xShapes2.is() && xShape->getShapeType().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.GroupShape")))
- // export the contents of group shapes, but we only ever stream at the top
+ // export the contents of group shapes, but we only ever stream at the top
// recursive level anyway, so pass false for streaming.
exportShapes( xShapes2, false, bMaster);
else
@@ -661,7 +661,7 @@ bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile
utl::TempFile aFile;
aFile.EnableKillingFile();
-
+
Sequence< PropertyValue > aFilterData(bExportAsJPEG ? 3 : 2);
aFilterData[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Version") );
aFilterData[0].Value <<= (sal_Int32)6000;
@@ -703,10 +703,10 @@ bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile
BitmapEx rBitmapEx( aGraphic.GetBitmap(), Color(255,255,255) );
Rectangle clipRect;
- for( sal_uLong i = 0, nCount = rMtf.GetActionCount(); i < nCount; i++ )
+ for( size_t i = 0, nCount = rMtf.GetActionSize(); i < nCount; i++ )
{
- const MetaAction* pAction = rMtf.GetAction( i );
- const sal_uInt16 nType = pAction->GetType();
+ const MetaAction* pAction = rMtf.GetAction( i );
+ const sal_uInt16 nType = pAction->GetType();
switch( nType )
{
@@ -728,8 +728,7 @@ bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile
else
rMtf.Read( *aFile.GetStream( STREAM_READ ) );
- int icount = rMtf.GetActionCount();
- return icount != 0;
+ return rMtf.GetActionSize() != 0;
}
sal_uInt32 FlashExporter::ActionSummer(Reference< XShape >& xShape)
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 8a12b91..eefc24f 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -151,7 +151,7 @@ void Writer::Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, sal_Bool b
while( ( i + 1 ) < nSize )
{
if( ( i + 3 ) < nSize )
- {
+ {
PolyFlags P1( rPoly.GetFlags( i ) );
PolyFlags P4( rPoly.GetFlags( i + 3 ) );
@@ -160,7 +160,7 @@ void Writer::Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, sal_Bool b
( POLY_CONTROL == rPoly.GetFlags( i + 2 ) ) &&
( POLY_NORMAL == P4 || POLY_SMOOTH == P4 || POLY_SYMMTR == P4 ) )
{
- Impl_quadBezierApprox( rBits, aLastPoint, d*d,
+ Impl_quadBezierApprox( rBits, aLastPoint, d*d,
rPoly.GetPoint( i ).X(), rPoly.GetPoint( i ).Y(),
rPoly.GetPoint( i+1 ).X(), rPoly.GetPoint( i+1 ).Y(),
rPoly.GetPoint( i+2 ).X(), rPoly.GetPoint( i+2 ).Y(),
@@ -168,8 +168,8 @@ void Writer::Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, sal_Bool b
i += 3;
continue;
}
- }
-
+ }
+
++i;
const Point aPolyPoint( rPoly[ i ] );
@@ -228,7 +228,7 @@ void Writer::Impl_addStraightEdgeRecord( BitStream& rBits, sal_Int16 dx, sal_Int
if( (dx != 0) && (dy != 0) )
{
- rBits.writeUB( 1, 1 ); // GeneralLineFlag
+ rBits.writeUB( 1, 1 ); // GeneralLineFlag
rBits.writeSB( dx, nBits ); // DeltaX
rBits.writeSB( dy, nBits ); // DeltaY
}
@@ -257,8 +257,8 @@ void Writer::Impl_addCurvedEdgeRecord( BitStream& rBits, sal_Int16 control_dx, s
rBits.writeUB( 0, 1 ); // CurvedFlag
sal_uInt8 nBits = static_cast<sal_uInt8>(
- max( getMaxBitsSigned( control_dx ),
- max( getMaxBitsSigned( control_dy ),
+ max( getMaxBitsSigned( control_dx ),
+ max( getMaxBitsSigned( control_dy ),
max( getMaxBitsSigned( anchor_dx ),
max( getMaxBitsSigned( anchor_dy ), (sal_uInt16)3 ) ) ) ) );
@@ -558,7 +558,7 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I
pDX = (sal_Int32*) pDXArray;
}
else
- {
+ {
pOwnArray = new sal_Int32[ nLen ];
aNormSize = Size( mpVDev->GetTextArray( rText, pOwnArray ), 0 );
pDX = pOwnArray;
@@ -591,7 +591,7 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I
const FontMetric aMetric( mpVDev->GetFontMetric() );
FlashFont& rFlashFont = Impl_getFont( aFont );
-
+
// always adjust text position to match baseline alignment
switch( aOldFont.GetAlign() )
{
@@ -620,7 +620,7 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I
}
#endif
- // CL: This is still a hack until we figure out how to calculate a correct bound rect
+ // CL: This is still a hack until we figure out how to calculate a correct bound rect
// for rotatet text
Rectangle textBounds( 0, 0, static_cast<long>(mnDocWidth*mnDocXScale), static_cast<long>(mnDocHeight*mnDocYScale) );
double scale = 1.0;
@@ -641,7 +641,7 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I
}
basegfx::B2DHomMatrix m(basegfx::tools::createRotateB2DHomMatrix(static_cast<double>(nOrientation) * F_PI1800));
- m.translate( double(aPt.X() / scale), double(aPt.Y()) );
+ m.translate( double(aPt.X() / scale), double(aPt.Y()) );
m.scale( scale, scale );
sal_Int16 nHeight = _Int16( map( Size( 0, aFont.GetHeight() ) ).Height() );
@@ -703,7 +703,7 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I
// export facility, although the positioning had to be tweaked a little. I can't explain the
// numbers, but the flash lines up very well with the original OOo document. All of this should
// probably be converted to polygons as part of the meta file, though, as we don't handle any
- // fancy lines (like dashes).
+ // fancy lines (like dashes).
if( ( aOldFont.GetStrikeout() != STRIKEOUT_NONE ) || ( aOldFont.GetUnderline() != UNDERLINE_NONE ) )
{
Polygon aPoly( 4 );
@@ -711,15 +711,15 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I
if( aOldFont.GetStrikeout() != STRIKEOUT_NONE )
{
- aPoly[ 0 ].X() = aBaseLinePos.X();
+ aPoly[ 0 ].X() = aBaseLinePos.X();
aPoly[ 0 ].Y() = aBaseLinePos.Y() - FRound( aMetric.GetAscent() * 0.26 ) - nLineHeight;
- aPoly[ 1 ].X() = aPoly[ 0 ].X() + aNormSize.Width() - 1;
+ aPoly[ 1 ].X() = aPoly[ 0 ].X() + aNormSize.Width() - 1;
aPoly[ 1 ].Y() = aPoly[ 0 ].Y();
- aPoly[ 2 ].X() = aPoly[ 1 ].X();
+ aPoly[ 2 ].X() = aPoly[ 1 ].X();
aPoly[ 2 ].Y() = aPoly[ 1 ].Y() + nLineHeight - 1;
- aPoly[ 3 ].X() = aPoly[ 0 ].X();
+ aPoly[ 3 ].X() = aPoly[ 0 ].X();
aPoly[ 3 ].Y() = aPoly[ 2 ].Y();
-
+
Impl_writePolygon( aPoly, sal_True, aTextColor, aTextColor );
}
@@ -727,13 +727,13 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I
// but it looks good to me.
if( aOldFont.GetUnderline() != UNDERLINE_NONE )
{
- aPoly[ 0 ].X() = aBaseLinePos.X();
+ aPoly[ 0 ].X() = aBaseLinePos.X();
aPoly[ 0 ].Y() = static_cast<long>(aBaseLinePos.Y() + 1.5*nLineHeight);
- aPoly[ 1 ].X() = aPoly[ 0 ].X() + aNormSize.Width() - 1;
+ aPoly[ 1 ].X() = aPoly[ 0 ].X() + aNormSize.Width() - 1;
aPoly[ 1 ].Y() = aPoly[ 0 ].Y();
- aPoly[ 2 ].X() = aPoly[ 1 ].X();
+ aPoly[ 2 ].X() = aPoly[ 1 ].X();
aPoly[ 2 ].Y() = aPoly[ 1 ].Y() + nLineHeight - 1;
- aPoly[ 3 ].X() = aPoly[ 0 ].X();
+ aPoly[ 3 ].X() = aPoly[ 0 ].X();
aPoly[ 3 ].Y() = aPoly[ 2 ].Y();
Impl_writePolygon( aPoly, sal_True, aTextColor, aTextColor );
@@ -848,7 +848,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali
compress2(pCompressed, &compressed_size, pImageData, raw_size, Z_BEST_COMPRESSION);
#endif
- // AS: SWF files let you provide an Alpha mask for JPEG images, but we have
+ // AS: SWF files let you provide an Alpha mask for JPEG images, but we have
// to ZLIB compress the alpha channel seperately.
uLong alpha_compressed_size = 0;
sal_uInt8 *pAlphaCompressed = NULL;
@@ -857,7 +857,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali
alpha_compressed_size = uLongf(width * height + (sal_uInt32)(raw_size/100) + 12);
pAlphaCompressed = new sal_uInt8[ compressed_size ];
-#ifdef DBG_UTIL
+#ifdef DBG_UTIL
if(compress2(pAlphaCompressed, &alpha_compressed_size, pAlphaData, width * height, Z_BEST_COMPRESSION) != Z_OK)
{
DBG_ASSERT( false, "compress2 failed!" ); ((void)0);
@@ -924,14 +924,14 @@ void Writer::Impl_writeImage( const BitmapEx& rBmpEx, const Point& rPt, const Si
// However, I can't explain why exactly. I got some of this by trial and error.
double XScale = static_cast<double>(originalPixelRect.GetWidth())/destRect.GetWidth();
double YScale = static_cast<double>(originalPixelRect.GetHeight())/destRect.GetHeight();
-
+
// AS: If rClipRect has a value set, then we need to crop the bmp appropriately.
// If a map event already occurred in the metafile, then we do not need to map
// the clip rect as it's already been done.
if (!rClipRect.IsEmpty())
{
// AS: Christian, I also don't understand why bNeedToMapClipRect is necessary, but it
- // works like a charm. Usually, the map event in the meta file does not cause the
+ // works like a charm. Usually, the map event in the meta file does not cause the
// clipping rectangle to get mapped. However, sometimes there are multiple layers
// of mapping which eventually do cause the clipping rect to be mapped.
Size clipSize( bNeedToMapClipRect ? map(rClipRect.GetSize()) : rClipRect.GetSize() );
@@ -943,9 +943,9 @@ void Writer::Impl_writeImage( const BitmapEx& rBmpEx, const Point& rPt, const Si
// AS: The bmp origion is always 0,0 so we have to adjust before we crop.
cropRect.Move(-srcPt.X(), -srcPt.Y());
// AS: Rectangle has no scale function (?!) so I do it manually...
- Rectangle cropPixelRect(static_cast<long>(cropRect.Left()*XScale),
- static_cast<long>(cropRect.Top()*YScale),
- static_cast<long>(cropRect.Right()*XScale),
+ Rectangle cropPixelRect(static_cast<long>(cropRect.Left()*XScale),
+ static_cast<long>(cropRect.Top()*YScale),
+ static_cast<long>(cropRect.Right()*XScale),
static_cast<long>(cropRect.Bottom()*YScale));
bmpSource.Crop(cropPixelRect);
@@ -1029,7 +1029,7 @@ void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal
// the header and the image need start and stop (D8 and D9),
// so that's why you see those written to both. I don't
// really know what the rest of these are, I got it to work
- // kind of by trial and error and by comparing with known
+ // kind of by trial and error and by comparing with known
// good SWF files.
sal_uInt8 cType = 0x01;
const sal_uInt8* pJpgSearch = pJpgData;
@@ -1065,7 +1065,7 @@ void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal
{
// AS: Lengths are big endian.
- // Beware. pJpgSearch is not necessarily word-aligned,
+ // Beware. pJpgSearch is not necessarily word-aligned,
// so we access it byte-wise.
// AS: Add 2 to the length to include the 0xFFXX itself.
@@ -1178,7 +1178,7 @@ void Writer::Impl_writeRect( const Rectangle& rRect, long nRadX, long nRadY )
if( (rRect.nTop == rRect.nBottom) || (rRect.nLeft == rRect.nRight) )
{
Color aColor( mpVDev->GetFillColor() );
- Impl_writeLine( rRect.TopLeft(), rRect.BottomRight(), &aColor );
+ Impl_writeLine( rRect.TopLeft(), rRect.BottomRight(), &aColor );
}
else
{
@@ -1299,9 +1299,9 @@ bool Writer::Impl_writeFilling( SvtGraphicFill& rFilling )
aMatrix.set(a, b, aTransform.matrix[a*3+b]);
}
}
- aMatrix.set(2, 0, 0.0);
- aMatrix.set(2, 1, 0.0);
- aMatrix.set(2, 2, 1.0);
+ aMatrix.set(2, 0, 0.0);
+ aMatrix.set(2, 1, 0.0);
+ aMatrix.set(2, 2, 1.0);
// scale bitmap
double XScale = (double)aNewRect.GetWidth()/aOldRect.GetWidth();
@@ -1321,7 +1321,7 @@ bool Writer::Impl_writeFilling( SvtGraphicFill& rFilling )
// -----------------------------------------------------------------------------
-/* CL: The idea was to export page fields as text fields that get theire
+/* CL: The idea was to export page fields as text fields that get theire
string from a variable set with actionscript by each page. This didn't
work out since the formating is always wrong when text follows the
page number field since pages greater one may require more space than
@@ -1414,7 +1414,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
{
Rectangle clipRect;
int bMap = 0;
- for( sal_uLong i = 0, nCount = rMtf.GetActionCount(); i < nCount; i++ )
+ for( size_t i = 0, nCount = rMtf.GetActionSize(); i < nCount; i++ )
{
const MetaAction* pAction = rMtf.GetAction( i );
const sal_uInt16 nType = pAction->GetType();
@@ -1440,7 +1440,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
case( META_LINE_ACTION ):
{
const MetaLineAction* pA = (const MetaLineAction*) pAction;
-
+
if(pA->GetLineInfo().IsDefault())
{
Impl_writeLine( pA->GetStartPoint(), pA->GetEndPoint() );
@@ -1508,7 +1508,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
aPoly = Polygon( pA->GetRect(), pA->GetStartPoint(), pA->GetEndPoint(), POLY_CHORD );
}
break;
-
+
case( META_POLYGON_ACTION ):
aPoly = ( (const MetaPolygonAction*) pAction )->GetPolygon();
break;
@@ -1635,16 +1635,16 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
sal_Bool bFound = sal_False;
- for( sal_uLong j = 0, nC = aGDIMetaFile.GetActionCount(); ( j < nC ) && !bFound; j++ )
+ for( size_t j = 0, nC = aGDIMetaFile.GetActionSize(); ( j < nC ) && !bFound; j++ )
{
const MetaAction* pSubstAct = aGDIMetaFile.GetAction( j );
-
+
if( pSubstAct->GetType() == META_BMPSCALE_ACTION )
{
bFound = sal_True;
const MetaBmpScaleAction* pBmpScaleAction = (const MetaBmpScaleAction*) pSubstAct;
- Impl_writeImage( pBmpScaleAction->GetBitmap(),
- pA->GetPoint(), pA->GetSize(),
+ Impl_writeImage( pBmpScaleAction->GetBitmap(),
+ pA->GetPoint(), pA->GetSize(),
Point(), pBmpScaleAction->GetBitmap().GetSizePixel(), clipRect, 1 == bMap );
}
}
@@ -1668,7 +1668,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
if( pAction->GetType() == META_GRADIENTEX_ACTION )
pGradAction = (const MetaGradientExAction*) pAction;
- else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
+ else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
( ( (const MetaCommentAction*) pAction )->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_END" ) == COMPARE_EQUAL ) )
{
bDone = sal_True;
@@ -1678,7 +1678,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
if( pGradAction )
Impl_writeGradientEx( pGradAction->GetPolyPolygon(), pGradAction->GetGradient());
}
- else if( pA->GetComment().CompareIgnoreCaseToAscii( "XPATHFILL_SEQ_BEGIN" ) == COMPARE_EQUAL &&
+ else if( pA->GetComment().CompareIgnoreCaseToAscii( "XPATHFILL_SEQ_BEGIN" ) == COMPARE_EQUAL &&
pData )
{
@@ -1701,7 +1701,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
{
pAction = rMtf.GetAction( i );
- if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
+ if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
( ( (const MetaCommentAction*) pAction )->GetComment().CompareIgnoreCaseToAscii( "XPATHFILL_SEQ_END" ) == COMPARE_EQUAL ) )
{
bDone = sal_True;
@@ -1709,7 +1709,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
}
}
- else if( pA->GetComment().CompareIgnoreCaseToAscii( "XPATHSTROKE_SEQ_BEGIN" ) == COMPARE_EQUAL &&
+ else if( pA->GetComment().CompareIgnoreCaseToAscii( "XPATHSTROKE_SEQ_BEGIN" ) == COMPARE_EQUAL &&
pData )
{
@@ -1732,7 +1732,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
{
pAction = rMtf.GetAction( i );
- if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
+ if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
( ( (const MetaCommentAction*) pAction )->GetComment().CompareIgnoreCaseToAscii( "XPATHSTROKE_SEQ_END" ) == COMPARE_EQUAL ) )
{
bDone = sal_True;
@@ -1756,7 +1756,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
Impl_writePageField( aRect );
}
- if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
+ if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
( ( (const MetaCommentAction*) pAction )->GetComment().CompareIgnoreCaseToAscii( "FIELD_SEQ_END" ) == COMPARE_EQUAL ) )
{
bDone = sal_True;
@@ -1771,8 +1771,8 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
{
const MetaBmpScaleAction* pA = (const MetaBmpScaleAction*) pAction;
- Impl_writeImage( pA->GetBitmap(),
- pA->GetPoint(), pA->GetSize(),
+ Impl_writeImage( pA->GetBitmap(),
+ pA->GetPoint(), pA->GetSize(),
Point(), pA->GetBitmap().GetSizePixel(), clipRect, 1 == bMap );
}
break;
@@ -1780,8 +1780,8 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
case( META_BMP_ACTION ):
{
const MetaBmpAction* pA = (const MetaBmpAction*) pAction;
- Impl_writeImage( pA->GetBitmap(),
- pA->GetPoint(), mpVDev->PixelToLogic( pA->GetBitmap().GetSizePixel()),
+ Impl_writeImage( pA->GetBitmap(),
+ pA->GetPoint(), mpVDev->PixelToLogic( pA->GetBitmap().GetSizePixel()),
Point(), pA->GetBitmap().GetSizePixel(), clipRect, 1 ==bMap );
}
break;
@@ -1789,8 +1789,8 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
case( META_BMPSCALEPART_ACTION ):
{
const MetaBmpScalePartAction* pA = (const MetaBmpScalePartAction*) pAction;
- Impl_writeImage( pA->GetBitmap(),
- pA->GetDestPoint(), pA->GetDestSize(),
+ Impl_writeImage( pA->GetBitmap(),
+ pA->GetDestPoint(), pA->GetDestSize(),
pA->GetSrcPoint(), pA->GetSrcSize(), clipRect, 1 == bMap );
}
break;
@@ -1798,8 +1798,8 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
case( META_BMPEX_ACTION ):
{
const MetaBmpExAction* pA = (const MetaBmpExAction*) pAction;
- Impl_writeImage( pA->GetBitmapEx(),
- pA->GetPoint(), mpVDev->PixelToLogic( pA->GetBitmapEx().GetSizePixel() ),
+ Impl_writeImage( pA->GetBitmapEx(),
+ pA->GetPoint(), mpVDev->PixelToLogic( pA->GetBitmapEx().GetSizePixel() ),
Point(), pA->GetBitmapEx().GetSizePixel(), clipRect, 1 == bMap );
}
break;
@@ -1807,8 +1807,8 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
case( META_BMPEXSCALE_ACTION ):
{
const MetaBmpExScaleAction* pA = (const MetaBmpExScaleAction*) pAction;
- Impl_writeImage( pA->GetBitmapEx(),
- pA->GetPoint(), pA->GetSize(),
+ Impl_writeImage( pA->GetBitmapEx(),
+ pA->GetPoint(), pA->GetSize(),
Point(), pA->GetBitmapEx().GetSizePixel(), clipRect, 1 == bMap );
}
break;
@@ -1816,8 +1816,8 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
case( META_BMPEXSCALEPART_ACTION ):
{
const MetaBmpExScalePartAction* pA = (const MetaBmpExScalePartAction*) pAction;
- Impl_writeImage( pA->GetBitmapEx(),
- pA->GetDestPoint(), pA->GetDestSize(),
+ Impl_writeImage( pA->GetBitmapEx(),
+ pA->GetDestPoint(), pA->GetDestSize(),
pA->GetSrcPoint(), pA->GetSrcSize(), clipRect, 1 == bMap );
}
break;
@@ -1826,7 +1826,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
{
const MetaTextAction* pA = (const MetaTextAction*) pAction;
Impl_writeText( pA->GetPoint(), String( pA->GetText(), pA->GetIndex(), pA->GetLen() ), NULL, 0);
- }
+ }
break;
case( META_TEXTRECT_ACTION ):
@@ -1947,7 +1947,7 @@ void Writer::Impl_quadBezierApprox( BitStream& rBits,
P4y == 3.0*P3y - 3.0*P2y + P1y )
{
Impl_addQuadBezier( rBits, rLastPoint,
- 3.0/2.0*P2x - 1.0/2.0*P1x, 3.0/2.0*P2y - 1.0/2.0*P1y,
+ 3.0/2.0*P2x - 1.0/2.0*P1x, 3.0/2.0*P2y - 1.0/2.0*P1y,
P4x, P4y);
}
else
@@ -1961,8 +1961,8 @@ void Writer::Impl_quadBezierApprox( BitStream& rBits,
// Intersection of P2P1 and P4P3
// (P2y-P4y)(P3x-P4x)-(P2x-P4x)(P3y-P4y)
- // lambda = -------------------------------------
- // (P1x-P2x)(P3y-P4y)-(P1y-P2y)(P3x-P4x)
+ // lambda = -------------------------------------
+ // (P1x-P2x)(P3y-P4y)-(P1y-P2y)(P3x-P4x)
//
// Intersection point IP is now
// IP = P2 + lambda(P1-P2)
@@ -1970,7 +1970,7 @@ void Writer::Impl_quadBezierApprox( BitStream& rBits,
const double nominator( (P2y-P4y)*(P3x-P4x) - (P2x-P4x)*(P3y-P4y) );
const double denominator( (P1x-P2x)*(P3y-P4y) - (P1y-P2y)*(P3x-P4x) );
const double lambda( nominator / denominator );
-
+
const double IPx( P2x + lambda*( P1x - P2x) );
const double IPy( P2y + lambda*( P1y - P2y) );
@@ -2014,14 +2014,14 @@ void Writer::Impl_quadBezierApprox( BitStream& rBits,
// Should denominator be 0: then P1P2 and P3P4 are parallel (P1P2^T R[90,P3P4] = 0.0),
// meaning that either we have a straight line or an inflexion point (see else block below)
if( 0.0 != denominator &&
- ::std::max( fJ1x*fJ1x + fJ1y*fJ1y,
+ ::std::max( fJ1x*fJ1x + fJ1y*fJ1y,
fJ2x*fJ2x + fJ2y*fJ2y) < d2 )
{
// requested resolution reached.
// Add end points to output file.
// order is preserved, since this is so to say depth first traversal.
Impl_addQuadBezier( rBits, rLastPoint,
- QP2x, QP2y,
+ QP2x, QP2y,
QP3x, QP3y);
}
else
@@ -2033,7 +2033,7 @@ void Writer::Impl_quadBezierApprox( BitStream& rBits,
// straight line. If the given cubic bezier does not deviate by
// more than d/4 from a straight line, either:
// - take the line (that's what we do here)
- // - express the line by a quadratic bezier
+ // - express the line by a quadratic bezier
// Perform bezier flatness test (lecture notes from R. Schaback,
// Mathematics of Computer-Aided Design, Uni Goettingen, 2000)
@@ -2051,7 +2051,7 @@ void Writer::Impl_quadBezierApprox( BitStream& rBits,
const double fJ2y2( P3y - P1y - 2.0/3.0*(P4y - P1y) );
// stop if distance from line is guaranteed to be bounded by d/4
- if( ::std::max( fJ1x2*fJ1x2 + fJ1y2*fJ1y2,
+ if( ::std::max( fJ1x2*fJ1x2 + fJ1y2*fJ1y2,
fJ2x2*fJ2x2 + fJ2y2*fJ2y2) < d2/16.0 )
{
// do not subdivide further, add straight line instead
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 5d7d9fb..3d6070b 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -289,7 +289,7 @@ void METWriter::CountActionsAndBitmaps(const GDIMetaFile * pMTF)
{
const MetaAction* pMA;
- for( sal_uLong nAction = 0, nActionCount=pMTF->GetActionCount(); nAction < nActionCount; nAction++ )
+ for( size_t nAction = 0, nActionCount=pMTF->GetActionSize(); nAction < nActionCount; nAction++ )
{
pMA = pMTF->GetAction(nAction);
@@ -298,8 +298,8 @@ void METWriter::CountActionsAndBitmaps(const GDIMetaFile * pMTF)
case META_EPS_ACTION :
{
const GDIMetaFile aGDIMetaFile( ((const MetaEPSAction*)pMA)->GetSubstitute() );
- sal_Int32 nCount = aGDIMetaFile.GetActionCount();
- sal_Int32 i;
+ size_t nCount = aGDIMetaFile.GetActionSize();
+ size_t i;
for ( i = 0; i < nCount; i++ )
if ( ((const MetaAction*)aGDIMetaFile.GetAction( i ))->GetType() == META_BMPSCALE_ACTION )
break;
@@ -376,15 +376,15 @@ void METWriter::WriteFieldId(sal_uLong nId)
void METWriter::CreateChrSets(const GDIMetaFile * pMTF)
{
- sal_uLong nAction, nActionCount;
+ size_t nAction, nActionCount;
const MetaAction * pMA;
if (bStatus==sal_False)
return;
- nActionCount=pMTF->GetActionCount();
+ nActionCount = pMTF->GetActionSize();
- for (nAction=0; nAction<nActionCount; nAction++)
+ for (nAction = 0; nAction < nActionCount; nAction++)
{
pMA = pMTF->GetAction(nAction);
@@ -717,7 +717,7 @@ void METWriter::WriteImageObjects(const GDIMetaFile * pMTF)
if (bStatus==sal_False)
return;
- for ( sal_uLong nAction = 0, nActionCount = pMTF->GetActionCount(); nAction < nActionCount; nAction++)
+ for ( size_t nAction = 0, nActionCount = pMTF->GetActionSize(); nAction < nActionCount; nAction++)
{
pMA = pMTF->GetAction(nAction);
@@ -770,8 +770,8 @@ void METWriter::WriteImageObjects(const GDIMetaFile * pMTF)
const MetaEPSAction* pA = (const MetaEPSAction*)pMA;
const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
- sal_Int32 nCount = aGDIMetaFile.GetActionCount();
- for ( sal_Int32 i = 0; i < nCount; i++ )
+ size_t nCount = aGDIMetaFile.GetActionSize();
+ for ( size_t i = 0; i < nCount; i++ )
{
const MetaAction* pMetaAct = aGDIMetaFile.GetAction( i );
if ( pMetaAct->GetType() == META_BMPSCALE_ACTION )
@@ -1474,7 +1474,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
if(bStatus==sal_False)
return;
- for( sal_uLong nA = 0, nACount = pMTF->GetActionCount(); nA < nACount; nA++ )
+ for( size_t nA = 0, nACount = pMTF->GetActionSize(); nA < nACount; nA++ )
{
const MetaAction* pMA = pMTF->GetAction( nA );
@@ -2032,8 +2032,8 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
const MetaEPSAction* pA = (const MetaEPSAction*)pMA;
const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
- sal_Int32 nCount = aGDIMetaFile.GetActionCount();
- for ( sal_Int32 i = 0; i < nCount; i++ )
+ size_t nCount = aGDIMetaFile.GetActionSize();
+ for ( size_t i = 0; i < nCount; i++ )
{
const MetaAction* pMetaAct = aGDIMetaFile.GetAction( i );
if ( pMetaAct->GetType() == META_BMPSCALE_ACTION )
@@ -2239,7 +2239,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
aGDILineColor=pGS->aLineColor;
aGDIFillColor=pGS->aFillColor;
eGDIRasterOp=pGS->eRasterOp;
- aGDIFont=pGS->aFont;
+ aGDIFont=pGS->aFont;
if ( pGS->aClipRect != aGDIClipRect )
WriteClipRect( pGS->aClipRect );
aPictureMapMode=pGS->aMapMode;
@@ -2282,7 +2282,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
case META_FLOATTRANSPARENT_ACTION:
{
const MetaFloatTransparentAction* pA = (const MetaFloatTransparentAction*) pMA;
-
+
GDIMetaFile aTmpMtf( pA->GetGDIMetaFile() );
Point aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() );
const Size aSrcSize( aTmpMtf.GetPrefSize() );
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 02723dd..aad2e96 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -210,12 +210,12 @@ void PictWriter::MayCallback()
void PictWriter::CountActionsAndBitmaps(const GDIMetaFile & rMTF)
{
- sal_uLong nAction, nActionCount;
+ size_t nAction, nActionCount;
const MetaAction* pMA;
- nActionCount = rMTF.GetActionCount();
+ nActionCount = rMTF.GetActionSize();
- for (nAction=0; nAction<nActionCount; nAction++)
+ for (nAction=0; nAction < nActionCount; nAction++)
{
pMA = rMTF.GetAction( nAction );
@@ -445,7 +445,7 @@ void PictWriter::ConvertLinePattern(PictPattern & rPat, sal_Bool bVisible)
{
if( bVisible )
{
- rPat.nHi=0xffffffff;
+ rPat.nHi=0xffffffff;
rPat.nLo=0xffffffff;
}
else
@@ -459,7 +459,7 @@ void PictWriter::ConvertFillPattern(PictPattern & rPat, sal_Bool bVisible)
{
if( bVisible )
{
- rPat.nHi=0xffffffff;
+ rPat.nHi=0xffffffff;
rPat.nLo=0xffffffff;
}
else
@@ -714,7 +714,7 @@ void PictWriter::WriteOpcode_FontName(const Font & rFont)
if (bDstFontNameValid==sal_False || nDstFontNameId!=nFontId || aDstFontName!=rFont.GetName())
{
- ByteString aByteString( rFont.GetName(), gsl_getSystemTextEncoding() );
+ ByteString aByteString( rFont.GetName(), gsl_getSystemTextEncoding() );
sal_uInt16 nFontNameLen = aByteString.Len();
if ( nFontNameLen )
{
@@ -736,8 +736,8 @@ void PictWriter::WriteOpcode_ClipRect( const Rectangle& rRect )
Rectangle aRect( MapRectangle( rRect ) );
aRect.nBottom++;
aRect.nRight++;
- *pPict << (sal_uInt16)1 // opcode 1
- << (sal_uInt16)10 // data size
+ *pPict << (sal_uInt16)1 // opcode 1
+ << (sal_uInt16)10 // data size
<< (sal_Int16)aRect.Top() << (sal_Int16)aRect.Left()
<< (sal_Int16)aRect.Bottom() << (sal_Int16)aRect.Right();
aClipRect = aRect;
@@ -915,7 +915,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize,
nBitsPerPixel = aBitmap.GetBitCount();
// export code below only handles four discrete cases
- nBitsPerPixel =
+ nBitsPerPixel =
nBitsPerPixel <= 1 ? 1 : nBitsPerPixel <= 4 ? 4 : nBitsPerPixel <= 8 ? 8 : 24;
nWidth = pAcc->Width();
@@ -1431,15 +1431,15 @@ void PictWriter::HandleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx
void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
{
- sal_uLong nA, nACount;
+ size_t nA, nACount;
const MetaAction* pMA;
if( !bStatus)
return;
- nACount=rMTF.GetActionCount();
+ nACount = rMTF.GetActionSize();
- for (nA=0; nA<nACount; nA++)
+ for (nA=0; nA < nACount; nA++)
{
pMA = rMTF.GetAction(nA);
@@ -1703,7 +1703,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
{
const MetaPolyPolygonAction* pA = (const MetaPolyPolygonAction*) pMA;
- const PolyPolygon& rPolyPoly = pA->GetPolyPolygon();
+ const PolyPolygon& rPolyPoly = pA->GetPolyPolygon();
sal_uInt16 nPolyCount = rPolyPoly.Count();
PolyPolygon aSimplePolyPoly( rPolyPoly );
for ( sal_uInt16 i = 0; i < nPolyCount; i++ )
@@ -1863,8 +1863,8 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
const MetaEPSAction* pA = (const MetaEPSAction*)pMA;
const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
- sal_Int32 nCount = aGDIMetaFile.GetActionCount();
- for ( sal_Int32 i = 0; i < nCount; i++ )
+ size_t nCount = aGDIMetaFile.GetActionSize();
+ for ( size_t i = 0; i < nCount; i++ )
{
const MetaAction* pMetaAct = aGDIMetaFile.GetAction( i );
if ( pMetaAct->GetType() == META_BMPSCALE_ACTION )
@@ -2086,8 +2086,8 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
if ( pAt->aClipRect != aClipRect )
{
Rectangle aRect( pAt->aClipRect );
- *pPict << (sal_uInt16)1 // opcode 1
- << (sal_uInt16)10 // data size
+ *pPict << (sal_uInt16)1 // opcode 1
+ << (sal_uInt16)10 // data size
<< (sal_Int16)aRect.Top() << (sal_Int16)aRect.Left()
<< (sal_Int16)aRect.Bottom() << (sal_Int16)aRect.Right();
}
@@ -2127,7 +2127,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
case META_FLOATTRANSPARENT_ACTION:
{
const MetaFloatTransparentAction* pA = (const MetaFloatTransparentAction*) pMA;
-
+
GDIMetaFile aTmpMtf( pA->GetGDIMetaFile() );
Point aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() );
const Size aSrcSize( aTmpMtf.GetPrefSize() );
@@ -2169,7 +2169,7 @@ void PictWriter::WriteHeader(const GDIMetaFile & rMTF)
{
sal_uInt16 i;
Size aSize( rMTF.GetPrefSize() );
- Point aPoint;
+ Point aPoint;
Rectangle aRect( aPoint, aSize );
// 512 Bytes "Muell" am Anfang:
@@ -2195,7 +2195,7 @@ void PictWriter::WriteHeader(const GDIMetaFile & rMTF)
// viele Import-Filter verlangen die Angabe eines
// Clipping-Bereichs am Anfang
-
+
WriteOpcode_ClipRect( aRect );
}
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 018719f..93b1c34 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -132,7 +132,7 @@ private:
double nBoundingY1;
double nBoundingX2;
double nBoundingY2;
- //
+ //
StackMember* pGDIStack;
sal_uLong mnCursorPos; // aktuelle Cursorposition im Output
Color aColor; // aktuelle Farbe die fuer den Output benutzt wird
@@ -218,7 +218,7 @@ private:
void ImplIntersect( const PolyPolygon& rPolyPoly );
void ImplPolyPoly( const PolyPolygon & rPolyPolygon, sal_Bool bTextOutline = sal_False );
void ImplPolyLine( const Polygon & rPolygon );
-
+
void ImplSetClipRegion( Region& rRegion );
void ImplBmp( Bitmap*, Bitmap*, const Point &, double nWidth, double nHeight );
void ImplText( const String& rUniString, const Point& rPos, const sal_Int32* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev );
@@ -310,14 +310,14 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi
{
String aPreviewStr( RTL_CONSTASCII_USTRINGPARAM( "Preview" ) );
String aVersionStr( RTL_CONSTASCII_USTRINGPARAM( "Version" ) );
- String aColorStr( RTL_CONSTASCII_USTRINGPARAM( "ColorFormat" ) );
+ String aColorStr( RTL_CONSTASCII_USTRINGPARAM( "ColorFormat" ) );
String aComprStr( RTL_CONSTASCII_USTRINGPARAM( "CompressionMode" ) );
mnPreview = pFilterConfigItem->ReadInt32( aPreviewStr, 1 );
mnLevel = pFilterConfigItem->ReadInt32( aVersionStr, 2 );
if ( mnLevel != 1 )
mnLevel = 2;
mbGrayScale = pFilterConfigItem->ReadInt32( aColorStr, 1 ) == 2;
- mbCompression = pFilterConfigItem->ReadInt32( aComprStr, 1 ) == 1;
+ mbCompression = pFilterConfigItem->ReadInt32( aComprStr, 1 ) == 1;
String sTextMode( RTL_CONSTASCII_USTRINGPARAM( "TextMode" ) );
mnTextMode = pFilterConfigItem->ReadInt32( sTextMode, 0 );
if ( mnTextMode > 2 )
@@ -371,7 +371,7 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi
if (rGraphic.GetType() == GRAPHIC_GDIMETAFILE)
pMTF = &rGraphic.GetGDIMetaFile();
- else if (rGraphic.GetGDIMetaFile().GetActionCount())
+ else if (rGraphic.GetGDIMetaFile().GetActionSize())
pMTF = pAMTF = new GDIMetaFile( rGraphic.GetGDIMetaFile() );
else
{
@@ -409,7 +409,7 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi
pChrSetList = NULL;
nNextChrSetId = 1;
- if( pMTF->GetActionCount() )
+ if( pMTF->GetActionSize() )
{
ImplWriteProlog( ( mnPreview & EPS_PREVIEW_EPSI ) ? &rGraphic : NULL );
mnCursorPos = 0;
@@ -526,7 +526,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview )
*mpPS << "%";
nCount2 = 312;
}
- nVal <<= 1;
+ nVal <<= 1;
if ( pAcc->GetPixel( nY, nX ) == aBlack )
nVal |= 1;
if ( ! ( --nCount ) )
@@ -545,7 +545,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview )
aTmpBitmap.ReleaseAccess( pAcc );
ImplExecMode( PS_RET );
ImplWriteLine( "%%EndPreview" );
- }
+ }
}
ImplWriteLine( "%%BeginProlog" );
ImplWriteLine( "%%BeginResource: procset SDRes-Prolog 1.0 0" );
@@ -626,7 +626,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
{
PolyPolygon aFillPath;
- for( sal_uLong nCurAction = 0, nCount = rMtf.GetActionCount(); nCurAction < nCount; nCurAction++ )
+ for( size_t nCurAction = 0, nCount = rMtf.GetActionSize(); nCurAction < nCount; nCurAction++ )
{
MetaAction* pMA = rMtf.GetAction( nCurAction );
@@ -722,7 +722,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
Polygon aPoly( ( (const MetaPolyLineAction*) pMA )->GetPolygon() );
const LineInfo& rLineInfo = ( ( const MetaPolyLineAction*)pMA )->GetLineInfo();
ImplWriteLineInfo( rLineInfo );
-
+
if(basegfx::B2DLINEJOIN_NONE == rLineInfo.GetLineJoin()
&& rLineInfo.GetWidth() > 1)
{
@@ -732,21 +732,21 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
for(sal_uInt16 a(0); a + 1 < nPoints; a++)
{
- if(bCurve
+ if(bCurve
&& POLY_NORMAL != aPoly.GetFlags(a + 1)
&& a + 2 < nPoints
&& POLY_NORMAL != aPoly.GetFlags(a + 2)
&& a + 3 < nPoints)
{
- const Polygon aSnippet(4,
- aPoly.GetConstPointAry() + a,
+ const Polygon aSnippet(4,
+ aPoly.GetConstPointAry() + a,
aPoly.GetConstFlagAry() + a);
ImplPolyLine(aSnippet);
a += 2;
}
else
{
- const Polygon aSnippet(2,
+ const Polygon aSnippet(2,
aPoly.GetConstPointAry() + a);
ImplPolyLine(aSnippet);
}
@@ -912,9 +912,9 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
{
VirtualDevice l_aVDev;
GDIMetaFile aTmpMtf;
-
+
l_aVDev.SetMapMode( rVDev.GetMapMode() );
- l_aVDev.AddHatchActions( ( (const MetaHatchAction*)pMA)->GetPolyPolygon(),
+ l_aVDev.AddHatchActions( ( (const MetaHatchAction*)pMA)->GetPolyPolygon(),
( (const MetaHatchAction*)pMA )->GetHatch(), aTmpMtf );
ImplWriteActions( aTmpMtf, rVDev );
}
@@ -1203,7 +1203,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
case META_FLOATTRANSPARENT_ACTION:
{
const MetaFloatTransparentAction* pA = (const MetaFloatTransparentAction*) pMA;
-
+
GDIMetaFile aTmpMtf( pA->GetGDIMetaFile() );
Point aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() );
const Size aSrcSize( aTmpMtf.GetPrefSize() );
@@ -1229,7 +1229,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
break;
case META_COMMENT_ACTION:
- {
+ {
const MetaCommentAction* pA = (const MetaCommentAction*) pMA;
if ( pA->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_BEGIN" ) == COMPARE_EQUAL )
{
@@ -1239,14 +1239,14 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
MetaAction* pAction = rMtf.GetAction( nCurAction );
if( pAction->GetType() == META_GRADIENTEX_ACTION )
pGradAction = (const MetaGradientExAction*) pAction;
- else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
+ else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
( ( (const MetaCommentAction*) pAction )->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_END" ) == COMPARE_EQUAL ) )
{
break;
}
}
if( pGradAction )
- ImplWriteGradient( pGradAction->GetPolyPolygon(), pGradAction->GetGradient(), rVDev );
+ ImplWriteGradient( pGradAction->GetPolyPolygon(), pGradAction->GetGradient(), rVDev );
}
else if ( pA->GetComment().Equals( "XPATHFILL_SEQ_END" ) )
{
@@ -1262,7 +1262,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
if ( pData )
{
SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), STREAM_READ );
- sal_Bool bSkipSequence = sal_False;
+ sal_Bool bSkipSequence = sal_False;
ByteString sSeqEnd;
if( pA->GetComment().Equals( "XPATHSTROKE_SEQ_BEGIN" ) )
@@ -1345,8 +1345,8 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
MetaBitmapAction using RasterOp xor
Because RasterOps cannot been used in Postscript, we have to
- replace these actions. The MetaComment "XPATHFILL_SEQ_BEGIN" is
- providing the clippath of the object. The following loop is
+ replace these actions. The MetaComment "XPATHFILL_SEQ_BEGIN" is
+ providing the clippath of the object. The following loop is
trying to find the bitmap that is matching the clippath, so that
only one bitmap is exported, otherwise if the bitmap is not
locatable, all metaactions are played normally.
@@ -1413,7 +1413,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
pMA = rMtf.GetAction( nCurAction );
if ( pMA->GetType() == META_COMMENT_ACTION )
{
- ByteString sComment( ((MetaCommentAction*)pMA)->GetComment() );
+ ByteString sComment( ((MetaCommentAction*)pMA)->GetComment() );
if ( sComment.Equals( sSeqEnd ) )
break;
}
@@ -1614,7 +1614,7 @@ void PSWriter::ImplPolyPoly( const PolyPolygon & rPolyPoly, sal_Bool bTextOutlin
}
if ( bLineColor )
{
- ImplWriteLineColor( PS_SPACE );
+ ImplWriteLineColor( PS_SPACE );
for ( i = 0; i < nPolyCount; i++ )
ImplAddPath( rPolyPoly.GetObject( i ) );
ImplClosePathDraw( PS_RET );
@@ -1633,7 +1633,7 @@ void PSWriter::ImplPolyLine( const Polygon & rPoly )
if ( nPointCount )
{
if ( nPointCount > 1 )
- {
+ {
ImplMoveTo( rPoly.GetPoint( 0 ) );
i = 1;
while ( i < nPointCount )
@@ -1650,7 +1650,7 @@ void PSWriter::ImplPolyLine( const Polygon & rPoly )
ImplLineTo( rPoly.GetPoint( i++ ), PS_SPACE | PS_WRAP );
}
}
-
+
// #104645# explicitely close path if polygon is closed
if( rPoly[ 0 ] == rPoly[ nPointCount-1 ] )
ImplClosePathDraw( PS_RET );
@@ -2052,10 +2052,10 @@ void PSWriter::ImplText( const String& rUniString, const Point& rPos, const sal_
if ( !nLen )
return;
if ( mnTextMode == 0 ) // using glpyh outlines
- {
+ {
Font aNotRotatedFont( maFont );
aNotRotatedFont.SetOrientation( 0 );
-
+
VirtualDevice aVirDev( 1 );
aVirDev.SetMapMode( rVDev.GetMapMode() );
aVirDev.SetFont( aNotRotatedFont );
@@ -2063,7 +2063,7 @@ void PSWriter::ImplText( const String& rUniString, const Point& rPos, const sal_
sal_Int16 nRotation = maFont.GetOrientation();
Polygon aPolyDummy( 1 );
-
+
PolyPolygon aPolyPoly;
Point aPos( rPos );
if ( nRotation )
@@ -2404,7 +2404,7 @@ void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo )
{
default: // B2DLINEJOIN_NONE, B2DLINEJOIN_MIDDLE
// do NOT use SvtGraphicStroke::joinNone here
- // since it will be written as numerical value directly
+ // since it will be written as numerical value directly
// and is NOT a valid EPS value
break;
case basegfx::B2DLINEJOIN_MITER:
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 5de0cbc..688f528 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -231,7 +231,7 @@ sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter, Reference< com:
aMtf.Stop();
aMtf.WindStart();
- if( aMtf.GetActionCount() &&
+ if( aMtf.GetActionSize() &&
( !mbSkipEmptyPages || aPageSize.Width || aPageSize.Height ) )
bRet = ImplExportPage( rPDFWriter, *pPDFExtOutDevData, aMtf ) || bRet;
@@ -292,7 +292,7 @@ void PDFExportStreamDoc::write( const Reference< XOutputStream >& xStream )
aArgs.getArray()[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "EncryptionData" ) );
aArgs.getArray()[2].Value <<= m_aPreparedPassword;
}
-
+
try
{
xStore->storeToURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" ) ),
@@ -722,7 +722,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
// which is sadly out out our control
aPermissionPassword = rtl::OUString();
aOpenPassword = rtl::OUString();
-
+
/*
* FIXME: the entries are only implicitly defined by the resource file. Should there
* ever be an additional form submit format this could get invalid.
@@ -1031,7 +1031,7 @@ sal_Bool PDFExport::ImplExportPage( PDFWriter& rWriter, PDFExtOutDevData& rPDFEx
basegfx::B2DRectangle aB2DRect( aPageRect.Left(), aPageRect.Top(), aPageRect.Right(), aPageRect.Bottom() );
rWriter.SetClipRegion( basegfx::B2DPolyPolygon( basegfx::tools::createPolygonFromRect( aB2DRect ) ) );
-
+
rWriter.PlayMetafile( aMtf, aCtx, &rPDFExtOutDevData );
rPDFExtOutDevData.ResetSyncData();
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 7fc7e1e..8c2f21f 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
#include "precompiled_filter.hxx"
#define ITEMID_FIELD 0
-
+
#include "svgwriter.hxx"
#include "svgfontexport.hxx"
#include "svgfilter.hxx"
@@ -49,9 +49,9 @@ using ::rtl::OUString;
// -------------
// #110680#
-SVGExport::SVGExport(
+SVGExport::SVGExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
- const Reference< XDocumentHandler >& rxHandler )
+ const Reference< XDocumentHandler >& rxHandler )
: SvXMLExport( xServiceFactory, OUString(), rxHandler )
{
GetDocHandler()->startDocument();
@@ -75,7 +75,7 @@ ObjectRepresentation::ObjectRepresentation() :
// -----------------------------------------------------------------------------
-ObjectRepresentation::ObjectRepresentation( const Reference< XInterface >& rxObject,
+ObjectRepresentation::ObjectRepresentation( const Reference< XInterface >& rxObject,
const GDIMetaFile& rMtf ) :
mxObject( rxObject ),
mpMtf( new GDIMetaFile( rMtf ) )
@@ -98,7 +98,7 @@ ObjectRepresentation::~ObjectRepresentation()
}
// -----------------------------------------------------------------------------
-
+
ObjectRepresentation& ObjectRepresentation::operator=( const ObjectRepresentation& rPresentation )
{
mxObject = rPresentation.mxObject;
@@ -152,7 +152,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
{
Reference< XMasterPagesSupplier > xMasterPagesSupplier( mxSrcDoc, UNO_QUERY );
Reference< XDrawPagesSupplier > xDrawPagesSupplier( mxSrcDoc, UNO_QUERY );
-
+
if( xMasterPagesSupplier.is() && xDrawPagesSupplier.is() )
{
Reference< XDrawPages > xMasterPages( xMasterPagesSupplier->getMasterPages(), UNO_QUERY );
@@ -178,9 +178,9 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
try
{
const sal_Int32 nDefaultPage = ( ( SVG_EXPORT_ALLPAGES == nPageToExport ) ? 0 : nPageToExport );
-
+
xDrawPages->getByIndex( nDefaultPage ) >>= mxDefaultPage;
-
+
if( mxDefaultPage.is() )
{
SvxDrawPage* pSvxDrawPage = SvxDrawPage::getImplementation( mxDefaultPage );
@@ -189,31 +189,31 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list