[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra/frameworks] /: Readd FILTER_PPT_TO_ODP to build
From: Friedrich W. H. Kossebau <kossebau () kde ! org>
Date: 2015-03-31 20:40:51
Message-ID: E1Yd2xv-0007BK-2y () scm ! kde ! org
[Download RAW message or body]
Git commit 344d87886eb64df52ce3651128a2904e4b0a9586 by Friedrich W. H. Koss=
ebau.
Committed on 31/03/2015 at 20:33.
Pushed by kossebau into branch 'frameworks'.
Readd FILTER_PPT_TO_ODP to build
M +1 -1 CalligraProducts.cmake
M +2 -1 filters/stage/powerpoint/CMakeLists.txt
M +3 -2 filters/stage/powerpoint/PowerPointImport.cpp
http://commits.kde.org/calligra/344d87886eb64df52ce3651128a2904e4b0a9586
diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index 94666ee..319fb57 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -159,7 +159,7 @@ calligra_define_product(FILTER_WPG_TO_ODG "WPG to ODG f=
ilter" UNPORTED REQUIRES
# Stage filters
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" UNPORTED RE=
QUIRES LIB_MSO 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)
=
# Words filters
diff --git a/filters/stage/powerpoint/CMakeLists.txt b/filters/stage/powerp=
oint/CMakeLists.txt
index 9c642be..31a8a7d 100644
--- a/filters/stage/powerpoint/CMakeLists.txt
+++ b/filters/stage/powerpoint/CMakeLists.txt
@@ -20,10 +20,11 @@ add_executable(ppttoodp ppttoodpmain.cpp)
target_link_libraries(ppttoodp ppttoodplib)
=
add_library(calligra_filter_ppt2odp MODULE PowerPointImport.cpp)
+kcoreaddons_desktop_to_json(calligra_filter_ppt2odp calligra_filter_ppt2od=
p.desktop)
+
target_link_libraries(calligra_filter_ppt2odp ppttoodplib komain)
=
install(TARGETS calligra_filter_ppt2odp DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
-install( FILES calligra_filter_ppt2odp.desktop DESTINATION ${SERVICES_IN=
STALL_DIR}/calligra)
=
if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
install( FILES stage_powerpoint_thumbnail.desktop DESTINATION ${SERV=
ICES_INSTALL_DIR})
diff --git a/filters/stage/powerpoint/PowerPointImport.cpp b/filters/stage/=
powerpoint/PowerPointImport.cpp
index defcd14..61e3835 100644
--- a/filters/stage/powerpoint/PowerPointImport.cpp
+++ b/filters/stage/powerpoint/PowerPointImport.cpp
@@ -23,8 +23,9 @@
=
#include "PptToOdp.h"
=
-K_PLUGIN_FACTORY(PowerPointImportFactory, registerPlugin<PowerPointImport>=
();)
-K_EXPORT_PLUGIN(PowerPointImportFactory("calligrafilters"))
+#include <kpluginfactory.h>
+
+K_PLUGIN_FACTORY_WITH_JSON(PowerPointImportFactory, "calligra_filter_ppt2o=
dp.json", registerPlugin<PowerPointImport>();)
=
KoFilter::ConversionStatus PowerPointImport::convert(const QByteArray& fro=
m, const QByteArray& to)
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic