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

[pflin svn gnome org]

Author: pflin
Date: Thu Aug 21 07:36:56 2008
New Revision: 13647
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13647&view=rev

Log:
2008-08-21  Fong Lin  <pflin novell com>
	* patches/dev300/controls-with-images-import.diff:ajusted some codes.



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

Modified: trunk/patches/dev300/controls-with-images-import.diff
==============================================================================
--- trunk/patches/dev300/controls-with-images-import.diff	(original)
+++ trunk/patches/dev300/controls-with-images-import.diff	Thu Aug 21 07:36:56 2008
@@ -18,9 +18,9 @@
  	using OCX_Control::Import; // to not hide the other two import methods
 
 
---- svx/source/msfilter/msocximex.cxx.orig	2008-08-15 06:28:07.000000000 +0800
-+++ svx/source/msfilter/msocximex.cxx	2008-08-15 16:25:46.000000000 +0800
-@@ -90,6 +90,12 @@
+--- svx/source/msfilter/msocximex.cxx.orig	2008-08-21 14:55:02.000000000 +0800
++++ svx/source/msfilter/msocximex.cxx	2008-08-21 15:05:53.000000000 +0800
+@@ -83,6 +83,12 @@
  
  #include <algorithm>
  #include <memory>
@@ -30,9 +30,9 @@
 +#include <com/sun/star/io/XInputStream.hpp>
 +#include <comphelper/componentcontext.hxx>
 +#include <unotools/streamwrap.hxx>
-  
- #ifndef C2S
- #define C2S(cChar)	String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(cChar))
+ 
+ #include <com/sun/star/beans/NamedValue.hpp>
+ #include <com/sun/star/table/XCellRange.hpp>
 @@ -113,6 +119,7 @@ using namespace cppu;
  
  
@@ -202,7 +202,20 @@
  
  long WriteAlign(SvStorageStream *pS, int nAmount)
  {
-@@ -5389,15 +5318,7 @@ sal_Bool OCX_Image::Read(SotStorageStrea
+@@ -5292,12 +5221,6 @@ sal_Bool OCX_TabStrip::ReadFontData(SotS
+ 
+ sal_Bool OCX_Image::Read(SotStorageStream *pS)
+ {
+-    if ( !bSetInDialog )
+-    {
+-        // preserve the present behavior at the moment.
+-        // only import image control for UserForms
+-        return sal_False;
+-    }
+     ULONG nStart = pS->Tell();
+ 	*pS >> nIdentifier;
+ 	DBG_ASSERT(nStandardId==nIdentifier,
+@@ -5389,15 +5312,14 @@ sal_Bool OCX_Image::Read(SotStorageStrea
          long imagePos = pS->Tell();
  
          pS->Seek( imagePos );
@@ -216,23 +229,13 @@
 -        result = storePictureInDoc( pDocSh, pictName, pImage, nImageLen );
 -        delete pImage;
 +		mxGrfObj = lcl_readGraphicObject( pS );
++		if( mxGrfObj.is() )
++		{
++			sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
++			sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
++		}
++		// make sure the stream position should be pointing after the image
++		pS->Seek( imagePos + nImageLen );
      }
      return sal_True;
  }
-@@ -5420,11 +5341,13 @@ sal_Bool OCX_Image::Import( uno::Referen
- 		bTemp = sal_False;
- 	aTmp = bool2any(bTemp);
- 	rPropSet->setPropertyValue( WW8_ASCII2STR("Enabled"), aTmp);
--    if ( sImageUrl.getLength() )
--    {
-+	if( mxGrfObj.is() )
-+	{
-+		sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
-+		sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
-         aTmp <<= sImageUrl;
-         rPropSet->setPropertyValue( WW8_ASCII2STR("ImageURL"), aTmp);
--    }
-+	}
- 	return sal_True;
- }
-