[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/source
Szymon Kłos (via logerrit)
logerrit at kemper.freedesktop.org
Mon Oct 7 08:36:41 UTC 2019
vcl/source/window/toolbox2.cxx | 15 ---------------
1 file changed, 15 deletions(-)
New commits:
commit 8d2f644e04f4d52d71c48ab17e19d7834e16f3c3
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Oct 4 14:21:31 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Oct 7 10:36:04 2019 +0200
Revert "jsdialogs: send images for toolbox items"
We use svg icons from online resources - no need for
sending this.
This reverts commit 657b73d6be7c0efbbe838b3d3b90276bda702d58.
Change-Id: Id98a9704ee88857a0231514b741e63a8a7929e1a
Reviewed-on: https://gerrit.libreoffice.org/80212
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index e0a6e93c087b..5e5de5430d22 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -36,9 +36,6 @@
#include <svdata.hxx>
#include <brdwin.hxx>
#include <toolbox.h>
-#include <tools/stream.hxx>
-#include <vcl/cvtgrf.hxx>
-#include <comphelper/base64.hxx>
#include <unotools/confignode.hxx>
@@ -1804,18 +1801,6 @@ boost::property_tree::ptree ToolBox::DumpAsPropertyTree()
{
boost::property_tree::ptree aEntry;
int nId = GetItemId(i);
-
- Image aImage = GetItemImage(nId);
- SvMemoryStream aOStm(65535, 65535);
-
- if(GraphicConverter::Export(aOStm, aImage.GetBitmapEx(), ConvertDataFormat::PNG) == ERRCODE_NONE)
- {
- css::uno::Sequence<sal_Int8> aSeq( static_cast<sal_Int8 const *>(aOStm.GetData()), aOStm.Tell());
- OUStringBuffer aBuffer("data:image/png;base64,");
- ::comphelper::Base64::encode(aBuffer, aSeq);
- aEntry.put("image", aBuffer.makeStringAndClear());
- }
-
aEntry.put("type", "toolitem");
aEntry.put("text", GetItemText(nId));
aEntry.put("command", GetItemCommand(nId));
More information about the Libreoffice-commits
mailing list