[ooo-build-commit] patches/dev300 patches/vba

[Tor Lillqvist]

 patches/dev300/apply                       |    1 
 patches/vba/vba-autotext-ole-read-fix.diff |   34 -----------------------------
 2 files changed, 35 deletions(-)

New commits:
commit 878019b8d423ccec3b4c307a1d0002a61c8c6a79
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 13:43:05 2009 +0300

    vba-autotext-ole-read-fix.diff is upstream in dev300-m57
    
    * patches/vba/vba-autotext-ole-read-fix.diff: Delete. Is upstream in
      dev300-m57.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ee6d092..9be765e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1637,7 +1637,6 @@ vba-vpagebreak-object.diff, hanbo
 vba-combobox-listindex-fix.diff, n#476891, Fong
 vba-fix-copysheet-toend.diff, n#478187 
 vba-improve-toolbarapi-macro-search.diff
-vba-autotext-ole-read-fix.diff, i#99786, i#99790
 # fix core when there is an error in the doc close vba
 # event handler ( bit of a hack )
 fix-doc-exit-basic-error-core.diff
diff --git a/patches/vba/vba-autotext-ole-read-fix.diff b/patches/vba/vba-autotext-ole-read-fix.diff
deleted file mode 100644
index caff8b9..0000000
--- a/patches/vba/vba-autotext-ole-read-fix.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git sw/source/core/swg/SwXMLTextBlocks1.cxx sw/source/core/swg/SwXMLTextBlocks1.cxx
-index 14a0497..41e468f 100644
---- sw/source/core/swg/SwXMLTextBlocks1.cxx
-+++ sw/source/core/swg/SwXMLTextBlocks1.cxx
-@@ -40,6 +40,7 @@
- #include <com/sun/star/xml/sax/InputSource.hpp>
- #include <com/sun/star/io/XActiveDataSource.hpp>
- #include <com/sun/star/xml/sax/XParser.hpp>
-+#include <com/sun/star/document/XStorageBasedDocument.hpp>
- #include <doc.hxx>
- #ifndef _DOCSH_HXX
- #include <docsh.hxx>
-@@ -81,6 +82,21 @@ ULONG SwXMLTextBlocks::GetDoc( USHORT nIdx )
-             ReadXML->SetBlockMode( sal_True );
-             aReader.Read( *ReadXML );
-             ReadXML->SetBlockMode( sal_False );
-+            // Ole objects fails to display when inserted into document 
-+            // because the ObjectReplacement folder ( and contents are missing )
-+            rtl::OUString sObjReplacements( RTL_CONSTASCII_USTRINGPARAM( "ObjectReplacements" ) );
-+            if ( xRoot->hasByName( sObjReplacements ) )
-+            {
-+                uno::Reference< document::XStorageBasedDocument > xDocStor( pDoc->GetDocShell()->GetModel(), uno::UNO_QUERY_THROW );
-+                uno::Reference< embed::XStorage > xStr( xDocStor->getDocumentStorage() );
-+                if ( xStr.is() )
-+                {
-+                    xRoot->copyElementTo( sObjReplacements, xStr, sObjReplacements );
-+                    uno::Reference< embed::XTransactedObject > xTrans( xStr, uno::UNO_QUERY );
-+                    if ( xTrans.is() )
-+                        xTrans->commit();
-+                }
-+            }
-         }
-         catch( uno::Exception& )
- 		{