[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 2 commits - desktop/CppunitTest_desktop_lib.mk desktop/qa desktop/source filter/Configuration_filter.mk filter/source postprocess/CustomTarget_registry.mk svtools/source
Miklos Vajna
vmiklos at collabora.co.uk
Tue Oct 20 09:41:34 PDT 2015
desktop/CppunitTest_desktop_lib.mk | 2 +
desktop/qa/desktop_lib/test_desktop_lib.cxx | 21 +++++++++++++
desktop/source/lib/init.cxx | 4 ++
filter/Configuration_filter.mk | 9 +++++
filter/source/config/fragments/filters/calc_png_Export.xcu | 20 ++++++++++++
postprocess/CustomTarget_registry.mk | 2 +
svtools/source/filter/DocumentToGraphicRenderer.cxx | 2 +
7 files changed, 60 insertions(+)
New commits:
commit faec766d902f612ba0e580eb86a3d64147eb0e4b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Oct 20 18:12:22 2015 +0200
sc: initial png export
Change-Id: Iae0e89646eab794879529274f09839ad34aa4696
(cherry picked from commit 03bb5d52fecd6c613c6cc36508eb44e5e1c3456a)
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index c3464a2..3730fd1 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -64,6 +64,7 @@ public:
void testSearchCalc();
void testPaintTile();
void testSaveAs();
+ void testSaveAsCalc();
CPPUNIT_TEST_SUITE(DesktopLOKTest);
CPPUNIT_TEST(testGetStyles);
@@ -74,6 +75,7 @@ public:
CPPUNIT_TEST(testSearchCalc);
CPPUNIT_TEST(testPaintTile);
CPPUNIT_TEST(testSaveAs);
+ CPPUNIT_TEST(testSaveAsCalc);
CPPUNIT_TEST_SUITE_END();
uno::Reference<lang::XComponent> mxComponent;
@@ -320,6 +322,14 @@ void DesktopLOKTest::testSaveAs()
CPPUNIT_ASSERT(pDocument->pClass->saveAs(pDocument, aTempFile.GetURL().toUtf8().getStr(), "png", 0));
}
+void DesktopLOKTest::testSaveAsCalc()
+{
+ LibLODocument_Impl* pDocument = loadDoc("search.ods");
+ utl::TempFile aTempFile;
+ aTempFile.EnableKillingFile();
+ CPPUNIT_ASSERT(pDocument->pClass->saveAs(pDocument, aTempFile.GetURL().toUtf8().getStr(), "png", 0));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 7f5ae35..49a3352 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -135,6 +135,7 @@ static const ExtensionMap aCalcExtensionMap[] =
{ "xhtml", "XHTML Calc File" },
{ "xls", "MS Excel 97" },
{ "xlsx", "Calc MS Excel 2007 XML" },
+ { "png", "calc_png_Export" },
{ NULL, NULL }
};
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 29e672b..0a0dddb 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -837,6 +837,15 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writergraphics
writer_png_Export \
))
+# fcfg_calcgraphics
+$(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calcgraphics_types.xcu,filter/source/config/fragments/types,\
+ png_Portable_Network_Graphic \
+))
+
+$(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_calcgraphics_filters.xcu,filter/source/config/fragments/filters,\
+ calc_png_Export \
+))
+
# fcfg_internalgraphics
$(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_internalgraphics_types.xcu,filter/source/config/fragments/types,\
bmp_MS_Windows \
diff --git a/filter/source/config/fragments/filters/calc_png_Export.xcu b/filter/source/config/fragments/filters/calc_png_Export.xcu
new file mode 100644
index 0000000..999bef2
--- /dev/null
+++ b/filter/source/config/fragments/filters/calc_png_Export.xcu
@@ -0,0 +1,20 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+ <node oor:name="calc_png_Export" oor:op="replace">
+ <prop oor:name="Flags"><value>EXPORT ALIEN 3RDPARTYFILTER</value></prop>
+ <prop oor:name="UIComponent"><value>com.sun.star.comp.GraphicExportDialog</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.GraphicExportFilter</value></prop>
+ <prop oor:name="UserData"><value></value></prop>
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">PNG - Portable Network Graphic</value>
+ </prop>
+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
+ <prop oor:name="Type"><value>png_Portable_Network_Graphic</value></prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+ </node>
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 79025f9..5f7364a 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -87,6 +87,8 @@ postprocess_FILES_graphicfilter := \
$(call gb_XcuFilterTypesTarget_get_target,fcfg_drawgraphics_types.xcu) \
$(call gb_XcuFilterFiltersTarget_get_target,fcfg_impressgraphics_filters.xcu) \
$(call gb_XcuFilterTypesTarget_get_target,fcfg_impressgraphics_types.xcu) \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_calcgraphics_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_calcgraphics_types.xcu) \
$(call gb_XcuFilterFiltersTarget_get_target,fcfg_writergraphics_filters.xcu) \
$(call gb_XcuFilterTypesTarget_get_target,fcfg_writergraphics_types.xcu)
diff --git a/svtools/source/filter/DocumentToGraphicRenderer.cxx b/svtools/source/filter/DocumentToGraphicRenderer.cxx
index e33a94e..e78b0f1 100644
--- a/svtools/source/filter/DocumentToGraphicRenderer.cxx
+++ b/svtools/source/filter/DocumentToGraphicRenderer.cxx
@@ -148,6 +148,8 @@ Graphic DocumentToGraphicRenderer::renderToGraphic(
sal_Int32 DocumentToGraphicRenderer::getCurrentPageWriter()
{
Reference<text::XTextViewCursorSupplier> xTextViewCursorSupplier(mxModel->getCurrentController(), UNO_QUERY);
+ if (!xTextViewCursorSupplier.is())
+ return 1;
Reference<text::XPageCursor> xCursor(xTextViewCursorSupplier->getViewCursor(), UNO_QUERY);
return xCursor->getPage();
}
commit 678aa48c5f45feb533c51e0c58bcba362db15ece
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Oct 20 17:13:30 2015 +0200
lok::Document::saveAs: add Writer/Impress/Draw png mapping
Change-Id: I7530281302b9787a9cb9f98f0dee9d98d39cfb05
(cherry picked from commit d42c3e0ddd9078c00de591b7470d73ad8a186cb1)
diff --git a/desktop/CppunitTest_desktop_lib.mk b/desktop/CppunitTest_desktop_lib.mk
index 0c963f9..a1f7125 100644
--- a/desktop/CppunitTest_desktop_lib.mk
+++ b/desktop/CppunitTest_desktop_lib.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_lib, \
sw \
test \
unotest \
+ utl \
vcl \
$(gb_UWINAPI) \
))
@@ -64,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_components,desktop_lib,\
unoxml/source/service/unoxml \
xmloff/util/xo \
i18npool/source/search/i18nsearch \
+ filter/source/graphic/graphicfilter \
))
$(eval $(call gb_CppunitTest_use_configuration,desktop_lib))
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index df8723b..c3464a2 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -21,6 +21,7 @@
#include <comphelper/propertysequence.hxx>
#include <svl/srchitem.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#include <unotools/tempfile.hxx>
#include "../../inc/lib/init.hxx"
@@ -62,6 +63,7 @@ public:
void testGetPartPageRectangles();
void testSearchCalc();
void testPaintTile();
+ void testSaveAs();
CPPUNIT_TEST_SUITE(DesktopLOKTest);
CPPUNIT_TEST(testGetStyles);
@@ -71,6 +73,7 @@ public:
CPPUNIT_TEST(testGetPartPageRectangles);
CPPUNIT_TEST(testSearchCalc);
CPPUNIT_TEST(testPaintTile);
+ CPPUNIT_TEST(testSaveAs);
CPPUNIT_TEST_SUITE_END();
uno::Reference<lang::XComponent> mxComponent;
@@ -309,6 +312,14 @@ void DesktopLOKTest::testPaintTile()
closeDoc();
}
+void DesktopLOKTest::testSaveAs()
+{
+ LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
+ utl::TempFile aTempFile;
+ aTempFile.EnableKillingFile();
+ CPPUNIT_ASSERT(pDocument->pClass->saveAs(pDocument, aTempFile.GetURL().toUtf8().getStr(), "png", 0));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index cb8a7a3..7f5ae35 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -120,6 +120,7 @@ static const ExtensionMap aWriterExtensionMap[] =
{ "pdf", "writer_pdf_Export" },
{ "txt", "Text" },
{ "xhtml", "XHTML Writer File" },
+ { "png", "writer_png_Export" },
{ NULL, NULL }
};
@@ -153,6 +154,7 @@ static const ExtensionMap aImpressExtensionMap[] =
{ "svg", "impress_svg_Export" },
{ "swf", "impress_flash_Export" },
{ "xhtml", "XHTML Impress File" },
+ { "png", "impress_png_Export"},
{ NULL, NULL }
};
@@ -165,6 +167,7 @@ static const ExtensionMap aDrawExtensionMap[] =
{ "svg", "draw_svg_Export" },
{ "swf", "draw_flash_Export" },
{ "xhtml", "XHTML Draw File" },
+ { "png", "draw_png_Export"},
{ NULL, NULL }
};
More information about the Libreoffice-commits
mailing list