diff --git a/Desktop/data/importers/excelimporter.h b/Desktop/data/importers/excelimporter.h index 90c027cfae..52b0c31dfa 100644 --- a/Desktop/data/importers/excelimporter.h +++ b/Desktop/data/importers/excelimporter.h @@ -30,9 +30,6 @@ class ExcelImporter : public Importer ExcelImporter(); virtual ~ExcelImporter() {} - - bool importerDeliversLabels() const override { return false; } - protected: ImportDataSet* loadFile(const std::string &locator, std::function progressCallback) override; diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt index bfa5030a85..3c44b422e0 100644 --- a/Engine/CMakeLists.txt +++ b/Engine/CMakeLists.txt @@ -107,16 +107,16 @@ if(WINDOWS) POST_BUILD DEPENDS ${CMAKE_BINARY_DIR}/R-Interface/libR-Interface.dll COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBGCC_S_SEH_DLL} ${CMAKE_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBSTDCPP_DLL} - ${CMAKE_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_MSYS_DLL} - ${CMAKE_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBSTDCPP_DLL} + ${CMAKE_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_MSYS_DLL} + ${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBWINPTHREAD_DLL} ${CMAKE_BINARY_DIR} - #COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBJSONCPP_DLL} - # ${CMAKE_BINARY_DIR} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBREADSTAT_DLL} - ${CMAKE_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBREADSTAT_DLL} + ${CMAKE_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBFREEXL_DLL} + ${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_ZLIB_DLL} ${CMAKE_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBICONV_DLL} diff --git a/Tools/CMake/Install.cmake b/Tools/CMake/Install.cmake index be07380e7c..ed8e82fbd4 100644 --- a/Tools/CMake/Install.cmake +++ b/Tools/CMake/Install.cmake @@ -384,10 +384,11 @@ if(WIN32) install( FILES ${RTOOLS_LIBGCC_S_SEH_DLL} ${RTOOLS_LIBSTDCPP_DLL} - ${RTOOLS_MSYS_DLL} + ${RTOOLS_MSYS_DLL} ${RTOOLS_LIBWINPTHREAD_DLL} - #${RTOOLS_LIBJSONCPP_DLL} - ${RTOOLS_LIBREADSTAT_DLL} + #${RTOOLS_LIBJSONCPP_DLL} + ${RTOOLS_LIBREADSTAT_DLL} + ${RTOOLS_LIBFREEXL_DLL} ${RTOOLS_ZLIB_DLL} ${RTOOLS_LIBICONV_DLL} ${_LIB_R_INTERFACE_DLL} diff --git a/Tools/windows/msix/AppxManifest-nightly.xml.in b/Tools/windows/msix/AppxManifest-nightly.xml.in index c43481c078..c06d60d3bd 100644 --- a/Tools/windows/msix/AppxManifest-nightly.xml.in +++ b/Tools/windows/msix/AppxManifest-nightly.xml.in @@ -55,6 +55,8 @@ .csv .sav .ods + .xls + .xlsx .zsav .xpt .por diff --git a/Tools/windows/msix/AppxManifest-sideload.xml.in b/Tools/windows/msix/AppxManifest-sideload.xml.in index 56dbe8ca11..ba08066439 100644 --- a/Tools/windows/msix/AppxManifest-sideload.xml.in +++ b/Tools/windows/msix/AppxManifest-sideload.xml.in @@ -55,6 +55,8 @@ .csv .sav .ods + .xls + .xlsx .zsav .xpt .por diff --git a/Tools/windows/msix/AppxManifest-store-beta.xml.in b/Tools/windows/msix/AppxManifest-store-beta.xml.in index ab33bc8fd0..fae2b0ade1 100644 --- a/Tools/windows/msix/AppxManifest-store-beta.xml.in +++ b/Tools/windows/msix/AppxManifest-store-beta.xml.in @@ -55,6 +55,8 @@ .csv .sav .ods + .xls + .xlsx .zsav .xpt .por diff --git a/Tools/windows/msix/AppxManifest-store.xml.in b/Tools/windows/msix/AppxManifest-store.xml.in index 84eebdd1c5..82b7a389f6 100644 --- a/Tools/windows/msix/AppxManifest-store.xml.in +++ b/Tools/windows/msix/AppxManifest-store.xml.in @@ -55,6 +55,8 @@ .csv .sav .ods + .xls + .xlsx .zsav .xpt .por