various situations where graphic go missing on save

Resolves: #i114361# provide and accept changed URL...

of embedded graphic file during save (ODF export)

(cherry picked from commit a90c007908eb3f66e28a9ea525729065db652b6f)

Conflicts:
	sw/inc/ndgrf.hxx
	sw/source/core/graphic/ndgrf.cxx
	sw/source/core/unocore/unoframe.cxx
	sw/source/filter/xml/xmltexte.cxx
	xmloff/source/draw/shapeexport2.cxx

Change-Id: I9d4a02af2561467fe1a66f036b55d6dcf2429986
(cherry picked from commit 192abfb36b8a4859879fcb49326d59ed62083c8d)

Resolves: #i124717# do not mark *.svm graphic files as *.bmp graphic files

(cherry picked from commit a5cfb91f3dc4b38055fb920f65101cc45d52f8de)

Conflicts:
	svtools/source/filter/filter.cxx

Change-Id: I43f62a453bfa17254cebc07bde95f07f16a329c2
(cherry picked from commit 12dd68e3d20ad36ebe7cb40a600215f6d2b7b6ec)

Resolves: #i124946# only apply new embedded stream name...

for a graphic, if is already has one.

- needed correction for the fix made for issue #i114361#

(cherry picked from commit 23a4bd91ceb89e5e0a2413f80fc987db106a0bc9)

Conflicts:
	sw/inc/ndgrf.hxx
	sw/source/core/graphic/ndgrf.cxx
	sw/source/filter/xml/xmltexte.cxx

Change-Id: Ia9771932ae5b380ccae9b0a3cbb79d41f5d9bdb8
(cherry picked from commit 05e07167e422caf58d23ff883edda30acc3ba88d)

Resolves: #i124966# keep picture format information

- <GfxLink> instance - also for the reading of preview picture data

in order to avoid trouble on save in case that the preview data equals the
picture data

(cherry picked from commit d6af1b601bb8fe2569d17e01505f67e1becc9366)

Conflicts:
	svx/source/svdraw/svdograf.cxx

Change-Id: Ifecb07b4d5d33d593502fccd6f21644893027d2d
(cherry picked from commit 597ae8dd9c28ee370874b219d594fa1c105f2c72)
Reviewed-on: https://gerrit.libreoffice.org/9455
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

1 files changed, 5 insertions, 3 deletions

diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index df6189d5d3de..5a9496f8e541 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1352,9 +1352,11 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
                     {
                         pFilterData = new com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >( 3 );
 
-                        com::sun::star::awt::Size aPreviewSizeHint( 64, 64 );
-                        bool bAllowPartialStreamRead = true;
-                        bool bCreateNativeLink = false;
+                        const com::sun::star::awt::Size aPreviewSizeHint( 64, 64 );
+                        const bool bAllowPartialStreamRead = true;
+                        // create <GfxLink> instance also for previews in order to avoid that its corresponding
+                        // data is cleared in the graphic cache entry in case that the preview data equals the complete graphic data
+                        const bool bCreateNativeLink = true;
                         (*pFilterData)[ 0 ].Name = "PreviewSizeHint";
                         (*pFilterData)[ 0 ].Value <<= aPreviewSizeHint;
                         (*pFilterData)[ 1 ].Name = "AllowPartialStreamRead";