sc/uiconfig/scalc/ui/notebookbar.ui | 5 ++++-
sd/uiconfig/sdraw/ui/notebookbar.ui | 5 ++++-
sd/uiconfig/simpress/ui/notebookbar.ui | 5 ++++-
svgio/CppunitTest_svgio.mk | 1 +
svgio/CppunitTest_svgio_tools.mk | 1 +
svgio/Library_svgio.mk | 1 +
svgio/inc/svgdocumenthandler.hxx | 3 +++
svgio/source/svguno/xsvgparser.cxx | 10 ++++++++++
sw/uiconfig/swriter/ui/notebookbar.ui | 5 ++++-
vcl/workben/fftester.cxx | 10 ++++++++++
10 files changed, 42 insertions(+), 4 deletions(-)
New commits:
commit 7d913c6ec16cab123bd261bca20c4aaeea6b0b38
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Apr 25 20:13:07 2023 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Apr 26 16:23:49 2023 +0200
expose parsing svgs for testing
Change-Id: I4d59aa9a684bd3e05fca473d6c7567cd8258b242
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151002
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svgio/CppunitTest_svgio.mk b/svgio/CppunitTest_svgio.mk
index 3a828ad036e3..1bd6c3b0b5d0 100644
--- a/svgio/CppunitTest_svgio.mk
+++ b/svgio/CppunitTest_svgio.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svgio,\
unotest \
tk \
tl \
+ utl \
vcl \
))
diff --git a/svgio/CppunitTest_svgio_tools.mk b/svgio/CppunitTest_svgio_tools.mk
index cb48c5eda09d..abb6bb6e0fc7 100644
--- a/svgio/CppunitTest_svgio_tools.mk
+++ b/svgio/CppunitTest_svgio_tools.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_use_libraries,svgio_tools,\
svt \
tk \
tl \
+ utl \
vcl \
))
diff --git a/svgio/Library_svgio.mk b/svgio/Library_svgio.mk
index c5a35405323f..917f9ea4865e 100644
--- a/svgio/Library_svgio.mk
+++ b/svgio/Library_svgio.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,svgio,\
sax \
vcl \
svt \
+ utl \
))
$(eval $(call gb_Library_add_exception_objects,svgio,\
diff --git a/svgio/inc/svgdocumenthandler.hxx b/svgio/inc/svgdocumenthandler.hxx
index 197c9e8e83ee..a13284340a38 100644
--- a/svgio/inc/svgdocumenthandler.hxx
+++ b/svgio/inc/svgdocumenthandler.hxx
@@ -23,6 +23,7 @@
#include "svgdocument.hxx"
#include <cppuhelper/implbase.hxx>
+class SvStream;
namespace svgio::svgreader { class SvgCharacterNode; }
namespace svgio::svgreader
@@ -60,4 +61,6 @@ namespace svgio::svgreader
} // end of namespace svgio::svgreader
+extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportSVG(SvStream& rStream);
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svguno/xsvgparser.cxx
b/svgio/source/svguno/xsvgparser.cxx
index 705f97a0487a..fd2f5d3ddff0 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/graphic/XSvgParser.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
+#include <comphelper/processfactory.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/xml/sax/XParser.hpp>
@@ -30,6 +31,8 @@
#include <svgdocumenthandler.hxx>
#include <comphelper/diagnose_ex.hxx>
#include <rtl/ref.hxx>
+#include <tools/stream.hxx>
+#include <unotools/streamwrap.hxx>
#include <svgvisitor.hxx>
#include <utility>
@@ -196,4 +199,11 @@ svgio_XSvgParser_get_implementation(
return cppu::acquire(new svgio::svgreader::XSvgParser(context));
}
+extern "C" bool TestImportSVG(SvStream& rStream)
+{
+ css::uno::Reference<css::io::XInputStream> xStream(new
utl::OInputStreamWrapper(rStream));
+ rtl::Reference<svgio::svgreader::XSvgParser> xSvgParser(new
svgio::svgreader::XSvgParser(comphelper::getProcessComponentContext()));
+ return xSvgParser->getDecomposition(xStream, OUString()).getLength() != 0;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index bc4a692b4f81..c396b28f1ede 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -542,6 +542,16 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
SvFileStream aFileStream(out, StreamMode::READ);
ret = static_cast<int>((*pfnImport)(aFileStream));
}
+ else if (strcmp(argv[2], "svg") == 0)
+ {
+ static FFilterCall pfnImport(nullptr);
+ if (!pfnImport)
+ {
+ pfnImport = load(u"libsvgiolo.so", "TestImportSVG");
+ }
+ SvFileStream aFileStream(out, StreamMode::READ);
+ ret = static_cast<int>((*pfnImport)(aFileStream));
+ }
#endif
}
catch (...)
commit c163334ae8cdd202dd4060ef1f401a9e9b51ce3e
Author: Rafael Lima <rafael.palma.l...@gmail.com>
AuthorDate: Thu Apr 20 11:06:40 2023 -0300
Commit: Rafael Lima <rafael.palma.l...@gmail.com>
CommitDate: Wed Apr 26 16:23:42 2023 +0200
tdf#151624 Fix Insert Formula tool in the Tabbed UI
As reported in the ticket the Insert Formula tool was misaligned in the
Tabbed UI since the removal of the Emoji tool.
This patch fixes that by making the tool use all the available vertical
space.
Change-Id: I26d36ba4fc6f38e80d8ab46bfdf88c08fbf2fd68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150701
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 7669f4196949..bbcc0b556fac 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -5791,8 +5791,11 @@
<object class="sfxlo-NotebookbarToolBox"
id="LineA13">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="toolbar_style">both-horiz</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="toolbar_style">both</property>
<property name="show_arrow">False</property>
+ <property name="icon_size">3</property>
<child>
<object class="GtkToolButton"
id="Insert-InsertObjectStarMath">
<property name="visible">True</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index f5f582fc13b5..f0bf8734ad9b 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -5504,8 +5504,11 @@
<object class="sfxlo-NotebookbarToolBox"
id="LineA13">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="toolbar_style">both-horiz</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="toolbar_style">both</property>
<property name="show_arrow">False</property>
+ <property name="icon_size">3</property>
<child>
<object class="GtkToolButton"
id="Insert-InsertMath">
<property name="visible">True</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 4d99066f3ef6..20329c825473 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -5939,8 +5939,11 @@
<object class="sfxlo-NotebookbarToolBox"
id="LineA13">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="toolbar_style">both-horiz</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="toolbar_style">both</property>
<property name="show_arrow">False</property>
+ <property name="icon_size">3</property>
<child>
<object class="GtkToolButton"
id="Insert-InsertMath">
<property name="visible">True</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui
b/sw/uiconfig/swriter/ui/notebookbar.ui
index b6b66f4cbd81..e4d17b5b2523 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -5643,8 +5643,11 @@
<object class="sfxlo-NotebookbarToolBox"
id="LineA12">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="toolbar_style">both-horiz</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
+ <property name="toolbar_style">both</property>
<property name="show_arrow">False</property>
+ <property name="icon_size">3</property>
<child>
<object class="GtkToolButton"
id="Insert-InsertObjectStarMath1">
<property name="visible">True</property>
