[ooo-build-commit] patches/vba

[Kohei Yoshida]

 patches/vba/cws-vbasupportdev300.diff |   82 +++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 41 deletions(-)

New commits:
commit d51d3935ad39ebcbf77c25e34f840f42ef7a29cc
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Oct 1 14:14:44 2009 -0400

    Fixed patch apply failure by reordering hunks.
    
    * patches/vba/cws-vbasupportdev300.diff:

diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index 3a2941a..4cc695f 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -68595,11 +68595,11 @@ Index: basctl/source/basicide/baside2.cxx
  
  void ModulWindow::SetReadOnly( BOOL b )
  {
-Index: basctl/source/basicide/baside3.cxx
-===================================================================
---- basctl/source/basicide/baside3.cxx	(revision 276159)
-+++ basctl/source/basicide/baside3.cxx	(revision 276288)
-@@ -82,6 +82,7 @@
+diff --git basctl/source/basicide/baside3.cxx basctl/source/basicide/baside3.cxx
+index caceda3..211c105 100644
+--- basctl/source/basicide/baside3.cxx
++++ basctl/source/basicide/baside3.cxx
+@@ -85,6 +85,7 @@
  #include <com/sun/star/resource/XStringResourceResolver.hpp>
  #include <com/sun/star/resource/StringResourceWithLocation.hpp>
  #include <com/sun/star/task/XInteractionHandler.hpp>
@@ -68607,13 +68607,13 @@ Index: basctl/source/basicide/baside3.cxx
  
  using namespace comphelper;
  using namespace	::com::sun::star;
-@@ -112,8 +113,16 @@ DialogWindow::DialogWindow( Window* pParent, const
+@@ -115,8 +116,16 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, St
  {
- 	InitSettings( TRUE, TRUE, TRUE );
+     InitSettings( TRUE, TRUE, TRUE );
  
--	pEditor = new DlgEditor();
+-    pEditor = new DlgEditor();
 +	pEditor = new DlgEditor( rDocument.getDocument() );
- 	pEditor->SetWindow( this );
+     pEditor->SetWindow( this );
 +	// set vba mode on DialogModel ( allows it to work in 100thmm instead of MAP_APPFONT )
 +	if ( rDocument.getDocument().is() )
 +	{
@@ -68622,19 +68622,37 @@ Index: basctl/source/basicide/baside3.cxx
 +		if ( xDocVBAMode.is()  &&  xDialogModelVBAMode.is() )
 +			xDialogModelVBAMode->setVBACompatModeOn( xDocVBAMode->getVBACompatModeOn() );
 +	}
- 	pEditor->SetDialog( xDialogModel );
+     pEditor->SetDialog( xDialogModel );
  
- 	// Undo einrichten
-@@ -724,7 +733,7 @@ BOOL DialogWindow::SaveDialog()
- 		Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
- 		OSL_ASSERT( xProps.is() );
- 		OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
--		Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
+     // Undo einrichten
+@@ -731,7 +740,7 @@ BOOL DialogWindow::SaveDialog()
+         Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
+         OSL_ASSERT( xProps.is() );
+         OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
+-        Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
 +		Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().getDocument() );
- 		Reference< XInputStream > xInput( xISP->createInputStream() );
- 
- 		Reference< XSimpleFileAccess > xSFI( xMSF->createInstance
-@@ -894,8 +903,9 @@ BasicEntryDescriptor DialogWindow::CreateEntryDesc
+         Reference< XInputStream > xInput( xISP->createInputStream() );
+ 
+         Reference< XSimpleFileAccess > xSFI( xMSF->createInstance
+@@ -1013,7 +1022,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 );
+@@ -1239,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 )
+             {
+@@ -1300,8 +1309,9 @@ BasicEntryDescriptor DialogWindow::CreateEntryDescriptor()
  {
      ScriptDocument aDocument( GetDocument() );
      String aLibName( GetLibName() );
@@ -68645,33 +68663,15 @@ Index: basctl/source/basicide/baside3.cxx
  }
  
  void DialogWindow::SetReadOnly( BOOL b )
-@@ -942,7 +952,7 @@ void DialogWindow::StoreData()
+@@ -1348,7 +1358,7 @@ void DialogWindow::StoreData()
                      Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), UNO_QUERY );
                      OSL_ASSERT( xProps.is() );
                      OSL_VERIFY( xProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xContext );
--					Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
+-                    Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext );
 +					Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().getDocument() );
- 					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
+                     xLib->replaceByName( ::rtl::OUString( GetName() ), makeAny( xISP ) );
                  }
              }
- 
--            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)