Rebased ref, commits from common ancestor:
commit cf12f8edbb80001a32e26e91a6a32d948cfa730d
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon May 10 15:45:13 2021 +0900
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Mon May 10 21:00:49 2021 +0900
vcl: add more methods to the PDFium
Change-Id: I74ef0f713125c7069620d1abc9534a636c1707d9
diff --git a/include/vcl/filter/PDFiumLibrary.hxx
b/include/vcl/filter/PDFiumLibrary.hxx
index c5f1766f60c0..46988cf3c946 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -111,6 +111,13 @@ public:
virtual PDFSegmentType getType() const = 0;
};
+struct PDFImageMetadata
+{
+ sal_uInt32 mnWidth;
+ sal_uInt32 mnHeight;
+ sal_uInt32 mnBitsPerPixel;
+};
+
class VCL_DLLPUBLIC PDFiumPageObject
{
public:
@@ -127,15 +134,20 @@ public:
virtual double getFontSize() = 0;
virtual OUString getFontName() = 0;
virtual PDFTextRenderMode getTextRenderMode() = 0;
+ virtual bool hasTransparency() = 0;
virtual Color getFillColor() = 0;
virtual Color getStrokeColor() = 0;
virtual double getStrokeWidth() = 0;
// Path
virtual int getPathSegmentCount() = 0;
virtual std::unique_ptr<PDFiumPathSegment> getPathSegment(int index) = 0;
+ virtual bool getDrawMode(PDFFillMode& eFillMode, bool& bStroke) = 0;
+ // Image
virtual Size getImageSize(PDFiumPage& rPage) = 0;
+ virtual PDFImageMetadata getImageMetadata(PDFiumPage& rPage) = 0;
+
virtual std::unique_ptr<PDFiumBitmap> getImageBitmap() = 0;
- virtual bool getDrawMode(PDFFillMode& eFillMode, bool& bStroke) = 0;
+ virtual bool getDecodedImageData(std::vector<sal_uInt8>& rData) = 0;
};
class VCL_DLLPUBLIC PDFiumSearchHandle
diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx
index adfa4db4fa45..f0fa8a8c2ce0 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -254,15 +254,19 @@ public:
double getFontSize() override;
OUString getFontName() override;
PDFTextRenderMode getTextRenderMode() override;
+ bool hasTransparency() override;
Color getFillColor() override;
Color getStrokeColor() override;
double getStrokeWidth() override;
// Path
int getPathSegmentCount() override;
std::unique_ptr<PDFiumPathSegment> getPathSegment(int index) override;
+ bool getDrawMode(PDFFillMode& eFillMode, bool& bStroke) override;
+ // Image
Size getImageSize(PDFiumPage& rPage) override;
+ PDFImageMetadata getImageMetadata(PDFiumPage& rPage) override;
std::unique_ptr<PDFiumBitmap> getImageBitmap() override;
- bool getDrawMode(PDFFillMode& eFillMode, bool& bStroke) override;
+ bool getDecodedImageData(std::vector<sal_uInt8>& rData) override;
};
class PDFiumSearchHandleImpl final : public PDFiumSearchHandle
@@ -835,6 +839,8 @@ Color PDFiumPageObjectImpl::getFillColor()
return aColor;
}
+bool PDFiumPageObjectImpl::hasTransparency() { return
FPDFPageObj_HasTransparency(mpPageObject); }
+
Color PDFiumPageObjectImpl::getStrokeColor()
{
Color aColor = COL_TRANSPARENT;
@@ -874,6 +880,28 @@ Size PDFiumPageObjectImpl::getImageSize(PDFiumPage& rPage)
return Size(aMeta.width, aMeta.height);
}
+PDFImageMetadata PDFiumPageObjectImpl::getImageMetadata(PDFiumPage& rPage)
+{
+ FPDF_IMAGEOBJ_METADATA aMeta;
+ auto& rPageImpl = static_cast<PDFiumPageImpl&>(rPage);
+ FPDFImageObj_GetImageMetadata(mpPageObject, rPageImpl.getPointer(),
&aMeta);
+ return { aMeta.width, aMeta.height, aMeta.bits_per_pixel };
+}
+
+bool PDFiumPageObjectImpl::getDecodedImageData(std::vector<sal_uInt8>& rData)
+{
+ unsigned long nLength = FPDFImageObj_GetImageDataDecoded(mpPageObject,
nullptr, 0);
+ if (nLength > 0)
+ {
+ rData.resize(nLength);
+ unsigned long nReadLength
+ = FPDFImageObj_GetImageDataDecoded(mpPageObject, rData.data(),
nLength);
+ if (nReadLength == nLength)
+ return true;
+ }
+ return false;
+}
+
std::unique_ptr<PDFiumBitmap> PDFiumPageObjectImpl::getImageBitmap()
{
std::unique_ptr<PDFiumBitmap> pPDFiumBitmap;
commit 0c756b051c1f40ebad2498088ed59722ae12e6c8
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon May 3 16:42:22 2021 +0900
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Mon May 10 21:00:48 2021 +0900
Add PDF importer to read a PDF into drawinglayer primitives
Change-Id: I8d2e28a39515dfef8a1b4c6b06df095dd3a4eaec
diff --git a/Repository.mk b/Repository.mk
index 8e6f0be49fc6..3481abf3dcc8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -398,6 +398,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
passwordcontainer \
pcr \
pdffilter \
+ pdfimporter \
$(call gb_Helper_optional,SCRIPTING,protocolhandler) \
sax \
sb \
diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx
b/drawinglayer/source/tools/primitive2dxmldump.cxx
index ade8cfaed89b..992619fe89f6 100644
--- a/drawinglayer/source/tools/primitive2dxmldump.cxx
+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
@@ -113,6 +113,13 @@ void Primitive2dXmlDump::dump(
aWriter.endDocument();
pStream->Seek(STREAM_SEEK_TO_BEGIN);
+
+ std::size_t nSize = pStream->remainingSize();
+ std::unique_ptr<sal_uInt8[]> pBuffer(new sal_uInt8[nSize + 1]);
+ pStream->ReadBytes(pBuffer.get(), nSize);
+ pBuffer[nSize] = 0;
+
+ printf ("%s\n", pBuffer.get());
}
xmlDocUniquePtr Primitive2dXmlDump::dumpAndParse(
diff --git a/filter/CppunitTest_filter_pdfimporter_test.mk
b/filter/CppunitTest_filter_pdfimporter_test.mk
new file mode 100644
index 000000000000..3b17dcdcb43f
--- /dev/null
+++ b/filter/CppunitTest_filter_pdfimporter_test.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,filter_pdfimporter_test))
+
+$(eval $(call gb_CppunitTest_use_externals,filter_pdfimporter_test,\
+ boost_headers \
+ libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,filter_pdfimporter_test, \
+ filter/qa/cppunit/PdfImporterTest \
+))
+
+$(eval $(call gb_CppunitTest_use_library_objects,filter_pdfimporter_test,\
+ pdfimporter \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,filter_pdfimporter_test, \
+ basegfx \
+ drawinglayer \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ test \
+ unotest \
+ utl \
+ tl \
+ vcl \
+ tk \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,filter_pdfimporter_test))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,filter_pdfimporter_test))
+$(eval $(call gb_CppunitTest_use_ure,filter_pdfimporter_test))
+$(eval $(call gb_CppunitTest_use_vcl,filter_pdfimporter_test))
+$(eval $(call gb_CppunitTest_use_rdb,filter_pdfimporter_test,services))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Library_pdfimporter.mk b/filter/Library_pdfimporter.mk
new file mode 100644
index 000000000000..93a567cbc247
--- /dev/null
+++ b/filter/Library_pdfimporter.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Library_Library,pdfimporter))
+
+$(eval $(call gb_Library_set_include,pdfimporter,\
+ -I$(SRCDIR)/filter/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_use_external,pdfimporter,boost_headers))
+
+$(eval $(call gb_Library_add_exception_objects,pdfimporter,\
+ filter/source/pdfimporter/PDFImporter \
+))
+
+$(eval $(call gb_Library_use_libraries,pdfimporter,\
+ drawinglayer \
+ basegfx \
+ vcl \
+ tl \
+ sal \
+ cppu \
+ tk \
+))
+
+$(eval $(call gb_Library_use_sdk_api,pdfimporter))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 42a82bacf5c0..e079e523aa99 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_add_targets,filter,\
Library_msfilter \
Library_odfflatxml \
Library_pdffilter \
+ Library_pdfimporter \
Library_storagefd \
Library_svgfilter \
Library_graphicfilter \
@@ -49,6 +50,7 @@ $(eval $(call gb_Module_add_check_targets,filter,\
CppunitTest_filter_xslt \
CppunitTest_filter_priority \
CppunitTest_filter_msfilter \
+ CppunitTest_filter_pdfimporter_test \
CppunitTest_filter_textfilterdetect \
))
diff --git a/filter/qa/cppunit/PdfImporterTest.cxx
b/filter/qa/cppunit/PdfImporterTest.cxx
new file mode 100644
index 000000000000..ee57b9bdbc67
--- /dev/null
+++ b/filter/qa/cppunit/PdfImporterTest.cxx
@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#include <sal/config.h>
+#include <sal/types.h>
+#include <test/bootstrapfixture.hxx>
+#include <test/xmltesttools.hxx>
+
+#include <filter/pdfimporter/PDFImporter.hxx>
+#include <vcl/BinaryDataContainer.hxx>
+#include <tools/stream.hxx>
+#include <drawinglayer/converters.hxx>
+#include <drawinglayer/geometry/viewinformation2d.hxx>
+#include <drawinglayer/tools/primitive2dxmldump.hxx>
+
+#include <tools/stream.hxx>
+#include <vcl/pngwrite.hxx>
+
+class PDFImporterTest : public test::BootstrapFixture, public XmlTestTools
+{
+ OUString getFullUrl(std::u16string_view sFileName)
+ {
+ return m_directories.getURLFromSrc(u"/filter/qa/cppunit/data/") +
sFileName;
+ }
+
+ void testPath();
+ void testImage();
+ void testText();
+
+ CPPUNIT_TEST_SUITE(PDFImporterTest);
+ //CPPUNIT_TEST(testPath);
+ //CPPUNIT_TEST(testImage);
+ CPPUNIT_TEST(testText);
+ CPPUNIT_TEST_SUITE_END();
+};
+
+void PDFImporterTest::testPath()
+{
+ SvFileStream aFileStream(getFullUrl(u"/PdfTest-Rect.pdf"),
StreamMode::READ);
+ const sal_uInt64 nStreamLength = aFileStream.TellEnd();
+ auto rData = std::make_unique<std::vector<sal_uInt8>>(nStreamLength);
+ aFileStream.ReadBytes(rData->data(), rData->size());
+ BinaryDataContainer aDataContainer(std::move(rData));
+ PDFImporter aImporter(aDataContainer);
+
+ drawinglayer::primitive2d::Primitive2DContainer aContainer;
+ aImporter.importPage(0, aContainer);
+
+ drawinglayer::geometry::ViewInformation2D rViewInformation2D;
+
+ auto aRange = aContainer.getB2DRange(rViewInformation2D);
+
+ BitmapEx aBitmapEx
+ = drawinglayer::convertToBitmapEx(aContainer, rViewInformation2D,
2000, 2000, 10000 * 1000);
+
+ SvFileStream aNew("~/xxxxxxx.png", StreamMode::WRITE | StreamMode::TRUNC);
+ vcl::PNGWriter aPNGWriter(aBitmapEx);
+ aPNGWriter.Write(aNew);
+
+ drawinglayer::Primitive2dXmlDump aDumper;
+ aDumper.dump(aContainer, OUString());
+ xmlDocUniquePtr pDocument = aDumper.dumpAndParse(aContainer);
+ CPPUNIT_ASSERT(pDocument);
+
+ assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/transform/unifiedtransparence",
+ "transparence", "0.498039215686275");
+
+ CPPUNIT_ASSERT_EQUAL(-0.5, aRange.getMinX());
+ CPPUNIT_ASSERT_EQUAL(-0.5, aRange.getMinY());
+ CPPUNIT_ASSERT_EQUAL(612.5, aRange.getMaxX());
+ CPPUNIT_ASSERT_EQUAL(792.5, aRange.getMaxY());
+
+ CPPUNIT_ASSERT_EQUAL(tools::Long(1000), aBitmapEx.GetSizePixel().Width());
+ CPPUNIT_ASSERT_EQUAL(tools::Long(1000), aBitmapEx.GetSizePixel().Height());
+
+ CPPUNIT_ASSERT(false);
+}
+
+void PDFImporterTest::testImage()
+{
+ SvFileStream aFileStream(getFullUrl(u"/PdfTest-Image.pdf"),
StreamMode::READ);
+ const sal_uInt64 nStreamLength = aFileStream.TellEnd();
+ auto rData = std::make_unique<std::vector<sal_uInt8>>(nStreamLength);
+ aFileStream.ReadBytes(rData->data(), rData->size());
+ BinaryDataContainer aDataContainer(std::move(rData));
+ PDFImporter aImporter(aDataContainer);
+
+ drawinglayer::primitive2d::Primitive2DContainer aContainer;
+ aImporter.importPage(0, aContainer);
+
+ drawinglayer::geometry::ViewInformation2D rViewInformation2D;
+
+ auto aRange = aContainer.getB2DRange(rViewInformation2D);
+
+ BitmapEx aBitmapEx
+ = drawinglayer::convertToBitmapEx(aContainer, rViewInformation2D,
2000, 2000, 10000 * 1000);
+
+ SvFileStream aNew("~/xxxxxxx.png", StreamMode::WRITE | StreamMode::TRUNC);
+ vcl::PNGWriter aPNGWriter(aBitmapEx);
+ aPNGWriter.Write(aNew);
+
+ drawinglayer::Primitive2dXmlDump aDumper;
+ aDumper.dump(aContainer, OUString());
+ xmlDocUniquePtr pDocument = aDumper.dumpAndParse(aContainer);
+ CPPUNIT_ASSERT(pDocument);
+
+ assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/transform/unifiedtransparence",
+ "transparence", "0.498039215686275");
+
+ CPPUNIT_ASSERT_EQUAL(-0.5, aRange.getMinX());
+ CPPUNIT_ASSERT_EQUAL(-0.5, aRange.getMinY());
+ CPPUNIT_ASSERT_EQUAL(612.5, aRange.getMaxX());
+ CPPUNIT_ASSERT_EQUAL(792.5, aRange.getMaxY());
+
+ CPPUNIT_ASSERT_EQUAL(tools::Long(1000), aBitmapEx.GetSizePixel().Width());
+ CPPUNIT_ASSERT_EQUAL(tools::Long(1000), aBitmapEx.GetSizePixel().Height());
+
+ CPPUNIT_ASSERT(false);
+}
+
+void PDFImporterTest::testText()
+{
+ SvFileStream aFileStream(getFullUrl(u"/PdfTest-Text.pdf"),
StreamMode::READ);
+ const sal_uInt64 nStreamLength = aFileStream.TellEnd();
+ auto rData = std::make_unique<std::vector<sal_uInt8>>(nStreamLength);
+ aFileStream.ReadBytes(rData->data(), rData->size());
+ BinaryDataContainer aDataContainer(std::move(rData));
+ PDFImporter aImporter(aDataContainer);
+
+ drawinglayer::primitive2d::Primitive2DContainer aContainer;
+ aImporter.importPage(0, aContainer);
+
+ drawinglayer::geometry::ViewInformation2D rViewInformation2D;
+
+ auto aRange = aContainer.getB2DRange(rViewInformation2D);
+
+ BitmapEx aBitmapEx
+ = drawinglayer::convertToBitmapEx(aContainer, rViewInformation2D,
2000, 2000, 10000 * 1000);
+
+ SvFileStream aNew("~/xxxxxxx.png", StreamMode::WRITE | StreamMode::TRUNC);
+ vcl::PNGWriter aPNGWriter(aBitmapEx);
+ aPNGWriter.Write(aNew);
+
+ drawinglayer::Primitive2dXmlDump aDumper;
+ aDumper.dump(aContainer, OUString());
+ xmlDocUniquePtr pDocument = aDumper.dumpAndParse(aContainer);
+ CPPUNIT_ASSERT(pDocument);
+
+ assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/transform/unifiedtransparence",
+ "transparence", "0.498039215686275");
+
+ CPPUNIT_ASSERT_EQUAL(-0.5, aRange.getMinX());
+ CPPUNIT_ASSERT_EQUAL(-0.5, aRange.getMinY());
+ CPPUNIT_ASSERT_EQUAL(612.5, aRange.getMaxX());
+ CPPUNIT_ASSERT_EQUAL(792.5, aRange.getMaxY());
+
+ CPPUNIT_ASSERT_EQUAL(tools::Long(1000), aBitmapEx.GetSizePixel().Width());
+ CPPUNIT_ASSERT_EQUAL(tools::Long(1000), aBitmapEx.GetSizePixel().Height());
+
+ CPPUNIT_ASSERT(false);
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(PDFImporterTest);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/qa/cppunit/data/PdfTest-Image.pdf
b/filter/qa/cppunit/data/PdfTest-Image.pdf
new file mode 100644
index 000000000000..394ee272f3d4
Binary files /dev/null and b/filter/qa/cppunit/data/PdfTest-Image.pdf differ
diff --git a/filter/qa/cppunit/data/PdfTest-Rect.pdf
b/filter/qa/cppunit/data/PdfTest-Rect.pdf
new file mode 100644
index 000000000000..7115df65176f
--- /dev/null
+++ b/filter/qa/cppunit/data/PdfTest-Rect.pdf
@@ -0,0 +1,134 @@
+%PDF-1.6
+%äüöß
+2 0 obj
+<</Length 3 0 R/Filter/FlateDecode>>
+stream
+x����JA ��y��{�&ٙ�Y(=�UQ�z� ڪl .H_����"����!��%��x�7$�@R03��el;��=<-�
���#��O��
X#7��Ly�3 ��y9����j���6H��զ
+1���%K�̤0��hL:R,�SsSH�8S����BJ�duL�bg��|�Օs �4�����h����m�}E��
�ƅ��*�H���l��'���8a���M9��4S�� �Q���X8wY
+endstream
+endobj
+
+3 0 obj
+241
+endobj
+
+8 0 obj
+<<
+>>
+endobj
+
+9 0 obj
+<</Font 8 0 R
+/ProcSet[/PDF/Text]
+>>
+endobj
+
+1 0 obj
+<</Type/Page/Parent 7 0 R/Resources 9 0 R/MediaBox[0 0 612 792]/StructParents 0
+/Group<</S/Transparency/CS/DeviceRGB/I true>>/Contents 2 0 R>>
+endobj
+
+10 0 obj
+<</Count 1/First 11 0 R/Last 11 0 R
+>>
+endobj
+
+11 0 obj
+<</Count 0/Title<FEFF005000610067006500200031>
+/Dest[1 0 R/XYZ 0 792 0]/Parent 10 0 R>>
+endobj
+
+4 0 obj
+<</Type/StructElem
+/S/Figure
+/P 12 0 R
+/Pg 1 0 R
+/K[0 ]
+>>
+endobj
+
+5 0 obj
+<</Type/StructElem
+/S/Figure
+/P 12 0 R
+/Pg 1 0 R
+/K[1 ]
+>>
+endobj
+
+6 0 obj
+<</Type/StructElem
+/S/Figure
+/P 12 0 R
+/Pg 1 0 R
+/K[2 ]
+>>
+endobj
+
+12 0 obj
+<</Type/StructTreeRoot
+/ParentTree 13 0 R
+/K[4 0 R 5 0 R 6 0 R ]
+>>
+endobj
+
+13 0 obj
+<</Nums[
+0 [ 4 0 R 5 0 R 6 0 R ]
+]>>
+endobj
+
+7 0 obj
+<</Type/Pages
+/Resources 9 0 R
+/MediaBox[ 0 0 612 792 ]
+/Kids[ 1 0 R ]
+/Count 1>>
+endobj
+
+14 0 obj
+<</Type/Catalog/Pages 7 0 R
+/OpenAction[1 0 R /XYZ null null 0]
+/ViewerPreferences<</DisplayDocTitle true
+>>
+/Outlines 10 0 R
+/StructTreeRoot 12 0 R
+/MarkInfo<</Marked true>>
+>>
+endobj
+
+15 0 obj
+<</Title<FEFF004D007900540065006D0070006C006100740065>
+/Creator<FEFF0044007200610077>
+/Producer<FEFF004C0069006200720065004F0066006600690063006500200037002E0030>
+/CreationDate(D:20210505091047+09'00')>>
+endobj
+
+xref
+0 16
+0000000000 65535 f
+0000000426 00000 n
+0000000019 00000 n
+0000000331 00000 n
+0000000746 00000 n
+0000000821 00000 n
+0000000896 00000 n
+0000001110 00000 n
+0000000351 00000 n
+0000000373 00000 n
+0000000585 00000 n
+0000000641 00000 n
+0000000971 00000 n
+0000001056 00000 n
+0000001208 00000 n
+0000001403 00000 n
+trailer
+<</Size 16/Root 14 0 R
+/Info 15 0 R
+/ID [ <3F7788F2D0928B3B95B0CDBBD9EAC1B8>
+<3F7788F2D0928B3B95B0CDBBD9EAC1B8> ]
+/DocChecksum /F2715E25D79DC609834CA579FA23A5BA
+>>
+startxref
+1623
+%%EOF
diff --git a/filter/qa/cppunit/data/PdfTest-Text.pdf
b/filter/qa/cppunit/data/PdfTest-Text.pdf
new file mode 100644
index 000000000000..c449bf559228
Binary files /dev/null and b/filter/qa/cppunit/data/PdfTest-Text.pdf differ
diff --git a/filter/source/pdfimporter/PDFImporter.cxx
b/filter/source/pdfimporter/PDFImporter.cxx
new file mode 100644
index 000000000000..b4b37aea7128
--- /dev/null
+++ b/filter/source/pdfimporter/PDFImporter.cxx
@@ -0,0 +1,384 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ *
+ */
+
+#include <filter/pdfimporter/PDFImporter.hxx>
+
+#include <sal/log.hxx>
+#include <tools/UnitConversion.hxx>
+#include <tools/color.hxx>
+#include <vcl/bitmapex.hxx>
+#include <vcl/BitmapTools.hxx>
+
+#include <cmath>
+
+#include <toolkit/helper/vclunohelper.hxx>
+
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+
+#include <drawinglayer/attribute/lineattribute.hxx>
+#include <drawinglayer/attribute/strokeattribute.hxx>
+#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
+#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
+#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
+#include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx>
+#include <drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx>
+#include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx>
+#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
+
+PDFImporter::PDFImporter(BinaryDataContainer& rDataContainer)
+ : mpPDFium(vcl::pdf::PDFiumLibrary::get())
+{
+ auto* pData = rDataContainer.getData();
+ sal_Int32 nSize = rDataContainer.getSize();
+
+ mpPdfDocument = mpPDFium->openDocument(pData, nSize);
+}
+
+namespace
+{
+void setupPage(drawinglayer::primitive2d::Primitive2DContainer& rContainer,
+ basegfx::B2DSize const& rPageSize)
+{
+ basegfx::B2DRange aPageRange(0.0, 0.0, rPageSize.getX(), rPageSize.getY());
+
+ printf("Page Size %.2fpt %.2fpt\n", rPageSize.getX(), rPageSize.getY());
+
+ const auto aPolygon = basegfx::utils::createPolygonFromRect(aPageRange);
+
+ const drawinglayer::primitive2d::Primitive2DReference xPage(
+ new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(aPolygon,
+
basegfx::BColor(0.0, 0.0, 0.0)));
+ const drawinglayer::primitive2d::Primitive2DReference xHidden(
+ new drawinglayer::primitive2d::HiddenGeometryPrimitive2D(
+ drawinglayer::primitive2d::Primitive2DContainer{ xPage }));
+
+ rContainer.push_back(xHidden);
+}
+
+double sqrt2(double a, double b) { return sqrt(a * a + b * b); }
+
+} // end anonymous namespace
+
+bool PDFImporter::importPage(int nPageIndex,
+ drawinglayer::primitive2d::Primitive2DContainer&
rContainer)
+{
+ if (!mpPdfDocument)
+ return false;
+
+ drawinglayer::primitive2d::Primitive2DContainer aContent;
+
+ const int nPageCount = mpPdfDocument->getPageCount();
+ if (!(nPageCount > 0 && nPageIndex >= 0 && nPageIndex < nPageCount))
+ return false;
+
+ mpPdfPage = mpPdfDocument->openPage(nPageIndex);
+ if (!mpPdfPage)
+ return false;
+
+ basegfx::B2DSize aPageSize = mpPdfDocument->getPageSize(nPageIndex);
+
+ setupPage(aContent, aPageSize);
+
+ // Load the page text to extract it when we get text elements.
+ auto pTextPage = mpPdfPage->getTextPage();
+
+ const int nPageObjectCount = mpPdfPage->getObjectCount();
+
+ for (int nPageObjectIndex = 0; nPageObjectIndex < nPageObjectCount;
++nPageObjectIndex)
+ {
+ auto pPageObject = mpPdfPage->getObject(nPageObjectIndex);
+ importPdfObject(pPageObject, pTextPage, nPageObjectIndex, aContent);
+ }
+
+ // point to pixel conversion
+ double dConversionFactor = double(conversionFract(o3tl::Length::pt,
o3tl::Length::px));
+ const auto aTransform = basegfx::utils::createScaleTranslateB2DHomMatrix(
+ dConversionFactor, -dConversionFactor, 0.0, aPageSize.getY() *
dConversionFactor);
+
+ const drawinglayer::primitive2d::Primitive2DReference xTransform(
+ new drawinglayer::primitive2d::TransformPrimitive2D(aTransform,
aContent));
+
+ rContainer.push_back(xTransform);
+
+ return true;
+}
+
+void PDFImporter::importPdfObject(std::unique_ptr<vcl::pdf::PDFiumPageObject>
const& pPageObject,
+ std::unique_ptr<vcl::pdf::PDFiumTextPage>
const& pTextPage,
+ int nPageObjectIndex,
+
drawinglayer::primitive2d::Primitive2DContainer& rContent)
+{
+ if (!pPageObject)
+ return;
+
+ const vcl::pdf::PDFPageObjectType ePageObjectType = pPageObject->getType();
+ switch (ePageObjectType)
+ {
+ case vcl::pdf::PDFPageObjectType::Text:
+ printf("pdf::PDFPageObjectType::Text\n");
+ importText(pPageObject, pTextPage, rContent);
+ break;
+ case vcl::pdf::PDFPageObjectType::Path:
+ printf("pdf::PDFPageObjectType::Path\n");
+ importPath(pPageObject, rContent);
+ break;
+ case vcl::pdf::PDFPageObjectType::Image:
+ printf("pdf::PDFPageObjectType::Image\n");
+ importImage(pPageObject, rContent);
+ break;
+ case vcl::pdf::PDFPageObjectType::Shading:
+ printf("pdf::PDFPageObjectType::Shading\n");
+ break;
+ case vcl::pdf::PDFPageObjectType::Form:
+ printf("pdf::PDFPageObjectType::Form\n");
+ break;
+ case vcl::pdf::PDFPageObjectType::Unknown:
+ SAL_WARN("filter", "Unknown PDF page object #" << nPageObjectIndex
+ << " of type: " <<
int(ePageObjectType));
+ break;
+ }
+}
+
+void PDFImporter::importText(std::unique_ptr<vcl::pdf::PDFiumPageObject>
const& pPageObject,
+ std::unique_ptr<vcl::pdf::PDFiumTextPage> const&
pTextPage,
+ drawinglayer::primitive2d::Primitive2DContainer&
rRootContainer)
+{
+ basegfx::B2DRectangle aTextRect = pPageObject->getBounds();
+ basegfx::B2DHomMatrix aMatrix = pPageObject->getMatrix();
+
+ OUString sText = pPageObject->getText(pTextPage);
+
+ const double dFontSize = pPageObject->getFontSize();
+ double dFontSizeH = std::fabs(sqrt2(aMatrix.a(), aMatrix.c()) * dFontSize);
+ double dFontSizeV = std::fabs(sqrt2(aMatrix.b(), aMatrix.d()) * dFontSize);
+
+ OUString sFontName = pPageObject->getFontName();
+
+ printf("TEXT: %s\n", sText.toUtf8().getStr());
+
+ Color aTextColor(COL_TRANSPARENT);
+ bool bFill = false;
+ bool bUse = true;
+
+ switch (pPageObject->getTextRenderMode())
+ {
+ case vcl::pdf::PDFTextRenderMode::Fill:
+ case vcl::pdf::PDFTextRenderMode::FillClip:
+ case vcl::pdf::PDFTextRenderMode::FillStroke:
+ case vcl::pdf::PDFTextRenderMode::FillStrokeClip:
+ bFill = true;
+ break;
+ case vcl::pdf::PDFTextRenderMode::Stroke:
+ case vcl::pdf::PDFTextRenderMode::StrokeClip:
+ case vcl::pdf::PDFTextRenderMode::Unknown:
+ break;
+ case vcl::pdf::PDFTextRenderMode::Invisible:
+ case vcl::pdf::PDFTextRenderMode::Clip:
+ bUse = false;
+ break;
+ }
+
+ if (bUse)
+ {
+ Color aColor = bFill ? pPageObject->getFillColor() :
pPageObject->getStrokeColor();
+ if (aColor != COL_TRANSPARENT)
+ {
+ aTextColor = aColor.GetRGBColor();
+ }
+ }
+}
+
+void PDFImporter::importImage(std::unique_ptr<vcl::pdf::PDFiumPageObject>
const& pPageObject,
+ drawinglayer::primitive2d::Primitive2DContainer&
rRootContainer)
+{
+ std::unique_ptr<vcl::pdf::PDFiumBitmap> pPdfBitmap =
pPageObject->getImageBitmap();
+ if (!pPdfBitmap)
+ {
+ SAL_WARN("filter", "Failed to get IMAGE");
+ return;
+ }
+
+ const vcl::pdf::PDFBitmapType eFormat = pPdfBitmap->getFormat();
+ if (eFormat == vcl::pdf::PDFBitmapType::Unknown)
+ {
+ SAL_WARN("filter", "Failed to get IMAGE format");
+ return;
+ }
+
+ vcl::pdf::PDFImageMetadata aMetadata =
pPageObject->getImageMetadata(*mpPdfPage);
+ printf("METADATA %lu %lu %lu\n", aMetadata.mnWidth, aMetadata.mnHeight,
+ aMetadata.mnBitsPerPixel);
+
+ const sal_uInt8* pBuffer = pPdfBitmap->getBuffer();
+ const int nWidth = pPdfBitmap->getWidth();
+ const int nHeight = pPdfBitmap->getHeight();
+ const int nStride = pPdfBitmap->getStride();
+
+ BitmapEx aBitmap;
+
+ printf("hasTransparency %d\n", pPageObject->hasTransparency());
+
+ switch (eFormat)
+ {
+ case vcl::pdf::PDFBitmapType::BGR:
+ printf("vcl::pdf::PDFBitmapType::BGR\n");
+ aBitmap = vcl::bitmap::CreateFromData(pBuffer, nWidth, nHeight,
nStride,
+ vcl::PixelFormat::N24_BPP);
+ break;
+ case vcl::pdf::PDFBitmapType::BGRx:
+ printf("vcl::pdf::PDFBitmapType::BGRx\n");
+ aBitmap = vcl::bitmap::CreateFromData(pBuffer, nWidth, nHeight,
nStride,
+ vcl::PixelFormat::N32_BPP);
+ break;
+ case vcl::pdf::PDFBitmapType::BGRA:
+ printf("vcl::pdf::PDFBitmapType::BGRA\n");
+ aBitmap = vcl::bitmap::CreateFromData(pBuffer, nWidth, nHeight,
nStride,
+ vcl::PixelFormat::N32_BPP);
+ break;
+ case vcl::pdf::PDFBitmapType::Gray:
+ // TODO
+ default:
+ SAL_WARN("filter", "Got IMAGE width: " << nWidth << ", height: "
<< nHeight
+ << ", stride: " << nStride
+ << ", format: " <<
int(eFormat));
+ break;
+ }
+
+ basegfx::B2DRectangle aBounds = pPageObject->getBounds();
+
+ rRootContainer.push_back(new drawinglayer::primitive2d::BitmapPrimitive2D(
+ VCLUnoHelper::CreateVCLXBitmap(aBitmap),
basegfx::utils::createScaleTranslateB2DHomMatrix(
+ aBounds.getRange(),
aBounds.getMinimum())));
+}
+
+void PDFImporter::importPath(std::unique_ptr<vcl::pdf::PDFiumPageObject>
const& pPageObject,
+ drawinglayer::primitive2d::Primitive2DContainer&
rRootContainer)
+{
+ drawinglayer::primitive2d::Primitive2DContainer aContent;
+
+ basegfx::B2DHomMatrix aPathMatrix = pPageObject->getMatrix();
+
+ basegfx::B2DPolyPolygon aPolyPolygon;
+ basegfx::B2DPolygon aPolygon;
+ std::vector<basegfx::B2DPoint> aBezier;
+
+ const int nSegments = pPageObject->getPathSegmentCount();
+ for (int nSegmentIndex = 0; nSegmentIndex < nSegments; ++nSegmentIndex)
+ {
+ auto pPathSegment = pPageObject->getPathSegment(nSegmentIndex);
+ if (!pPathSegment)
+ continue;
+
+ basegfx::B2DPoint aB2DPoint = pPathSegment->getPoint();
+
+ aPolygon.setClosed(pPathSegment->isClosed());
+
+ const vcl::pdf::PDFSegmentType eSegmentType = pPathSegment->getType();
+ switch (eSegmentType)
+ {
+ case vcl::pdf::PDFSegmentType::Lineto:
+ {
+ aPolygon.append(aB2DPoint);
+ }
+ break;
+
+ case vcl::pdf::PDFSegmentType::Bezierto:
+ {
+ aBezier.emplace_back(aB2DPoint.getX(), aB2DPoint.getY());
+ if (aBezier.size() == 3)
+ {
+ aPolygon.appendBezierSegment(aBezier[0], aBezier[1],
aBezier[2]);
+ aBezier.clear();
+ }
+ }
+ break;
+
+ case vcl::pdf::PDFSegmentType::Moveto:
+ {
+ if (aPolygon.count() > 0)
+ {
+ aPolyPolygon.append(aPolygon);
+ aPolygon.clear();
+ }
+
+ aPolygon.append(aB2DPoint);
+ }
+ break;
+
+ case vcl::pdf::PDFSegmentType::Unknown:
+ default:
+ {
+ SAL_WARN("filter", "Unknown path segment type in PDF: " <<
int(eSegmentType));
+ }
+ break;
+ }
+ }
+
+ if (aBezier.size() == 3)
+ {
+ aPolygon.appendBezierSegment(aBezier[0], aBezier[1], aBezier[2]);
+ aBezier.clear();
+ }
+
+ if (aPolygon.count() > 0)
+ {
+ aPolyPolygon.append(aPolygon, 1);
+ aPolygon.clear();
+ }
+
+ printf("PolyPoly size %d\n", aPolyPolygon.count());
+ for (auto const& rPoly : aPolyPolygon)
+ printf("Poly size %d\n", rPoly.count());
+
+ double fStrokeWidth = pPageObject->getStrokeWidth();
+ printf("Stroke: %f\n", fStrokeWidth);
+
+ vcl::pdf::PDFFillMode nFillMode = vcl::pdf::PDFFillMode::Alternate;
+ bool bStroke = true;
+
+ if (!pPageObject->getDrawMode(nFillMode, bStroke))
+ {
+ SAL_WARN("filter", "Huh...");
+ }
+
+ Color aFillColor = pPageObject->getFillColor();
+ Color aStokeColor = COL_TRANSPARENT;
+
+ if (bStroke)
+ {
+ aStokeColor = pPageObject->getStrokeColor();
+ }
+
+ if (aStokeColor == COL_TRANSPARENT)
+ aStokeColor = aFillColor;
+
+ if (!bStroke)
+ {
+ const drawinglayer::primitive2d::Primitive2DReference
xPolyPolygonColorPrimitive(
+ new
drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(aPolyPolygon,
+
aFillColor.getBColor()));
+ aContent.push_back(xPolyPolygonColorPrimitive);
+ }
+
+ drawinglayer::attribute::LineAttribute
aLineAttribute(aStokeColor.getBColor(), fStrokeWidth);
+ const drawinglayer::primitive2d::Primitive2DReference
xPolyPolygonStrokePrimitive(
+ new
drawinglayer::primitive2d::PolyPolygonStrokePrimitive2D(aPolyPolygon,
aLineAttribute));
+ aContent.push_back(xPolyPolygonStrokePrimitive);
+
+ const drawinglayer::primitive2d::Primitive2DReference xTransform(
+ new drawinglayer::primitive2d::TransformPrimitive2D(aPathMatrix,
aContent));
+ rRootContainer.push_back(xTransform);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/filter/pdfimporter/PDFImporter.hxx
b/include/filter/pdfimporter/PDFImporter.hxx
new file mode 100644
index 000000000000..01cd94d264c9
--- /dev/null
+++ b/include/filter/pdfimporter/PDFImporter.hxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ *
+ */
+
+#pragma once
+
+#include <vcl/filter/PDFiumLibrary.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
+#include <vcl/BinaryDataContainer.hxx>
+
+class PDFImporter
+{
+private:
+ std::shared_ptr<vcl::pdf::PDFium> mpPDFium;
+ std::unique_ptr<vcl::pdf::PDFiumDocument> mpPdfDocument;
+ std::unique_ptr<vcl::pdf::PDFiumPage> mpPdfPage;
+
+ void importPdfObject(std::unique_ptr<vcl::pdf::PDFiumPageObject> const&
pPageObject,
+ std::unique_ptr<vcl::pdf::PDFiumTextPage> const&
pTextPage,
+ int nPageObjectIndex,
+ drawinglayer::primitive2d::Primitive2DContainer&
rRootContainer);
+
+ void importText(std::unique_ptr<vcl::pdf::PDFiumPageObject> const&
pPageObject,
+ std::unique_ptr<vcl::pdf::PDFiumTextPage> const& pTextPage,
+ drawinglayer::primitive2d::Primitive2DContainer&
rRootContainer);
+
+ void importPath(std::unique_ptr<vcl::pdf::PDFiumPageObject> const&
pPageObject,
+ drawinglayer::primitive2d::Primitive2DContainer&
rRootContainer);
+
+ void importImage(std::unique_ptr<vcl::pdf::PDFiumPageObject> const&
pPageObject,
+ drawinglayer::primitive2d::Primitive2DContainer&
rRootContainer);
+
+public:
+ PDFImporter(BinaryDataContainer& rDataContainer);
+
+ bool importPage(int nPageIndex,
drawinglayer::primitive2d::Primitive2DContainer& rContainer);
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3569a2e7e106146fcb535bcf819cddf05ab7fd46
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Tue May 22 14:44:39 2018 +0900
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Mon May 10 21:00:48 2021 +0900
tdf#91874 Command Popup
Change-Id: I92cdd3130b8de42ee0863c9e7154e7c7246d9377
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 4bd6c194ff0e..a3c10ba915fb 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -385,7 +385,7 @@ class SvxSearchItem;
// default-ids for windows
-// free (SID_SFX_START + 610)
+#define SID_COMMAND_POPUP (SID_SFX_START + 610)
#define SID_NEWWINDOW (SID_SFX_START + 620)
#define SID_CLOSEWIN (SID_SFX_START + 621)
#define SID_VIEWSHELL (SID_SFX_START + 623)
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index d3d77d8c818c..313a06b25a6a 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -313,6 +313,12 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some
emoji thing
<value xml:lang="en-US"
install:module="unxwnt">.uno:OptionsTreeDialog</value>
</prop>
</node>
+ <node oor:name="F1_MOD1" oor:op="replace">
+ <prop oor:name="Command">
+ <value xml:lang="x-no-translate">I10N SHORTCUTS - NO
TRANSLATE</value>
+ <value xml:lang="en-US">.uno:CommandPopup</value>
+ </prop>
+ </node>
</node>
<node oor:name="Modules">
<node oor:name="com.sun.star.script.BasicIDE" oor:op="replace">
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 95283860318e..b54acd108f4f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6529,6 +6529,14 @@ bit 3 (0x8): #define
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:CommandPopup" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Search Commands</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
<node oor:name=".uno:DevelopmentToolsDockingWindow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Development Tools</value>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml
b/sc/uiconfig/scalc/menubar/menubar.xml
index 17916a541c63..eeb746de8432 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -766,6 +766,7 @@
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
+ <menu:menuitem menu:id=".uno:CommandPopup"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml
b/sd/uiconfig/sdraw/menubar/menubar.xml
index 082e9e277929..544155d33f04 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -643,6 +643,7 @@
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
+ <menu:menuitem menu:id=".uno:CommandPopup"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml
b/sd/uiconfig/simpress/menubar/menubar.xml
index a6efad8be128..fc64d6050e6e 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -674,6 +674,7 @@
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
+ <menu:menuitem menu:id=".uno:CommandPopup"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index f2fe7c708da7..cab55c2a3335 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -130,6 +130,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/bastyp/progress \
sfx2/source/bastyp/sfxhtml \
sfx2/source/bastyp/sfxresid \
+ sfx2/source/commandpopup/CommandPopup \
sfx2/source/config/evntconf \
sfx2/source/control/asyncfunc \
sfx2/source/control/bindings \
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index a9eacafe4c7b..0ba3a5700a7c 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/classificationbox \
sfx2/uiconfig/ui/cmisinfopage \
sfx2/uiconfig/ui/cmisline \
+ sfx2/uiconfig/ui/commandpopup \
sfx2/uiconfig/ui/custominfopage \
sfx2/uiconfig/ui/deck \
sfx2/uiconfig/ui/descriptioninfopage \
diff --git a/sfx2/inc/commandpopup/CommandPopup.hxx
b/sfx2/inc/commandpopup/CommandPopup.hxx
new file mode 100644
index 000000000000..302a04fa410f
--- /dev/null
+++ b/sfx2/inc/commandpopup/CommandPopup.hxx
@@ -0,0 +1,104 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#pragma once
+
+#include <vcl/layout.hxx>
+
+#include <sfx2/dllapi.h>
+#include <sfx2/viewfrm.hxx>
+
+#include <vcl/weld.hxx>
+#include <vcl/window.hxx>
+
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+
+struct CurrentEntry final
+{
+ OUString m_aCommandURL;
+ OUString m_aTooltip;
+
+ CurrentEntry(OUString const& rCommandURL, OUString const& rTooltip)
+ : m_aCommandURL(rCommandURL)
+ , m_aTooltip(rTooltip)
+ {
+ }
+};
+
+struct MenuContent final
+{
+ OUString m_aCommandURL;
+ OUString m_aMenuLabel;
+ OUString m_aFullLabelWithPath;
+ OUString m_aTooltip;
+ std::vector<MenuContent> m_aSubMenuContent;
+};
+
+class MenuContentHandler final
+{
+private:
+ css::uno::Reference<css::frame::XFrame> m_xFrame;
+ MenuContent m_aMenuContent;
+ OUString m_sModuleLongName;
+
+public:
+ MenuContentHandler(css::uno::Reference<css::frame::XFrame> const& xFrame);
+
+ void gatherMenuContent(css::uno::Reference<css::container::XIndexAccess>
const& xIndexAccess,
+ MenuContent& rMenuContent);
+
+ void findInMenu(OUString const& rText, std::unique_ptr<weld::TreeView>&
rpCommandTreeView,
+ std::vector<CurrentEntry>& rCommandList);
+
+private:
+ void findInMenuRecursive(MenuContent const& rMenuContent, OUString const&
rText,
+ std::unique_ptr<weld::TreeView>&
rpCommandTreeView,
+ std::vector<CurrentEntry>& rCommandList);
+};
+
+class SFX2_DLLPUBLIC CommandListBox final
+{
+private:
+ std::unique_ptr<weld::Builder> mxBuilder;
+ std::unique_ptr<weld::Popover> mxPopover;
+ std::unique_ptr<weld::Entry> mpEntry;
+ std::unique_ptr<weld::TreeView> mpCommandTreeView;
+
+ std::vector<CurrentEntry> maCommandList;
+ OUString m_PreviousText;
+ std::unique_ptr<MenuContentHandler> mpMenuContentHandler;
+
+ DECL_LINK(QueryTooltip, const weld::TreeIter&, OUString);
+ DECL_LINK(RowActivated, weld::TreeView&, bool);
+ DECL_LINK(ModifyHdl, weld::Entry&, void);
+ DECL_LINK(SelectionChanged, weld::TreeView&, void);
+ DECL_LINK(TreeViewKeyPress, const KeyEvent&, bool);
+
+ void dispatchCommandAndClose(OUString const& rCommand);
+
+public:
+ CommandListBox(weld::Window* pParent,
css::uno::Reference<css::frame::XFrame> const& xFrame);
+ void connect_closed(const Link<weld::Popover&, void>& rLink)
+ {
+ mxPopover->connect_closed(rLink);
+ }
+};
+
+class SFX2_DLLPUBLIC CommandPopupHandler
+{
+private:
+ std::unique_ptr<CommandListBox> mpListBox;
+
+public:
+ void showPopup(weld::Window* pParent,
css::uno::Reference<css::frame::XFrame> const& xFrame);
+ DECL_LINK(PopupModeEnd, weld::Popover&, void);
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index 09aafef95b7d..a7c8a472e73d 100644
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
@@ -262,6 +262,11 @@ interface TopWindow : BrowseWindow
ExecMethod = MiscExec_Impl ;
StateMethod = MiscState_Impl ;
]
+ SID_COMMAND_POPUP
+ [
+ ExecMethod = MiscExec_Impl ;
+ StateMethod = MiscState_Impl ;
+ ]
SID_CLOSEWIN // ole(no) api(final/play/rec)
[
ExecMethod = Exec_Impl ;
@@ -307,4 +312,3 @@ shell SfxViewFrame
StateMethod = GetState_Impl ;
]
}
-
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 43dc58e317bf..92e5a77ee299 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -1271,6 +1271,23 @@ SfxStringItem FullName SID_DOCFULLNAME
GroupId = ;
]
+SfxVoidItem CommandPopup SID_COMMAND_POPUP
+[
+ AutoUpdate = TRUE,
+ FastCall = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = TRUE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Asynchron;
+
+
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ ToolBoxConfig = TRUE,
+ GroupId = SfxGroupId::View;
+]
SfxBoolItem FullScreen SID_WIN_FULLSCREEN
diff --git a/sfx2/source/commandpopup/CommandPopup.cxx
b/sfx2/source/commandpopup/CommandPopup.cxx
new file mode 100644
index 000000000000..25eaa0c62f1b
--- /dev/null
+++ b/sfx2/source/commandpopup/CommandPopup.cxx
@@ -0,0 +1,257 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#include <commandpopup/CommandPopup.hxx>
+
+#include <workwin.hxx>
+
+#include <sfx2/msgpool.hxx>
+#include <sfx2/bindings.hxx>
+
+#include <comphelper/processfactory.hxx>
+#include <comphelper/dispatchcommand.hxx>
+
+#include <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/frame/theUICommandDescription.hpp>
+#include <com/sun/star/ui/theUICategoryDescription.hpp>
+#include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/util/URL.hpp>
+#include <com/sun/star/util/URLTransformer.hpp>
+
+#include <vcl/commandinfoprovider.hxx>
+
+using namespace css;
+
+MenuContentHandler::MenuContentHandler(uno::Reference<frame::XFrame> const&
xFrame)
+ : m_xFrame(xFrame)
+ , m_sModuleLongName(vcl::CommandInfoProvider::GetModuleIdentifier(xFrame))
+{
+ auto xComponentContext = comphelper::getProcessComponentContext();
+
+ uno::Reference<ui::XModuleUIConfigurationManagerSupplier>
xModuleConfigSupplier;
+
xModuleConfigSupplier.set(ui::theModuleUIConfigurationManagerSupplier::get(xComponentContext));
+
+ uno::Reference<ui::XUIConfigurationManager> xConfigurationManager;
+ xConfigurationManager =
xModuleConfigSupplier->getUIConfigurationManager(m_sModuleLongName);
+
+ uno::Reference<container::XIndexAccess> xConfigData;
+ xConfigData =
xConfigurationManager->getSettings("private:resource/menubar/menubar", false);
+
+ gatherMenuContent(xConfigData, m_aMenuContent);
+}
+
+void MenuContentHandler::gatherMenuContent(
+ uno::Reference<container::XIndexAccess> const& xIndexAccess, MenuContent&
rMenuContent)
+{
+ for (sal_Int32 n = 0; n < xIndexAccess->getCount(); n++)
+ {
+ MenuContent aNewContent;
+ uno::Sequence<beans::PropertyValue> aProperties;
+ uno::Reference<container::XIndexAccess> xIndexContainer;
+
+ if (!(xIndexAccess->getByIndex(n) >>= aProperties))
+ continue;
+
+ bool bIsVisible = true;
+ bool bIsEnabled = true;
+
+ for (auto const& rProperty : aProperties)
+ {
+ OUString aPropertyName = rProperty.Name;
+ if (aPropertyName == "CommandURL")
+ rProperty.Value >>= aNewContent.m_aCommandURL;
+ else if (aPropertyName == "ItemDescriptorContainer")
+ rProperty.Value >>= xIndexContainer;
+ else if (aPropertyName == "IsVisible")
+ rProperty.Value >>= bIsVisible;
+ else if (aPropertyName == "Enabled")
+ rProperty.Value >>= bIsEnabled;
+ }
+
+ if (!bIsEnabled || !bIsVisible)
+ continue;
+
+ auto aCommandProperties =
vcl::CommandInfoProvider::GetCommandProperties(
+ aNewContent.m_aCommandURL, m_sModuleLongName);
+ OUString aLabel =
vcl::CommandInfoProvider::GetLabelForCommand(aCommandProperties);
+ aNewContent.m_aMenuLabel = aLabel;
+
+ if (!rMenuContent.m_aFullLabelWithPath.isEmpty())
+ aNewContent.m_aFullLabelWithPath =
rMenuContent.m_aFullLabelWithPath + " / ";
+ aNewContent.m_aFullLabelWithPath += aNewContent.m_aMenuLabel;
+
+ aNewContent.m_aTooltip =
vcl::CommandInfoProvider::GetTooltipForCommand(
+ aNewContent.m_aCommandURL, aCommandProperties, m_xFrame);
+
+ if (xIndexContainer.is())
+ gatherMenuContent(xIndexContainer, aNewContent);
+
+ rMenuContent.m_aSubMenuContent.push_back(aNewContent);
+ }
+}
+
+void MenuContentHandler::findInMenu(OUString const& rText,
+ std::unique_ptr<weld::TreeView>&
rpCommandTreeView,
+ std::vector<CurrentEntry>& rCommandList)
+{
+ findInMenuRecursive(m_aMenuContent, rText, rpCommandTreeView,
rCommandList);
+}
+
+void MenuContentHandler::findInMenuRecursive(MenuContent const& rMenuContent,
OUString const& rText,
+ std::unique_ptr<weld::TreeView>&
rpCommandTreeView,
+ std::vector<CurrentEntry>&
rCommandList)
+{
+ for (MenuContent const& aSubContent : rMenuContent.m_aSubMenuContent)
+ {
+ if (aSubContent.m_aMenuLabel.toAsciiLowerCase().startsWith(rText))
+ {
+ OUString sCommandURL = aSubContent.m_aCommandURL;
+ util::URL aCommandURL;
+ aCommandURL.Complete = sCommandURL;
+ uno::Reference<uno::XComponentContext> xContext
+ = comphelper::getProcessComponentContext();
+ uno::Reference<util::XURLTransformer> xParser =
util::URLTransformer::create(xContext);
+ xParser->parseStrict(aCommandURL);
+
+ auto* pViewFrame = SfxViewFrame::Current();
+
+ SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool(pViewFrame);
+ const SfxSlot* pSlot = rSlotPool.GetUnoSlot(aCommandURL.Path);
+ if (pSlot)
+ {
+ std::unique_ptr<SfxPoolItem> pState;
+ SfxItemState eState
+ = pViewFrame->GetBindings().QueryState(pSlot->GetSlotId(),
pState);
+
+ if (eState != SfxItemState::DISABLED)
+ {
+ auto xGraphic
+ =
vcl::CommandInfoProvider::GetXGraphicForCommand(sCommandURL, m_xFrame);
+ rCommandList.emplace_back(sCommandURL,
aSubContent.m_aTooltip);
+
+ auto pIter = rpCommandTreeView->make_iterator();
+ rpCommandTreeView->insert(nullptr, -1,
&aSubContent.m_aFullLabelWithPath,
+ nullptr, nullptr, nullptr,
false, pIter.get());
+ rpCommandTreeView->set_image(*pIter, xGraphic);
+ }
+ }
+ }
+ findInMenuRecursive(aSubContent, rText, rpCommandTreeView,
rCommandList);
+ }
+}
+
+CommandListBox::CommandListBox(weld::Window* pParent,
uno::Reference<frame::XFrame> const& xFrame)
+ : mxBuilder(Application::CreateBuilder(pParent, "sfx/ui/commandpopup.ui"))
+ , mxPopover(mxBuilder->weld_popover("CommandPopup"))
+ , mpEntry(mxBuilder->weld_entry("command_entry"))
+ , mpCommandTreeView(mxBuilder->weld_tree_view("command_treeview"))
+ , mpMenuContentHandler(std::make_unique<MenuContentHandler>(xFrame))
+{
+ mpEntry->connect_changed(LINK(this, CommandListBox, ModifyHdl));
+ mpEntry->connect_key_press(LINK(this, CommandListBox, TreeViewKeyPress));
+ mpCommandTreeView->connect_query_tooltip(LINK(this, CommandListBox,
QueryTooltip));
+ mpCommandTreeView->connect_row_activated(LINK(this, CommandListBox,
RowActivated));
+
+ Size aFrameSize = pParent->get_size();
+
+ // Set size of the pop-over window
+ tools::Long nWidth = std::max(tools::Long(400), aFrameSize.Width() / 3);
+ mpCommandTreeView->set_size_request(nWidth, 400);
+
+ // Set the location of the pop-over window
+ tools::Rectangle aRect(Point(aFrameSize.Width() / 2, 0), Size(0, 0));
+ mxPopover->popup_at_rect(pParent, aRect);
+ mpEntry->grab_focus();
+}
+
+IMPL_LINK_NOARG(CommandListBox, QueryTooltip, const weld::TreeIter&, OUString)
+{
+ size_t nSelected = mpCommandTreeView->get_selected_index();
+ if (nSelected < maCommandList.size())
+ {
+ auto const& rCurrent = maCommandList[nSelected];
+ return rCurrent.m_aTooltip;
+ }
+ return OUString();
+}
+
+IMPL_LINK_NOARG(CommandListBox, RowActivated, weld::TreeView&, bool)
+{
+ OUString aCommandURL;
+ int nSelected = mpCommandTreeView->get_selected_index();
+ if (nSelected < int(maCommandList.size()))
+ {
+ auto const& rCurrent = maCommandList[nSelected];
+ aCommandURL = rCurrent.m_aCommandURL;
+ }
+ dispatchCommandAndClose(aCommandURL);
+ return true;
+}
+
+IMPL_LINK(CommandListBox, TreeViewKeyPress, const KeyEvent&, rKeyEvent, bool)
+{
+ if (rKeyEvent.GetKeyCode().GetCode() == KEY_DOWN ||
rKeyEvent.GetKeyCode().GetCode() == KEY_UP)
+ {
+ int nDirection = rKeyEvent.GetKeyCode().GetCode() == KEY_DOWN ? 1 : -1;
+ int nNewIndex = mpCommandTreeView->get_selected_index() + nDirection;
+ nNewIndex = std::clamp(nNewIndex, 0, mpCommandTreeView->n_children());
+ mpCommandTreeView->select(nNewIndex);
+ mpCommandTreeView->set_cursor(nNewIndex);
+ return true;
+ }
+ else if (rKeyEvent.GetKeyCode().GetCode() == KEY_RETURN)
+ {
+ RowActivated(*mpCommandTreeView);
+ }
+
+ return false;
+}
+
+IMPL_LINK_NOARG(CommandListBox, ModifyHdl, weld::Entry&, void)
+{
+ mpCommandTreeView->clear();
+ maCommandList.clear();
+
+ OUString sText = mpEntry->get_text();
+ if (sText.isEmpty())
+ return;
+
+ mpCommandTreeView->freeze();
+ mpMenuContentHandler->findInMenu(sText.toAsciiLowerCase(),
mpCommandTreeView, maCommandList);
+ mpCommandTreeView->thaw();
+
+ if (mpCommandTreeView->n_children() > 0)
+ {
+ mpCommandTreeView->set_cursor(0);
+ mpCommandTreeView->select(0);
+ }
+
+ mpEntry->grab_focus();
+}
+
+void CommandListBox::dispatchCommandAndClose(OUString const& rCommand)
+{
+ mxPopover->popdown();
+
+ if (!rCommand.isEmpty())
+ comphelper::dispatchCommand(rCommand,
uno::Sequence<beans::PropertyValue>());
+}
+
+void CommandPopupHandler::showPopup(weld::Window* pParent,
+ css::uno::Reference<css::frame::XFrame>
const& xFrame)
+{
+ mpListBox.reset(new CommandListBox(pParent, xFrame));
+ mpListBox->connect_closed(LINK(this, CommandPopupHandler, PopupModeEnd));
+}
+
+IMPL_LINK_NOARG(CommandPopupHandler, PopupModeEnd, weld::Popover&, void) {
mpListBox.reset(); }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 09c54757986d..542ec9f78fa3 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -25,6 +25,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/classificationhelper.hxx>
#include <sfx2/notebookbar/SfxNotebookBar.hxx>
+#include <svx/svdview.hxx>
#include <com/sun/star/document/MacroExecMode.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/DispatchRecorder.hpp>
@@ -45,6 +46,7 @@
#include <svl/undo.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/weld.hxx>
+#include <vcl/weldutils.hxx>
#include <svtools/miscopt.hxx>
#include <tools/diagnose_ex.h>
#include <com/sun/star/container/XIndexAccess.hpp>
@@ -90,6 +92,7 @@
#include <unotools/configmgr.hxx>
#include <comphelper/sequenceashashmap.hxx>
+#include <commandpopup/CommandPopup.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -2971,8 +2974,18 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
rReq.Done();
break;
}
+ case SID_COMMAND_POPUP:
+ {
+ static CommandPopupHandler spCommandPopupHandler;
+
+ tools::Rectangle aRectangle(Point(0,0),
GetWindow().GetSizePixel());
+ weld::Window* pParent = weld::GetPopupParent(GetWindow(),
aRectangle);
+ css::uno::Reference<css::frame::XFrame>
xFrame(GetFrame().GetFrameInterface(), css::uno::UNO_QUERY);
+ spCommandPopupHandler.showPopup(pParent, xFrame);
- // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ rReq.Done();
+ break;
+ }
case SID_WIN_FULLSCREEN:
{
const SfxBoolItem* pItem =
rReq.GetArg<SfxBoolItem>(rReq.GetSlot());
diff --git a/sfx2/uiconfig/ui/commandpopup.ui b/sfx2/uiconfig/ui/commandpopup.ui
new file mode 100644
index 000000000000..b329d64c6f1e
--- /dev/null
+++ b/sfx2/uiconfig/ui/commandpopup.ui
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.38.2 -->
+<interface domain="sfx">
+ <requires lib="gtk+" version="3.18"/>
+ <object class="GtkTreeStore" id="liststore1">
+ <columns>
+ <!-- column-name icon -->
+ <column type="GdkPixbuf"/>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name tooltip -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkPopover" id="CommandPopup">
+ <property name="can-focus">False</property>
+ <property name="position">bottom</property>
+ <child>
+ <object class="GtkBox" id="container">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border-width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkEntry" id="command_entry">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="caps-lock-warning">False</property>
+ <property name="placeholder-text" translatable="yes"
context="commandpopup|entry">Search command</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="shadow-type">in</property>
+ <child>
+ <object class="GtkTreeView" id="command_treeview">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="model">liststore1</property>
+ <property name="headers-visible">False</property>
+ <property name="headers-clickable">False</property>
+ <property name="enable-search">False</property>
+ <property name="search-column">0</property>
+ <property name="hover-selection">True</property>
+ <property name="show-expanders">False</property>
+ <property name="tooltip-column">2</property>
+ <property name="activate-on-single-click">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="column">
+ <property name="sizing">fixed</property>
+ <child>
+ <object class="GtkCellRendererPixbuf"
id="cellrenderericon"/>
+ <attributes>
+ <attribute name="pixbuf">0</attribute>
+ </attributes>
+ </child>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderertext"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+</interface>
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml
b/sw/uiconfig/sglobal/menubar/menubar.xml
index 9c8f61f03d28..b8dafe715afe 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -787,6 +787,7 @@
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
+ <menu:menuitem menu:id=".uno:CommandPopup"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml
b/sw/uiconfig/sweb/menubar/menubar.xml
index 46c1a22f32fc..b8d6bc1b711a 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -653,6 +653,7 @@
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
+ <menu:menuitem menu:id=".uno:CommandPopup"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml
b/sw/uiconfig/swform/menubar/menubar.xml
index 0e64a2315124..652ea24bfbb4 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -734,6 +734,7 @@
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
+ <menu:menuitem menu:id=".uno:CommandPopup"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml
b/sw/uiconfig/swriter/menubar/menubar.xml
index afc744f1b415..e71db98f06f7 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -807,6 +807,7 @@
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
+ <menu:menuitem menu:id=".uno:CommandPopup"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml
b/sw/uiconfig/swxform/menubar/menubar.xml
index 7fb669089632..e70d8b7e60de 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -781,6 +781,7 @@
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuitem menu:id=".uno:Documentation"/>
<menu:menuitem menu:id=".uno:TipOfTheDay"/>
+ <menu:menuitem menu:id=".uno:CommandPopup"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:QuestionAnswers"/>
<menu:menuitem menu:id=".uno:SendFeedback"/>
commit 3fdcdeddc7690f4a4fce21f7e648da1dfc0a68bf
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Thu Mar 18 15:59:20 2021 +0900
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Mon May 10 21:00:47 2021 +0900
vcl: bring back RGB565 scanline transformer
While we don't support this as a Bitmap format anymore, we still
need to transform a buffer that is in RGB565 format in some cases.
For example backwards compatibility or if a certain bitmap format
supports such pixel format.
This change also simplifies some scanline transformers by removing
code duplication.
Change-Id: I64aa258b8b1fbebf0ed174c0d5fdd2f75f382b28
diff --git a/vcl/inc/bitmap/ScanlineTools.hxx b/vcl/inc/bitmap/ScanlineTools.hxx
index c343cf34f61e..dc305937b5fd 100644
--- a/vcl/inc/bitmap/ScanlineTools.hxx
+++ b/vcl/inc/bitmap/ScanlineTools.hxx
@@ -16,7 +16,7 @@
namespace vcl::bitmap
{
-class ScanlineTransformer
+class IScanlineTransformer
{
public:
virtual void startLine(sal_uInt8* pLine) = 0;
@@ -24,127 +24,162 @@ public:
virtual Color readPixel() = 0;
virtual void writePixel(Color nColor) = 0;
- virtual ~ScanlineTransformer() = default;
+ virtual ~IScanlineTransformer() = default;
};
-class ScanlineTransformer_ARGB final : public ScanlineTransformer
+class ScanlineTransformer_RGB565 final : public IScanlineTransformer
{
-private:
- sal_uInt8* pData;
+protected:
+ sal_uInt16* mpData;
public:
- virtual void startLine(sal_uInt8* pLine) override { pData = pLine; }
+ void startLine(sal_uInt8* pLine) override { mpData =
reinterpret_cast<sal_uInt16*>(pLine); }
- virtual void skipPixel(sal_uInt32 nPixel) override { pData += nPixel << 2;
}
+ void skipPixel(sal_uInt32 nPixel) override { mpData += nPixel; }
- virtual Color readPixel() override
+ Color readPixel() override
{
- const Color aColor(ColorTransparency, pData[4], pData[1], pData[2],
pData[3]);
- pData += 4;
- return aColor;
+ sal_uInt8 R = sal_uInt8((*mpData & 0xf800) >> 8);
+ sal_uInt8 G = sal_uInt8((*mpData & 0x07e0) >> 3);
+ sal_uInt8 B = sal_uInt8((*mpData & 0x001f) << 3);
+ mpData++;
+ return Color(R, G, B);
}
- virtual void writePixel(Color nColor) override
+ void writePixel(Color nColor) override
{
- *pData++ = 255 - nColor.GetAlpha();
- *pData++ = nColor.GetRed();
- *pData++ = nColor.GetGreen();
- *pData++ = nColor.GetBlue();
+ sal_uInt16 R = (nColor.GetRed() & 0xf8) << 8;
+ sal_uInt16 G = (nColor.GetGreen() & 0xfc) << 3;
+ sal_uInt16 B = (nColor.GetBlue() & 0xf8) >> 3;
+ *mpData++ = R | G | B;
}
};
-class ScanlineTransformer_BGR final : public ScanlineTransformer
+class ScanlineTransformerBase : public IScanlineTransformer
{
-private:
- sal_uInt8* pData;
+protected:
+ sal_uInt8* mpData;
public:
- virtual void startLine(sal_uInt8* pLine) override { pData = pLine; }
+ ScanlineTransformerBase()
+ : mpData(nullptr)
+ {
+ }
+
+ void startLine(sal_uInt8* pLine) override { mpData = pLine; }
+};
- virtual void skipPixel(sal_uInt32 nPixel) override { pData += (nPixel <<
1) + nPixel; }
+class ScanlineTransformer_ARGB final : public ScanlineTransformerBase
+{
+public:
+ void skipPixel(sal_uInt32 nPixel) override { mpData += nPixel << 2; }
- virtual Color readPixel() override
+ Color readPixel() override
{
- const Color aColor(pData[2], pData[1], pData[0]);
- pData += 3;
+ const Color aColor(ColorTransparency, mpData[4], mpData[1], mpData[2],
mpData[3]);
+ mpData += 4;
return aColor;
}
- virtual void writePixel(Color nColor) override
+ void writePixel(Color nColor) override
{
- *pData++ = nColor.GetBlue();
- *pData++ = nColor.GetGreen();
- *pData++ = nColor.GetRed();
+ *mpData++ = 255 - nColor.GetAlpha();
+ *mpData++ = nColor.GetRed();
+ *mpData++ = nColor.GetGreen();
+ *mpData++ = nColor.GetBlue();
}
};
-class ScanlineTransformer_8BitPalette final : public ScanlineTransformer
+class ScanlineTransformer_BGR final : public ScanlineTransformerBase
{
-private:
- sal_uInt8* pData;
+public:
+ void skipPixel(sal_uInt32 nPixel) override { mpData += (nPixel << 1) +
nPixel; }
+
+ Color readPixel() override
+ {
+ const Color aColor(mpData[2], mpData[1], mpData[0]);
+ mpData += 3;
+ return aColor;
+ }
+
+ void writePixel(Color nColor) override
+ {
+ *mpData++ = nColor.GetBlue();
+ *mpData++ = nColor.GetGreen();
+ *mpData++ = nColor.GetRed();
+ }
+};
+
+class ScanlineTransformerPaletteBase : public ScanlineTransformerBase
+{
+protected:
const BitmapPalette& mrPalette;
public:
- explicit ScanlineTransformer_8BitPalette(const BitmapPalette& rPalette)
- : pData(nullptr)
+ ScanlineTransformerPaletteBase(const BitmapPalette& rPalette)
+ : ScanlineTransformerBase()
, mrPalette(rPalette)
{
}
+};
- virtual void startLine(sal_uInt8* pLine) override { pData = pLine; }
+class ScanlineTransformer_8BitPalette final : public
ScanlineTransformerPaletteBase
+{
+public:
+ explicit ScanlineTransformer_8BitPalette(const BitmapPalette& rPalette)
+ : ScanlineTransformerPaletteBase(rPalette)
+ {
+ }
- virtual void skipPixel(sal_uInt32 nPixel) override { pData += nPixel; }
+ void skipPixel(sal_uInt32 nPixel) override { mpData += nPixel; }
- virtual Color readPixel() override
+ Color readPixel() override
{
- const sal_uInt8 nIndex(*pData++);
+ const sal_uInt8 nIndex(*mpData++);
if (nIndex < mrPalette.GetEntryCount())
return mrPalette[nIndex];
else
return COL_BLACK;
}
- virtual void writePixel(Color nColor) override
+ void writePixel(Color nColor) override
{
- *pData++ = static_cast<sal_uInt8>(mrPalette.GetBestIndex(nColor));
+ *mpData++ = static_cast<sal_uInt8>(mrPalette.GetBestIndex(nColor));
}
};
-class ScanlineTransformer_4BitPalette final : public ScanlineTransformer
+class ScanlineTransformer_4BitPalette final : public
ScanlineTransformerPaletteBase
{
private:
- sal_uInt8* pData;
- const BitmapPalette& mrPalette;
sal_uInt32 mnX;
sal_uInt32 mnShift;
public:
explicit ScanlineTransformer_4BitPalette(const BitmapPalette& rPalette)
- : pData(nullptr)
- , mrPalette(rPalette)
+ : ScanlineTransformerPaletteBase(rPalette)
, mnX(0)
, mnShift(0)
{
}
- virtual void skipPixel(sal_uInt32 nPixel) override
+ void skipPixel(sal_uInt32 nPixel) override
{
mnX += nPixel;
if (nPixel & 1) // is nPixel an odd number
mnShift ^= 4;
}
- virtual void startLine(sal_uInt8* pLine) override
+ void startLine(sal_uInt8* pLine) override
{
- pData = pLine;
+ ScanlineTransformerBase::startLine(pLine);
mnX = 0;
mnShift = 4;
}
- virtual Color readPixel() override
+ Color readPixel() override
{
const sal_uInt32 nDataIndex = mnX / 2;
- const sal_uInt8 nIndex((pData[nDataIndex] >> mnShift) & 0x0f);
+ const sal_uInt8 nIndex((mpData[nDataIndex] >> mnShift) & 0x0f);
mnX++;
mnShift ^= 4;
@@ -154,42 +189,39 @@ public:
return COL_BLACK;
}
- virtual void writePixel(Color nColor) override
+ void writePixel(Color nColor) override
{
const sal_uInt32 nDataIndex = mnX / 2;
const sal_uInt8 nColorIndex = mrPalette.GetBestIndex(nColor);
- pData[nDataIndex] |= (nColorIndex & 0x0f) << mnShift;
+ mpData[nDataIndex] |= (nColorIndex & 0x0f) << mnShift;
mnX++;
mnShift ^= 4;
}
};
-class ScanlineTransformer_1BitPalette final : public ScanlineTransformer
+class ScanlineTransformer_1BitPalette final : public
ScanlineTransformerPaletteBase
{
private:
- sal_uInt8* pData;
- const BitmapPalette& mrPalette;
sal_uInt32 mnX;
public:
explicit ScanlineTransformer_1BitPalette(const BitmapPalette& rPalette)
- : pData(nullptr)
- , mrPalette(rPalette)
+ : ScanlineTransformerPaletteBase(rPalette)
, mnX(0)
{
}
- virtual void skipPixel(sal_uInt32 nPixel) override { mnX += nPixel; }
+ void skipPixel(sal_uInt32 nPixel) override { mnX += nPixel; }
- virtual void startLine(sal_uInt8* pLine) override
+ void startLine(sal_uInt8* pLine) override
{
- pData = pLine;
+ ScanlineTransformerBase::startLine(pLine);
mnX = 0;
}
- virtual Color readPixel() override
+ Color readPixel() override
{
- const sal_uInt8 nIndex((pData[mnX >> 3] >> (7 - (mnX & 7))) & 1);
+ const sal_uInt8 nIndex((mpData[mnX >> 3] >> (7 - (mnX & 7))) & 1);
mnX++;
if (nIndex < mrPalette.GetEntryCount())
@@ -198,18 +230,18 @@ public:
return COL_BLACK;
}
- virtual void writePixel(Color nColor) override
+ void writePixel(Color nColor) override
{
if (mrPalette.GetBestIndex(nColor) & 1)
- pData[mnX >> 3] |= 1 << (7 - (mnX & 7));
+ mpData[mnX >> 3] |= 1 << (7 - (mnX & 7));
else
- pData[mnX >> 3] &= ~(1 << (7 - (mnX & 7)));
+ mpData[mnX >> 3] &= ~(1 << (7 - (mnX & 7)));
mnX++;
}
};
-std::unique_ptr<ScanlineTransformer> getScanlineTransformer(sal_uInt16 nBits,
- const
BitmapPalette& rPalette)
+std::unique_ptr<IScanlineTransformer> getScanlineTransformer(sal_uInt16 nBits,
+ const
BitmapPalette& rPalette)
{
switch (nBits)
{
@@ -219,6 +251,8 @@ std::unique_ptr<ScanlineTransformer>
getScanlineTransformer(sal_uInt16 nBits,
return std::make_unique<ScanlineTransformer_4BitPalette>(rPalette);
case 8:
return std::make_unique<ScanlineTransformer_8BitPalette>(rPalette);
+ case 16:
+ return std::make_unique<ScanlineTransformer_RGB565>();
case 24:
return std::make_unique<ScanlineTransformer_BGR>();
case 32:
diff --git a/vcl/qa/cppunit/ScanlineToolsTest.cxx
b/vcl/qa/cppunit/ScanlineToolsTest.cxx
index c6751b827ca1..6f497b2b8295 100644
--- a/vcl/qa/cppunit/ScanlineToolsTest.cxx
+++ b/vcl/qa/cppunit/ScanlineToolsTest.cxx
@@ -19,6 +19,7 @@ class ScanlineToolsTest : public CppUnit::TestFixture
{
void ScanlineTransformer_32_ARGB();
void ScanlineTransformer_24_BGR();
+ void ScanlineTransformer_16_RGB565();
void ScanlineTransformer_8bit_Palette();
void ScanlineTransformer_4bit_Palette();
void ScanlineTransformer_1bit_Palette();
@@ -26,6 +27,7 @@ class ScanlineToolsTest : public CppUnit::TestFixture
CPPUNIT_TEST_SUITE(ScanlineToolsTest);
CPPUNIT_TEST(ScanlineTransformer_32_ARGB);
CPPUNIT_TEST(ScanlineTransformer_24_BGR);
+ CPPUNIT_TEST(ScanlineTransformer_16_RGB565);
CPPUNIT_TEST(ScanlineTransformer_8bit_Palette);
CPPUNIT_TEST(ScanlineTransformer_4bit_Palette);
CPPUNIT_TEST(ScanlineTransformer_1bit_Palette);
@@ -35,8 +37,7 @@ class ScanlineToolsTest : public CppUnit::TestFixture
void ScanlineToolsTest::ScanlineTransformer_32_ARGB()
{
BitmapPalette aPalette;
- std::unique_ptr<vcl::bitmap::ScanlineTransformer> pScanlineTransformer
- = vcl::bitmap::getScanlineTransformer(32, aPalette);
+ auto pScanlineTransformer = vcl::bitmap::getScanlineTransformer(32,
aPalette);
std::vector<sal_uInt8> aScanLine(5 * 4, 0); // 5 * 4 BytesPerPixel
pScanlineTransformer->startLine(aScanLine.data());
@@ -64,8 +65,7 @@ void ScanlineToolsTest::ScanlineTransformer_32_ARGB()
void ScanlineToolsTest::ScanlineTransformer_24_BGR()
{
BitmapPalette aPalette;
- std::unique_ptr<vcl::bitmap::ScanlineTransformer> pScanlineTransformer
- = vcl::bitmap::getScanlineTransformer(24, aPalette);
+ auto pScanlineTransformer = vcl::bitmap::getScanlineTransformer(24,
aPalette);
std::vector<sal_uInt8> aScanLine(5 * 3, 0); // 5 * 3 BytesPerPixel
pScanlineTransformer->startLine(aScanLine.data());
@@ -90,6 +90,51 @@ void ScanlineToolsTest::ScanlineTransformer_24_BGR()
}
}
+void ScanlineToolsTest::ScanlineTransformer_16_RGB565()
+{
+ BitmapPalette aPalette;
+ auto pScanlineTransformer = vcl::bitmap::getScanlineTransformer(16,
aPalette);
+
+ // Test writing - we apply colors which will be written into the scanline
+ // in the R5G6B5 format
+ std::vector<sal_uInt8> aScanLine(5 * 2, 0); // 5 * 2 BytesPerPixel
+ pScanlineTransformer->startLine(aScanLine.data());
+
+ std::vector<Color> aColors{
+ Color(ColorTransparency, 0, 10, 250, 120), Color(ColorTransparency,
50, 30, 230, 110),
+ Color(ColorTransparency, 100, 50, 210, 100), Color(ColorTransparency,
150, 70, 190, 90),
+ Color(ColorTransparency, 200, 90, 170, 80),
+ };
+
+ for (Color const& aColor : aColors)
+ {
+ pScanlineTransformer->writePixel(aColor);
+ }
+
+ std::vector<sal_uInt8> aExpectedBytes{ 207, 15, 45, 31, 140, 54, 235, 69,
74, 93 };
+
+ for (size_t i = 0; i < aScanLine.size(); ++i)
+ {
+ CPPUNIT_ASSERT_EQUAL(int(aExpectedBytes[i]), int(aScanLine[i]));
+ }
+
+ // Test reading - we insert a scanline in R5G6B5 format and read
+ // the colors from it
+
+ pScanlineTransformer->startLine(aScanLine.data());
+
+ std::vector<Color> aExpectedColors{
+ Color(8, 248, 120), Color(24, 228, 104), Color(48, 208, 96),
+ Color(64, 188, 88), Color(88, 168, 80),
+ };
+
+ for (size_t i = 0; i < aExpectedColors.size(); ++i)
+ {
+ Color aColor = pScanlineTransformer->readPixel();
+ CPPUNIT_ASSERT_EQUAL(aExpectedColors[i], aColor);
+ }
+}
+
void ScanlineToolsTest::ScanlineTransformer_8bit_Palette()
{
std::vector<Color> aColors{
@@ -102,8 +147,7 @@ void ScanlineToolsTest::ScanlineTransformer_8bit_Palette()
for (size_t i = 0; i < aColors.size(); ++i)
aPalette[i] = aColors[i];
- std::unique_ptr<vcl::bitmap::ScanlineTransformer> pScanlineTransformer
- = vcl::bitmap::getScanlineTransformer(8, aPalette);
+ auto pScanlineTransformer = vcl::bitmap::getScanlineTransformer(8,
aPalette);
std::vector<sal_uInt8> aScanLine(5, 0); // 5 * 1 BytesPerPixel
pScanlineTransformer->startLine(aScanLine.data());
@@ -142,8 +186,7 @@ void ScanlineToolsTest::ScanlineTransformer_4bit_Palette()
aPalette[i] = aColors[i];
}
- std::unique_ptr<vcl::bitmap::ScanlineTransformer> pScanlineTransformer
- = vcl::bitmap::getScanlineTransformer(4, aPalette);
+ auto pScanlineTransformer = vcl::bitmap::getScanlineTransformer(4,
aPalette);
std::vector<sal_uInt8> aScanLine(3, 0); // 6 * 0.5 BytesPerPixel
pScanlineTransformer->startLine(aScanLine.data());
@@ -182,8 +225,7 @@ void ScanlineToolsTest::ScanlineTransformer_1bit_Palette()
aPalette[0] = Color(10, 250, 120);
aPalette[1] = Color(110, 150, 70);
- std::unique_ptr<vcl::bitmap::ScanlineTransformer> pScanlineTransformer
- = vcl::bitmap::getScanlineTransformer(1, aPalette);
+ auto pScanlineTransformer = vcl::bitmap::getScanlineTransformer(1,
aPalette);
std::vector<sal_uInt8> aScanLine(2, 0); // 13 * 1/8 BytesPerPixel
pScanlineTransformer->startLine(aScanLine.data());
commit 8aa2fb966c92b8e8c11b7b4f1eaed79d64fe72a8
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Sun Mar 7 13:48:39 2021 +0900
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Mon May 10 21:00:47 2021 +0900
vcl: add PNG writer based on libpng
Change-Id: I52ffd1b286162ee0dd9f694c4f3210385f71daf8
diff --git a/include/vcl/filter/PngImageWriter.hxx
b/include/vcl/filter/PngImageWriter.hxx
new file mode 100644
index 000000000000..4f64a028af53
--- /dev/null
+++ b/include/vcl/filter/PngImageWriter.hxx
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ *
+ */
+
+#include <vcl/dllapi.h>
+#include <com/sun/star/task/XStatusIndicator.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <tools/stream.hxx>
+#include <vcl/bitmapex.hxx>
+
+#pragma once
+
+namespace vcl
+{
+class VCL_DLLPUBLIC PngImageWriter
+{
+ SvStream& mrStream;
+ css::uno::Reference<css::task::XStatusIndicator> mxStatusIndicator;
+
+ int mnCompressionLevel;
+ bool mbInterlaced;
+
+public:
+ PngImageWriter(SvStream& rStream);
+
+ virtual ~PngImageWriter() {}
+
+ void setParameters(css::uno::Sequence<css::beans::PropertyValue> const&
rParameters)
+ {
+ for (auto const& rValue : rParameters)
+ {
+ if (rValue.Name == "Compression")
+ rValue.Value >>= mnCompressionLevel;
+ else if (rValue.Name == "Interlaced")
+ rValue.Value >>= mbInterlaced;
+ }
+ }
+ bool write(BitmapEx& rBitmap);
+};
+
+} // namespace vcl
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 73b4af3775e2..440eecdba314 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -480,6 +480,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/filter/wmf/wmfexternal \
vcl/source/filter/wmf/wmfwr \
vcl/source/filter/png/PngImageReader \
+ vcl/source/filter/png/PngImageWriter \
vcl/source/filter/png/pngwrite \
vcl/source/font/Feature \
vcl/source/font/FeatureCollector \
diff --git a/vcl/qa/cppunit/png/PngFilterTest.cxx
b/vcl/qa/cppunit/png/PngFilterTest.cxx
index c167c4c9c636..1c5f29b40abe 100644
--- a/vcl/qa/cppunit/png/PngFilterTest.cxx
+++ b/vcl/qa/cppunit/png/PngFilterTest.cxx
@@ -24,14 +24,20 @@
#include <test/bootstrapfixture.hxx>
#include <tools/stream.hxx>
#include <vcl/filter/PngImageReader.hxx>
+#include <vcl/filter/PngImageWriter.hxx>
#include <vcl/BitmapReadAccess.hxx>
+#include <bitmap/BitmapWriteAccess.hxx>
#include <vcl/alpha.hxx>
#include <vcl/graphicfilter.hxx>
+#include <unotools/tempfile.hxx>
using namespace css;
class PngFilterTest : public test::BootstrapFixture
{
+ // Should keep the temp files (should be false)
+ static constexpr bool bKeepTemp = true;
+
OUString maDataUrl;
OUString getFullUrl(std::u16string_view sFileName)
@@ -48,10 +54,16 @@ public:
void testPng();
void testMsGifInPng();
+ void testPngRoundtrip8BitGrey();
+ void testPngRoundtrip24();
+ void testPngRoundtrip32();
CPPUNIT_TEST_SUITE(PngFilterTest);
CPPUNIT_TEST(testPng);
CPPUNIT_TEST(testMsGifInPng);
+ CPPUNIT_TEST(testPngRoundtrip8BitGrey);
+ CPPUNIT_TEST(testPngRoundtrip24);
+ CPPUNIT_TEST(testPngRoundtrip32);
CPPUNIT_TEST_SUITE_END();
};
@@ -245,6 +257,106 @@ void PngFilterTest::testMsGifInPng()
CPPUNIT_ASSERT(aGraphic.IsAnimated());
}
+void PngFilterTest::testPngRoundtrip8BitGrey()
+{
+ utl::TempFile aTempFile("testPngRoundtrip8BitGrey");
+ if (!bKeepTemp)
+ aTempFile.EnableKillingFile();
+ {
+ SvStream& rStream = *aTempFile.GetStream(StreamMode::WRITE);
+ Bitmap aBitmap(Size(16, 16), vcl::PixelFormat::N8_BPP,
&Bitmap::GetGreyPalette(256));
+ {
+ BitmapScopedWriteAccess pWriteAccess(aBitmap);
+ pWriteAccess->Erase(COL_BLACK);
+ for (int i = 0; i < 8; ++i)
+ {
+ for (int j = 0; j < 8; ++j)
+ {
+ pWriteAccess->SetPixel(i, j, COL_GRAY);
+ }
+ }
+ for (int i = 8; i < 16; ++i)
+ {
+ for (int j = 8; j < 16; ++j)
+ {
+ pWriteAccess->SetPixel(i, j, COL_LIGHTGRAY);
+ }
+ }
+ }
+ BitmapEx aBitmapEx(aBitmap);
+
+ vcl::PngImageWriter aPngWriter(rStream);
+ CPPUNIT_ASSERT_EQUAL(true, aPngWriter.write(aBitmapEx));
+ aTempFile.CloseStream();
+ }
+ {
+ SvStream& rStream = *aTempFile.GetStream(StreamMode::READ);
+
+ vcl::PngImageReader aPngReader(rStream);
+ BitmapEx aBitmapEx;
+ CPPUNIT_ASSERT_EQUAL(true, aPngReader.read(aBitmapEx));
+
+ CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Width());
+ CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Height());
+
+ CPPUNIT_ASSERT_EQUAL(COL_GRAY, aBitmapEx.GetPixelColor(0, 0));
+ CPPUNIT_ASSERT_EQUAL(COL_LIGHTGRAY, aBitmapEx.GetPixelColor(15, 15));
+ CPPUNIT_ASSERT_EQUAL(COL_BLACK, aBitmapEx.GetPixelColor(15, 0));
+ CPPUNIT_ASSERT_EQUAL(COL_BLACK, aBitmapEx.GetPixelColor(0, 15));
+ }
+}
+
+void PngFilterTest::testPngRoundtrip24()
+{
+ utl::TempFile aTempFile("testPngRoundtrip24");
+ if (!bKeepTemp)
+ aTempFile.EnableKillingFile();
+ {
+ SvStream& rStream = *aTempFile.GetStream(StreamMode::WRITE);
+ Bitmap aBitmap(Size(16, 16), vcl::PixelFormat::N24_BPP);
+ {
+ BitmapScopedWriteAccess pWriteAccess(aBitmap);
+ pWriteAccess->Erase(COL_BLACK);
+ for (int i = 0; i < 8; ++i)
+ {
+ for (int j = 0; j < 8; ++j)
+ {
+ pWriteAccess->SetPixel(i, j, COL_LIGHTRED);
+ }
+ }
+ for (int i = 8; i < 16; ++i)
+ {
+ for (int j = 8; j < 16; ++j)
+ {
+ pWriteAccess->SetPixel(i, j, COL_LIGHTBLUE);
+ }
+ }
+ }
+ BitmapEx aBitmapEx(aBitmap);
+
+ vcl::PngImageWriter aPngWriter(rStream);
+ CPPUNIT_ASSERT_EQUAL(true, aPngWriter.write(aBitmapEx));
+ }
+ {
+ SvStream& rStream = *aTempFile.GetStream(StreamMode::READ);
+ rStream.Seek(0);
+
+ vcl::PngImageReader aPngReader(rStream);
+ BitmapEx aBitmapEx;
+ CPPUNIT_ASSERT_EQUAL(true, aPngReader.read(aBitmapEx));
+
+ CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Width());
+ CPPUNIT_ASSERT_EQUAL(16L, aBitmapEx.GetSizePixel().Height());
+
+ CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, aBitmapEx.GetPixelColor(0, 0));
+ CPPUNIT_ASSERT_EQUAL(COL_LIGHTBLUE, aBitmapEx.GetPixelColor(15, 15));
+ CPPUNIT_ASSERT_EQUAL(COL_BLACK, aBitmapEx.GetPixelColor(15, 0));
+ CPPUNIT_ASSERT_EQUAL(COL_BLACK, aBitmapEx.GetPixelColor(0, 15));
+ }
+}
+
+void PngFilterTest::testPngRoundtrip32() {}
+
CPPUNIT_TEST_SUITE_REGISTRATION(PngFilterTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/vcl/source/filter/png/PngImageWriter.cxx
b/vcl/source/filter/png/PngImageWriter.cxx
new file mode 100644
index 000000000000..c1e638e0aad0
--- /dev/null
+++ b/vcl/source/filter/png/PngImageWriter.cxx
@@ -0,0 +1,143 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ *
+ */
+
+#include <vcl/filter/PngImageWriter.hxx>
+#include <png.h>
+#include <bitmap/BitmapWriteAccess.hxx>
+#include <vcl/bitmap.hxx>
+
+namespace vcl
+{
+static void lclWriteStream(png_structp pPng, png_bytep pData, png_size_t
pDataSize)
+{
+ png_voidp pIO = png_get_io_ptr(pPng);
+
+ if (pIO == nullptr)
+ return;
+
+ SvStream* pStream = static_cast<SvStream*>(pIO);
+
+ sal_Size nBytesWritten = pStream->WriteBytes(pData, pDataSize);
+
+ if (nBytesWritten != pDataSize)
+ png_error(pPng, "Write Error");
+}
+
+bool pngWrite(SvStream& rStream, BitmapEx& rBitmapEx, int nCompressionLevel)
+{
+ png_structp pPng = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr,
nullptr, nullptr);
+
+ if (!pPng)
+ return false;
+
+ png_infop pInfo = png_create_info_struct(pPng);
+ if (!pInfo)
+ {
+ png_destroy_write_struct(&pPng, nullptr);
+ return false;
+ }
+
+ Bitmap aBitmap;
+
+ if (setjmp(png_jmpbuf(pPng)))
+ {
+ png_destroy_read_struct(&pPng, &pInfo, nullptr);
+ return false;
+ }
+
+ // Set our custom stream writer
+ png_set_write_fn(pPng, &rStream, lclWriteStream, nullptr);
+
+ aBitmap = rBitmapEx.GetBitmap();
+
+ {
+ Bitmap::ScopedReadAccess pAccess(aBitmap);
+ Size aSize = rBitmapEx.GetSizePixel();
+
+ int bitDepth = -1;
+ int colorType = -1;
+
+ /* PNG_COLOR_TYPE_GRAY (1, 2, 4, 8, 16)
+ PNG_COLOR_TYPE_GRAY_ALPHA (8, 16)
+ PNG_COLOR_TYPE_PALETTE (bit depths 1, 2, 4, 8)
+ PNG_COLOR_TYPE_RGB (bit_depths 8, 16)
+ PNG_COLOR_TYPE_RGB_ALPHA (bit_depths 8, 16)
+ PNG_COLOR_MASK_PALETTE
+ PNG_COLOR_MASK_COLOR
+ PNG_COLOR_MASK_ALPHA
+ */
+ auto eScanlineFormat = pAccess->GetScanlineFormat();
+ if (eScanlineFormat == ScanlineFormat::N8BitPal &&
aBitmap.HasGreyPalette8Bit())
+ {
+ colorType = PNG_COLOR_TYPE_GRAY;
+ bitDepth = 8;
+ }
+ else if (eScanlineFormat == ScanlineFormat::N24BitTcBgr
+ || eScanlineFormat == ScanlineFormat::N24BitTcRgb)
+ {
+ colorType = PNG_COLOR_TYPE_RGB;
+ bitDepth = 8;
+ if (eScanlineFormat == ScanlineFormat::N24BitTcBgr)
+ png_set_bgr(pPng);
+ }
+ else
+ {
+ return false;
+ }
+
+ png_set_compression_level(pPng, nCompressionLevel);
+
+ int interlaceType = PNG_INTERLACE_NONE;
+ int compressionType = PNG_COMPRESSION_TYPE_DEFAULT;
+ int filterMethod = PNG_FILTER_TYPE_DEFAULT;
+
+ png_set_IHDR(pPng, pInfo, aSize.Width(), aSize.Height(), bitDepth,
colorType, interlaceType,
+ compressionType, filterMethod);
+
+ png_write_info(pPng, pInfo);
+
+ int nNumberOfPasses = 1;
+
+ Scanline pSourcePointer;
+
+ tools::Long nHeight = pAccess->Height();
+
+ for (int nPass = 0; nPass < nNumberOfPasses; nPass++)
+ {
+ for (tools::Long y = 0; y <= nHeight; y++)
+ {
+ pSourcePointer = pAccess->GetScanline(y);
+ png_write_rows(pPng, &pSourcePointer, 1);
+ }
+ }
+ }
+
+ png_write_end(pPng, pInfo);
+
+ png_destroy_write_struct(&pPng, &pInfo);
+
+ return true;
+}
+
+PngImageWriter::PngImageWriter(SvStream& rStream)
+ : mrStream(rStream)
+ , mnCompressionLevel(6)
+ , mbInterlaced(false)
+{
+}
+
+bool PngImageWriter::write(BitmapEx& rBitmapEx)
+{
+ return pngWrite(mrStream, rBitmapEx, mnCompressionLevel);
+}
+
+} // namespace vcl
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 06111d07da4e0b538953dbad3e8076ad29b94b74
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Thu Nov 12 10:01:20 2020 +0100
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Mon May 10 21:00:46 2021 +0900
basegfx: added LengthUnit class as the base unit for length
Change-Id: I1d4790b60dd784e8b2e2e438274f3ebd6db4b60c
diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index a0379e76612a..b66b1381d69a 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basegfx,\
basegfx/test/basegfxtools \
basegfx/test/clipstate \
basegfx/test/genericclipper \
+ basegfx/test/LengthUnitTest \
))
# vim: set noet sw=4 ts=4:
diff --git a/basegfx/test/LengthUnitTest.cxx b/basegfx/test/LengthUnitTest.cxx
new file mode 100644
index 000000000000..0b80c33da5b0
--- /dev/null
+++ b/basegfx/test/LengthUnitTest.cxx
@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#include <basegfx/units/LengthUnit.hxx>
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+
+class LengthUnitTest : public CppUnit::TestFixture
+{
+public:
+ void test();
+
+ CPPUNIT_TEST_SUITE(LengthUnitTest);
+ CPPUNIT_TEST(test);
+ CPPUNIT_TEST_SUITE_END();
+};
+
+void LengthUnitTest::test()
+{
+ gfx::LengthUnit cm = 1_cm + 5_cm - 2_cm;
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(4.0, cm.as_cm(), 1e-4);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(0.04, cm.as_m(), 1e-4);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(40.0, cm.as_mm(), 1e-4);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(1440000), cm.raw());
+
+ gfx::LengthUnit cm2 = 5_cm * 2;
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(3600000), cm2.raw());
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, cm2.as_cm(), 1e-4);
+
+ // 1 km - 50 m = 950 m = 95000 cm
+ gfx::LengthUnit cm3 = 100000_cm - 5000_cm;
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(34200000000), cm3.raw());
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(95000.0, cm3.as_cm(), 1e-4);
+
+ gfx::LengthUnit cm4(1_cm);
+ cm4 /= 2;
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(180000), cm4.raw());
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(0.5, cm4.as_cm(), 1e-4);
+
+ // (635 * 20) + 3 * (635 * 15) = 41275EMU
+ gfx::LengthUnit pt = 1_pt + 3_px;
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(3.25, pt.as_pt(), 1e-4);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(65.0, pt.as_twip(), 1e-4);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0451, pt.as_in(), 1e-4);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(41275), pt.raw());
+
+ gfx::LengthUnit inch = 1_in; // 1440 * 635
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1440.0, inch.as_twip(), 1e-4);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(96.0, inch.as_px(), 1e-4);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, inch.as_in(), 1e-4);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(914400.0, inch.as_emu(), 1e-4);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(914400), inch.raw());
+
+ // Conversion
+ sal_Int64 asNumber(17_pt);
+ asNumber += sal_Int64(1_pt);
+ gfx::LengthUnit asLength = gfx::LengthUnit::emu(asNumber);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(18 * 635 * 20), asLength.raw());
+
+ gfx::LengthUnit maximum = gfx::LengthUnit::emu(SAL_MAX_INT64);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(256204778801.5, maximum.as_m(), 1e-1);
+ // 256204778 km
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(SAL_MAX_INT64), maximum.raw());
+
+ gfx::LengthUnit minimum = gfx::LengthUnit::emu(SAL_MIN_INT64);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(-256204778801.5, minimum.as_m(), 1e-1);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(double(SAL_MIN_INT64), minimum.as_emu(),
1e-1);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(SAL_MIN_INT64), minimum.raw());
+
+ // 27 emu + 33 emu + 360 emu = 420
+ gfx::LengthUnit emus = 27_emu + 33_emu + 1_hmm;
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(420), emus.raw());
+
+ // Creation from number
+ int number = 10;
+ auto asCm = gfx::LengthUnit::cm(number);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, asCm.as_cm(), 1e-4);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(3600000), asCm.raw());
+
+ auto asMm = gfx::LengthUnit::mm(number);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, asMm.as_mm(), 1e-4);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(360000), asMm.raw());
+
+ auto asInch = gfx::LengthUnit::in(number);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, asInch.as_in(), 1e-4);
+ CPPUNIT_ASSERT_EQUAL(sal_Int64(9144000), asInch.raw());
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(LengthUnitTest);
diff --git a/include/basegfx/units/LengthUnit.hxx
b/include/basegfx/units/LengthUnit.hxx
new file mode 100644
index 000000000000..4edd1cc4704f
--- /dev/null
+++ b/include/basegfx/units/LengthUnit.hxx
@@ -0,0 +1,194 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#pragma once
+
+#include <sal/types.h>
+
+namespace gfx
+{
+namespace
+{
+constexpr sal_Int64 constFactor_hmm_to_EMU = 360ll;
+constexpr sal_Int64 constFactor_mm_to_EMU = constFactor_hmm_to_EMU * 100ll;
+constexpr sal_Int64 constFactor_cm_to_EMU = constFactor_hmm_to_EMU * 1000ll;
+constexpr sal_Int64 constFactor_m_to_EMU = constFactor_hmm_to_EMU * 100000ll;
+
+constexpr sal_Int64 constFactor_twip_to_EMU = 635ll;
+constexpr sal_Int64 constFactor_in_to_EMU = constFactor_twip_to_EMU * 1440ll;
+constexpr sal_Int64 constFactor_pt_to_EMU = constFactor_twip_to_EMU * 20ll;
+constexpr sal_Int64 constFactor_px_to_EMU = constFactor_twip_to_EMU * 15ll;
+
+} // end anonymous namespace
+
+template <typename T> class LengthUnitBase
+{
+private:
+ // value in EMU units
+ T m_nValue;
+
+ constexpr explicit LengthUnitBase(T nValue)
+ : m_nValue(nValue)
+ {
+ }
+
+public:
+ static constexpr LengthUnitBase cm(T nValue)
+ {
+ return LengthUnitBase(gfx::constFactor_cm_to_EMU * nValue);
+ }
+
+ static constexpr LengthUnitBase mm(T nValue)
+ {
+ return LengthUnitBase(gfx::constFactor_mm_to_EMU * nValue);
+ }
+
+ static constexpr LengthUnitBase hmm(T nValue)
+ {
+ return LengthUnitBase(gfx::constFactor_hmm_to_EMU * nValue);
+ }
+
+ static constexpr LengthUnitBase in(T nValue)
+ {
+ return LengthUnitBase(gfx::constFactor_in_to_EMU * nValue);
+ }
+
+ static constexpr LengthUnitBase twip(T nValue)
+ {
+ return LengthUnitBase(gfx::constFactor_twip_to_EMU * nValue);
+ }
+
+ static constexpr LengthUnitBase pt(T nValue)
+ {
+ return LengthUnitBase(gfx::constFactor_pt_to_EMU * nValue);
+ }
+
+ static constexpr LengthUnitBase px(T nValue)
+ {
+ return LengthUnitBase(gfx::constFactor_px_to_EMU * nValue);
+ }
+
+ static constexpr LengthUnitBase emu(T nValue) { return
LengthUnitBase(nValue); }
+
+ constexpr explicit LengthUnitBase()
+ : m_nValue(0)
+ {
+ }
+
+ constexpr explicit operator T() const { return m_nValue; }
+
+ constexpr LengthUnitBase& operator+=(LengthUnitBase const& rhs)
+ {
+ m_nValue += rhs.m_nValue;
+ return *this;
+ }
+
+ constexpr LengthUnitBase& operator-=(LengthUnitBase const& rhs)
+ {
+ m_nValue -= rhs.m_nValue;
+ return *this;
+ }
+
+ constexpr LengthUnitBase& operator*=(T const& rhs)
+ {
+ m_nValue *= rhs;
+ return *this;
+ }
+
+ constexpr LengthUnitBase& operator/=(T const& rhs)
+ {
+ m_nValue /= rhs;
+ return *this;
+ }
+
+ constexpr LengthUnitBase& operator-()
+ {
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
