[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/frameworks] /: Readd FILTER_PPTX_TO_ODP to build
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2015-03-31 20:40:51
Message-ID: E1Yd2xv-0007BK-EU () scm ! kde ! org
[Download RAW message or body]

Git commit b00acd4df70da3b8655090f1f894a7ef068d8ac7 by Friedrich W. H. Koss=
ebau.
Committed on 31/03/2015 at 20:38.
Pushed by kossebau into branch 'frameworks'.

Readd FILTER_PPTX_TO_ODP to build

M  +1    -1    CalligraProducts.cmake
M  +1    -5    filters/stage/pptx/CMakeLists.txt
M  +1    -2    filters/stage/pptx/PptxImport.cpp

http://commits.kde.org/calligra/b00acd4df70da3b8655090f1f894a7ef068d8ac7

diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 319fb57..e28a9c6 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -160,7 +160,7 @@ calligra_define_product(FILTER_WPG_TO_ODG "WPG to ODG f=
ilter" UNPORTED  REQUIRES
 calligra_define_product(FILTER_KEY_TO_ODP "Apple Keynote to ODP filter" UN=
PORTED  REQUIRES LIB_CALLIGRA)
 calligra_define_product(FILTER_KPR_TO_ODP "KPresenter to ODP filter"  REQU=
IRES LIB_CALLIGRA)
 calligra_define_product(FILTER_PPT_TO_ODP "PPT to OPD filter"  REQUIRES LI=
B_MSO LIB_CALLIGRA)
-calligra_define_product(FILTER_PPTX_TO_ODP "PPTX to ODP filter" UNPORTED  =
REQUIRES LIB_KOMSOOXML LIB_KOODF2 LIB_CALLIGRA)
+calligra_define_product(FILTER_PPTX_TO_ODP "PPTX to ODP filter"  REQUIRES =
LIB_KOMSOOXML LIB_KOODF2 LIB_CALLIGRA)
 =

 # Words filters
 calligra_define_product(FILTER_DOC_TO_ODT "DOC to ODT filter" UNPORTED  RE=
QUIRES LIB_MSO LIB_KOMSOOXML LIB_CALLIGRA)
diff --git a/filters/stage/pptx/CMakeLists.txt b/filters/stage/pptx/CMakeLi=
sts.txt
index 8bc150f..52372a0 100644
--- a/filters/stage/pptx/CMakeLists.txt
+++ b/filters/stage/pptx/CMakeLists.txt
@@ -22,6 +22,7 @@ set(pptx2odp_PART_SRCS
 )
 =

 add_library(calligra_filter_pptx2odp MODULE ${pptx2odp_PART_SRCS})
+kcoreaddons_desktop_to_json(calligra_filter_pptx2odp calligra_filter_pptx2=
odp.desktop)
 =

 target_link_libraries(
     calligra_filter_pptx2odp
@@ -36,11 +37,6 @@ install(TARGETS calligra_filter_pptx2odp DESTINATION ${C=
ALLIGRA_PLUGIN_INSTALL_D
 =

 ########### install files ###############
 =

-install( FILES
-  calligra_filter_pptx2odp.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/calligra
-)
-
 if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
     install( FILES stage_pptx_thumbnail.desktop  DESTINATION ${SERVICES_IN=
STALL_DIR})
 endif()
diff --git a/filters/stage/pptx/PptxImport.cpp b/filters/stage/pptx/PptxImp=
ort.cpp
index a8bccc6..d6068ae 100644
--- a/filters/stage/pptx/PptxImport.cpp
+++ b/filters/stage/pptx/PptxImport.cpp
@@ -51,8 +51,7 @@
 =

 #include <memory>
 =

-K_PLUGIN_FACTORY(PptxImportFactory, registerPlugin<PptxImport>();)
-K_EXPORT_PLUGIN(PptxImportFactory("calligrafilters"))
+K_PLUGIN_FACTORY_WITH_JSON(PptxImportFactory, "calligra_filter_pptx2odp.js=
on", registerPlugin<PptxImport>();)
 =

 enum PptxDocumentType {
     PptxDocumentPresentation,
[prev in list] [next in list] [prev in thread] [next in thread]