sc/inc/orcusfilters.hxx | 1 - sc/inc/rangelst.hxx | 2 +- sc/source/core/data/conditio.cxx | 6 +++++- sc/source/core/tool/rangelst.cxx | 8 +++----- sc/source/ui/condformat/condformatdlg.cxx | 2 +- sw/Module_sw.mk | 1 - 6 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit 7c63d52506b66563eefcf29c803b23bb9b812491 Author: Markus Mohrhard <[email protected]> Date: Wed Dec 5 02:40:44 2012 +0100 remove unused parameter Change-Id: Ica799b8a036a3055ea50ecc90ca85acc1ec51f21 diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index 4f23ee9..06cebec 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, - SCTAB nDefaultTab = 0, sal_Unicode cDelimiter = 0 ); + SCTAB nDefaultTab = 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 a631a1a..bd93b7c 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -185,12 +185,11 @@ ScRangeList::~ScRangeList() sal_uInt16 ScRangeList::Parse( const String& rStr, ScDocument* pDoc, sal_uInt16 nMask, formula::FormulaGrammar::AddressConvention eConv, - SCTAB nDefaultTab, sal_Unicode cDelimiter ) + SCTAB nDefaultTab ) { if ( rStr.Len() ) { - if (!cDelimiter) - cDelimiter = ScCompiler::GetNativeSymbol(ocSep).GetChar(0); + sal_Unicode cDelimiter = ScCompiler::GetNativeSymbol(ocSep).GetChar(0); nMask |= SCA_VALID; // falls das jemand vergessen sollte sal_uInt16 nResult = (sal_uInt16)~0; // alle Bits setzen commit 4b586bd622c94e617075f4e176087584ae5fe47d Author: Markus Mohrhard <[email protected]> Date: Wed Dec 5 02:25:50 2012 +0100 correctly parse range in cond format dlg Change-Id: I92d19cd71f7f1c9e90b2d3039a5c3c6a0143d1c7 diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index 73270bc..4f23ee9 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 c22a1e6..a631a1a 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 15ffd57..3398188 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) diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 6abd321..bec0bde 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -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,\ commit 1c60abfdb617039cedc53982c7c8eca640e28cac Author: Markus Mohrhard <[email protected]> Date: Wed Dec 5 02:25:33 2012 +0100 adapt cond format range when copying sheets, fdo#56742 Change-Id: I9b28ac161f326ebeeaf0fa22e0a96915187d7c94 diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 5e038e5..c193607 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1972,7 +1972,11 @@ void ScConditionalFormat::CompileXML() void ScConditionalFormat::UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ) { - maRanges.UpdateReference( eUpdateRefMode, pDoc, rRange, nDx, nDy, nDz ); + if( eUpdateRefMode == URM_COPY && nDz != 0 ) + maRanges.UpdateReference( URM_MOVE, pDoc, rRange, nDx, nDy, nDz ); + else + maRanges.UpdateReference( eUpdateRefMode, pDoc, rRange, nDx, nDy, nDz ); + for(CondFormatContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) itr->UpdateReference(eUpdateRefMode, rRange, nDx, nDy, nDz); } commit c1cff220853c803f40ff4284fd6046a86cc15d43 Author: Markus Mohrhard <[email protected]> Date: Tue Dec 4 21:01:00 2012 +0100 unnecessary forward declaration Change-Id: I5a4a60a3d374b71625646378e938b51fc9dbaeb2 diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx index 9f3ca13..22e9cc9 100644 --- a/sc/inc/orcusfilters.hxx +++ b/sc/inc/orcusfilters.hxx @@ -14,7 +14,6 @@ class ScDocument; class SvTreeListBox; -class Image; struct ScOrcusXMLTreeParam; struct ScOrcusImportXMLParam; class ScOrcusXMLContext; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
