summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-27 15:45:20 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-27 15:47:57 +0200
commit120d8fc75c164555058d63ef7dca8bfbd8316a5a (patch)
tree96975d019fdb15192bde592f11f23e166533c050 /framework
parent02f114096d56f717da4b1665b1d2d3a9dac20f4e (diff)
Use FixedVariable::bAbsPath to check for special path vars
Change-Id: I526c45ecf3c7e21b87c16eef5047707f74da7668
Diffstat (limited to 'framework')
-rw-r--r--framework/source/services/substitutepathvars.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index cd6bead77284..4d0299886c7c 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1091,9 +1091,7 @@ throw ( RuntimeException )
if ( nPos >= 0 )
{
bool bMatch = true;
- if ( i.eVariable == PREDEFVAR_USERNAME ||
- i.eVariable == PREDEFVAR_LANGID ||
- i.eVariable == PREDEFVAR_VLANG )
+ if ( !aFixedVarTable[i.eVariable].bAbsPath )
{
// Special path variables as they can occur in the middle of a path. Only match if they
// describe a whole directory and not only a substring of a directory!