[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Apr 5 04:43:00 PDT 2011
patches/dev300/external-apm-header.diff | 62 ++++++++++++++++----------------
1 file changed, 31 insertions(+), 31 deletions(-)
New commits:
commit b6aaf73a15ba162abc9bcf7e38141abb276bb03f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Apr 5 14:42:31 2011 +0300
Make external-apm-header.diff apply again
diff --git a/patches/dev300/external-apm-header.diff b/patches/dev300/external-apm-header.diff
index 740a332..b4e604b 100644
--- a/patches/dev300/external-apm-header.diff
+++ b/patches/dev300/external-apm-header.diff
@@ -51,22 +51,22 @@ index 43bd280..c113d53 100644
// - GraphicFilter-Types -
// -----------------------
@@ -393,13 +394,15 @@ public:
- USHORT ImportGraphic( Graphic& rGraphic, const String& rPath,
+ sal_uInt16 ImportGraphic( Graphic& rGraphic, const String& rPath,
SvStream& rStream,
- USHORT nFormat = GRFILTER_FORMAT_DONTKNOW,
-- USHORT * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 );
-+ USHORT * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0
+ sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW,
+- sal_uInt16 * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0 );
++ sal_uInt32 * pDeterminedFormat = NULL, sal_uInt32 nImportFlags = 0
+ , WMF_APMFILEHEADER *pAPMHeader = NULL);
- USHORT ImportGraphic( Graphic& rGraphic, const String& rPath,
+ sal_uInt16 ImportGraphic( Graphic& rGraphic, const String& rPath,
SvStream& rStream,
- USHORT nFormat,
- USHORT * pDeterminedFormat, sal_uInt32 nImportFlags,
+ sal_uInt16 nFormat,
+ sal_uInt16 * pDeterminedFormat, sal_uInt32 nImportFlags,
- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData );
+ com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData
+ , WMF_APMFILEHEADER *pAPMHeader = NULL);
- BOOL Setup( USHORT nFormat );
+ sal_Bool Setup( sal_uInt16 nFormat );
diff --git svtools/inc/svtools/wmf.hxx svtools/inc/svtools/wmf.hxx
index 9d536d5..45a0f1f 100644
@@ -76,7 +76,7 @@ index 9d536d5..45a0f1f 100644
#include "svtools/svtdllapi.h"
#include <svtools/fltcall.hxx>
--BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL );
+-sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL );
+struct WMF_APMFILEHEADER {
+ sal_uInt32 key;
+ sal_uInt16 hmf;
@@ -100,9 +100,9 @@ index 9d536d5..45a0f1f 100644
+ }
+};
+
-+BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL, WMF_APMFILEHEADER *pAPMHeader = NULL );
++sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem = NULL, WMF_APMFILEHEADER *pAPMHeader = NULL );
- SVT_DLLPUBLIC BOOL ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem );
+ SVT_DLLPUBLIC sal_Bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pConfigItem );
diff --git svtools/source/filter.vcl/filter/filter.cxx svtools/source/filter.vcl/filter/filter.cxx
index 7caea58..a919ab9 100644
@@ -112,9 +112,9 @@ index 7caea58..a919ab9 100644
return nRetValue;
}
--USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rIStream,
-- USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags )
-+USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rIStream, USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags, WMF_APMFILEHEADER *pAPMHeader )
+-sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rIStream,
+- sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat, sal_uInt32 nImportFlags )
++sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rIStream, sal_uInt16* nFormat, sal_uInt16** pDeterminedFormat, sal_uInt32 nImportFlags, WMF_APMFILEHEADER *pAPMHeader )
{
- return ImportGraphic( rGraphic, rPath, rIStream, nFormat, pDeterminedFormat, nImportFlags, NULL );
+ return ImportGraphic( rGraphic, rPath, rIStream, nFormat, pDeterminedFormat, nImportFlags, NULL, pAPMHeader );
@@ -122,14 +122,14 @@ index 7caea58..a919ab9 100644
//-------------------------------------------------------------------------
- USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rIStream,
- USHORT nFormat, USHORT* pDeterminedFormat, sal_uInt32 nImportFlags,
+ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvStream& rIStream,
+ sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat, sal_uInt32 nImportFlags,
- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData )
+ com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData
+ , WMF_APMFILEHEADER *pAPMHeader)
{
String aFilterName;
- ULONG nStmBegin;
+ sal_uLong nStmBegin;
@@ -1486,7 +1486,7 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS
aFilterName.EqualsIgnoreCaseAscii( IMP_EMF ) )
{
@@ -144,7 +144,7 @@ index 019f968..51ec483 100644
--- svtools/source/filter.vcl/wmf/winmtf.hxx
+++ svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -159,6 +159,7 @@ struct LOGFONTW
- BYTE lfPitchAndFamily;
+ sal_uInt8 lfPitchAndFamily;
String alfFaceName;
};
+struct WMF_APMFILEHEADER;
@@ -155,11 +155,11 @@ index 019f968..51ec483 100644
sal_uInt32 nUnicodeEscapeAction;
// Liesst den Kopf der WMF-Datei
-- BOOL ReadHeader();
-+ BOOL ReadHeader(WMF_APMFILEHEADER *pAPMHeader);
+- sal_Bool ReadHeader();
++ sal_Bool ReadHeader(WMF_APMFILEHEADER *pAPMHeader);
// Liesst die Parameter des Rocords mit der Funktionsnummer nFunction.
- void ReadRecordParams( USHORT nFunction );
+ void ReadRecordParams( sal_uInt16 nFunction );
@@ -792,7 +793,7 @@ public:
~WMFReader();
@@ -185,8 +185,8 @@ index be7a15e..1a70555 100644
// ------------------------------------------------------------------------
--BOOL WMFReader::ReadHeader()
-+BOOL WMFReader::ReadHeader(WMF_APMFILEHEADER *pAPMHeader)
+-sal_Bool WMFReader::ReadHeader()
++sal_Bool WMFReader::ReadHeader(WMF_APMFILEHEADER *pAPMHeader)
{
Rectangle aPlaceableBound;
sal_uInt32 nl, nStrmPos = pWMF->Tell();
@@ -213,17 +213,17 @@ index be7a15e..1a70555 100644
pOut->SetWinOrg( aPlaceableBound.TopLeft() );
@@ -1067,7 +1075,7 @@ BOOL WMFReader::ReadHeader()
- return TRUE;
+ return sal_True;
}
-void WMFReader::ReadWMF()
+void WMFReader::ReadWMF(WMF_APMFILEHEADER *pAPMHeader)
{
- USHORT nFunction;
- ULONG nPos, nPercent, nLastPercent;
+ sal_uInt16 nFunction;
+ sal_uLong nPos, nPercent, nLastPercent;
@@ -1090,7 +1098,7 @@ void WMFReader::ReadWMF()
pWMF->Seek( nStartPos );
- Callback( (USHORT) ( nLastPercent = 0 ) );
+ Callback( (sal_uInt16) ( nLastPercent = 0 ) );
- if ( ReadHeader() )
+ if ( ReadHeader( pAPMHeader ) )
@@ -238,11 +238,11 @@ index ab9bee2..3658a1e 100644
// -----------------------------------------------------------------------------
--BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem )
-+BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem, WMF_APMFILEHEADER *pAPMHeader )
+-sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem )
++sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem, WMF_APMFILEHEADER *pAPMHeader )
{
- UINT32 nMetaType;
- UINT32 nOrgPos = rStreamWMF.Tell();
+ sal_uInt32 nMetaType;
+ sal_uInt32 nOrgPos = rStreamWMF.Tell();
@@ -51,7 +51,7 @@ BOOL ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile,
}
else
More information about the Libreoffice-commits
mailing list