[Libreoffice-commits] core.git: Branch 'private/kohei/chart-bugs' - sw/source

Kohei Yoshida kohei.yoshida at collabora.com
Wed Jun 18 15:56:43 PDT 2014


 sw/source/uibase/dochdl/swdtflvr.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit dd1cedc98cca8c9ce1c6478f265d9c9447975cfd
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Jun 18 18:55:52 2014 -0400

    Send correct shell ID when pasting chart into writer.
    
    So that the number formats survive...
    
    Change-Id: I884c02be7ca350a99545203f9ce6d40e46937b75

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 766cb50..9d33a70 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1717,7 +1717,10 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
         nId = 0;
 
     if (nId)
-        xStrm = rData.GetInputStream(nId, OUString());
+    {
+        SwDocShell* pDocSh = rSh.GetDoc()->GetDocShell();
+        xStrm = rData.GetInputStream(nId, SfxObjectShell::CreateShellID(pDocSh));
+    }
 
     if (xStrm.is())
     {


More information about the Libreoffice-commits mailing list