ooo-build r14981 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Dec 31 19:47:27 2008
New Revision: 14981
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14981&view=rev

Log:
2008-12-31  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/impress-odf12-compat-fix.diff: fixed export of chart 
	objects.  Only a fragment of the chart substream was exported because
	an exception was thrown during export.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/impress-odf12-compat-fix.diff

Modified: trunk/patches/dev300/impress-odf12-compat-fix.diff
==============================================================================
--- trunk/patches/dev300/impress-odf12-compat-fix.diff	(original)
+++ trunk/patches/dev300/impress-odf12-compat-fix.diff	Wed Dec 31 19:47:27 2008
@@ -70,7 +70,7 @@
 index 9df993c..d6d87e3 100644
 --- xmloff/source/draw/sdpropls.cxx
 +++ xmloff/source/draw/sdpropls.cxx
-@@ -860,19 +860,53 @@ sal_Bool XMLSdHeaderFooterVisibilityTypeHdl::exportXML(
+@@ -862,19 +862,60 @@ sal_Bool XMLSdHeaderFooterVisibilityTypeHdl::exportXML(
  //////////////////////////////////////////////////////////////////////////////
  
  XMLSdPropHdlFactory::XMLSdPropHdlFactory( uno::Reference< frame::XModel > xModel, SvXMLImport& rImport )
@@ -93,7 +93,7 @@
  
 +void XMLSdPropHdlFactory::init()
 +{
-+	// query BuildId for potential backward compat mode
++    // query BuildId for potential backward compat mode
 +    uno::Reference< beans::XPropertySet > xModelSet( mxModel, uno::UNO_QUERY );
 +    if( xModelSet.is() )
 +    {
@@ -101,8 +101,15 @@
 +        const OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BuildId" ) );
 +
 +        OUString sBuildId;
-+        xModelSet->getPropertyValue(sPropName) >>= sBuildId;
-+			
++        try
++        {
++            xModelSet->getPropertyValue(sPropName) >>= sBuildId;
++        }
++        catch (const beans::UnknownPropertyException&)
++        {
++            DBG_ERROR("The model doesn't have a property named BuildId.");
++        }
++
 +        if( sBuildId.getLength() )
 +        {
 +            sal_Int32 nIndex = sBuildId.indexOf('$');