From cde62f8965c57e92aaea5054908f5010423fde5f Mon Sep 17 00:00:00 2001 From: Vilius Sutkus '89 Date: Tue, 27 Aug 2024 09:46:13 +0300 Subject: [PATCH] Unexpose pdf2htmlEX and wvWare in odr::OpenDocumentReader class --- src/odr/open_document_reader.cpp | 28 +--------------------------- src/odr/open_document_reader.hpp | 28 ---------------------------- 2 files changed, 1 insertion(+), 55 deletions(-) diff --git a/src/odr/open_document_reader.cpp b/src/odr/open_document_reader.cpp index 73c9a235..04d8d865 100644 --- a/src/odr/open_document_reader.cpp +++ b/src/odr/open_document_reader.cpp @@ -7,17 +7,11 @@ #include #include #include +#include #include #include -#if defined(WITH_PDF2HTMLEX) -#include -#endif -#if defined(WITH_WVWARE) -#include -#endif - namespace odr { std::string OpenDocumentReader::version() noexcept { @@ -251,26 +245,6 @@ Html OpenDocumentReader::html(const PdfFile &pdf_file, return html::translate(pdf_file, output_path, config); } -#if defined(WITH_PDF2HTMLEX) -Html OpenDocumentReader::pdf2htmlEX(const std::string &input_path, - const std::string &output_path, - const HtmlConfig &config, - std::optional &password) { - return internal::html::pdf2htmlEX_wrapper(input_path, output_path, config, - password); -} -#endif - -#if defined(WITH_WVWARE) -Html OpenDocumentReader::wvHtml(const std::string &input_path, - const std::string &output_path, - const HtmlConfig &config, - std::optional &password) { - return internal::html::wvWare_wrapper(input_path, output_path, config, - password); -} -#endif - void OpenDocumentReader::edit(const Document &document, const char *diff) { html::edit(document, diff); } diff --git a/src/odr/open_document_reader.hpp b/src/odr/open_document_reader.hpp index 3849389c..e73c993e 100644 --- a/src/odr/open_document_reader.hpp +++ b/src/odr/open_document_reader.hpp @@ -2,8 +2,6 @@ #define ODR_OPEN_DOCUMENT_READER_HPP #include -#include -#include #include #include @@ -141,32 +139,6 @@ class OpenDocumentReader final { const std::string &output_path, const HtmlConfig &config); -#if defined(WITH_PDF2HTMLEX) - /// @brief Translates a PDF file to HTML using pdf2htmlEX. - /// - /// @param input_path Path to the file to translate. - /// @param output_path Path to save the HTML output. - /// @param config Configuration for the HTML output. - /// @return HTML output. - [[nodiscard]] static Html pdf2htmlEX(const std::string &input_path, - const std::string &output_path, - const HtmlConfig &config, - std::optional &password); -#endif - -#if defined(WITH_WVWARE) - /// @brief Translates a doc file to HTML using wvWare. - /// - /// @param input_path Path to the file to translate. - /// @param output_path Path to save the HTML output. - /// @param config Configuration for the HTML output. - /// @return HTML output. - [[nodiscard]] static Html wvHtml(const std::string &input_path, - const std::string &output_path, - const HtmlConfig &config, - std::optional &password); -#endif - /// @brief Edit a document. /// @param document The document. /// @param diff The diff.