filter/Configuration_filter.mk | 2 filter/source/config/fragments/filters/draw_svm_Export.xcu | 30 ---------- filter/source/config/fragments/filters/impress_svm_Export.xcu | 30 ---------- svtools/source/filter/exportdialog.cxx | 3 - 4 files changed, 65 deletions(-)
New commits: commit 4feaf73a4da939be741516edd3636d1a3c3fc0e2 Author: Bryan Quigley <[email protected]> Date: Tue Dec 8 11:51:55 2015 -0500 tdf#92925 Remove SVM export from Impress/Draw There's no good reason to export a Draw/Impress document as an SVM. It can still be used as a fallback in exporting an image in any document (including Impress/Draw) though so leaving support to export images as SVM. Change-Id: I3eb5fbd241fe7535b316c2559bbfd09fec3680c7 Reviewed-on: https://gerrit.libreoffice.org/20475 Tested-by: Jenkins <[email protected]> Reviewed-by: jan iversen <[email protected]> diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 998487a..b46d39f 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -720,7 +720,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_drawgraphics_f draw_met_Export \ draw_png_Export \ draw_svg_Export \ - draw_svm_Export \ draw_tif_Export \ draw_wmf_Export \ )) @@ -761,7 +760,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impressgraphic impress_met_Export \ impress_png_Export \ impress_svg_Export \ - impress_svm_Export \ impress_tif_Export \ impress_wmf_Export \ )) diff --git a/filter/source/config/fragments/filters/draw_svm_Export.xcu b/filter/source/config/fragments/filters/draw_svm_Export.xcu deleted file mode 100644 index c636a25..0000000 --- a/filter/source/config/fragments/filters/draw_svm_Export.xcu +++ /dev/null @@ -1,30 +0,0 @@ -<!-- - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . ---> - <node oor:name="draw_svm_Export" oor:op="replace"> - <prop oor:name="Flags"><value>EXPORT ALIEN SUPPORTSSELECTION</value></prop> - <prop oor:name="UIComponent"><value>com.sun.star.svtools.SvFilterOptionsDialog</value></prop> - <prop oor:name="FilterService"/> - <prop oor:name="UserData"><value></value></prop> - <prop oor:name="UIName"> - <value xml:lang="en-US">SVM - StarView Metafile</value> - </prop> - <prop oor:name="FileFormatVersion"><value>0</value></prop> - <prop oor:name="Type"><value>svm_StarView_Metafile</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/filters/impress_svm_Export.xcu b/filter/source/config/fragments/filters/impress_svm_Export.xcu deleted file mode 100644 index 79e250c..0000000 --- a/filter/source/config/fragments/filters/impress_svm_Export.xcu +++ /dev/null @@ -1,30 +0,0 @@ -<!-- - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . ---> - <node oor:name="impress_svm_Export" oor:op="replace"> - <prop oor:name="Flags"><value>EXPORT ALIEN SUPPORTSSELECTION</value></prop> - <prop oor:name="UIComponent"><value>com.sun.star.svtools.SvFilterOptionsDialog</value></prop> - <prop oor:name="FilterService"/> - <prop oor:name="UserData"><value></value></prop> - <prop oor:name="UIName"> - <value xml:lang="en-US">SVM - StarView Metafile</value> - </prop> - <prop oor:name="FileFormatVersion"><value>0</value></prop> - <prop oor:name="Type"><value>svm_StarView_Metafile</value></prop> - <prop oor:name="TemplateName"/> - <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop> - </node> diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 3b303fe..6ae9509 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -54,7 +54,6 @@ #define FORMAT_EPS 14 #define FORMAT_MET 15 #define FORMAT_SVG 16 -#define FORMAT_SVM 17 #define UNIT_DEFAULT -1 #define UNIT_INCH 0 @@ -89,8 +88,6 @@ static sal_Int16 GetFilterFormat(const OUString& rExt) nFormat = FORMAT_MET; else if ( rExt == "SVG" ) nFormat = FORMAT_SVG; - else if ( rExt == "SVM" ) - nFormat = FORMAT_SVM; return nFormat; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
