ooo-build r13076 - trunk/patches/test/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Sat Jul  5 09:19:08 2008
New Revision: 13076
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13076&view=rev

Log:
fix stupid ordering foo causing core ( prevent the core from even
happening too )


Modified:
   trunk/patches/test/vba/HackyImageControlWithNonLinkedImages.diff

Modified: trunk/patches/test/vba/HackyImageControlWithNonLinkedImages.diff
==============================================================================
--- trunk/patches/test/vba/HackyImageControlWithNonLinkedImages.diff	(original)
+++ trunk/patches/test/vba/HackyImageControlWithNonLinkedImages.diff	Sat Jul  5 09:19:08 2008
@@ -400,7 +400,7 @@
              case BASEPROPERTY_BORDERCOLOR:
              case BASEPROPERTY_SYMBOL_COLOR:
 diff --git toolkit/source/controls/unocontrols.cxx toolkit/source/controls/unocontrols.cxx
-index 821c1b9..4dcfb3d 100644
+index 821c1b9..de4294d 100644
 --- toolkit/source/controls/unocontrols.cxx
 +++ toolkit/source/controls/unocontrols.cxx
 @@ -37,6 +37,7 @@
@@ -460,7 +460,7 @@
  }
  
  void SAL_CALL ImageProducerControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception)
-@@ -615,16 +635,38 @@ void SAL_CALL ImageProducerControlModel:
+@@ -615,16 +635,39 @@ void SAL_CALL ImageProducerControlModel:
      {
          switch ( nHandle )
          {
@@ -478,6 +478,7 @@
 +                {
 +                    //setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( lcl_getGraphicFromURL_nothrow( sURL, xProv->getStorage() ) ) );
 +                }
++                break;
 +                
 +            }
 +            
@@ -487,13 +488,12 @@
              {
                  mbAdjustingGraphic = true;
                  ::rtl::OUString sImageURL;
--                OSL_VERIFY( rValue >>= sImageURL );
+                 OSL_VERIFY( rValue >>= sImageURL );
 -                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( lcl_getGraphicFromURL_nothrow( sImageURL ) ) );
-+                //OSL_VERIFY( rValue >>= sImageURL );
 +		uno::Reference< graphic::XGraphicLinkProvider > xProv;
 +                if ( ImplHasProperty( BASEPROPERTY_GRAPHICLINKPROVIDER ) )
 +                    getPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHICLINKPROVIDER ) ) >>= xProv;
-+                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( lcl_getGraphicFromURL_nothrow( sImageURL , xProv->getStorage()  ) ) );
++                setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( lcl_getGraphicFromURL_nothrow( sImageURL , xProv.is() ? xProv->getStorage() : NULL ) ) );
                  mbAdjustingGraphic = false;
              }
              break;
@@ -501,7 +501,7 @@
  
          case BASEPROPERTY_GRAPHIC:
              if ( !mbAdjustingGraphic && ImplHasProperty( BASEPROPERTY_IMAGEURL ) )
-@@ -676,8 +718,23 @@ void ImageProducerControlModel::removeCo
+@@ -676,8 +719,23 @@ void ImageProducerControlModel::removeCo
  
  void ImageProducerControlModel::startProduction(  ) throw (::com::sun::star::uno::RuntimeException)
  {
@@ -547,7 +547,7 @@
              DECL_PROP_2     ( "HelpURL",                HELPURL,            ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
              DECL_PROP_2     ( "HideInactiveSelection",  HIDEINACTIVESELECTION, bool,            BOUND, MAYBEDEFAULT ),
 diff --git xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
-index d57bb95..9a9eb1e 100644
+index d57bb95..8be9235 100644
 --- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
 +++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
 @@ -40,6 +40,8 @@
@@ -599,10 +599,10 @@
  void importBindableAndListRangeBits( DialogImport* _pImport, const rtl::OUString sLinkedCell, const rtl::OUString & sCellRange, ControlImportContext& ctx )
  {
      Reference< lang::XMultiServiceFactory > xFac( _pImport->getDocOwner(), UNO_QUERY );;
-@@ -1062,6 +1097,23 @@ void ImageControlElement::endElement()
- 	ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
- 							  OUString( RTL_CONSTASCII_USTRINGPARAM("src") ),
- 							  _xAttributes );
+@@ -1059,9 +1094,27 @@ void ImageControlElement::endElement()
+ 	ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ScaleImage") ),
+ 							   OUString( RTL_CONSTASCII_USTRINGPARAM("scale-image") ),
+ 							   _xAttributes );
 +
 +	rtl::OUString sURL = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "src" ) );
 +        // hard code-test
@@ -620,6 +620,10 @@
 +    
 +        }
 +
+ 	ctx.importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
+ 							  OUString( RTL_CONSTASCII_USTRINGPARAM("src") ),
+ 							  _xAttributes );
++
      ctx.importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Tabstop") ),
                                 OUString( RTL_CONSTASCII_USTRINGPARAM("tabstop") ),
                                 _xAttributes );