[Libreoffice-commits] core.git: 3 commits - offapi/com qadevOOo/objdsc qadevOOo/tests sc/source

[Eike Rathke]

 offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl                |    8 ++++----
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv               |    1 +
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSpreadsheetSettingsObj.csv |    1 +
 qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java          |    3 ++-
 sc/source/core/tool/docoptio.cxx                                         |    4 ++--
 5 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 0ccb3ccc4c7bafeb2fbbd689c90f710bc65d37e0
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Jul 20 23:50:43 2016 +0200

    add test for css::sheet::SpreadsheetDocumentSettings Wildcards property
    
    Though many other optional properties since OOo3 are also missing, is
    adding this even worth it?
    
    Change-Id: I72eeb3e55c6464b0e46e484177a773b2188846b0

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
index 2e78dcf..fbd045b 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
@@ -73,6 +73,7 @@
 "ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"CharLocale#optional"
 "ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"CharLocaleAsian#optional"
 "ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"CharLocaleComplex#optional"
+"ScModelObj";"com::sun::star::sheet::SpreadsheetDocumentSettings#optional";"Wildcards#optional"
 "ScModelObj";"com::sun::star::document::OfficeDocument";"AutomaticControlFocus#optional"
 "ScModelObj";"com::sun::star::document::OfficeDocument";"ApplyFormDesignMode#optional"
 "ScModelObj";"com::sun::star::document::OfficeDocument";"RuntimeUID#optional"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSpreadsheetSettingsObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSpreadsheetSettingsObj.csv
index 26144b7..2d15f48 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSpreadsheetSettingsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScSpreadsheetSettingsObj.csv
@@ -22,3 +22,4 @@
 "ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"CharLocale#optional"
 "ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"CharLocaleAsian#optional"
 "ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"CharLocaleComplex#optional"
+"ScSpreadsheetSettingsObj";"com::sun::star::sheet::SpreadsheetDocumentSettings";"Wildcards#optional"
diff --git a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java
index 81f6366..8a00bab 100644
--- a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java
+++ b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetDocumentSettings.java
@@ -44,6 +44,7 @@ import com.sun.star.util.Date;
 *  <li><code> RegularExpressions</code></li>
 *  <li><code> ForbiddenCharacters</code></li>
 *  <li><code> HasDrawPages</code></li>
+*  <li><code> Wildcards</code></li>
 * </ul> <p>
 * Properties testing is automated by <code>lib.MultiPropertyTest</code>.
 * @see com.sun.star.sheet.SpreadsheetDocumentSettings
@@ -137,4 +138,4 @@ public class _SpreadsheetDocumentSettings extends MultiPropertyTest {
                     rLocale.Variant.equals(locale.Variant);
         }
     }
-}
\ No newline at end of file
+}
commit 9cd4a2d92388d199293e44a63ebe32f7c61aceff
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Jul 20 23:37:34 2016 +0200

    adapt description to reality
    
    Change-Id: I2062902e496715223ff9a4183c90f66d742d2687

diff --git a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
index bdb784e4..7487f6a 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl
@@ -126,8 +126,8 @@ published service SpreadsheetDocumentSettings
         e.g., for functions which look up spreadsheet contents.
 
         <p>RegularExpressions and Wildcards are mutually exclusive, only
-        one can have the value `TRUE`. Internally, if both are true then
-        Wildcards takes precedence over RegularExpressions.</p>
+        one can have the value `TRUE`. If both are set to `TRUE` via API
+        calls then the last one set takes precedence.</p>
      */
     [property] boolean RegularExpressions;
 
@@ -217,8 +217,8 @@ published service SpreadsheetDocumentSettings
         e.g., for functions which look up spreadsheet contents.
 
         <p>Wildcards and RegularExpressions are mutually exclusive, only
-        one can have the value `TRUE`. Internally, if both are true then
-        Wildcards takes precedence over RegularExpressions.</p>
+        one can have the value `TRUE`. If both are set to `TRUE` via API
+        calls then the last one set takes precedence.</p>
 
         @since LibreOffice 5.2
      */
commit c48c5bad9d371da0e0c47c7ef5611a4afe4fd82e
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Jul 20 23:18:20 2016 +0200

    switch also internal default to Wildcards, tdf#88581 related
    
    Change-Id: I95fc22ba8672ffd7f4c52734e46537420bfd32b0

diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index a84f8ae..5220a84 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -96,8 +96,8 @@ void ScDocOptions::ResetDocOptions()
     bMatchWholeCell     = true;
     bDoAutoSpell        = false;
     bLookUpColRowNames  = true;
-    bFormulaRegexEnabled= true;
-    bFormulaWildcardsEnabled= false;
+    bFormulaRegexEnabled= false;
+    bFormulaWildcardsEnabled= true;
     eFormulaSearchType  = eSearchTypeUnknown;
     bWriteCalcConfig    = true;
 }