diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-06-12 11:24:30 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-06-12 11:27:19 -0400 |
| commit | a2a1a59a448420a858724371c4a339f75ebe8c1e (patch) | |
| tree | 712007fb53468d43a1010e42c71cfd7eaf5976dc /sc | |
| parent | 10f8d24540a4145af3ec629f7eb724849ca53d22 (diff) | |
fdo#77506: More reliable way to determine label strings.
Not beautiful, but doable.
Change-Id: I6f3b00d620e7d7d19cc05ec4239deeb14d0d5201
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/unonames.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/chart2uno.cxx | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx index ca7a28c5c3bf..aaead415849b 100644 --- a/sc/inc/unonames.hxx +++ b/sc/inc/unonames.hxx @@ -654,6 +654,8 @@ #define SC_UNONAME_INCLUDEHIDDENCELLS "IncludeHiddenCells" #define SC_UNONAME_HIDDENVALUES "HiddenValues" #define SC_UNONAME_USE_INTERNAL_DATA_PROVIDER "UseInternalDataProvider" +#define SC_UNONAME_HAS_STRING_LABEL "HasStringLabel" +#define SC_UNONAME_TIME_BASED "TimeBased" // Solver #define SC_UNONAME_TIMEOUT "Timeout" diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 3da876a99c3a..ed9c2dc8d9e9 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -3526,10 +3526,22 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(const OUString& rProper BuildDataCache(); aRet <<= m_aHiddenValues; } - else if (rPropertyName == "TimeBased") + else if (rPropertyName == SC_UNONAME_TIME_BASED) { aRet <<= mbTimeBased; } + else if (rPropertyName == SC_UNONAME_HAS_STRING_LABEL) + { + // Read-only property. It returns whether or not the label value is a + // direct user input, rather than an indirect reference. + bool bHasStringLabel = false; + if (m_pTokens->size() == 1) + { + const ScToken& rToken = *(*m_pTokens)[0]; + bHasStringLabel = rToken.GetType() == formula::svString; + } + aRet <<= bHasStringLabel; + } else throw beans::UnknownPropertyException(); // TODO: support optional properties |