diff options
author | David Tardon <dtardon@redhat.com> | 2015-12-08 14:42:30 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2015-12-08 19:18:53 +0100 |
commit | 83d30fdbcba0df628c9c6dd51a868e0fa32b0eef (patch) | |
tree | e57128f9f8c14886afcaaacd2d40b3d06b220c2c | |
parent | a1c88572948a326a216f0e832a9eed7f664c9009 (diff) |
merge libmwaw format specs (draw)
Change-Id: Ia0dfe1e1ce1ab2b1ef266d1aa0950fd6670b0c50
22 files changed, 35 insertions, 594 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index fe303dda4f14..166750a08ed7 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -583,18 +583,10 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,f draw_Corel_Presentation_Exchange \ draw_Freehand_Document \ draw_Visio_Document \ - draw_Beagle_Works \ - draw_ClarisDraw \ draw_ClarisWorks \ - draw_Great_Works \ - draw_MacDraft \ - draw_MacDraw \ - draw_MacDrawPro \ - draw_Mac_Works \ - draw_MacPaint \ - draw_PixelPaint \ - draw_SuperPaint \ draw_PageMaker_Document \ + MWAW_Bitmap \ + MWAW_Drawing \ )) $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filter/source/config/fragments/filters,\ @@ -610,18 +602,10 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.x CorelDrawDocument \ CorelPresentationExchange \ FreehandDocument \ - Beagle_Works_Draw \ - ClarisDraw \ ClarisWorks_Draw \ - Great_Works_Draw \ - MacDraft \ - MacDraw_Draw \ - MacDrawPro_Draw \ - Mac_Works_Draw \ - MacPaint_Draw \ - PixelPaint_Draw \ - SuperPaint_Draw \ PageMakerDocument \ + MWAW_Bitmap \ + MWAW_Drawing \ )) # fcfg_impress diff --git a/filter/source/config/fragments/filters/ClarisDraw.xcu b/filter/source/config/fragments/filters/ClarisDraw.xcu deleted file mode 100644 index deb250cb0e63..000000000000 --- a/filter/source/config/fragments/filters/ClarisDraw.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="ClarisDraw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> - <prop oor:name="UIComponent"/> - <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="UserData"><value></value></prop> - <prop oor:name="UIName"> - <value xml:lang="en-US">ClarisDraw</value> - </prop> - <prop oor:name="FileFormatVersion"><value>0</value></prop> - <prop oor:name="Type"><value>draw_ClarisDraw</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/Great_Works_Draw.xcu b/filter/source/config/fragments/filters/MWAW_Bitmap.xcu index 27ebf0ec86e1..034b72132219 100644 --- a/filter/source/config/fragments/filters/Great_Works_Draw.xcu +++ b/filter/source/config/fragments/filters/MWAW_Bitmap.xcu @@ -7,7 +7,7 @@ * --> -<node oor:name="Great_Works_Draw" oor:op="replace"> +<node oor:name="MWAW_Bitmap" oor:op="replace"> <prop oor:name="Flags"> <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> @@ -15,13 +15,13 @@ <value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value> </prop> <prop oor:name="UIName"> - <value xml:lang="en-US">GreatWorks Drawing</value> + <value xml:lang="en-US">Legacy Mac Bitmap</value> </prop> <prop oor:name="FileFormatVersion"> <value>0</value> </prop> <prop oor:name="Type"> - <value>draw_Great_Works</value> + <value>MWAW_Bitmap</value> </prop> <prop oor:name="DocumentService"> <value>com.sun.star.drawing.DrawingDocument</value> diff --git a/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu b/filter/source/config/fragments/filters/MWAW_Drawing.xcu index 1cec0bb1c0e7..b92f378497dd 100644 --- a/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu +++ b/filter/source/config/fragments/filters/MWAW_Drawing.xcu @@ -7,7 +7,7 @@ * --> -<node oor:name="Beagle_Works_Draw" oor:op="replace"> +<node oor:name="MWAW_Drawing" oor:op="replace"> <prop oor:name="Flags"> <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value> </prop> @@ -15,13 +15,13 @@ <value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value> </prop> <prop oor:name="UIName"> - <value xml:lang="en-US">BeagleWorks/WordPerfect Works v1 Drawing</value> + <value xml:lang="en-US">Legacy Mac Drawing</value> </prop> <prop oor:name="FileFormatVersion"> <value>0</value> </prop> <prop oor:name="Type"> - <value>draw_Beagle_Works</value> + <value>MWAW_Drawing</value> </prop> <prop oor:name="DocumentService"> <value>com.sun.star.drawing.DrawingDocument</value> diff --git a/filter/source/config/fragments/filters/MacDraft.xcu b/filter/source/config/fragments/filters/MacDraft.xcu deleted file mode 100644 index 7a704985cec3..000000000000 --- a/filter/source/config/fragments/filters/MacDraft.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="MacDraft" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> - <prop oor:name="UIComponent"/> - <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="UserData"><value></value></prop> - <prop oor:name="UIName"> - <value xml:lang="en-US">MacDraft</value> - </prop> - <prop oor:name="FileFormatVersion"><value>0</value></prop> - <prop oor:name="Type"><value>draw_MacDraft</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/MacDrawPro_Draw.xcu b/filter/source/config/fragments/filters/MacDrawPro_Draw.xcu deleted file mode 100644 index 633e6c04b016..000000000000 --- a/filter/source/config/fragments/filters/MacDrawPro_Draw.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="MacDrawPro_Draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> - <prop oor:name="UIComponent"/> - <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="UserData"><value></value></prop> - <prop oor:name="UIName"> - <value xml:lang="en-US">MacDraw II</value> - </prop> - <prop oor:name="FileFormatVersion"><value>0</value></prop> - <prop oor:name="Type"><value>draw_MacDrawPro</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/MacDraw_Draw.xcu b/filter/source/config/fragments/filters/MacDraw_Draw.xcu deleted file mode 100644 index 6b2af4cc8f86..000000000000 --- a/filter/source/config/fragments/filters/MacDraw_Draw.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="MacDraw_Draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> - <prop oor:name="UIComponent"/> - <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="UserData"><value></value></prop> - <prop oor:name="UIName"> - <value xml:lang="en-US">MacDraw (v0-v1)</value> - </prop> - <prop oor:name="FileFormatVersion"><value>0</value></prop> - <prop oor:name="Type"><value>draw_MacDraw</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/MacPaint_Draw.xcu b/filter/source/config/fragments/filters/MacPaint_Draw.xcu deleted file mode 100644 index dea46694db63..000000000000 --- a/filter/source/config/fragments/filters/MacPaint_Draw.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="MacPaint_Draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> - <prop oor:name="UIComponent"/> - <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="UserData"><value></value></prop> - <prop oor:name="UIName"> - <value xml:lang="en-US">MacPaint (v1)</value> - </prop> - <prop oor:name="FileFormatVersion"><value>0</value></prop> - <prop oor:name="Type"><value>draw_MacPaint</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/Mac_Works_Draw.xcu b/filter/source/config/fragments/filters/Mac_Works_Draw.xcu deleted file mode 100644 index 792c89d6e74c..000000000000 --- a/filter/source/config/fragments/filters/Mac_Works_Draw.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="Mac_Works_Draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> - <prop oor:name="UIComponent"/> - <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="UserData"><value></value></prop> - <prop oor:name="UIName"> - <value xml:lang="en-US">Microsoft Works for Mac Drawing (v1 - v4)</value> - </prop> - <prop oor:name="FileFormatVersion"><value>0</value></prop> - <prop oor:name="Type"><value>draw_Mac_Works</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/PixelPaint_Draw.xcu b/filter/source/config/fragments/filters/PixelPaint_Draw.xcu deleted file mode 100644 index ce6c9385235d..000000000000 --- a/filter/source/config/fragments/filters/PixelPaint_Draw.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="PixelPaint_Draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> - <prop oor:name="UIComponent"/> - <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="UserData"><value></value></prop> - <prop oor:name="UIName"> - <value xml:lang="en-US">PixelPaint (v1)</value> - </prop> - <prop oor:name="FileFormatVersion"><value>0</value></prop> - <prop oor:name="Type"><value>draw_PixelPaint</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/SuperPaint_Draw.xcu b/filter/source/config/fragments/filters/SuperPaint_Draw.xcu deleted file mode 100644 index aa4f5afea9a7..000000000000 --- a/filter/source/config/fragments/filters/SuperPaint_Draw.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="SuperPaint_Draw" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop> - <prop oor:name="UIComponent"/> - <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="UserData"><value></value></prop> - <prop oor:name="UIName"> - <value xml:lang="en-US">SuperPaint (v1)</value> - </prop> - <prop oor:name="FileFormatVersion"><value>0</value></prop> - <prop oor:name="Type"><value>draw_SuperPaint</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/types/draw_Great_Works.xcu b/filter/source/config/fragments/types/MWAW_Bitmap.xcu index f9aeb0781f0f..532f1060968b 100644 --- a/filter/source/config/fragments/types/draw_Great_Works.xcu +++ b/filter/source/config/fragments/types/MWAW_Bitmap.xcu @@ -7,23 +7,21 @@ * --> -<node oor:name="draw_Great_Works" oor:op="replace"> +<node oor:name="MWAW_Bitmap" oor:op="replace"> <prop oor:name="DetectService"> <value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value> </prop> <prop oor:name="Extensions"> - <value>dummy</value> - </prop> - <prop oor:name="MediaType"> - <value></value> + <value>*</value> </prop> + <prop oor:name="MediaType"/> <prop oor:name="Preferred"> <value>true</value> </prop> <prop oor:name="PreferredFilter"> - <value>Great_Works_Draw</value> + <value>MWAW_Bitmap</value> </prop> <prop oor:name="UIName"> - <value>GreatWorks Document</value> + <value>Legacy Mac Bitmap</value> </prop> </node> diff --git a/filter/source/config/fragments/types/draw_Beagle_Works.xcu b/filter/source/config/fragments/types/MWAW_Drawing.xcu index 177ad9713d94..3edba277e0b5 100644 --- a/filter/source/config/fragments/types/draw_Beagle_Works.xcu +++ b/filter/source/config/fragments/types/MWAW_Drawing.xcu @@ -7,23 +7,21 @@ * --> -<node oor:name="draw_Beagle_Works" oor:op="replace"> +<node oor:name="MWAW_Drawing" oor:op="replace"> <prop oor:name="DetectService"> <value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value> </prop> <prop oor:name="Extensions"> - <value>dummy</value> - </prop> - <prop oor:name="MediaType"> - <value></value> + <value>*</value> </prop> + <prop oor:name="MediaType"/> <prop oor:name="Preferred"> <value>true</value> </prop> <prop oor:name="PreferredFilter"> - <value>Beagle_Works_Draw</value> + <value>MWAW_Drawing</value> </prop> <prop oor:name="UIName"> - <value>BeagleWorks/WordPerfect Works Document</value> + <value>Legacy Mac Drawing</value> </prop> </node> diff --git a/filter/source/config/fragments/types/draw_ClarisDraw.xcu b/filter/source/config/fragments/types/draw_ClarisDraw.xcu deleted file mode 100644 index d4ddbeaf9faa..000000000000 --- a/filter/source/config/fragments/types/draw_ClarisDraw.xcu +++ /dev/null @@ -1,29 +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_ClarisDraw" oor:op="replace" > - <prop oor:name="DetectService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>dummy</value></prop> - <prop oor:name="MediaType"></prop> - <prop oor:name="Preferred"><value>true</value></prop> - <prop oor:name="PreferredFilter"><value>ClarisDraw</value></prop> - <prop oor:name="UIName"> - <value>ClarisDraw</value> - </prop> - <prop oor:name="ClipboardFormat"/> - </node> diff --git a/filter/source/config/fragments/types/draw_MacDraft.xcu b/filter/source/config/fragments/types/draw_MacDraft.xcu deleted file mode 100644 index 47a778cbb884..000000000000 --- a/filter/source/config/fragments/types/draw_MacDraft.xcu +++ /dev/null @@ -1,29 +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_MacDraft" oor:op="replace" > - <prop oor:name="DetectService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>dummy</value></prop> - <prop oor:name="MediaType"></prop> - <prop oor:name="Preferred"><value>true</value></prop> - <prop oor:name="PreferredFilter"><value>MacDraft</value></prop> - <prop oor:name="UIName"> - <value>MacDraft</value> - </prop> - <prop oor:name="ClipboardFormat"/> - </node> diff --git a/filter/source/config/fragments/types/draw_MacDraw.xcu b/filter/source/config/fragments/types/draw_MacDraw.xcu deleted file mode 100644 index dac298475f1f..000000000000 --- a/filter/source/config/fragments/types/draw_MacDraw.xcu +++ /dev/null @@ -1,29 +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_MacDraw" oor:op="replace" > - <prop oor:name="DetectService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>dummy</value></prop> - <prop oor:name="MediaType"></prop> - <prop oor:name="Preferred"><value>true</value></prop> - <prop oor:name="PreferredFilter"><value>MacDraw_Draw</value></prop> - <prop oor:name="UIName"> - <value>MacDraw (v0-v1)</value> - </prop> - <prop oor:name="ClipboardFormat"/> - </node> diff --git a/filter/source/config/fragments/types/draw_MacDrawPro.xcu b/filter/source/config/fragments/types/draw_MacDrawPro.xcu deleted file mode 100644 index 903f702c30d3..000000000000 --- a/filter/source/config/fragments/types/draw_MacDrawPro.xcu +++ /dev/null @@ -1,29 +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_MacDrawPro" oor:op="replace" > - <prop oor:name="DetectService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>dummy</value></prop> - <prop oor:name="MediaType"></prop> - <prop oor:name="Preferred"><value>true</value></prop> - <prop oor:name="PreferredFilter"><value>MacDrawPro_Draw</value></prop> - <prop oor:name="UIName"> - <value>MacDraw II</value> - </prop> - <prop oor:name="ClipboardFormat"/> - </node> diff --git a/filter/source/config/fragments/types/draw_MacPaint.xcu b/filter/source/config/fragments/types/draw_MacPaint.xcu deleted file mode 100644 index 4cadffdcc6a5..000000000000 --- a/filter/source/config/fragments/types/draw_MacPaint.xcu +++ /dev/null @@ -1,29 +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_MacPaint" oor:op="replace" > - <prop oor:name="DetectService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>dummy</value></prop> - <prop oor:name="MediaType"></prop> - <prop oor:name="Preferred"><value>true</value></prop> - <prop oor:name="PreferredFilter"><value>MacPaint_Draw</value></prop> - <prop oor:name="UIName"> - <value>MacPaint (v1)</value> - </prop> - <prop oor:name="ClipboardFormat"/> - </node> diff --git a/filter/source/config/fragments/types/draw_Mac_Works.xcu b/filter/source/config/fragments/types/draw_Mac_Works.xcu deleted file mode 100644 index 15dea5441aed..000000000000 --- a/filter/source/config/fragments/types/draw_Mac_Works.xcu +++ /dev/null @@ -1,29 +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_Mac_Works" oor:op="replace" > - <prop oor:name="DetectService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>dummy</value></prop> - <prop oor:name="MediaType"></prop> - <prop oor:name="Preferred"><value>true</value></prop> - <prop oor:name="PreferredFilter"><value>Mac_Works_Draw</value></prop> - <prop oor:name="UIName"> - <value>Microsoft Works for Mac Document (v1 - v4)</value> - </prop> - <prop oor:name="ClipboardFormat"/> - </node> diff --git a/filter/source/config/fragments/types/draw_PixelPaint.xcu b/filter/source/config/fragments/types/draw_PixelPaint.xcu deleted file mode 100644 index 2a03ad6dcbab..000000000000 --- a/filter/source/config/fragments/types/draw_PixelPaint.xcu +++ /dev/null @@ -1,29 +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_PixelPaint" oor:op="replace" > - <prop oor:name="DetectService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>dummy</value></prop> - <prop oor:name="MediaType"></prop> - <prop oor:name="Preferred"><value>true</value></prop> - <prop oor:name="PreferredFilter"><value>PixelPaint_Draw</value></prop> - <prop oor:name="UIName"> - <value>PixelPaint (v1)</value> - </prop> - <prop oor:name="ClipboardFormat"/> - </node> diff --git a/filter/source/config/fragments/types/draw_SuperPaint.xcu b/filter/source/config/fragments/types/draw_SuperPaint.xcu deleted file mode 100644 index 6f7e349de7a4..000000000000 --- a/filter/source/config/fragments/types/draw_SuperPaint.xcu +++ /dev/null @@ -1,29 +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_SuperPaint" oor:op="replace" > - <prop oor:name="DetectService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop> - <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>dummy</value></prop> - <prop oor:name="MediaType"></prop> - <prop oor:name="Preferred"><value>true</value></prop> - <prop oor:name="PreferredFilter"><value>SuperPaint_Draw</value></prop> - <prop oor:name="UIName"> - <value>SuperPaint (v1)</value> - </prop> - <prop oor:name="ClipboardFormat"/> - </node> diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx b/writerperfect/source/draw/MWAWDrawImportFilter.cxx index 3e90a026859c..ed9947fdc4b1 100644 --- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx +++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx @@ -55,99 +55,32 @@ bool MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, O if (confidence == MWAWDocument::MWAW_C_EXCELLENT) { - if (docKind == MWAWDocument::MWAW_K_DRAW || docKind == MWAWDocument::MWAW_K_PAINT) + switch (docKind) { + case MWAWDocument::MWAW_K_DRAW: switch (docType) { - case MWAWDocument::MWAW_T_BEAGLEWORKS: - rTypeName = "draw_Beagle_Works"; - break; case MWAWDocument::MWAW_T_CLARISWORKS: rTypeName = "draw_ClarisWorks"; break; - case MWAWDocument::MWAW_T_GREATWORKS: - rTypeName = "draw_Great_Works"; - break; - case MWAWDocument::MWAW_T_MACDRAFT: - rTypeName = "draw_MacDraft"; - break; - case MWAWDocument::MWAW_T_MACDRAW: - rTypeName = "draw_MacDraw"; - break; - case MWAWDocument::MWAW_T_MACDRAWPRO: - rTypeName = "draw_MacDrawPro"; - break; - case MWAWDocument::MWAW_T_MACPAINT: - rTypeName = "draw_MacPaint"; - break; - case MWAWDocument::MWAW_T_MICROSOFTWORKS: - rTypeName = "draw_Mac_Works"; - break; - case MWAWDocument::MWAW_T_PIXELPAINT: - rTypeName = "draw_PixelPaint"; - break; - case MWAWDocument::MWAW_T_SUPERPAINT: - rTypeName = "draw_SuperPaint"; + default: + rTypeName = "MWAW_Drawing"; break; - case MWAWDocument::MWAW_T_RESERVED1: // also MWAWDocument::MWAW_T_CLARISDRAW - rTypeName = "draw_ClarisDraw"; + } + break; + case MWAWDocument::MWAW_K_PAINT: + switch (docType) + { + case MWAWDocument::MWAW_T_CLARISWORKS: + rTypeName = "draw_ClarisWorks"; break; - - case MWAWDocument::MWAW_T_ACTA: - case MWAWDocument::MWAW_T_ADOBEILLUSTRATOR: - case MWAWDocument::MWAW_T_CLARISRESOLVE: - case MWAWDocument::MWAW_T_DBASE: - case MWAWDocument::MWAW_T_DOCMAKER: - case MWAWDocument::MWAW_T_EDOC: - case MWAWDocument::MWAW_T_FAMILYTREEMAKER: - case MWAWDocument::MWAW_T_FILEMAKER: - case MWAWDocument::MWAW_T_FOXBASE: - case MWAWDocument::MWAW_T_FRAMEMAKER: - case MWAWDocument::MWAW_T_FULLIMPACT: - case MWAWDocument::MWAW_T_FULLPAINT: - case MWAWDocument::MWAW_T_FULLWRITE: - case MWAWDocument::MWAW_T_INFOGENIE: - case MWAWDocument::MWAW_T_KALEIDAGRAPH: - case MWAWDocument::MWAW_T_HANMACWORDJ: - case MWAWDocument::MWAW_T_HANMACWORDK: - case MWAWDocument::MWAW_T_LIGHTWAYTEXT: - case MWAWDocument::MWAW_T_MACDOC: - case MWAWDocument::MWAW_T_MACWRITE: - case MWAWDocument::MWAW_T_MACWRITEPRO: - case MWAWDocument::MWAW_T_MARINERWRITE: - case MWAWDocument::MWAW_T_MINDWRITE: - case MWAWDocument::MWAW_T_MICROSOFTFILE: - case MWAWDocument::MWAW_T_MICROSOFTMULTIPLAN: - case MWAWDocument::MWAW_T_MICROSOFTWORD: - case MWAWDocument::MWAW_T_MORE: - case MWAWDocument::MWAW_T_NISUSWRITER: - case MWAWDocument::MWAW_T_OVERVUE: - case MWAWDocument::MWAW_T_PAGEMAKER: - case MWAWDocument::MWAW_T_RAGTIME: - case MWAWDocument::MWAW_T_READYSETGO: - case MWAWDocument::MWAW_T_SYMPOSIUM: - case MWAWDocument::MWAW_T_TEACHTEXT: - case MWAWDocument::MWAW_T_TEXEDIT: - case MWAWDocument::MWAW_T_TRAPEZE: - case MWAWDocument::MWAW_T_WINGZ: - case MWAWDocument::MWAW_T_WRITENOW: - case MWAWDocument::MWAW_T_WRITERPLUS: - case MWAWDocument::MWAW_T_XPRESS: - case MWAWDocument::MWAW_T_ZWRITE: - case MWAWDocument::MWAW_T_4DIMENSION: - - case MWAWDocument::MWAW_T_RESERVED2: - case MWAWDocument::MWAW_T_RESERVED3: - case MWAWDocument::MWAW_T_RESERVED4: - case MWAWDocument::MWAW_T_RESERVED5: - case MWAWDocument::MWAW_T_RESERVED6: - case MWAWDocument::MWAW_T_RESERVED7: - case MWAWDocument::MWAW_T_RESERVED8: - case MWAWDocument::MWAW_T_RESERVED9: - case MWAWDocument::MWAW_T_UNKNOWN: default: + rTypeName = "MWAW_Bitmap"; break; } + break; + default: + break; } } |