ooo-build r15087 - branches/debian-2-4-1/patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Jan 15 22:25:47 2009
New Revision: 15087
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15087&view=rev

Log:
make apply on 2.4.1...

Modified:
   branches/debian-2-4-1/patches/src680/hidden-text-backport.diff

Modified: branches/debian-2-4-1/patches/src680/hidden-text-backport.diff
==============================================================================
--- branches/debian-2-4-1/patches/src680/hidden-text-backport.diff	(original)
+++ branches/debian-2-4-1/patches/src680/hidden-text-backport.diff	Thu Jan 15 22:25:47 2009
@@ -1,14 +1,14 @@
 diff -ur xmloff.orig/inc/txtprmap.hxx xmloff/inc/txtprmap.hxx
---- xmloff.orig/inc/txtprmap.hxx	2007-04-12 18:40:44.000000000 +0100
-+++ xmloff/inc/txtprmap.hxx	2008-12-12 16:22:08.000000000 +0000
+--- xmloff.orig/inc/xmloff/txtprmap.hxx	2007-04-12 18:40:44.000000000 +0100
++++ xmloff/inc/xmloff/txtprmap.hxx	2008-12-12 16:22:08.000000000 +0000
 @@ -188,6 +188,7 @@
  #define CTF_DEFAULT_OUTLINE_LEVEL           (XML_TEXT_CTF_START + 140)
  #define CTF_OLD_FLOW_WITH_TEXT              (XML_TEXT_CTF_START + 141)
- #define CTF_ISNUMBERING						(XML_TEXT_CTF_START + 142)
+ #define CTF_ISNUMBERING                     (XML_TEXT_CTF_START + 142)
 +#define CTF_TEXT_DISPLAY                    (XML_TEXT_CTF_START + 143)
- 
- 
  #define TEXT_PROP_MAP_TEXT 0
+ #define TEXT_PROP_MAP_PARA 1
+ #define TEXT_PROP_MAP_FRAME 2
 diff -ur xmloff.orig/source/text/txtimppr.cxx xmloff/source/text/txtimppr.cxx
 --- xmloff.orig/source/text/txtimppr.cxx	2008-12-12 16:09:12.000000000 +0000
 +++ xmloff/source/text/txtimppr.cxx	2009-01-13 18:29:52.000000000 +0000
@@ -95,12 +95,12 @@
                  // Now check for font name in rState and set corrected value,
                  // if necessary.
 diff -ru xmloff.orig/inc/xmlimp.hxx xmloff/inc/xmlimp.hxx
---- xmloff.orig/inc/xmlimp.hxx	2006-10-30 09:05:18.000000000 +0000
-+++ xmloff/inc/xmlimp.hxx	2008-12-19 17:49:38.000000000 +0000
+--- xmloff.orig/inc/xmloff/xmlimp.hxx	2006-10-30 09:05:18.000000000 +0000
++++ xmloff/inc/xmloff/xmlimp.hxx	2008-12-19 17:49:38.000000000 +0000
 @@ -468,6 +468,18 @@
- 		If false is returned the build ids are not available (yet).
- 	**/
- 	bool getBuildIds( sal_Int32& rUPD, sal_Int32& rBuild ) const;
+         @see <member>mbIsGraphicLoadOnDemmandSupported</member>
+      */
+     bool isGraphicLoadOnDemmandSupported() const;
 +
 +    static const sal_uInt16 OOo_1x = 10;
 +    static const sal_uInt16 OOo_2x = 20;
@@ -119,10 +119,10 @@
 diff -ru xmloff.orig/source/core/xmlimp.cxx xmloff/source/core/xmlimp.cxx
 --- xmloff.orig/source/core/xmlimp.cxx	2006-10-30 09:05:54.000000000 +0000
 +++ xmloff/source/core/xmlimp.cxx	2008-12-19 17:20:20.000000000 +0000
-@@ -1835,3 +1835,18 @@
- 	return bRet;
+@@ -1835,3 +1835,19 @@
+     return mpImpl->aODFVersion;
  }
- 
++ 
 +sal_uInt16 SvXMLImport::getGeneratorVersion() const
 +{
 +	sal_Int32 nUPD, nBuild;