|
 |
f325b2 |
From b15cf8984c13436ce3d9c8ee58d9be075f7316dc Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Tue, 20 Oct 2015 17:13:30 +0200
|
|
|
f325b2 |
Subject: [PATCH 218/398] lok::Document::saveAs: add Writer/Impress/Draw png
|
|
|
f325b2 |
mapping
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I7530281302b9787a9cb9f98f0dee9d98d39cfb05
|
|
|
f325b2 |
(cherry picked from commit d42c3e0ddd9078c00de591b7470d73ad8a186cb1)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
desktop/CppunitTest_desktop_lib.mk | 2 ++
|
|
|
f325b2 |
desktop/qa/desktop_lib/test_desktop_lib.cxx | 11 +++++++++++
|
|
|
f325b2 |
desktop/source/lib/init.cxx | 3 +++
|
|
|
f325b2 |
3 files changed, 16 insertions(+)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/desktop/CppunitTest_desktop_lib.mk b/desktop/CppunitTest_desktop_lib.mk
|
|
|
f325b2 |
index 0c963f9088c2..a1f712585507 100644
|
|
|
f325b2 |
--- a/desktop/CppunitTest_desktop_lib.mk
|
|
|
f325b2 |
+++ b/desktop/CppunitTest_desktop_lib.mk
|
|
|
f325b2 |
@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_lib, \
|
|
|
f325b2 |
sw \
|
|
|
f325b2 |
test \
|
|
|
f325b2 |
unotest \
|
|
|
f325b2 |
+ utl \
|
|
|
f325b2 |
vcl \
|
|
|
f325b2 |
$(gb_UWINAPI) \
|
|
|
f325b2 |
))
|
|
|
f325b2 |
@@ -64,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_components,desktop_lib,\
|
|
|
f325b2 |
unoxml/source/service/unoxml \
|
|
|
f325b2 |
xmloff/util/xo \
|
|
|
f325b2 |
i18npool/source/search/i18nsearch \
|
|
|
f325b2 |
+ filter/source/graphic/graphicfilter \
|
|
|
f325b2 |
))
|
|
|
f325b2 |
|
|
|
f325b2 |
$(eval $(call gb_CppunitTest_use_configuration,desktop_lib))
|
|
|
f325b2 |
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
|
|
|
f325b2 |
index df8723b8cedd..c3464a243a3c 100644
|
|
|
f325b2 |
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
|
|
|
f325b2 |
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
|
|
|
f325b2 |
@@ -21,6 +21,7 @@
|
|
|
f325b2 |
#include <comphelper/propertysequence.hxx>
|
|
|
f325b2 |
#include <svl/srchitem.hxx>
|
|
|
f325b2 |
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
|
|
|
f325b2 |
+#include <unotools/tempfile.hxx>
|
|
|
f325b2 |
|
|
|
f325b2 |
#include "../../inc/lib/init.hxx"
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -62,6 +63,7 @@ public:
|
|
|
f325b2 |
void testGetPartPageRectangles();
|
|
|
f325b2 |
void testSearchCalc();
|
|
|
f325b2 |
void testPaintTile();
|
|
|
f325b2 |
+ void testSaveAs();
|
|
|
f325b2 |
|
|
|
f325b2 |
CPPUNIT_TEST_SUITE(DesktopLOKTest);
|
|
|
f325b2 |
CPPUNIT_TEST(testGetStyles);
|
|
|
f325b2 |
@@ -71,6 +73,7 @@ public:
|
|
|
f325b2 |
CPPUNIT_TEST(testGetPartPageRectangles);
|
|
|
f325b2 |
CPPUNIT_TEST(testSearchCalc);
|
|
|
f325b2 |
CPPUNIT_TEST(testPaintTile);
|
|
|
f325b2 |
+ CPPUNIT_TEST(testSaveAs);
|
|
|
f325b2 |
CPPUNIT_TEST_SUITE_END();
|
|
|
f325b2 |
|
|
|
f325b2 |
uno::Reference<lang::XComponent> mxComponent;
|
|
|
f325b2 |
@@ -309,6 +312,14 @@ void DesktopLOKTest::testPaintTile()
|
|
|
f325b2 |
closeDoc();
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
+void DesktopLOKTest::testSaveAs()
|
|
|
f325b2 |
+{
|
|
|
f325b2 |
+ LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
|
|
|
f325b2 |
+ utl::TempFile aTempFile;
|
|
|
f325b2 |
+ aTempFile.EnableKillingFile();
|
|
|
f325b2 |
+ CPPUNIT_ASSERT(pDocument->pClass->saveAs(pDocument, aTempFile.GetURL().toUtf8().getStr(), "png", 0));
|
|
|
f325b2 |
+}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
|
|
|
f325b2 |
|
|
|
f325b2 |
CPPUNIT_PLUGIN_IMPLEMENT();
|
|
|
f325b2 |
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
|
|
|
f325b2 |
index 053ab440bf55..97fb6f6a235c 100644
|
|
|
f325b2 |
--- a/desktop/source/lib/init.cxx
|
|
|
f325b2 |
+++ b/desktop/source/lib/init.cxx
|
|
|
f325b2 |
@@ -116,6 +116,7 @@ static const ExtensionMap aWriterExtensionMap[] =
|
|
|
f325b2 |
{ "pdf", "writer_pdf_Export" },
|
|
|
f325b2 |
{ "txt", "Text" },
|
|
|
f325b2 |
{ "xhtml", "XHTML Writer File" },
|
|
|
f325b2 |
+ { "png", "writer_png_Export" },
|
|
|
f325b2 |
{ NULL, NULL }
|
|
|
f325b2 |
};
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -149,6 +150,7 @@ static const ExtensionMap aImpressExtensionMap[] =
|
|
|
f325b2 |
{ "svg", "impress_svg_Export" },
|
|
|
f325b2 |
{ "swf", "impress_flash_Export" },
|
|
|
f325b2 |
{ "xhtml", "XHTML Impress File" },
|
|
|
f325b2 |
+ { "png", "impress_png_Export"},
|
|
|
f325b2 |
{ NULL, NULL }
|
|
|
f325b2 |
};
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -161,6 +163,7 @@ static const ExtensionMap aDrawExtensionMap[] =
|
|
|
f325b2 |
{ "svg", "draw_svg_Export" },
|
|
|
f325b2 |
{ "swf", "draw_flash_Export" },
|
|
|
f325b2 |
{ "xhtml", "XHTML Draw File" },
|
|
|
f325b2 |
+ { "png", "draw_png_Export"},
|
|
|
f325b2 |
{ NULL, NULL }
|
|
|
f325b2 |
};
|
|
|
f325b2 |
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|