[Libreoffice-commits] .: patches/dev300 patches/vba

Noel Power noelp at kemper.freedesktop.org
Wed Oct 13 08:43:39 PDT 2010 

 patches/dev300/apply                         |   27 ---------------------------
 patches/dev300/fields-table-formula.diff     |    4 ++--
 patches/dev300/localize-pl-cygwin-paths.diff |    8 +-------
 patches/vba/vba-container-controls.diff      |    7 ++++---
 4 files changed, 7 insertions(+), 39 deletions(-)

New commits:
commit 35f783c8aa7e183cd2dc15ae73b773997d04e539
Author: Noel Power <noel.power at novell.com>
Date:   Wed Oct 13 16:43:08 2010 +0100

    fixup master build ( after m10 & vba patch addition )

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 087aba7..4cda01d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -440,10 +440,6 @@ gnome-vfs-locking-config_office.diff, i#91151, jholesov
 
 [ CalcFixes ]
 
-# fix incorrect export of combo boxes, by adding two empty bytes to make Excel
-# 2003 and 2007 happy.
-calc-combo-listbox-export-fix.diff, n#540566, noelp
-
 # Excel compatibility for handling of "string numbers".
 # FIXME: Please check, there was some change in this between OOO330_m4 and m6;
 # I have just updated the patch to apply again, but maybe it is not necessary
@@ -977,11 +973,6 @@ mono-component-support.diff
 
 [ VBAObjects ]
 SectionOwner => noelpwer
-# FIXME: half of the diff is somehow fixed to apply by pmladek
-#        few things need double checking
-cws-vbasupportdev300.diff
-# FIXME ooo330-m2 old version (m83) of the diff cws-vbasupportdev300_m83.diff, noelpwer
-
 # fix vbasupport for field related changes ( note this code
 # is disabled in vbasupportdev300 upstream )
 cws-vbasupportdev300_m83-fix.diff, cbosdo
@@ -997,36 +988,18 @@ vba-oox-autocodename.diff,  n#507768
 # tweak oox filter to handle strange scenario where there might be some
 # missing codenmames in excel
 vba-oox-olenameoverride.diff, n#359933, n#403974
-# fix strange ranges seperator regression problem
-fix-name-range-separator.diff, n#597351
 # remove dependency of vbahelper on oox ( added by container_controls.diff )
 vbahelper-no-oox.diff
-# misc changes to modify strange upstream changes
-vba-misc-tweakupstream.diff
 # unoize msvbahelper to solve some dependency issues for split build
-# FIXME disabled for m3f
-# FIXME cause build problems with m4; some stuff is missing
 vba-msvbahelper-splitbuilt.diff
 # fix upstream introduced Application::Intersection problem
 # FIXME The problem seems to be gone, but double-check.
 #vba-fix-interesection.diff
 # use oox filter exclusively for import of controls  ( excel/word )
 vba-use-ooxfilter-forcontrols.diff
-# fix hlink & macro import/export for autoshapes and pictures
-vba-fix-shapepic-hlinkmacro.diff
-# remove some events from base ( sun/oracle ) sources and replace with own
-vba-override-base-vbaevents.diff
-# add some rolled up patches from vbasupport
-# i#113356, i#112998 i#113955 i#113358 i#113515 i#112531 i#112596 i#112530
-vbasupport-patch-roll-up.diff, i#113356, i#112998 i#113955 i#113358 i#113515 i#112531 i#112596 i#112530
-# fix column address for Range.Cell
-vba-rangecell-colparam.diff, bnc#639297
 # fix logical Operator precendence for VBA
 # disabled as it causes a regression
 vba-fix-logical-precedence-order.diff, bnc#644156
-# fix bug with implicit handling of XIndexAccess for
-# objects ( introduced in vbasupportdev300.diff )
-vba-fix-implicit-indexaccess.diff
 [ VBAUntested ]
 SectionOwner => noelpwer
 # KEEP - unfinished autotext stuff
diff --git a/patches/dev300/fields-table-formula.diff b/patches/dev300/fields-table-formula.diff
index ea06980..e522f7d 100644
--- a/patches/dev300/fields-table-formula.diff
+++ b/patches/dev300/fields-table-formula.diff
@@ -669,9 +669,9 @@ index 9dd21a4..5abce43 100644
 +    return sRet;
 +}
 +
- /*-- 11.12.98 10:56:28---------------------------------------------------
  
-   -----------------------------------------------------------------------*/
+ uno::Reference< text::XTextCursor >  SwXCell::createTextCursor(void) throw( uno::RuntimeException )
+ {
 diff --git sw/source/filter/ww8/wrtw8nds.cxx sw/source/filter/ww8/wrtw8nds.cxx
 index 3191b6b..0095089 100644
 --- sw/source/filter/ww8/wrtw8nds.cxx
diff --git a/patches/dev300/localize-pl-cygwin-paths.diff b/patches/dev300/localize-pl-cygwin-paths.diff
index 8731408..afb353c 100644
--- a/patches/dev300/localize-pl-cygwin-paths.diff
+++ b/patches/dev300/localize-pl-cygwin-paths.diff
@@ -26,7 +26,7 @@ index 8310435..78b6b6e 100644
              my $bFlag="";
              if( $bAll ) {$args .= " en-US";}
              else{
-@@ -1154,6 +1155,19 @@ sub usage{
+@@ -1154,3 +1155,16 @@ sub usage{
      print STDERR "\nlocalize -m -l cs -f my.sdf\n( Merge cs translation into the sourcecode ) \n";
  }
  
@@ -43,9 +43,3 @@ index 8310435..78b6b6e 100644
 +    return $path;
 +}
 +
- #            my $line           = defined $_ ? $_ : '';
- #            my $leftpart       = defined $2 ? $2 : '';
- #            my $prj            = defined $3 ? $3 : '';
--- 
-1.7.0.1
-
diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index 7d3de1c..f7d7589 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -5093,11 +5093,12 @@ diff --git vbahelper/source/msforms/vbauserform.cxx vbahelper/source/msforms/vba
 index 5218610..e5c678a 100644
 --- vbahelper/source/msforms/vbauserform.cxx
 +++ vbahelper/source/msforms/vbauserform.cxx
-@@ -27,8 +27,8 @@
+@@ -27,9 +27,9 @@
  #include <vbahelper/helperdecl.hxx>
  #include "vbauserform.hxx"
  #include <com/sun/star/awt/XControl.hpp>
 -#include <com/sun/star/awt/XControlContainer.hpp>
+ #include <com/sun/star/awt/XWindow2.hpp>
  #include <com/sun/star/beans/PropertyConcept.hpp>
 +#include <com/sun/star/container/XNameContainer.hpp>
  #include <basic/sbx.hxx>
@@ -5185,9 +5186,9 @@ index fc55bb3..ccc853e 100644
      ScVbaUserForm( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException );
      virtual ~ScVbaUserForm();
 +    static css::uno::Reference< css::awt::XControl > nestedSearch( const rtl::OUString& aPropertyName, css::uno::Reference< css::awt::XControlContainer >& xContainer );
+     virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
+     virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
      // XUserForm
-     virtual void SAL_CALL RePaint(  ) throw (css::uno::RuntimeException);
-     virtual void SAL_CALL Show(  ) throw (css::uno::RuntimeException);
 diff --git vbahelper/util/makefile.mk vbahelper/util/makefile.mk
 index 33c4900..4b08391 100644
 --- vbahelper/util/makefile.mk

More information about the Libreoffice-commits mailing list