summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorAshod Nakashian <ashodnakashian@yahoo.com>2015-11-10 19:20:12 -0500
committerCaolán McNamara <caolanm@redhat.com>2015-11-12 10:47:26 +0000
commitd7801c39826f2f24f7340e1b25809d3bb65d6099 (patch)
tree6acf82af5954e72930272fd62ac37c07664cf937 /oox
parentb34eab5996c52269360d166815ef15a250627c48 (diff)
Namespace cleanup and disambiguation
Change-Id: Ib6d2f8b4e71436c3a7c26bdfc9847152ebaf0739 Reviewed-on: https://gerrit.libreoffice.org/19900 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/chart/datasourcecontext.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx
index ea754a917281..ceb0efc14d02 100644
--- a/oox/source/drawingml/chart/datasourcecontext.cxx
+++ b/oox/source/drawingml/chart/datasourcecontext.cxx
@@ -130,7 +130,7 @@ void DoubleSequenceContext::onCharacters( const OUString& rChars )
else
{
double fValue = rChars.toDouble();
- Color* pColor = nullptr;
+ ::Color* pColor = nullptr;
OUString aFormattedValue;
pNumFrmt->GetOutputString( fValue, nKey, aFormattedValue, &pColor );
mrModel.maData[ mnPtIndex ] <<= aFormattedValue;