framework/source/services/substitutepathvars.cxx | 3 ++- sc/source/core/data/colorscale.cxx | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-)
New commits: commit d9d85d6c989e848922841d6ce36ab3f4dad054dd Author: Markus Mohrhard <[email protected]> Date: Tue Sep 27 00:11:32 2016 +0200 tdf#101104 this paranoid safety check actually causes a bug Change-Id: Id31f98f5f84eabf603045e4d9f7ebd448689eed5 Reviewed-on: https://gerrit.libreoffice.org/29307 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 6df2b18..e85fd9f 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -953,10 +953,6 @@ ScIconSetInfo* ScIconSetFormat::GetIconSetInfo(const ScAddress& rAddr) const double nMin = GetMinValue(); double nMax = GetMaxValue(); - // this check is for safety - if(nMin > nMax) - return nullptr; - sal_Int32 nIndex = 0; const_iterator itr = begin(); ++itr; commit eb637b3195f0099e6e21361d625d7292fb484329 Author: Stephan Bergmann <[email protected]> Date: Tue Sep 27 09:18:11 2016 +0200 tdf#101898: Only re-substitute whole segments with $(username) ...otherwise, if $(username) happens to be "user", it will endlessly re- substitute inside a (already partly re-substituted) URL of the form $(user)/... Regression introduced with 16fb0d3d0f68708c183c53bd18660a23970b77fe "tdf#98407 PathSubstitution: Add substitution for $(username)". Change-Id: I1c8b64f383fdfd97fa5edc192e9ca4b46944d6f1 (cherry picked from commit 653e0ccc4e6230f28dd4c553dc7e9482beafa3cd) Reviewed-on: https://gerrit.libreoffice.org/29314 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 6263417..902a520 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -1095,7 +1095,8 @@ throw ( RuntimeException ) if ( nPos >= 0 ) { bool bMatch = true; - if ( i->eVariable == PREDEFVAR_LANGID || + if ( i->eVariable == PREDEFVAR_USERNAME || + i->eVariable == PREDEFVAR_LANGID || i->eVariable == PREDEFVAR_VLANG ) { // Special path variables as they can occur in the middle of a path. Only match if they
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
