ooo-build r14796 - in branches/opensuse-11-1: . patches/dev300 patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Tue Dec  9 11:57:51 2008
New Revision: 14796
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14796&view=rev

Log:
2008-12-08  Noel Power  <noel power novell com>

        * patches/dev300/apply: add vba-fix-docmodule-import-crash.diff
        * patches/dev300/controls-with-images-in-document.diff: modify to 
        provide fix for n#447560
        * patches/vba/vba-fix-docmodule-import-crash.diff: fix for n#446637


Added:
   branches/opensuse-11-1/patches/vba/vba-fix-docmodule-import-crash.diff
Modified:
   branches/opensuse-11-1/ChangeLog
   branches/opensuse-11-1/patches/dev300/apply
   branches/opensuse-11-1/patches/dev300/controls-with-images-in-document.diff

Modified: branches/opensuse-11-1/patches/dev300/apply
==============================================================================
--- branches/opensuse-11-1/patches/dev300/apply	(original)
+++ branches/opensuse-11-1/patches/dev300/apply	Tue Dec  9 11:57:51 2008
@@ -1673,6 +1673,8 @@
 # fix core issue in Commandbar
 vba-fix-commandbar-submenu.diff, n#434214, n#437157, Fong
 patch_i92329.diff, i#92329
+
+vba-fix-docmodule-import-crash.diff, n#447560
 [ VBAUntested ]
 SectionOwner => noelpwer
 vba-basic-null.diff i#85349, jjiao

Modified: branches/opensuse-11-1/patches/dev300/controls-with-images-in-document.diff
==============================================================================
--- branches/opensuse-11-1/patches/dev300/controls-with-images-in-document.diff	(original)
+++ branches/opensuse-11-1/patches/dev300/controls-with-images-in-document.diff	Tue Dec  9 11:57:51 2008
@@ -1071,7 +1071,7 @@
 index edc0c77..71d70ab 100644
 --- xmloff/source/forms/elementimport.cxx
 +++ xmloff/source/forms/elementimport.cxx
-@@ -1133,10 +1133,10 @@ namespace xmloff
+@@ -1133,10 +1133,17 @@ namespace xmloff
  					)
  				);
  
@@ -1080,9 +1080,16 @@
  		{
  			// make a global URL out of the local one
 -			::rtl::OUString sAdjustedValue = m_rContext.getGlobalContext().GetAbsoluteReference( _rValue );
-+			::rtl::OUString sAdjustedValue = m_rContext.getGlobalContext().ResolveGraphicObjectURL( _rValue, FALSE );
++			::rtl::OUString sAdjustedValue;
++			// only resolve image related url
++			// we don't want say form url targets to be resolved
++			// using ResolveGraphicObjectURL
++			if ( 0 == _rLocalName.compareToAscii( s_pImageDataAttributeName ) )
++				sAdjustedValue = m_rContext.getGlobalContext().ResolveGraphicObjectURL( _rValue, FALSE );
++			else
++				 sAdjustedValue = m_rContext.getGlobalContext().GetAbsoluteReference( _rValue );
  			OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, sAdjustedValue );
- 		}
+ 	}
  		else
 diff --git xmloff/source/forms/propertyexport.cxx xmloff/source/forms/propertyexport.cxx
 index bedd87f..0b5f7a7 100644

Added: branches/opensuse-11-1/patches/vba/vba-fix-docmodule-import-crash.diff
==============================================================================
--- (empty file)
+++ branches/opensuse-11-1/patches/vba/vba-fix-docmodule-import-crash.diff	Tue Dec  9 11:57:51 2008
@@ -0,0 +1,22 @@
+diff --git svx/source/msfilter/svxmsbas.cxx svx/source/msfilter/svxmsbas.cxx
+index 3b2feb0..2826ed4 100644
+--- svx/source/msfilter/svxmsbas.cxx
++++ svx/source/msfilter/svxmsbas.cxx
+@@ -457,8 +457,15 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( const String& rStorageName,
+ 				// get the api object for the codename
+ 				if ( xVBACodeNamedObjectAccess.is() )
+ 				{
+-					sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( sModuleInfo.ModuleName ), uno::UNO_QUERY );    
+-					OSL_TRACE("** Straight up creation of Module");
++					try
++					{
++						sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( sModuleInfo.ModuleName ), uno::UNO_QUERY );    
++						OSL_TRACE("** Straight up creation of Module");
++					}
++					catch(uno::Exception& e)
++					{
++						OSL_TRACE("Failed to get documument object for %s", rtl::OUStringToOString( sModuleInfo.ModuleName, RTL_TEXTENCODING_UTF8 ).getStr() );
++					}
+ 				}
+ 			}
+                         aSourceAny <<= sModuleInfo;