[Libreoffice-commits] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/pptx-the-rest-from-git.diff |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit eda74087c68020f2d099925bf164144ad4ad647c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Oct 14 15:34:30 2010 +0300

    Make pptx-the-rest-from-git.diff apply again

diff --git a/patches/dev300/pptx-the-rest-from-git.diff b/patches/dev300/pptx-the-rest-from-git.diff
index 736e8ed..f306f15 100644
--- a/patches/dev300/pptx-the-rest-from-git.diff
+++ b/patches/dev300/pptx-the-rest-from-git.diff
@@ -103,7 +103,7 @@ index 7dafac4..1c351a5 100644
      , maFraction( 1, 576 )
      , maMapModeSrc( MAP_100TH_MM )
      , maMapModeDest( MAP_INCH, Point(), maFraction, maFraction )
-@@ -975,21 +976,28 @@ size_t ShapeExport::ShapeHash::operator()( const ::com::sun::star::uno::Referenc
+@@ -975,23 +976,30 @@ size_t ShapeExport::ShapeHash::operator()( const ::com::sun::star::uno::Referenc
  
  sal_Int32 ShapeExport::GetNewShapeID( const Reference< XShape > rXShape )
  {
@@ -136,6 +136,8 @@ index 7dafac4..1c351a5 100644
 +ShapeExport::ShapeHashMap ShapeExport::saShapeMap;
 +
  } }
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git sd/source/filter/pptx/epptooxml.hxx sd/source/filter/pptx/epptooxml.hxx
 index 2a49d1f..2c850bd 100644
 --- sd/source/filter/pptx/epptooxml.hxx