fdo#70338 : Fixed file corruption issue after save for docx.

    - File was giving corruption message if saved in LO.
    - Issue due to video file.
    - Attached file contain .mov which was not handled properly.
    - Added mov extension support in graphic filter.

Reviewed on:
	https://gerrit.libreoffice.org/6818

Change-Id: Ia278127ddc4afcd2d5fe04e86ed6201fb28dc04f

5 files changed, 64 insertions, 0 deletions

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 347d00c365dc..587e4144c782 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -734,6 +734,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_drawgraphics_types.xcu,
 	graphic_SWF \
 	jpg_JPEG \
 	met_OS2_Metafile \
+        mov_MOV \
 	pbm_Portable_Bitmap \
 	pcd_Photo_CD_Base \
 	pcd_Photo_CD_Base16 \
@@ -764,6 +765,7 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_drawgraphics_filters.
 	GIF___Graphics_Interchange \
 	JPG___JPEG \
 	MET___OS_2_Metafile \
+	mov__MOV \
 	PBM___Portable_Bitmap \
 	PCT___Mac_Pict \
 	PCX___Zsoft_Paintbrush \
@@ -880,6 +882,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_internalgraphics_types.
 	gif_Graphics_Interchange \
 	jpg_JPEG \
 	met_OS2_Metafile \
+        mov_MOV \
 	pbm_Portable_Bitmap \
 	pcd_Photo_CD_Base \
 	pcd_Photo_CD_Base16 \
@@ -947,6 +950,7 @@ $(call filter_Configuration_add_internal_filters,fcfg_langpack,fcfg_internalgrap
 	xbm_Import \
 	xpm_Export \
 	xpm_Import \
+        mov_Import \
 )
 
 # fcfg_xslt
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index d0bd8cf50c19..dadf07e78f1e 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -220,6 +220,7 @@ int getFlatTypeRank(const OUString& rType)
         "psd_Adobe_Photoshop",
         "png_Portable_Network_Graphic",
         "jpg_JPEG",
+        "mov_MOV",
         "gif_Graphics_Interchange",
         "bmp_MS_Windows",
         "pcx_Zsoft_Paintbrush",
diff --git a/filter/source/config/fragments/filters/mov__MOV.xcu b/filter/source/config/fragments/filters/mov__MOV.xcu
new file mode 100644
index 000000000000..eb06ad730832
--- /dev/null
+++ b/filter/source/config/fragments/filters/mov__MOV.xcu
@@ -0,0 +1,21 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+    <node oor:name="MOV - MOV" oor:op="replace">
+        <prop oor:name="Flags"><value>IMPORT ALIEN</value></prop>
+        <prop oor:name="UIComponent"/>
+        <prop oor:name="FilterService"/>
+        <prop oor:name="UserData"><value></value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="x-default">MOV - QuickTime File Format</value>
+        </prop>
+        <prop oor:name="FileFormatVersion"><value>0</value></prop>
+        <prop oor:name="Type"><value>mov_MOV</value></prop>
+        <prop oor:name="TemplateName"/>
+        <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+    </node>
diff --git a/filter/source/config/fragments/internalgraphicfilters/mov_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/mov_Import.xcu
new file mode 100644
index 000000000000..3dd28860389f
--- /dev/null
+++ b/filter/source/config/fragments/internalgraphicfilters/mov_Import.xcu
@@ -0,0 +1,18 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+    <node oor:name="mov_Import" oor:op="replace"  >
+        <prop oor:name="Type"><value>mov_MOV</value></prop>
+        <prop oor:name="FormatName"><value>SVMOV</value></prop>
+        <prop oor:name="RealFilterName"><value>MOV - MOV</value></prop>
+        <prop oor:name="UIComponent"/>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">MOV - QuickTime File Format</value>
+        </prop>
+        <prop oor:name="Flags"><value>IMPORT</value></prop>
+    </node>
diff --git a/filter/source/config/fragments/types/mov_MOV.xcu b/filter/source/config/fragments/types/mov_MOV.xcu
new file mode 100644
index 000000000000..7471a78a7e51
--- /dev/null
+++ b/filter/source/config/fragments/types/mov_MOV.xcu
@@ -0,0 +1,20 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+    <node oor:name="mov_MOV" oor:op="replace" >
+        <prop oor:name="DetectService"><value>com.sun.star.comp.draw.FormatDetector</value></prop>
+        <prop oor:name="URLPattern"/>
+        <prop oor:name="Extensions"><value>mov MOV</value></prop>
+        <prop oor:name="MediaType"><value>application/movie</value></prop>
+        <prop oor:name="Preferred"><value>false</value></prop>
+        <prop oor:name="PreferredFilter"><value>MOV - MOV</value></prop>
+        <prop oor:name="UIName">
+            <value>MOV - QuickTime File Format</value>
+        </prop>
+        <prop oor:name="ClipboardFormat"/>
+    </node>