[Libreoffice-commits] .: patches/vba

[Tor Lillqvist]

 patches/vba/vba-container-controls.diff |   57 ++++++++++++++++----------------
 1 file changed, 30 insertions(+), 27 deletions(-)

New commits:
commit 514475431c1c76a5e9c0e5d648ee834f411004cd
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Oct 14 14:37:50 2010 +0300

    Make vba-container-controls.diff apply again

diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index f7d7589..1ff9689 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -1258,9 +1258,9 @@ diff --git oox/source/xls/excelfilter.cxx oox/source/xls/excelfilter.cxx
 index 52d6b69..6f3263f 100644
 --- oox/source/xls/excelfilter.cxx
 +++ oox/source/xls/excelfilter.cxx
-@@ -240,5 +240,64 @@ OUString ExcelBiffFilter::implGetImplementationName() const
- 
- // ============================================================================
+@@ -240,6 +240,63 @@ OUString ExcelBiffFilter::implGetImplementationName() const
+     return CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelBiffFilter" );
+ }
  
 +OUString SAL_CALL SimpleExcelVBAProjFilter_getImplementationName() throw()
 +{
@@ -1319,10 +1319,9 @@ index 52d6b69..6f3263f 100644
 +    return new ExcelGraphicHelper( getWorkbookData() );
 +}
 +
-+// ============================================================================
-+
- } // namespace xls
- } // namespace oox
+ Sequence< OUString > SAL_CALL ExcelBiffFilter_getSupportedServiceNames() throw()
+ {
+     OUString aServiceName = CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelBiffFilter" );
 diff --git sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx
 index 6083116..d50848b 100644
 --- sc/source/filter/excel/excimp8.cxx
@@ -6123,11 +6122,11 @@ index 1c67f19..89eb46b 100644
 -        addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":style-id") ),
 -                      all_styles->getStyleId( aStyle ) );
 -    }
--    
+-
 -    // collect elements
 -    readDefaults();
 -    readOrientationAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Orientation") ),
--                         OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );  
+-                         OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":align") ) );
 -    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinIncrement") ),
 -                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":increment") ) );
 -    readLongAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("SpinValue") ),
@@ -6149,13 +6148,13 @@ index 1c67f19..89eb46b 100644
      readEvents();
  }
  //__________________________________________________________________________________________________
-@@ -1333,10 +1324,254 @@ void ElementDescriptor::readDialogModel( StyleBag * all_styles )
+@@ -1333,12 +1324,256 @@ void ElementDescriptor::readDialogModel( StyleBag * all_styles )
          addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":withtitlebar") ),
-                       OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) ); 
+                       OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) );
  
 -    readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
 +    readImageURLAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ),
-                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) ); 
+                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":image-src") ) );
  
      readEvents();
  }
@@ -6405,6 +6404,8 @@ index 1c67f19..89eb46b 100644
 +    }
 +}
  }
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git xmlscript/source/xmldlg_imexp/xmldlg_export.cxx xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
 index 47b1d2f..1b12100 100644
 --- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -7736,27 +7737,27 @@ index 0f03070..a66c4a0 100644
  bool ImportContext::importImageAlignProperty(
      OUString const & rPropName, OUString const & rAttrName,
      Reference< xml::input::XAttributes > const & xAttributes )
-@@ -1892,42 +2023,20 @@ Reference< xml::input::XElement > DialogImport::getStyle(
+@@ -1892,44 +2023,22 @@ Reference< xml::input::XElement > DialogImport::getStyle(
      }
      return 0;
  }
 -//__________________________________________________________________________________________________
 -Reference< script::XLibraryContainer > DialogImport::getScriptLibraryContainer()
 -{
--	if( !_xScriptLibraryContainer.is() )
--	{
--		try
--		{
--			Reference< beans::XPropertySet > xProps( _xDoc, UNO_QUERY );
--			if( xProps.is() )
--				_xScriptLibraryContainer.set( xProps->getPropertyValue( OUSTR("BasicLibraries") ), UNO_QUERY );
--		}
--		catch( const Exception& )
--		{
--		}
--	}
+-    if( !_xScriptLibraryContainer.is() )
+-    {
+-        try
+-        {
+-            Reference< beans::XPropertySet > xProps( _xDoc, UNO_QUERY );
+-            if( xProps.is() )
+-                _xScriptLibraryContainer.set( xProps->getPropertyValue( OUSTR("BasicLibraries") ), UNO_QUERY );
+-        }
+-        catch( const Exception& )
+-        {
+-        }
+-    }
 -
--	return _xScriptLibraryContainer;
+-    return _xScriptLibraryContainer;
 -}
  
  //##################################################################################################
@@ -7771,7 +7772,7 @@ index 0f03070..a66c4a0 100644
  {
 -    DialogImport* pImport = new DialogImport( xContext, xDialogModel, xDocument );
 -    uno::Reference< script::vba::XVBACompatibility > xVBAModeSource( pImport->getScriptLibraryContainer(), uno::UNO_QUERY );
--    
+-
 -    uno::Reference< beans::XPropertySet > xDlgProps( xDialogModel, uno::UNO_QUERY );
 -    if ( xVBAModeSource.is() && xDlgProps.is() && xVBAModeSource->getVBACompatibilityMode() )
 -        xDlgProps->setPropertyValue( OUSTR("VBAForm"), uno::makeAny( sal_True ) );
@@ -7785,6 +7786,8 @@ index 0f03070..a66c4a0 100644
  }
 -
  }
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
 diff --git xmlscript/util/makefile.mk xmlscript/util/makefile.mk
 index 7a391cd..ef5e0b0 100644
 --- xmlscript/util/makefile.mk