[Libreoffice-commits] .: Branch 'libreoffice-4-0' - oox/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 6 20:33:13 PST 2012
oox/source/drawingml/chart/titlecontext.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 4ec7c5e494a09863bdd3f347a205323859ee7bae
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Thu Dec 6 23:30:42 2012 -0500
bnc#792528: Play it safe for non-Excel documents.
Excel is not the only one that use charts. Let's also store the static
label value to maData in case it is used for non-Excel documents.
Change-Id: I1faed76e2ff396873039bccb3e1b7dcf27aba8c6
diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx
index ea42cb8..7067ef5 100644
--- a/oox/source/drawingml/chart/titlecontext.cxx
+++ b/oox/source/drawingml/chart/titlecontext.cxx
@@ -69,10 +69,13 @@ void TextContext::onCharacters( const OUString& rChars )
{
if( isCurrentElement( C_TOKEN( v ) ) )
{
- // Static text is stored as a single string formula token.
+ // Static text is stored as a single string formula token for Excel document.
OUStringBuffer aBuf;
aBuf.append('"').append(rChars).append('"');
mrModel.mxDataSeq.create().maFormula = aBuf.makeStringAndClear();
+
+ // Also store it as a single element type for non-Excel document.
+ mrModel.mxDataSeq->maData[0] <<= rChars;
}
}
More information about the Libreoffice-commits
mailing list