Kaydet (Commit) 4b586bd6 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

correctly parse range in cond format dlg

Change-Id: I92d19cd71f7f1c9e90b2d3039a5c3c6a0143d1c7
üst 1c60abfd
......@@ -41,7 +41,7 @@ public:
sal_uInt16 Parse( const String&, ScDocument* = NULL,
sal_uInt16 nMask = SCA_VALID,
formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO,
sal_Unicode cDelimiter = 0 );
SCTAB nDefaultTab = 0, sal_Unicode cDelimiter = 0 );
void Format( String&, sal_uInt16 nFlags = 0, ScDocument* = NULL,
formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO,
......
......@@ -185,7 +185,7 @@ ScRangeList::~ScRangeList()
sal_uInt16 ScRangeList::Parse( const String& rStr, ScDocument* pDoc, sal_uInt16 nMask,
formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cDelimiter )
SCTAB nDefaultTab, sal_Unicode cDelimiter )
{
if ( rStr.Len() )
{
......@@ -199,8 +199,7 @@ sal_uInt16 ScRangeList::Parse( const String& rStr, ScDocument* pDoc, sal_uInt16
SCTAB nTab = 0;
if ( pDoc )
{
//! erste markierte Tabelle gibts nicht mehr am Dokument
//! -> uebergeben? oder spaeter an den Ranges setzen
nTab = nDefaultTab;
}
else
nTab = 0;
......
......@@ -456,7 +456,7 @@ ScConditionalFormat* ScCondFormatDlg::GetConditionalFormat() const
{
rtl::OUString aRangeStr = maEdRange.GetText();
ScRangeList aRange;
sal_uInt16 nFlags = aRange.Parse(aRangeStr, mpDoc, SCA_VALID, mpDoc->GetAddressConvention());
sal_uInt16 nFlags = aRange.Parse(aRangeStr, mpDoc, SCA_VALID, mpDoc->GetAddressConvention(), maPos.Tab());
ScConditionalFormat* pFormat = maCondFormList.GetConditionalFormat();
if(nFlags & SCA_VALID && !aRange.empty() && pFormat)
......
......@@ -38,7 +38,6 @@ $(eval $(call gb_Module_add_targets,sw,\
endif
$(eval $(call gb_Module_add_check_targets,sw,\
CppunitTest_sw_swdoc_test \
))
$(eval $(call gb_Module_add_slowcheck_targets,sw,\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment