summaryrefslogtreecommitdiff
path: root/patches/vba/vba-noregrex-for-match.diff
diff options
context:
space:
mode:
Diffstat (limited to 'patches/vba/vba-noregrex-for-match.diff')
-rw-r--r--patches/vba/vba-noregrex-for-match.diff34
1 files changed, 0 insertions, 34 deletions
diff --git a/patches/vba/vba-noregrex-for-match.diff b/patches/vba/vba-noregrex-for-match.diff
deleted file mode 100644
index 47cfeadf9..000000000
--- a/patches/vba/vba-noregrex-for-match.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git sc/source/core/tool/interpr1.cxx sc/source/core/tool/interpr1.cxx
-index fc008c4..22b0807 100644
---- sc/source/core/tool/interpr1.cxx
-+++ sc/source/core/tool/interpr1.cxx
-@@ -75,6 +75,7 @@
- #include "externalrefmgr.hxx"
- #include "doubleref.hxx"
- #include "queryparam.hxx"
-+#include <basic/sbstar.hxx>
-
- #define SC_DOUBLE_MAXVALUE 1.7e307
-
-@@ -4138,7 +4139,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.
- {