Author: steve_y
Date: Fri Nov 1 05:51:39 2013
New Revision: 1537831
URL: http://svn.apache.org/r1537831
Log:
i123528: Only placeholder shown for cropped picture in particular .pptx
Modified:
openoffice/trunk/main/oox/source/core/xmlfilterbase.cxx
openoffice/trunk/main/oox/source/token/namespaces.txt
openoffice/trunk/main/oox/source/token/tokens.txt
Modified: openoffice/trunk/main/oox/source/core/xmlfilterbase.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/core/xmlfilterbase.cxx?rev=1537831&r1=1537830&r2=1537831&view=diff
==============================================================================
--- openoffice/trunk/main/oox/source/core/xmlfilterbase.cxx (original)
+++ openoffice/trunk/main/oox/source/core/xmlfilterbase.cxx Fri Nov 1 05:51:39
2013
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include "oox/core/xmlfilterbase.hxx"
#include <cstdio>
@@ -120,6 +118,7 @@ XmlFilterBaseImpl::XmlFilterBaseImpl( co
maFastParser.registerNamespace( NMSP_ax );
maFastParser.registerNamespace( NMSP_xm );
+ maFastParser.registerNamespace( NMSP_markupCompat ); // i123528
}
// ============================================================================
Modified: openoffice/trunk/main/oox/source/token/namespaces.txt
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/token/namespaces.txt?rev=1537831&r1=1537830&r2=1537831&view=diff
==============================================================================
--- openoffice/trunk/main/oox/source/token/namespaces.txt (original)
+++ openoffice/trunk/main/oox/source/token/namespaces.txt Fri Nov 1 05:51:39
2013
@@ -70,3 +70,4 @@ dc http://purl.org/
dcTerms http://purl.org/dc/terms/
xm http://schemas.microsoft.com/office/excel/2006/main
sprm http://sprm
+markupCompat
http://schemas.openxmlformats.org/markup-compatibility/2006
Modified: openoffice/trunk/main/oox/source/token/tokens.txt
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/token/tokens.txt?rev=1537831&r1=1537830&r2=1537831&view=diff
==============================================================================
--- openoffice/trunk/main/oox/source/token/tokens.txt (original)
+++ openoffice/trunk/main/oox/source/token/tokens.txt Fri Nov 1 05:51:39 2013
@@ -37,6 +37,7 @@ AbbreviatedCaseNumber
Accel
Accel2
AlbumTitle
+AlternateContent
Always
Anchor
AppVersion
@@ -79,6 +80,7 @@ Characters
CharactersWithSpaces
Checkbox
Checked
+Choice
City
ClientData
ColHidden
@@ -2107,6 +2109,7 @@ factor
fade
fadeDir
fallback
+Fallback
false
family
fans
