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

[noelpwer svn gnome org]

Author: noelpwer
Date: Fri Jan  9 11:08:54 2009
New Revision: 15042
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15042&view=rev

Log:
2009-01-09  Noel Power  <noel power novell com>

        * patches/dev300/apply: missing fix for #446637 got deleted with
        delete of the controls-for-images-in-doc.diff
        * patches/dev300/forms-imageurl-fix.diff:



Added:
   trunk/patches/dev300/forms-imageurl-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jan  9 11:08:54 2009
@@ -1869,7 +1869,7 @@
 vba-servicemacros-rework.diff
 
 i97038-dateserial-fix.diff, Fong
-
+forms-imageurl-fix.diff, n#446637, i#97892
 [ VBAObjects ]
 # vba for word support
 #vba-word-support.diff, Fong

Added: trunk/patches/dev300/forms-imageurl-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/forms-imageurl-fix.diff	Fri Jan  9 11:08:54 2009
@@ -0,0 +1,22 @@
+Index: xmloff/source/forms/elementimport.cxx
+===================================================================
+--- xmloff/source/forms/elementimport.cxx	(revision 265800)
++++ xmloff/source/forms/elementimport.cxx	(working copy)
+@@ -1141,8 +1141,15 @@
+ 		if ( bMakeAbsolute && ( _rValue.getLength() > 0  ) )
+ 		{
+ 			// make a global URL out of the local one
+-			::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
+ 			OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue );