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

[noelpwer svn gnome org]

Author: noelpwer
Date: Fri Dec  5 16:50:20 2008
New Revision: 14758
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14758&view=rev

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

        * patches/dev300/controls-with-images-in-document.diff: fix for n#446637



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/controls-with-images-in-document.diff

Modified: trunk/patches/dev300/controls-with-images-in-document.diff
==============================================================================
--- trunk/patches/dev300/controls-with-images-in-document.diff	(original)
+++ trunk/patches/dev300/controls-with-images-in-document.diff	Fri Dec  5 16:50:20 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,9 +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 );
- 			OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, sAdjustedValue );
- 		}
++			::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