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

[René Engelhard]

 patches/dev300/apply                        |   11 ++++++++-
 patches/vba/vba-noregrex-for-match-m16.diff |   34 ++++++++++++++++++++++++++++
 patches/vba/vba-noregrex-for-match.diff     |    8 +++---
 3 files changed, 48 insertions(+), 5 deletions(-)

New commits:
commit 9e9d535259468f0b37dff53f7441bd51752143c9
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Jul 29 15:33:16 2009 +0200

    ooo310-m17 update
    
    * patches/dev300/apply: disable calc-external-ref-path-fix.diff, integrated
    * patches/vba/vba-noregrex-for-match-m16.diff: rotate
    * patches/vba/vba-noregrex-for-match.diff: update for m17

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f126a42..ab2af78 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1741,10 +1741,17 @@ vba-variant-fix.diff, Fong
 userform-image-import-fix.diff
 # spinbutton change wasn't imported correctly
 spinbutton-import-valuechange.diff
+
+[ VBAObjects >= ooo310-m17 ]
 # don't apply regex to MATCH function if typical
 # 'regex' like characters are present
 vba-noregrex-for-match.diff
+[ VBAObjects < ooo310-m17 ]
+# don't apply regex to MATCH function if typical
+# 'regex' like characters are present
+vba-noregrex-for-match-m16.diff
 
+[ VBAObjects ]
 # fix treatment of NULL with
 # a) NOT operator b) comparison operators
 vba-null-not-treatment.diff, n#496844
@@ -3190,9 +3197,11 @@ cws-ooxml03-enable-docx.diff
 # cell's dirty flag upon loading.
 calc-dirty-cells-after-load-fix.diff, n#491898, kohei
 
+[ CalcFixes < ooo310-m17 ]
 # fix incorrect URI path generation for external references.
-calc-external-ref-path-fix.diff, i#103347, kohei
+calc-external-ref-path-fix.diff, i#103317, kohei
 
+[ CalcFixes ]
 # set document modified when switching external link source.
 calc-external-ref-modify-link-modified.diff, i#103598, kohei
 
diff --git a/patches/vba/vba-noregrex-for-match-m16.diff b/patches/vba/vba-noregrex-for-match-m16.diff
new file mode 100644
index 0000000..10ea95b
--- /dev/null
+++ b/patches/vba/vba-noregrex-for-match-m16.diff
@@ -0,0 +1,34 @@
+diff --git sc/source/core/tool/interpr1.cxx sc/source/core/tool/interpr1.cxx
+index 2ae49af..8699b1b 100644
+--- sc/source/core/tool/interpr1.cxx
++++ sc/source/core/tool/interpr1.cxx
+@@ -66,6 +66,7 @@
+ #include "lookupcache.hxx"
+ #include "rangenam.hxx"
+ #include "compiler.hxx"
++#include <basic/sbstar.hxx>
+ 
+ #define SC_DOUBLE_MAXVALUE  1.7e307
+ 
+@@ -4092,7 +4093,20 @@ void ScInterpreter::ScMatch()
+                 }
+             }
+             if ( rEntry.bQueryByString )
+-                rParam.bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
++            {
++		BOOL bIsVBAMode = FALSE;
++                if ( pDok ) 
++                {
++                   SfxObjectShell* pDocSh = pDok->GetDocumentShell();
++                   if ( pDocSh )
++                        bIsVBAMode = pDocSh->GetBasic()->isVBAEnabled();
++                }
++                // #TODO handle MSO wildcards
++                if ( bIsVBAMode )
++                    rParam.bRegExp = FALSE;
++                else
++                    rParam.bRegExp = MayBeRegExp( *rEntry.pStr, pDok );
++            }
+ 
+             if (pMatSrc) // The source data is matrix array.
+             {
diff --git a/patches/vba/vba-noregrex-for-match.diff b/patches/vba/vba-noregrex-for-match.diff
index 10ea95b..9ea2f6a 100644
--- a/patches/vba/vba-noregrex-for-match.diff
+++ b/patches/vba/vba-noregrex-for-match.diff
@@ -2,14 +2,14 @@ diff --git sc/source/core/tool/interpr1.cxx sc/source/core/tool/interpr1.cxx
 index 2ae49af..8699b1b 100644
 --- sc/source/core/tool/interpr1.cxx
 +++ sc/source/core/tool/interpr1.cxx
-@@ -66,6 +66,7 @@
- #include "lookupcache.hxx"
+@@ -72,6 +72,7 @@
  #include "rangenam.hxx"
  #include "compiler.hxx"
+ #include "externalrefmgr.hxx"
 +#include <basic/sbstar.hxx>
- 
+
  #define SC_DOUBLE_MAXVALUE  1.7e307
- 
+
 @@ -4092,7 +4093,20 @@ void ScInterpreter::ScMatch()
                  }
              }