[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/external-apm-header.diff |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 14992cd5570cbfe5f5fdff03fc7e9ec6f686ea81
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 12 14:59:33 2011 +0300

    Fix more typos

diff --git a/patches/dev300/external-apm-header.diff b/patches/dev300/external-apm-header.diff
index 8049e0c..97cee41 100644
--- a/patches/dev300/external-apm-header.diff
+++ b/patches/dev300/external-apm-header.diff
@@ -114,7 +114,7 @@ index 7caea58..a919ab9 100644
  
 -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 )
++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 );