[ooo-build-commit] patches/vba

[Kohei Yoshida]

 patches/vba/cws-vbasupportdev300.diff |   28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

New commits:
commit 6d30c58c9ad5bd52c6c77cfae7a7bce1ad6cf783
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Oct 1 13:04:30 2009 -0400

    Fixed build breakage in basctl.
    
    However, this patch fails to apply, though I have absolutely no
    idea why.  Someone please help!
    
    * patches/vba/cws-vbasupportdev300.diff:

diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index a828145..3a2941a 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -68654,6 +68654,24 @@ Index: basctl/source/basicide/baside3.cxx
  					xLib->replaceByName( ::rtl::OUString( GetName() ), makeAny( xISP ) );
  				}
  			}
+@@ -1013,7 +1013,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
+             Reference< beans::XPropertySet > xProps( xMSF, UNO_QUERY );
+             OSL_ASSERT( xProps.is() );
+             OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
+-            ::xmlscript::importDialogModel( xInput, xDialogModel, xContext );
++            ::xmlscript::importDialogModel( xInput, xDialogModel, xContext, rDocument.getDocument() );
+ 
+             String aXmlDlgName;
+             Reference< beans::XPropertySet > xDialogModelPropSet( xDialogModel, UNO_QUERY );
+@@ -1248,7 +1248,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
+                 }
+             }
+ 
+-            Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
++            Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, rDocument.getDocument() );
+             bool bSuccess = rDocument.insertDialog( aLibName, aNewDlgName, xISP );
+             if( bSuccess )
+             {
 Index: basctl/source/inc/dlged.hxx
 ===================================================================
 --- basctl/source/inc/dlged.hxx	(revision 276159)
@@ -68708,10 +68726,10 @@ Index: basctl/inc/basidesh.hrc
  #define RID_STR_EXPORTPACKAGE			( RID_BASICIDE_START + 100 )
  #define RID_STR_EXPORTBASIC				( RID_BASICIDE_START + 101 )
  #define RID_STR_PACKAGE_BUNDLE			( RID_BASICIDE_START + 102 )
-+#define RID_STR_DOCUMENT_OBJECTS        ( RID_BASICIDE_START + 110 )
-+#define RID_STR_USERFORMS               ( RID_BASICIDE_START + 111 )
-+#define RID_STR_NORMAL_MODULES          ( RID_BASICIDE_START + 112 )
-+#define RID_STR_CLASS_MODULES           ( RID_BASICIDE_START + 113 )
++#define RID_STR_DOCUMENT_OBJECTS        ( RID_BASICIDE_START + 103 )
++#define RID_STR_USERFORMS               ( RID_BASICIDE_START + 104 )
++#define RID_STR_NORMAL_MODULES          ( RID_BASICIDE_START + 105 )
++#define RID_STR_CLASS_MODULES           ( RID_BASICIDE_START + 106 )
  
  #endif	// _SVX_NOIDERESIDS
  
@@ -90111,7 +90129,7 @@ Index: forms/source/misc/InterfaceContainer.cxx
 --- forms/source/misc/InterfaceContainer.cxx	(revision 276159)
 +++ forms/source/misc/InterfaceContainer.cxx	(revision 276288)
 @@ -60,13 +60,20 @@
- #include <memory>
+ #include <memory>
  
  //.........................................................................
 +#include <com/sun/star/frame/XModel.hpp>