diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-12-05 02:25:50 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-12-05 02:55:20 +0100 |
| commit | 4b586bd622c94e617075f4e176087584ae5fe47d (patch) | |
| tree | 9fa9af305608a705d966542855be5a1b395f3f4d /sc | |
| parent | 1c60abfdb617039cedc53982c7c8eca640e28cac (diff) | |
correctly parse range in cond format dlg
Change-Id: I92d19cd71f7f1c9e90b2d3039a5c3c6a0143d1c7
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/rangelst.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/rangelst.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/condformat/condformatdlg.cxx | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index 73270bc08065..4f23ee9e27b3 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -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, diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index c22a1e6a5a2a..a631a1a0e74b 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -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; diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 15ffd57a5518..3398188690cc 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -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) |