diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-06-13 11:12:50 -0400 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-06-23 15:02:14 +0000 |
| commit | 22cd19eeeb476c40b68bb1ff040fce6103fdeba4 (patch) | |
| tree | c4550dfcfbc10ebb75e3b6130ca44d44a28484ec /starmath | |
| parent | a28256553dcc29d67c530b29727bfbf3ba6aa81a (diff) | |
fdo#71076, fdo#71767: Preserve number formats when charts are copied.
(cherry picked from commit 1d38cb365543924f9c50014e6b2227e77de1d0c9)
Conflicts:
sd/source/ui/view/sdview3.cxx
xmloff/source/chart/SchXMLExport.cxx
Change-Id: If5ae8852152012483237e7602e56a0c46ea8748a
Reviewed-on: https://gerrit.libreoffice.org/9836
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/view.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index f7617d4ffa0c..1de12e66c507 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1570,8 +1570,10 @@ void SmViewShell::Execute(SfxRequest& rReq) if( aData.GetTransferable().is() && ( aData.HasFormat( nId = SOT_FORMATSTR_ID_EMBEDDED_OBJ ) || (aData.HasFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ) && - aData.HasFormat( nId = SOT_FORMATSTR_ID_EMBED_SOURCE ))) && - aData.GetInputStream( nId, xStrm ) && xStrm.is() ) + aData.HasFormat( nId = SOT_FORMATSTR_ID_EMBED_SOURCE )))) + xStrm = aData.GetInputStream(nId, OUString()); + + if (xStrm.is()) { try { |