sc/CppunitTest_sc_subsequent_filters_test.mk | 1 +
sc/Module_sc.mk | 6 ++++++
sc/qa/unit/data/contentCSV/spreadsheet-functions.csv | 1 +
sc/qa/unit/data/ods/formats.ods |binary
sc/qa/unit/data/ods/functions.ods |binary
sc/qa/unit/data/xlsx/formats.xlsx |binary
sc/source/core/data/documen4.cxx | 7 ++++++-
sc/source/ui/condformat/condformatdlg.cxx | 10 +++++++++-
sc/source/ui/view/tabvwshc.cxx | 2 +-
unotools/source/i18n/textsearch.cxx | 16 +++++-----------
10 files changed, 29 insertions(+), 14 deletions(-)
New commits:
commit 556aa12b84ef6f6d6baf56781925d0868693fe55
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Oct 19 10:34:01 2012 +0200
reenable all our unit tests
Change-Id: I9d2ff5f675faa1913dd90e4ce6269efe8bd2646d
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 2203364..4a53487 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -44,6 +44,12 @@ endif
$(eval $(call gb_Module_add_check_targets,sc,\
CppunitTest_sc_ucalc \
+ CppunitTest_sc_filters_test \
+ CppunitTest_sc_rangelst_test \
+))
+
+$(eval $(call gb_Module_add_slowcheck_targets,sc, \
+ CppunitTest_sc_subsequent_filters_test \
))
# Disabled to allow the check tinderbox execute the sd tests
commit cc8949955e58b45a579f3126846541f8b0e4bf64
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Oct 19 10:33:17 2012 +0200
add test case for the MATCH function
Change-Id: I627f4b579a5619e788df3726d2bd72a7f4cec964
diff --git a/sc/qa/unit/data/contentCSV/spreadsheet-functions.csv
b/sc/qa/unit/data/contentCSV/spreadsheet-functions.csv
index 6dbc97a..b8ba298 100644
--- a/sc/qa/unit/data/contentCSV/spreadsheet-functions.csv
+++ b/sc/qa/unit/data/contentCSV/spreadsheet-functions.csv
@@ -2,3 +2,4 @@ $C$2,$A$1,Sheet.B$2,Sheet!R2C2
2,4,4,5,6,15,15,6,9
1,3,4,4,2,2
2,4,7,8,4
+4,5,#N/A,8
diff --git a/sc/qa/unit/data/ods/functions.ods
b/sc/qa/unit/data/ods/functions.ods
index a90a224..6dd969c 100644
Binary files a/sc/qa/unit/data/ods/functions.ods and
b/sc/qa/unit/data/ods/functions.ods differ
diff --git a/sc/qa/unit/data/xlsx/formats.xlsx
b/sc/qa/unit/data/xlsx/formats.xlsx
index e579fa5..c75bbc7 100644
Binary files a/sc/qa/unit/data/xlsx/formats.xlsx and
b/sc/qa/unit/data/xlsx/formats.xlsx differ
commit 4e8d176b4f5e4861a68d582dfbd4c58da4cba3b9
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Oct 19 10:29:45 2012 +0200
actually pass the old cond format to the dialog
Change-Id: I78fad788514461fc01100f2b85a668ec2990387d
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 6ef470a..bb9aa7b 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -207,7 +207,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
{
const ScRangeList& rCondFormatRange = pCondFormat->GetRange();
if(rCondFormatRange == aRangeList)
- pResult = new ScCondFormatDlg( pB, pCW, pParent, pDoc,
NULL, rCondFormatRange, aPos, condformat::dialog::NONE );
+ pResult = new ScCondFormatDlg( pB, pCW, pParent, pDoc,
pCondFormat, rCondFormatRange, aPos, condformat::dialog::NONE );
}
if(!pResult)
commit 0c94072f401d32b6d631423ba98a6b84dc1cc7bd
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Oct 19 10:28:37 2012 +0200
differentiate between formula and normal conditions in the dialog
Change-Id: Ie0545b028479fe3de6c642c5f64a1ce8cf7f523b
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index bf4f8b2..fcf7dfc 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -74,7 +74,14 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const
ResId& rResId, ScDocum
switch(pEntry->GetType())
{
case condformat::CONDITION:
- maEntries.push_back(new ScConditionFrmtEntry( this, mpDoc,
maPos, static_cast<const ScCondFormatEntry*>( pEntry ) ) );
+ {
+ const ScCondFormatEntry* pConditionEntry =
static_cast<const ScCondFormatEntry*>( pEntry );
+ if(pConditionEntry->GetOperation() != SC_COND_DIRECT)
+ maEntries.push_back(new ScConditionFrmtEntry(
this, mpDoc, maPos, pConditionEntry ) );
+ else
+ maEntries.push_back(new ScFormulaFrmtEntry( this,
mpDoc, maPos, pConditionEntry ) );
+
+ }
break;
case condformat::COLORSCALE:
maEntries.push_back(new ScColorScale3FrmtEntry( this,
mpDoc, maPos, static_cast<const ScColorScaleFormat*>( pEntry ) ) );
@@ -102,6 +109,7 @@ ScCondFormatList::ScCondFormatList(Window* pParent, const
ResId& rResId, ScDocum
break;
}
}
+ RecalcAll();
if (!maEntries.empty())
maEntries.begin()->SetActive();
commit 1c0f4d8ca7c127c3d6b31ec772de5b9b680c9db5
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Thu Oct 18 18:56:41 2012 +0200
don't catch this exception, we want to crash if this fails and fix it
Change-Id: I6aa0e1ba94b1702a54c7520a5093e6d0ba75a0d9
diff --git a/unotools/source/i18n/textsearch.cxx
b/unotools/source/i18n/textsearch.cxx
index f6d606c..e0dd061 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -113,17 +113,11 @@ Reference<XTextSearch> TextSearch::getXTextSearch( const
SearchOptions& rPara )
if ( lcl_Equals(rCache.Options, rPara) )
return rCache.xTextSearch;
- try
- {
- Reference< XComponentContext > xContext =
::comphelper::getProcessComponentContext();
- rCache.xTextSearch.set( ::TextSearch::create(xContext) );
- rCache.xTextSearch->setOptions( rPara );
- rCache.Options = rPara;
- }
- catch ( Exception& e )
- {
- SAL_WARN( "unotools.i18n", "caught " << e.Message );
- }
+ Reference< XComponentContext > xContext =
::comphelper::getProcessComponentContext();
+ rCache.xTextSearch.set( ::TextSearch::create(xContext) );
+ rCache.xTextSearch->setOptions( rPara );
+ rCache.Options = rPara;
+
return rCache.xTextSearch;
}
commit 1ae22b70b763610768b5bf1416333c393470d9a5
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Thu Oct 18 18:55:28 2012 +0200
fix problem with conditional formats in formats.ods
Change-Id: I2dd43c333c7631545e464d1e28ff33ec93e8312f
diff --git a/sc/qa/unit/data/ods/formats.ods b/sc/qa/unit/data/ods/formats.ods
index f944e34..cfe3bc8 100644
Binary files a/sc/qa/unit/data/ods/formats.ods and
b/sc/qa/unit/data/ods/formats.ods differ
commit eb141a2cfa44b7414998d34a244edd8ccf5f5ce0
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Thu Oct 18 18:11:18 2012 +0200
ithe cond format data is no longer stored as SfxUInt32Item
Change-Id: I41c19f213de73052bcfd18eada35ed14dfd9a172
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 3295106..69c68b0 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -700,7 +700,12 @@ const SfxItemSet* ScDocument::GetCondResult( SCCOL nCol,
SCROW nRow, SCTAB nTab
ScConditionalFormat* ScDocument::GetCondFormat(
SCCOL nCol, SCROW nRow, SCTAB nTab ) const
{
- sal_uLong nIndex = ((const
SfxUInt32Item*)GetAttr(nCol,nRow,nTab,ATTR_CONDITIONAL))->GetValue();
+ sal_uInt32 nIndex = 0;
+ const std::vector<sal_uInt32>& rCondFormats = static_cast<const
ScCondFormatItem*>(GetAttr(nCol, nRow, nTab,
ATTR_CONDITIONAL))->GetCondFormatData();
+
+ if(!rCondFormats.empty())
+ nIndex = rCondFormats[0];
+
if (nIndex)
{
ScConditionalFormatList* pCondFormList = GetCondFormList(nTab);
commit 0db481900e7dc76cb003838c0afd5d61c4351b16
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Thu Oct 18 15:45:46 2012 +0200
add one more component file for subsequent filters test
Change-Id: Iba9baeb286d0c5e3f9eae6d5b57cb8c8ba62112d
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk
b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 613ff55..72a7ccc 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -100,6 +100,7 @@ $(eval $(call
gb_CppunitTest_use_components,sc_subsequent_filters_test,\
forms/util/frm \
framework/util/fwk \
i18npool/util/i18npool \
+ i18npool/source/search/i18nsearch \
oox/util/oox \
package/source/xstor/xstor \
package/util/package2 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
