Git commit 68a104ecfa385a4cf5f1f0df49fb617ace8a0c7d by Inge Wallin.
Committed on 30/03/2015 at 03:13.
Pushed by ingwa into branch 'frameworks'.

Readd the odt2docx filter to the build.

M  +1    -1    CalligraProducts.cmake
M  +4    -1    filters/words/docx/export/CMakeLists.txt
M  +5    -2    filters/words/docx/export/DocxExport.cpp

http://commits.kde.org/calligra/68a104ecfa385a4cf5f1f0df49fb617ace8a0c7d

diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 8d1d24e..1bba8db 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -165,7 +165,7 @@ calligra_define_product(FILTER_PPTX_TO_ODP "PPTX to ODP=
 filter"  REQUIRES LIB_KO
 # Words filters
 calligra_define_product(FILTER_DOC_TO_ODT "DOC to ODT filter" UNPORTED  RE=
QUIRES LIB_MSO LIB_KOMSOOXML LIB_CALLIGRA)
 calligra_define_product(FILTER_DOCX_TO_ODT "DOCX to ODT filter" UNPORTED  =
REQUIRES LIB_KOMSOOXML LIB_KOODF2 LIB_CALLIGRA)
-calligra_define_product(FILTER_ODT_TO_DOCX "ODT to DOCX filter" UNPORTED  =
REQUIRES LIB_KOODFREADER LIB_KOODF2 LIB_CALLIGRA)
+calligra_define_product(FILTER_ODT_TO_DOCX "ODT to DOCX filter" REQUIRES L=
IB_KOODFREADER LIB_KOODF2 LIB_CALLIGRA)
 calligra_define_product(FILTER_WORDPERFECT_TO_ODT "Word Perfect to ODT fil=
ter" UNPORTED  REQUIRES LIB_CALLIGRA)
 calligra_define_product(FILTER_WORKS_TO_ODT "MS Works to ODT filter" UNPOR=
TED  REQUIRES LIB_CALLIGRA)
 calligra_define_product(FILTER_APPLIXWORD_TO_ODT "Applixword to ODT filter=
" UNPORTED  REQUIRES LIB_CALLIGRA)
diff --git a/filters/words/docx/export/CMakeLists.txt b/filters/words/docx/=
export/CMakeLists.txt
index 65bdd7d..f8b4d0a 100644
--- a/filters/words/docx/export/CMakeLists.txt
+++ b/filters/words/docx/export/CMakeLists.txt
@@ -23,6 +23,9 @@ add_library(calligra_filter_odt2docx MODULE ${Odt2Docx_PA=
RT_SRCS})
 target_link_libraries(calligra_filter_odt2docx koodfreader komain koodf ko=
odf2)
 install(TARGETS calligra_filter_odt2docx DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 =

-install(FILES calligra_filter_odt2docx.desktop DESTINATION ${SERVICES_INST=
ALL_DIR}/calligra)
+#install(FILES calligra_filter_odt2docx.desktop DESTINATION ${SERVICES_INS=
TALL_DIR}/calligra)
+kcoreaddons_desktop_to_json(calligra_filter_odt2docx calligra_filter_odt2d=
ocx.desktop)
+
+install( PROGRAMS  calligra_filter_odt2docx.desktop  DESTINATION ${XDG_APP=
S_INSTALL_DIR})
 =

 endif()
diff --git a/filters/words/docx/export/DocxExport.cpp b/filters/words/docx/=
export/DocxExport.cpp
index b2c587e..666bc5f 100644
--- a/filters/words/docx/export/DocxExport.cpp
+++ b/filters/words/docx/export/DocxExport.cpp
@@ -46,8 +46,11 @@
 #include "OdfTextReaderDocxBackend.h"
 =

 =

-K_PLUGIN_FACTORY(DocxExportFactory, registerPlugin<DocxExport>();)
-K_EXPORT_PLUGIN(DocxExportFactory("wordsdocxexportng", "calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(DocxExportFactory, "calligra_filter_odt2docx.js=
on",
+			   registerPlugin<DocxExport>();)
+
+// Needed to instantiate the plugin factory.
+#include "DocxExport.moc"
 =

 =

 DocxExport::DocxExport(QObject *parent, const QVariantList &)