[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |1 -
1 file changed, 1 deletion(-)
New commits:
commit f2cb874d6de86dfffe13fe6f051b1ea84d8e628a
Author: Noel Grandin
AuthorDate: Fri Jul 10 08:56:44 2020 +0200
Commit: Noel Grandin
CommitDate: Fri Jul 10 08:56:44 2020 +0200
fix android build
after commit c6aa0d055ec6a102c269a4e1cd0fa98fd7c99d66
Date: Thu Jul 9 14:07:25 2020 +0200
eventattacher: create instances with uno constructors
Change-Id: Iae1bab85e7d2f32931cec27daa2fc30b6c4a0994
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d67cf7209766..06dd076a8eff 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -21,7 +21,6 @@ import xml.etree.ElementTree as ET
core_factory_list = [
("libembobj.a", "embobj_component_getFactory"),
-("libevtattlo.a", "evtatt_component_getFactory"),
("libfilterconfiglo.a", "filterconfig1_component_getFactory"),
("libfsstoragelo.a", "fsstorage_component_getFactory"),
("libhyphenlo.a", "hyphen_component_getFactory"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/IwyuFilter_accessibility.yaml avmedia/IwyuFilter_avmedia.yaml basctl/IwyuFilter_basctl.yaml basegfx/IwyuFilter_basegfx.yaml basic/IwyuFilter_basic.yaml bi
UnoControls/IwyuFilter_UnoControls.yaml |2 +- accessibility/IwyuFilter_accessibility.yaml |2 +- avmedia/IwyuFilter_avmedia.yaml |2 +- basctl/IwyuFilter_basctl.yaml |2 +- basegfx/IwyuFilter_basegfx.yaml |2 +- basic/IwyuFilter_basic.yaml |2 +- bin/find-unneeded-includes | 10 +- binaryurp/IwyuFilter_binaryurp.yaml |2 +- canvas/IwyuFilter_canvas.yaml |2 +- chart2/IwyuFilter_chart2.yaml |2 +- comphelper/IwyuFilter_comphelper.yaml |2 +- configmgr/IwyuFilter_configmgr.yaml |2 +- connectivity/IwyuFilter_connectivity.yaml |2 +- cppcanvas/IwyuFilter_cppcanvas.yaml |2 +- cppu/IwyuFilter_cppu.yaml |2 +- cppuhelper/IwyuFilter_cppuhelper.yaml |2 +- cui/IwyuFilter_cui.yaml |2 +- dbaccess/IwyuFilter_dbaccess.yaml |2 +- desktop/IwyuFilter_desktop.yaml |2 +- drawinglayer/IwyuFilter_drawinglayer.yaml |2 +- editeng/IwyuFilter_editeng.yaml |2 +- embeddedobj/IwyuFilter_embeddedobj.yaml |2 +- emfio/IwyuFilter_emfio.yaml |2 +- extensions/IwyuFilter_extensions.yaml |2 +- filter/IwyuFilter_filter.yaml |2 +- forms/IwyuFilter_forms.yaml |2 +- framework/IwyuFilter_framework.yaml |2 +- helpcompiler/IwyuFilter_helpcompiler.yaml |2 +- i18npool/IwyuFilter_i18npool.yaml |2 +- include/IwyuFilter_include.yaml |2 +- io/IwyuFilter_io.yaml |2 +- javaunohelper/IwyuFilter_javaunohelper.yaml |2 +- jvmaccess/IwyuFilter_jvmaccess.yaml |2 +- jvmfwk/IwyuFilter_jvmfwk.yaml |2 +- linguistic/IwyuFilter_linguistic.yaml |2 +- lotuswordpro/IwyuFilter_lotuswordpro.yaml |2 +- oox/IwyuFilter_oox.yaml |2 +- opencl/IwyuFilter_opencl.yaml |2 +- pyuno/IwyuFilter_pyuno.yaml |2 +- registry/IwyuFilter_registry.yaml |2 +- reportdesign/IwyuFilter_reportdesign.yaml |2 +- sc/IwyuFilter_sc.yaml |2 +- scaddins/IwyuFilter_scaddins.yaml |2 +- sccomp/IwyuFilter_sccomp.yaml |2 +- scripting/IwyuFilter_scripting.yaml |2 +- sd/IwyuFilter_sd.yaml |2 +- sdext/IwyuFilter_sdext.yaml |2 +- sfx2/IwyuFilter_sfx2.yaml |2 +- shell/IwyuFilter_shell.yaml |2 +- slideshow/IwyuFilter_slideshow.yaml |2 +- sot/IwyuFilter_sot.yaml |2 +- starmath/IwyuFilter_starmath.yaml |2 +- stoc/IwyuFilter_stoc.yaml |2 +- store/IwyuFilter_store.yaml |2 +- svl/IwyuFilter_svl.yaml |2 +- svtools/IwyuFilter_svtools.yaml |2 +- svx/IwyuFilter_svx.yaml |2 +- sw/IwyuFilter_sw.yaml |2 +- test/IwyuFilter_test.yaml |2 +- toolkit/IwyuFilter_toolkit.yaml |2 +- tools/IwyuFilter_tools.yaml |2 +- ucb/IwyuFilter_ucb.yaml |2 +- ucbhelper/IwyuFilter_ucbhelper.yaml |2 +- unoidl/IwyuFilter_unoidl.yaml |2 +- unotools/IwyuFilter_unotools.yaml |2 +- unoxml/IwyuFilter_unoxml.yaml |2 +- uui/IwyuFilter_uui.yaml |2 +- vbahelper/IwyuFilter_vbahelper.yaml |2 +- vcl/IwyuFilter_vcl.yaml |2 +- writerfilter/IwyuFilter_writerfilter.yaml |2 +- writerperfect/IwyuFilter_writerperfect.yaml |2 +- xmlhelp/IwyuFilter_xmlhelp.yaml |2 +- xmloff/IwyuFilter_xmloff.yaml |2 +- xmlsecurity/IwyuFilter_xmlsecurity.yaml |2 +- 74 files changed, 78 insertions(+), 78 deletions(-) New commits: commit c5b985bc9bd8d56fb012260cb1685a617261e7fc Author: Thorsten Behrens AuthorDate: Mon Jul 6 03:50:20 2020 +0200 Commit: Thorsten Behrens CommitDate: Fri Jul 10 02:03:40 2020 +0200 replace usage of blacklist with excludelist for IWYU Background and motivation: https://tools.ietf.org/html/draft-knodel-terminology-02 Change-Id: I2f22d455d2a936a85750eaab1fda215ebb6d9d48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98182 Tested-by: Thorsten Behrens Reviewed-by: Thorsten Behrens diff --git a/UnoControls/IwyuFilter_UnoControls.yaml b/UnoControls/IwyuFilter_UnoControls.yaml index 998e200af2cd..f49bd7b8c20e 100644 --- a/UnoControls/IwyuFilter_UnoControls.yaml +++ b/UnoControls/IwyuFilter_UnoControls.yaml @@ -1,6 +1,6 @@ --- assumeFilename: UnoControls/source/base/basecontrol.cxx -blac
[Libreoffice-commits] core.git: bin/check-elf-dynamic-objects bin/find-german-comments canvas/source comphelper/source compilerplugins/clang desktop/source include/comphelper include/opencl libreoffic
bin/check-elf-dynamic-objects | 74 ++--
bin/find-german-comments | 18 +--
canvas/source/directx/dx_9rm.cxx |2
comphelper/source/misc/lok.cxx | 22 +--
compilerplugins/clang/bufferadd.cxx|2
compilerplugins/clang/noexceptmove.cxx |4
compilerplugins/clang/staticvar.cxx|4
compilerplugins/clang/store/deletedspecial.cxx | 76 ++---
compilerplugins/clang/stringadd.cxx|2
compilerplugins/clang/test/staticvar.cxx |2
compilerplugins/clang/test/useuniqueptr.cxx|6 -
compilerplugins/clang/unusedvariableplus.cxx |2
compilerplugins/clang/useuniqueptr.cxx |2
compilerplugins/clang/vclwidgets.cxx |2
compilerplugins/clang/weakobject.cxx |2
desktop/source/lib/init.cxx|2
include/comphelper/lok.hxx |2
include/opencl/openclconfig.hxx|2
libreofficekit/qa/tilebench/tilebench.cxx |2
lingucomponent/source/spellcheck/spell/sspellimp.cxx |2
lingucomponent/source/thesaurus/libnth/nthesimp.cxx|2
offapi/util/types-whitelist|1
officecfg/registry/schema/org/openoffice/Office/Common.xcs |4
oox/source/drawingml/diagram/diagramlayoutatoms.cxx|2
oox/source/export/shapes.cxx | 10 -
opencl/source/opencl_device.cxx|6 -
opencl/source/openclconfig.cxx | 20 +--
solenv/gbuild/platform/filter-showIncludes.awk |6 -
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 -
sw/qa/extras/ooxmlexport/ooxmlexport2.cxx |6 -
sw/source/filter/ww8/docxattributeoutput.cxx |4
vcl/inc/driverblocklist.hxx|6 -
vcl/opengl/README.opengl |2
vcl/opengl/opengl_denylist_windows.xml |4
vcl/qa/cppunit/blocklistparsertest.cxx | 18 +--
vcl/qa/cppunit/test_blocklist_evaluate.xml |4
vcl/qa/cppunit/test_blocklist_parse.xml|4
vcl/skia/skia_denylist_vulkan.xml |4
vcl/source/helper/driverblocklist.cxx | 22 +--
39 files changed, 180 insertions(+), 181 deletions(-)
New commits:
commit abb6c01519a0318d7165dc9dc5b7d185353f93d6
Author: Thorsten Behrens
AuthorDate: Mon Jul 6 03:39:12 2020 +0200
Commit: Thorsten Behrens
CommitDate: Fri Jul 10 01:36:07 2020 +0200
replace usage of whitelist with allowlist
Background and motivation:
https://tools.ietf.org/html/draft-knodel-terminology-02
[API CHANGE] officecfg::Office::Common::Misc::OpenCLWhiteList ->
OpenCLAllowList
Change-Id: I65636b19b13e4af1e4851f70e78053f3443d6bb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98181
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 11f587363f90..89b46d16cd2e 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -84,106 +84,106 @@ files=$(find "${check_path}/program"
"${check_path}/sdk/bin" -type f)
# all RPATHs should point to ${INSTDIR}/program so that's the files they find
programfiles=$(echo ${files} | grep -o '/program/[^/]* ' | xargs -n 1 basename)
-# whitelists should contain only system libraries that have a good reputation
+# allowlists should contain only system libraries that have a good reputation
# of maintaining ABI stability
-# allow extending the whitelist using the environment variable to be able to
work
+# allow extending the allowlist using the environment variable to be able to
work
# on the installer stuff without the need for a baseline setup
-globalwhitelist="ld-linux-x86-64.so.2 ld-linux.so.2 libc.so.6 libm.so.6
libdl.so.2 libpthread.so.0 librt.so.1 libutil.so.1 libnsl.so.1 libcrypt.so.1
libgcc_s.so.1 libstdc++.so.6 libz.so.1 libfontconfig.so.1 libfreetype.so.6
libxml2.so.2 libxslt.so.1 libexslt.so.0 ${LO_ELFCHECK_WHITELIST-}"
-x11whitelist="libX11.so.6 libX11-xcb.so.1 libXext.so.6 libSM.so.6 libICE.so.6
libXinerama.so.1 libXrender.so.1 libXrandr.so.2 libcairo.so.2"
-openglwhitelist="libGL.so.1"
-giowhitelist="libgio-2.0.so.0 libgobject-2.0.so.0 libgmodule-2.0.so.0
libgthread-2.0.so.0 libglib-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3"
-gstreamerwhitelist="libgstaudio-1.0.so.0 libgstpbutils-1.0.so.0
libgstvideo-1.0.so.0 libgstbase-1.0.so.0 libgstreamer-1.0.so.0"
-
[Libreoffice-commits] core.git: basic/source bin/find-clang-format.py bin/get-bugzilla-attachments-by-mimetype bin/oss-fuzz-build.sh bin/sanitize-blacklist.txt bin/sanitize-excludelist.txt bin/symstor
.git-hooks/pre-commit |6 +- Repository.mk |4 - basic/source/runtime/stdobj.cxx |2 bin/find-clang-format.py|4 - bin/get-bugzilla-attachments-by-mimetype|2 bin/oss-fuzz-build.sh |2 bin/symstore.sh |8 +- canvas/source/directx/dx_9rm.cxx|6 +- canvas/source/directx/dx_config.cxx | 16 ++--- canvas/source/directx/dx_config.hxx |6 +- configure.ac|2 connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx|6 +- cui/source/options/optgdlg.cxx |2 cui/uiconfig/ui/optopenclpage.ui|2 cui/uiconfig/ui/optviewpage.ui |2 desktop/source/deployment/inc/dp_descriptioninfoset.hxx |6 +- desktop/source/deployment/misc/dp_descriptioninfoset.cxx| 24 desktop/source/migration/migration.cxx |8 +- desktop/source/migration/services/oo3extensionmigration.cxx | 14 ++-- desktop/source/migration/services/oo3extensionmigration.hxx |2 filter/source/svg/.eslintrc.js |2 fpicker/source/office/OfficeFilePicker.cxx | 12 ++-- fpicker/source/office/OfficeFilePicker.hxx |2 fpicker/source/office/RemoteFilesDialog.cxx | 12 ++-- fpicker/source/office/RemoteFilesDialog.hxx |6 +- fpicker/source/office/asyncfilepicker.cxx |4 - fpicker/source/office/asyncfilepicker.hxx |2 fpicker/source/office/contentenumeration.cxx| 12 ++-- fpicker/source/office/contentenumeration.hxx|6 +- fpicker/source/office/fileview.cxx | 20 +++ fpicker/source/office/fileview.hxx |4 - fpicker/source/office/foldertree.cxx|6 +- fpicker/source/office/foldertree.hxx|4 - fpicker/source/office/fpdialogbase.hxx |4 - fpicker/source/office/iodlg.cxx | 10 +-- fpicker/source/office/iodlg.hxx |4 - fpicker/source/office/iodlgimp.hxx |6 +- include/onlineupdate/mozilla/Attributes.h | 24 include/opencl/openclconfig.hxx |2 include/sfx2/filedlghelper.hxx |6 +- include/sfx2/sfxsids.hrc|2 include/vcl/opengl/OpenGLHelper.hxx |4 - offapi/com/sun/star/sheet/opencl/XOpenCLSelection.idl |2 officecfg/registry/data/org/openoffice/Office/Canvas.xcu|4 - officecfg/registry/schema/org/openoffice/Office/Canvas.xcs | 16 ++--- officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 +- oox/README |4 - oox/source/export/shapes.cxx| 16 ++--- opencl/source/opencl_device.cxx |6 +- opencl/source/openclconfig.cxx | 16 ++--- postprocess/qa/services.cxx | 16 ++--- sc/source/core/data/grouptokenconverter.cxx |2 sc/source/core/tool/token.cxx |4 - scripting/source/provider/MasterScriptProvider.cxx |4 - scripting/source/provider/ProviderCache.cxx |8 +- scripting/source/provider/ProviderCache.hxx |6 +- sfx2/source/appl/appopen.cxx| 10 +-- sfx2/source/appl/appuno.cxx | 16 ++--- sfx2/source/dialog/filedlghelper.cxx| 20 +++ sfx2/source/dialog/filedlgimpl.hxx |2 sfx2/source/doc/guisaveas.cxx | 24 shell/source/win32/SysShExec.cxx|4 - solenv/clang-format/ClangFormat.pm | 22 +++ solenv/clang-format/README |4 - solenv/clang-format/check-last-commit |6 +- solenv/clang-format/generate-style-excludelist |4 - solenv/clang-format/reformat-formatted-files|6 +- solenv/gbuild/extensions/post_GbuildToJson.mk |8 +- sw/qa/extras/fodfexport/fodfexport.cxx |2 sw/qa/extras/odfexport/odfexport.cxx|2 sw/qa/extras/ooxml
[Libreoffice-commits] core.git: include/oox oox/source sd/qa
include/oox/export/drawingml.hxx | 13 -
include/oox/export/shapes.hxx |1
oox/source/drawingml/customshapeproperties.cxx |3
oox/source/export/drawingml.cxx| 188 -
oox/source/export/shapes.cxx | 53 +---
sd/qa/unit/data/odp/tdf100348_FontworkBitmapFill.odp |binary
sd/qa/unit/data/odp/tdf100348_FontworkGradientGlow.odp |binary
sd/qa/unit/export-tests-ooxml1.cxx | 37 +++
8 files changed, 198 insertions(+), 97 deletions(-)
New commits:
commit 005f5db47b8e1bbd7ebddee92009be072e835fd5
Author: Regina Henschel
AuthorDate: Sat Jul 4 15:11:03 2020 +0200
Commit: Thorsten Behrens
CommitDate: Fri Jul 10 00:57:22 2020 +0200
tdf#100348 add fill to fontwork in export to pptx
This patch adds fill to the characters in a Fontwork shape in export
to pptx. It does not contain export to docx and not import.
Change-Id: Ie7c8a35380a845f513516636c4f60ee307eacd50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98187
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 439d817d0449..2760d2fe64a0 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -143,6 +143,7 @@ private:
/// Parent exporter, used for text callback.
DMLTextExport* mpTextExport;
+
protected:
css::uno::Any mAny;
::sax_fastparser::FSHelperPtr mpFS;
@@ -166,6 +167,7 @@ protected:
const char* GetRelationCompPrefix() const;
static bool EqualGradients( css::awt::Gradient aGradient1,
css::awt::Gradient aGradient2 );
+bool IsFontworkShape(const css::uno::Reference< css::beans::XPropertySet
>& rXShapePropSet);
void WriteGlowEffect(const css::uno::Reference&
rXPropSet);
void WriteSoftEdgeEffect(const
css::uno::Reference& rXPropSet);
@@ -244,17 +246,20 @@ public:
void WriteTransformation(const tools::Rectangle& rRectangle,
sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV =
false, sal_Int32 nRotation = 0, bool bIsGroupShape = false);
-void WriteText( const css::uno::Reference< css::uno::XInterface >&
rXIface, const OUString& presetWarp, bool bBodyPr, bool bText = true, sal_Int32
nXmlNamespace = 0);
+void WriteText( const css::uno::Reference< css::uno::XInterface >&
rXIface, bool bBodyPr, bool bText = true, sal_Int32 nXmlNamespace = 0);
void WriteParagraph( const css::uno::Reference< css::text::XTextContent >&
rParagraph,
- bool& rbOverridingCharHeight, sal_Int32& rnCharHeight
);
+ bool& rbOverridingCharHeight, sal_Int32&
rnCharHeight, const css::uno::Reference< css::beans::XPropertySet >&
rXShapePropSet);
void WriteParagraphProperties(const css::uno::Reference<
css::text::XTextContent >& rParagraph, float fFirstCharHeight);
void WriteParagraphNumbering(const css::uno::Reference<
css::beans::XPropertySet >& rXPropSet, float fFirstCharHeight,
sal_Int16 nLevel );
void WriteParagraphTabStops(const
css::uno::Reference& rXPropSet);
void WriteRun( const css::uno::Reference< css::text::XTextRange >& rRun,
- bool& rbOverridingCharHeight, sal_Int32& rnCharHeight );
+ bool& rbOverridingCharHeight, sal_Int32& rnCharHeight,
+ const css::uno::Reference< css::beans::XPropertySet >&
rXShapePropSet);
void WriteRunProperties( const css::uno::Reference<
css::beans::XPropertySet >& rRun, bool bIsField, sal_Int32 nElement, bool
bCheckDirect,
- bool& rbOverridingCharHeight, sal_Int32&
rnCharHeight, sal_Int16 nScriptType = css::i18n::ScriptType::LATIN);
+ bool& rbOverridingCharHeight, sal_Int32&
rnCharHeight,
+ sal_Int16 nScriptType =
css::i18n::ScriptType::LATIN,
+ const css::uno::Reference<
css::beans::XPropertySet >& rXShapePropSet = {});
void WritePresetShape( const char* pShape , std::vector<
std::pair> & rAvList );
void WritePresetShape( const char* pShape );
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index 53d505f168a2..e95af1eff83e 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -102,7 +102,6 @@ private:
ShapeHashMap maShapeMap;
ShapeHashMap* mpShapeMap;
-OUString m_presetWarp;
public:
diff --git a/oox/source/drawingml/customshapeproperties.cxx
b/oox/source/drawingml/customshapeproperties.cxx
index 00ecf33368ae..1b4d6b4a59f6 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -157,6 +157,9 @@ void CustomShapeProperties::pushToPropSet(
uno::Any aGeoPropSet = xP
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/util
loleaflet/util/create-l10n-all-js.pl |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 4b8cbc40920975bdfdc2de0d7cd4ca464414372e
Author: Tor Lillqvist
AuthorDate: Thu Jul 9 15:55:03 2020 +0300
Commit: Aron Budea
CommitDate: Thu Jul 9 23:53:51 2020 +0200
Fix create-l10n-all-js.pl for languages that include script and territory
On Android and iOS, the window.LANG gets set to a value that uses
hyphens as separators, not underscores. Also, the script is included
for the Chinese variants. While at it, make the code more lenient:
Accept either separator and with script or not.
Change-Id: I5a5319572ec96892d22eb3b30586b5b8203bdee1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98434
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
(cherry picked from commit 8166a0edaf93ab030af68ddac52910d7a93a2e0a)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98450
Reviewed-by: Aron Budea
diff --git a/loleaflet/util/create-l10n-all-js.pl
b/loleaflet/util/create-l10n-all-js.pl
index eb88af715..4cb151fde 100644
--- a/loleaflet/util/create-l10n-all-js.pl
+++ b/loleaflet/util/create-l10n-all-js.pl
@@ -53,7 +53,7 @@ if (false) {
window.LOCALIZATIONS = " . insert('de') . ";
} else if (onlylang == 'el') {
window.LOCALIZATIONS = " . insert('el') . ";
-} else if (window.LANG == 'en_GB') {
+} else if (window.LANG == 'en-GB' || window.LANG == 'en_GB') {
window.LOCALIZATIONS = " . insert('en_GB') . ";
} else if (onlylang == 'es') {
window.LOCALIZATIONS = " . insert('es') . ";
@@ -77,7 +77,7 @@ if (false) {
window.LOCALIZATIONS = " . insert('nn') . ";
} else if (onlylang == 'pl') {
window.LOCALIZATIONS = " . insert('pl') . ";
-} else if (window.LANG == 'pt_BR') {
+} else if (window.LANG == 'pt-BR' || window.LANG == 'pt_BR') {
window.LOCALIZATIONS = " . insert('pt_BR') . ";
} else if (onlylang == 'pt') {
window.LOCALIZATIONS = " . insert('pt') . ";
@@ -91,7 +91,9 @@ if (false) {
window.LOCALIZATIONS = " . insert('tr') . ";
} else if (onlylang == 'uk') {
window.LOCALIZATIONS = " . insert('uk') . ";
-} else if (window.LANG == 'zh_TW') {
+} else if (window.LANG == 'zh-CN' || window.LANG == 'zh-Hans-CN' ||
window.LANG == 'zh_CN' || window.LANG == 'zh_Hans_CN' ) {
+window.LOCALIZATIONS = " . insert('zh_CN') . ";
+} else if (window.LANG == 'zh-TW' || window.LANG == 'zh-Hant-TW' ||
window.LANG == 'zh_TW' || window.LANG == 'zh_Hant_TW') {
window.LOCALIZATIONS = " . insert('zh_TW') . ";
} else {
window.LOCALIZATIONS = {};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/extras/macros-test.cxx | 36 ++
sc/qa/extras/testdocuments/tdf131562.xlsm |binary
2 files changed, 36 insertions(+)
New commits:
commit b8ff69726959ee4d148c12866d64601d86635bcc
Author: Xisco Fauli
AuthorDate: Thu Jul 9 22:05:14 2020 +0200
Commit: Xisco Fauli
CommitDate: Thu Jul 9 23:21:54 2020 +0200
tdf131562: sc_macros_test: Add unittest
Change-Id: I08e8dd0230a6c900d0a88a015d066bffc2e8e8b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98475
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index ee1aa5c6fe27..8aa86fa4e50f 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -36,6 +36,7 @@ public:
void testMSP();
void testPasswordProtectedStarBasic();
void testRowColumn();
+void testTdf131562();
void testPasswordProtectedUnicodeString();
void testTdf131296_legacy();
void testTdf131296_new();
@@ -46,6 +47,7 @@ public:
CPPUNIT_TEST(testVba);
CPPUNIT_TEST(testPasswordProtectedStarBasic);
CPPUNIT_TEST(testRowColumn);
+CPPUNIT_TEST(testTdf131562);
CPPUNIT_TEST(testPasswordProtectedUnicodeString);
CPPUNIT_TEST(testTdf131296_legacy);
CPPUNIT_TEST(testTdf131296_new);
@@ -393,6 +395,40 @@ void ScMacrosTest::testRowColumn()
pDocSh->DoClose();
}
+void ScMacrosTest::testTdf131562()
+{
+OUString aFileName;
+createFileURL("tdf131562.xlsm", aFileName);
+uno::Reference< css::lang::XComponent > xComponent =
loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");
+
+CPPUNIT_ASSERT_MESSAGE("Failed to load the doc", xComponent.is());
+
+Any aRet;
+Sequence< sal_Int16 > aOutParamIndex;
+Sequence< Any > aOutParam;
+Sequence< uno::Any > aParams;
+
+SfxObjectShell* pFoundShell =
SfxObjectShell::GetShellFromComponent(xComponent);
+
+CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
+ScDocShell* pDocSh = static_cast(pFoundShell);
+ScDocument& rDoc = pDocSh->GetDocument();
+
+CPPUNIT_ASSERT_EQUAL(OUString("1"), rDoc.GetString(ScAddress(0,2,0)));
+CPPUNIT_ASSERT_EQUAL(OUString(""), rDoc.GetString(ScAddress(0,3,0)));
+
+SfxObjectShell::CallXScript(
+xComponent,
+
"vnd.sun.Star.script:VBAProject.Munka1.numberconcat?language=Basic&location=document",
+aParams, aRet, aOutParamIndex, aOutParam);
+
+//Without the fix in place, the macro wouldn't have concatenated 1 and " ."
+CPPUNIT_ASSERT_EQUAL(OUString("1 ."), rDoc.GetString(ScAddress(0,2,0)));
+CPPUNIT_ASSERT_EQUAL(OUString("1 .cat"), rDoc.GetString(ScAddress(0,3,0)));
+
+pDocSh->DoClose();
+}
+
void ScMacrosTest::testPasswordProtectedUnicodeString()
{
const OUString sCorrectString(u"English Русский 中文");
diff --git a/sc/qa/extras/testdocuments/tdf131562.xlsm
b/sc/qa/extras/testdocuments/tdf131562.xlsm
new file mode 100644
index ..e56576ba4583
Binary files /dev/null and b/sc/qa/extras/testdocuments/tdf131562.xlsm differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/source
sc/source/ui/vba/vbarange.cxx | 25 +++--
1 file changed, 19 insertions(+), 6 deletions(-)
New commits:
commit a7cf65ac009819cb6ae3c08e5fe3f496ef31260a
Author: Andreas Heinisch
AuthorDate: Tue Apr 7 16:43:18 2020 +0200
Commit: Eike Rathke
CommitDate: Thu Jul 9 21:09:14 2020 +0200
tdf#107885 - VBA AutoFilter can't compare strings
This is a combination of 2 commits.
tdf#107885 - VBA AutoFilter can't compare strings
During the creation of table fields from an auto filter
search criteria, check if the search text is numeric
in order to search either for strings or numeric values.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91834
Tested-by: Jenkins
Reviewed-by: Eike Rathke
(cherry picked from commit 59374ea361815b022b1f2a415f995852f23f222e)
Use OUString::toChar(), tdf#107885 follow-up
(cherry picked from commit 978862b99ca7af6a17012084923494b6c85754d5)
Change-Id: I6f334e7fd06c03850a535a0d54438577d15ccac4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98453
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 403ea1c2f1d5..f780474622f6 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -4303,7 +4303,6 @@ static void lcl_setTableFieldsFromCriteria( OUString&
sCriteria1, const uno::Ref
// *searchtext* - contains
// <>*searchtext* - doesn't contain
// [>|>=|<=|...]searchtext for GREATER_value, GREATER_EQUAL_value etc.
-bool bIsNumeric = false;
if ( sCriteria1.startsWith( EQUALS ) )
{
if ( sCriteria1.getLength() == static_cast(strlen(EQUALS)) )
@@ -4335,7 +4334,6 @@ static void lcl_setTableFieldsFromCriteria( OUString&
sCriteria1, const uno::Ref
}
else if ( sCriteria1.startsWith( GREATERTHAN ) )
{
-bIsNumeric = true;
if ( sCriteria1.startsWith( GREATERTHANEQUALS ) )
{
sCriteria1 = sCriteria1.copy( strlen(GREATERTHANEQUALS) );
@@ -4350,7 +4348,6 @@ static void lcl_setTableFieldsFromCriteria( OUString&
sCriteria1, const uno::Ref
}
else if ( sCriteria1.startsWith( LESSTHAN ) )
{
-bIsNumeric = true;
if ( sCriteria1.startsWith( LESSTHANEQUALS ) )
{
sCriteria1 = sCriteria1.copy( strlen(LESSTHANEQUALS) );
@@ -4366,11 +4363,27 @@ static void lcl_setTableFieldsFromCriteria( OUString&
sCriteria1, const uno::Ref
else
rFilterField.Operator = sheet::FilterOperator2::EQUAL;
-if ( bIsNumeric )
+// tdf#107885 - check if criteria is numeric using locale dependent
settings without group seperator
+// or, if the decimal separator is different from the English locale,
without any locale.
+sal_Int32 nParseEnd = 0;
+rtl_math_ConversionStatus eStatus = rtl_math_ConversionStatus_Ok;
+double fValue = ScGlobal::getLocaleDataPtr()->stringToDouble( sCriteria1,
false, &eStatus, &nParseEnd );
+if ( nParseEnd == sCriteria1.getLength() && eStatus ==
rtl_math_ConversionStatus_Ok )
{
-rFilterField.IsNumeric= true;
-rFilterField.NumericValue = sCriteria1.toDouble();
+rFilterField.IsNumeric = true;
+rFilterField.NumericValue = fValue;
}
+else if ( ScGlobal::getLocaleDataPtr()->getNumDecimalSep().toChar() != '.'
)
+{
+eStatus = rtl_math_ConversionStatus_Ok;
+fValue = ::rtl::math::stringToDouble( sCriteria1, '.', 0, &eStatus,
&nParseEnd );
+if ( nParseEnd == sCriteria1.getLength() && eStatus ==
rtl_math_ConversionStatus_Ok )
+{
+rFilterField.IsNumeric = true;
+rFilterField.NumericValue = fValue;
+}
+}
+
rFilterField.StringValue = sCriteria1;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/checklistmenu.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ebb48db9ddd393ec9280cd5d50cb3ddd2793226d Author: Caolán McNamara AuthorDate: Thu Jul 9 10:22:34 2020 +0100 Commit: Caolán McNamara CommitDate: Thu Jul 9 20:49:16 2020 +0200 cid#1401334 Uncaught exception Change-Id: I6530f653f80bb3db73cef28340db2ffcac3573d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98421 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 2919d33f230b..6a6cbf43514f 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -311,7 +311,7 @@ public: private: VclPtr mxParentMenu; VclPtr mxBox; -std::unique_ptr mxControl; +std::unique_ptr> mxControl; }; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/animobjs.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 06f0c944e66005266ed85051d301332b4e5c0653 Author: Caolán McNamara AuthorDate: Thu Jul 9 11:39:43 2020 +0100 Commit: Caolán McNamara CommitDate: Thu Jul 9 20:46:47 2020 +0200 Resolves: tdf#134674 object inserting using dialogs SdrModel not the target Documents one Change-Id: I07088bddc7c15109e7d377f86c6d0a7819faa658 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98423 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index cd25de214631..7b11b240748e 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -1055,7 +1055,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) // the clone remains in the animation; we insert a clone of the // clone into the group pClone = pPage->GetObj(i); -SdrObject* pCloneOfClone(pClone->CloneSdrObject(pPage->getSdrModelFromSdrPage())); +SdrObject* pCloneOfClone(pClone->CloneSdrObject(pTargetSdPage->getSdrModelFromSdrPage())); //SdrObject* pCloneOfClone = pPage->GetObj(i)->Clone(); pObjList->InsertObject(pCloneOfClone); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/ods/tdf124454.ods |binary
sc/qa/unit/subsequent_filters-test.cxx | 18 ++
2 files changed, 18 insertions(+)
New commits:
commit 96547693533aa0261ed46c19f922b3b8172591e3
Author: Xisco Fauli
AuthorDate: Thu Jul 9 13:56:46 2020 +0200
Commit: Xisco Fauli
CommitDate: Thu Jul 9 20:34:07 2020 +0200
tdf#124454: sc: Add unittest
Change-Id: Id7b606c0e7e3621ea855af325c755876e11ebc66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98429
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/data/ods/tdf124454.ods
b/sc/qa/unit/data/ods/tdf124454.ods
new file mode 100644
index ..c312ccb4f5db
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf124454.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 8399cef636e8..52f304235473 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -195,6 +195,7 @@ public:
void testCustomNumFormatHybridCellODS();
void testTdf121040();
void testTdf118624();
+void testTdf124454();
void testPrintRangeODS();
void testOutlineODS();
@@ -357,6 +358,7 @@ public:
CPPUNIT_TEST(testCustomNumFormatHybridCellODS);
CPPUNIT_TEST(testTdf121040);
CPPUNIT_TEST(testTdf118624);
+CPPUNIT_TEST(testTdf124454);
CPPUNIT_TEST(testPrintRangeODS);
CPPUNIT_TEST(testOutlineODS);
CPPUNIT_TEST(testColumnStyleXLSX);
@@ -2952,6 +2954,22 @@ void ScFiltersTest::testTdf118624()
xDocSh->DoClose();
}
+void ScFiltersTest::testTdf124454()
+{
+ScDocShellRef xDocSh = loadDoc("tdf124454.", FORMAT_ODS);
+CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+
+CPPUNIT_ASSERT_EQUAL(OUString("1"), rDoc.GetString(ScAddress(1,0,0)));
+CPPUNIT_ASSERT_EQUAL(OUString("1"), rDoc.GetString(ScAddress(2,0,0)));
+// Without the fix in place, double negation with text in array
+// would have returned -1
+CPPUNIT_ASSERT_EQUAL(OUString("1"), rDoc.GetString(ScAddress(3,0,0)));
+
+xDocSh->DoClose();
+}
+
void ScFiltersTest::testPrintRangeODS()
{
ScDocShellRef xDocSh = loadDoc("print-range.", FORMAT_ODS);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: eventattacher/source solenv/bin
eventattacher/source/eventattacher.cxx | 54 +
eventattacher/source/evtatt.component |5 +--
solenv/bin/native-code.py |2 +
3 files changed, 14 insertions(+), 47 deletions(-)
New commits:
commit c6aa0d055ec6a102c269a4e1cd0fa98fd7c99d66
Author: Noel Grandin
AuthorDate: Thu Jul 9 14:07:25 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 9 20:04:18 2020 +0200
eventattacher: create instances with uno constructors
See tdf#74608 for motivation
Change-Id: I61ae7e662c984961b507bf0394fcf8cf25496f0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98218
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/eventattacher/source/eventattacher.cxx
b/eventattacher/source/eventattacher.cxx
index fb7bb7563a4f..4099c1bc64fb 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
namespace com::sun::star::lang { class XMultiServiceFactory; }
@@ -53,9 +54,6 @@ using namespace cppu;
using namespace osl;
-#define SERVICENAME "com.sun.star.script.EventAttacher"
-#define IMPLNAME"com.sun.star.comp.EventAttacher"
-
namespace comp_EventAttacher {
@@ -213,7 +211,6 @@ public:
virtual OUString SAL_CALL getImplementationName( ) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
override;
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( )
override;
-static Sequence< OUString > getSupportedServiceNames_Static( );
// XInitialization
virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
override;
@@ -282,19 +279,9 @@ EventAttacherImpl::EventAttacherImpl( const Reference<
XComponentContext >& rxCo
}
/// @throws Exception
-static Reference< XInterface > EventAttacherImpl_CreateInstance( const
Reference< XMultiServiceFactory >& rSMgr )
-{
-XEventAttacher* pEventAttacher = new
EventAttacherImpl(comphelper::getComponentContext(rSMgr));
-
-Reference< XInterface > xRet(pEventAttacher, UNO_QUERY);
-
-return xRet;
-}
-
-
OUString SAL_CALL EventAttacherImpl::getImplementationName( )
{
-return IMPLNAME;
+return "com.sun.star.comp.EventAttacher";
}
sal_Bool SAL_CALL EventAttacherImpl::supportsService( const OUString&
ServiceName )
@@ -304,13 +291,7 @@ sal_Bool SAL_CALL EventAttacherImpl::supportsService(
const OUString& ServiceNam
Sequence SAL_CALL EventAttacherImpl::getSupportedServiceNames( )
{
-return getSupportedServiceNames_Static();
-}
-
-
-Sequence EventAttacherImpl::getSupportedServiceNames_Static( )
-{
-return { SERVICENAME };
+return { "com.sun.star.script.EventAttacher" };
}
void SAL_CALL EventAttacherImpl::initialize(const Sequence< Any >& Arguments)
@@ -858,30 +839,13 @@ Sequence< Reference >
EventAttacherImpl::attachMultipleEventList
}
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void * evtatt_component_getFactory(
-const char * pImplName, void * pServiceManager, void * )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+eventattacher_EventAttacher(
+css::uno::XComponentContext* context, css::uno::Sequence
const& )
{
-void * pRet = nullptr;
-
-if (pServiceManager && rtl_str_compare( pImplName, IMPLNAME ) == 0)
-{
-Reference< XSingleServiceFactory > xFactory( createOneInstanceFactory(
-static_cast< XMultiServiceFactory * >( pServiceManager ),
-IMPLNAME,
-::comp_EventAttacher::EventAttacherImpl_CreateInstance,
-
::comp_EventAttacher::EventAttacherImpl::getSupportedServiceNames_Static() ) );
-
-if (xFactory.is())
-{
-xFactory->acquire();
-pRet = xFactory.get();
-}
-}
-
-return pRet;
-}
+static rtl::Reference instance(new
comp_EventAttacher::EventAttacherImpl(context));
+instance->acquire();
+return static_cast(instance.get());
}
diff --git a/eventattacher/source/evtatt.component
b/eventattacher/source/evtatt.component
index 2cbf71d4a744..40389217c039 100644
--- a/eventattacher/source/evtatt.component
+++ b/eventattacher/source/evtatt.component
@@ -18,8 +18,9 @@
-->
http://openoffice.org/2010/uno-components";>
-
+xmlns="http://openoffice.org/2010/uno-components";>
+
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index ef2ed63dbf34..d67cf7209766 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -151,6 +151,8 @@ core_constructor_list = [
"drawinglayer_XPrimitive2DRenderer",
# emfio/emfio.component
"emfio_emfreader_XEmfParser_get_implementation",
+# eventattacher/source/evtatt.component
+"eventattacher_EventAttacher",
# extensions/source/logging/log.component
("com_sun_star_comp_extensions_FileHandler", "#ifdef ANDROID"),
("com_sun_star_comp_extensions_LoggerPool", "#ifdef ANDROID"),
__
ESC minutes 2020-Jul-09
* Present: + Sophie, Cloph, Heiko, Caolan, Ilmari, Michael W, Eike, Olivier, Michael S, Xisco, William * Pending Action Items: + AI: put together some proposal on what are the benefits of a dev list move from FDO to TDF (William) => Still need to send an email to Guilhem (William) + update the TDF wiki to advertise https://nextcloud.documentfoundation.org/apps/files/?dir=/Shared/Common/esc-minutes (William) => Wiki page has been updated to reflect the location change of the minutes. https://wiki.documentfoundation.org/Development/ESC * Release Engineering update (Cloph) + 7.0 status + RC1 on mirrors + UI freeze & string freeze in the first week of July in effect freeze exception fror randing flavor + there will be 3 RCs (Cloph) + RC2 in 1 weeks, RC3 in 3 weeks + 6.4 status + 6.4.5 released as fial + 6.4.6 rc1 week after the next + Remotes + Android viewer + Online * Documentation (Olivier) + New Help + No news + Helpcontents2 + Several fixes and updates from translators + Automated extraction to fill extended tips directly on UI files + use AtkObject::acessible-description + requires manual intervention to address hid="." + use Glade 3.36 (use flatpack) + can generate a PO file stub with translation + one per language + will spare translation rework + Must test in weblate + one shot intervention. + Guides + Progress on-going + Google seasons of Doc + Deadline for submission is today * UX Update (Heiko) + Bugzilla (topicUI) statistics 249(249) (topicUI) bugs open, 247(247) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week1 month 3 months 12 months added 7(4) 14(0) 37(-4) 155(-7) commented 120(68) 319(53) 930(-23) 3557(40) removed 2(0) 5(2) 9(2) 50(2) resolved 13(8) 39(-3) 129(-2) 384(11) + top 10 contributors: Heiko Tietze made 192 changes in 1 month, and 2131 changes in 1 year Telesto made 84 changes in 1 month, and 240 changes in 1 year Foote, V Stuart made 45 changes in 1 month, and 608 changes in 1 year Ilmari Lauhakangas made 42 changes in 1 month, and 171 changes in 1 year Timur made 34 changes in 1 month, and 193 changes in 1 year Rizal Muttaqin made 27 changes in 1 month, and 88 changes in 1 year Xisco Fauli made 27 changes in 1 month, and 549 changes in 1 year srijan bhatia made 20 changes in 1 month, and 26 changes in 1 year Kaganski, Mike made 17 changes in 1 month, and 113 changes in 1 year BogdanB made 16 changes in 1 month, and 84 changes in 1 year + New tickets with needsUXEval Jul/02-09 * Changes the slide format, changes the content dimensions (not honoring ratio etc) + https://bugs.documentfoundation.org/show_bug.cgi?id=134643 * Add contextual details in Tabbed Interface + https://bugs.documentfoundation.org/show_bug.cgi?id=134481 * Hyperlink colours cannot be changed by changing Hyperlink style + https://bugs.documentfoundation.org/show_bug.cgi?id=134456 => NAB, WF * UI: Paper tray settings in Page setup seems wrong + https://bugs.documentfoundation.org/show_bug.cgi?id=134642 * UI: Printer settings hidden under more + https://bugs.documentfoundation.org/show_bug.cgi?id=134640 * Tiny Text in Presenter Console Help - Linux + https://bugs.documentfoundation.org/show_bug.cgi?id=133715 => unconfirmed -> * UI: Branding: LibreOffice Personal edition + https://bugs.documentfoundation.org/show_bug.cgi?id=134486 => new -> * Need support for PPTX themes + https://bugs.documentfoundation.org/show_bug.cgi?id=134090 -> * Keybinding is defined by UI language instead of locale setting + https://bugs.documentfoundation.org/show_bug.cgi?id=134470 + interested peope are welcome to look into it -> * About dialog lost custom build-version + https://bugs.documentfoundation.org/show_bug.cgi?id=134522 + went into the copied version info to save space; drop this flag completely? => decision postponed for next weekl * Crash Reporting (Caolan) + 5(+5) import failure, 4(-57) export failures + 18 (-14, +18) coverity issues + another build succeeded, a bit hit and miss + 13 ossfuzz issues (10 timeouts) * Crash Reporting (Xisco) + https://crashreport.libreoffice.org/stats/version/6.3.6.2 + (-45) 2143 2188 2094 2327 1758 1376 858 668 529 283 0 + https://crashreport.libreoffice.org/stats/version/6.4.3.2 + (-241) 1954 2195 2625 3411 3771 4896 6243 7540 6577 5725 4328 2199 0 + https://crashreport.libreoffice.org/stats/v
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/source
sc/source/ui/inc/tabview.hxx |2 ++
sc/source/ui/view/tabview2.cxx | 16 +---
2 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 98e8bb0a5bb9d93fb1ba6476c0fdb1c7277ed68c
Author: Caolán McNamara
AuthorDate: Thu Jul 9 15:07:38 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 18:00:15 2020 +0200
tdf#134688 run error dialog async and keep the events in the one event loop
instead of a sub loop which helps to not lose the mouse release where
the dialog was shown on the mouse press
Change-Id: If0baf15e85aff7a28ca058e2626b58802d0dad08
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98451
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index a46c7145..794e10fb8241 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -137,6 +137,8 @@ private:
FuPoor* pDrawActual;
FuPoor* pDrawOld;
+std::shared_ptr m_xMessageBox;
+
std::array, 4> pGridWin;
std::array, 2> pColBar;
std::array, 2> pRowBar;
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 97e5dd9babd9..450c512e01d9 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -1431,13 +1431,15 @@ void ScTabView::ErrorMessage(const char* pGlobStrId)
}
}
-std::unique_ptr
xInfoBox(Application::CreateMessageDialog(pParent,
- VclMessageType::Info,
VclButtonsType::Ok,
- ScResId(pGlobStrId)));
-xInfoBox->run();
-
-if (bFocus)
-pParent->grab_focus();
+m_xMessageBox.reset(Application::CreateMessageDialog(pParent,
+ VclMessageType::Info,
VclButtonsType::Ok,
+ ScResId(pGlobStrId)));
+weld::Window* pGrabOnClose = bFocus ? pParent : nullptr;
+m_xMessageBox->runAsync(m_xMessageBox, [this, pGrabOnClose](sal_Int32
/*nResult*/) {
+m_xMessageBox.reset();
+if (pGrabOnClose)
+pGrabOnClose->grab_focus();
+});
}
void ScTabView::UpdatePageBreakData( bool bForcePaint )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: AllLangHelp_sbasic.mk Package_html_media.mk source/auxiliary source/media source/text
AllLangHelp_sbasic.mk|3 - Package_html_media.mk|2 source/auxiliary/sbasic.tree |1 source/media/helpimg/sbasic/a_statement.svg | 44 +++ source/media/helpimg/sbasic/comment_fragment.svg | 35 source/text/sbasic/shared/03010103.xhp |2 source/text/sbasic/shared/03090406.xhp |2 source/text/sbasic/shared/03090409.xhp |4 - source/text/sbasic/shared/conventions.xhp| 66 +++ 9 files changed, 154 insertions(+), 5 deletions(-) New commits: commit 290bab91dab73ea80e595c3b284926c7e01b35d1 Author: Alain Romedenne AuthorDate: Thu Jul 9 09:37:11 2020 +0200 Commit: Olivier Hallot CommitDate: Thu Jul 9 17:26:05 2020 +0200 tdf#131416 How to read syntax diagrams Change-Id: Ic8ec05c75658f600f5ea1509acb482cc3db5d796 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/98343 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk index 9a49cdaab..aa40d7b18 100644 --- a/AllLangHelp_sbasic.mk +++ b/AllLangHelp_sbasic.mk @@ -359,12 +359,13 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\ helpcontent2/source/text/sbasic/shared/0317 \ helpcontent2/source/text/sbasic/shared/03170010 \ helpcontent2/source/text/sbasic/shared/05060700 \ -helpcontent2/source/text/sbasic/shared/code-stubs \ helpcontent2/source/text/sbasic/shared/calc_functions \ +helpcontent2/source/text/sbasic/shared/code-stubs \ helpcontent2/source/text/sbasic/shared/classmodule \ helpcontent2/source/text/sbasic/shared/compatible \ helpcontent2/source/text/sbasic/shared/compatibilitymode \ helpcontent2/source/text/sbasic/shared/Compiler_options \ +helpcontent2/source/text/sbasic/shared/conventions \ helpcontent2/source/text/sbasic/shared/enum \ helpcontent2/source/text/sbasic/shared/ErrVBA \ helpcontent2/source/text/sbasic/shared/fragments \ diff --git a/Package_html_media.mk b/Package_html_media.mk index 2a7a8e767..92d69fb0b 100644 --- a/Package_html_media.mk +++ b/Package_html_media.mk @@ -107,9 +107,11 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE helpimg/smzb7.png \ helpimg/smzb8.png \ helpimg/smzb9.png \ +helpimg/sbasic/a_statement.svg \ helpimg/sbasic/argument_fragment.svg \ helpimg/sbasic/array_fragment.svg \ helpimg/sbasic/char_fragment.svg \ +helpimg/sbasic/comment_fragment.svg \ helpimg/sbasic/typename_fragment.svg \ helpimg/sbasic/Call_statement.svg \ helpimg/sbasic/Const_statement.svg \ diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree index b44630a98..62ce8a0d1 100644 --- a/source/auxiliary/sbasic.tree +++ b/source/auxiliary/sbasic.tree @@ -37,6 +37,7 @@ Compiler options Using Procedures and Functions Libraries, Modules and Dialogs +How to Read Syntax Diagrams Screen I/O Functions File I/O Functions diff --git a/source/media/helpimg/sbasic/a_statement.svg b/source/media/helpimg/sbasic/a_statement.svg new file mode 100644 index 0..866ed215c --- /dev/null +++ b/source/media/helpimg/sbasic/a_statement.svg @@ -0,0 +1,44 @@ +http://www.w3.org/2000/svg";> + +/* */ + + + + + + + + + +label: +statement +: + + +comment \ No newline at end of file diff --git a/source/media/helpimg/sbasic/comment_fragment.svg b/source/media/helpimg/sbasic/comment_fragment.svg new file mode 100644 index 0..b3b035cc0 --- /dev/null +++ b/source/media/helpimg/sbasic/comment_fragment.svg @@ -0,0 +1,35 @@ +http://www.w3.org/2000/svg";> + +/*
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 866cad33c6d05e9b60ccb4f8b0162edecb1faede Author: Alain Romedenne AuthorDate: Thu Jul 9 17:26:05 2020 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 9 17:26:05 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 290bab91dab73ea80e595c3b284926c7e01b35d1 - tdf#131416 How to read syntax diagrams Change-Id: Ic8ec05c75658f600f5ea1509acb482cc3db5d796 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/98343 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 5907932eac35..290bab91dab7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5907932eac35843d0cd88adea09ba8890ed59884 +Subproject commit 290bab91dab73ea80e595c3b284926c7e01b35d1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/vba/vbarange.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 978862b99ca7af6a17012084923494b6c85754d5
Author: Eike Rathke
AuthorDate: Thu Jul 9 17:15:34 2020 +0200
Commit: Eike Rathke
CommitDate: Thu Jul 9 17:16:31 2020 +0200
Use OUString::toChar(), tdf#107885 follow-up
Change-Id: I7615f878d800ae0ad68b68dd1ffedb0471c537f9
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 94d32d9eed93..ba115f6b137a 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -4373,7 +4373,7 @@ static void lcl_setTableFieldsFromCriteria( OUString&
sCriteria1, const uno::Ref
rFilterField.IsNumeric = true;
rFilterField.NumericValue = fValue;
}
-else if ( ScGlobal::getLocaleDataPtr()->getNumDecimalSep()[0] != '.' )
+else if ( ScGlobal::getLocaleDataPtr()->getNumDecimalSep().toChar() != '.'
)
{
eStatus = rtl_math_ConversionStatus_Ok;
fValue = ::rtl::math::stringToDouble( sCriteria1, '.', 0, &eStatus,
&nParseEnd );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/drviews7.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit abfaa0e504ef823c9befc90216651522c3fa3a1d
Author: Caolán McNamara
AuthorDate: Thu Jul 9 10:19:36 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 17:14:09 2020 +0200
cid#1448269 Dereference null return value
Change-Id: I9644d5e3845533fe8117f152c047cc381b3b2c48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98417
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 104d6f23801a..9f7dd8d417d3 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -1712,8 +1712,9 @@ void DrawViewShell::GetPageProperties( SfxItemSet &rSet )
switch (eXFS)
{
case drawing::FillStyle_SOLID:
+if (const XFillColorItem* pColorItem =
rPageAttr.GetItem(XATTR_FILLCOLOR))
{
-Color aColor = rPageAttr.GetItem( XATTR_FILLCOLOR
)->GetColorValue();
+Color aColor = pColorItem->GetColorValue();
XFillColorItem aFillColorItem( OUString(), aColor );
aFillColorItem.SetWhich( SID_ATTR_PAGE_COLOR );
rSet.Put( aFillColorItem );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/vba/vbarange.cxx | 25 +++--
1 file changed, 19 insertions(+), 6 deletions(-)
New commits:
commit 59374ea361815b022b1f2a415f995852f23f222e
Author: Andreas Heinisch
AuthorDate: Tue Apr 7 16:43:18 2020 +0200
Commit: Eike Rathke
CommitDate: Thu Jul 9 17:09:20 2020 +0200
tdf#107885 - VBA AutoFilter can't compare strings
During the creation of table fields from an auto filter
search criteria, check if the search text is numeric
in order to search either for strings or numeric values.
Change-Id: I6f334e7fd06c03850a535a0d54438577d15ccac4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91834
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 30c1904aed8b..94d32d9eed93 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -4303,7 +4303,6 @@ static void lcl_setTableFieldsFromCriteria( OUString&
sCriteria1, const uno::Ref
// *searchtext* - contains
// <>*searchtext* - doesn't contain
// [>|>=|<=|...]searchtext for GREATER_value, GREATER_EQUAL_value etc.
-bool bIsNumeric = false;
if ( sCriteria1.startsWith( EQUALS ) )
{
if ( sCriteria1.getLength() == static_cast(strlen(EQUALS)) )
@@ -4335,7 +4334,6 @@ static void lcl_setTableFieldsFromCriteria( OUString&
sCriteria1, const uno::Ref
}
else if ( sCriteria1.startsWith( GREATERTHAN ) )
{
-bIsNumeric = true;
if ( sCriteria1.startsWith( GREATERTHANEQUALS ) )
{
sCriteria1 = sCriteria1.copy( strlen(GREATERTHANEQUALS) );
@@ -4350,7 +4348,6 @@ static void lcl_setTableFieldsFromCriteria( OUString&
sCriteria1, const uno::Ref
}
else if ( sCriteria1.startsWith( LESSTHAN ) )
{
-bIsNumeric = true;
if ( sCriteria1.startsWith( LESSTHANEQUALS ) )
{
sCriteria1 = sCriteria1.copy( strlen(LESSTHANEQUALS) );
@@ -4366,11 +4363,27 @@ static void lcl_setTableFieldsFromCriteria( OUString&
sCriteria1, const uno::Ref
else
rFilterField.Operator = sheet::FilterOperator2::EQUAL;
-if ( bIsNumeric )
+// tdf#107885 - check if criteria is numeric using locale dependent
settings without group seperator
+// or, if the decimal separator is different from the English locale,
without any locale.
+sal_Int32 nParseEnd = 0;
+rtl_math_ConversionStatus eStatus = rtl_math_ConversionStatus_Ok;
+double fValue = ScGlobal::getLocaleDataPtr()->stringToDouble( sCriteria1,
false, &eStatus, &nParseEnd );
+if ( nParseEnd == sCriteria1.getLength() && eStatus ==
rtl_math_ConversionStatus_Ok )
{
-rFilterField.IsNumeric= true;
-rFilterField.NumericValue = sCriteria1.toDouble();
+rFilterField.IsNumeric = true;
+rFilterField.NumericValue = fValue;
}
+else if ( ScGlobal::getLocaleDataPtr()->getNumDecimalSep()[0] != '.' )
+{
+eStatus = rtl_math_ConversionStatus_Ok;
+fValue = ::rtl::math::stringToDouble( sCriteria1, '.', 0, &eStatus,
&nParseEnd );
+if ( nParseEnd == sCriteria1.getLength() && eStatus ==
rtl_math_ConversionStatus_Ok )
+{
+rFilterField.IsNumeric = true;
+rFilterField.NumericValue = fValue;
+}
+}
+
rFilterField.StringValue = sCriteria1;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/tabview.hxx |2 ++
sc/source/ui/view/tabview2.cxx | 16 +---
2 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit ebc2bbba2558dd6fe5cb41b453514211d1fb0c1c
Author: Caolán McNamara
AuthorDate: Thu Jul 9 15:07:38 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 16:59:48 2020 +0200
tdf#134688 run error dialog async and keep the events in the one event loop
instead of a sub loop which helps to not lose the mouse release where
the dialog was shown on the mouse press
Change-Id: If0baf15e85aff7a28ca058e2626b58802d0dad08
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98439
Tested-by: Xisco Fauli
Reviewed-by: Caolán McNamara
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 4f2a0aee30c5..b62dfc590115 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -138,6 +138,8 @@ private:
FuPoor* pDrawActual;
FuPoor* pDrawOld;
+std::shared_ptr m_xMessageBox;
+
std::array, 4> pGridWin;
std::array, 2> pColBar;
std::array, 2> pRowBar;
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index bf78bc7f21ee..16d626dc397d 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -1431,13 +1431,15 @@ void ScTabView::ErrorMessage(const char* pGlobStrId)
}
}
-std::unique_ptr
xInfoBox(Application::CreateMessageDialog(pParent,
- VclMessageType::Info,
VclButtonsType::Ok,
- ScResId(pGlobStrId)));
-xInfoBox->run();
-
-if (bFocus)
-pParent->grab_focus();
+m_xMessageBox.reset(Application::CreateMessageDialog(pParent,
+ VclMessageType::Info,
VclButtonsType::Ok,
+ ScResId(pGlobStrId)));
+weld::Window* pGrabOnClose = bFocus ? pParent : nullptr;
+m_xMessageBox->runAsync(m_xMessageBox, [this, pGrabOnClose](sal_Int32
/*nResult*/) {
+m_xMessageBox.reset();
+if (pGrabOnClose)
+pGrabOnClose->grab_focus();
+});
}
void ScTabView::UpdatePageBreakData( bool bForcePaint )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source
sc/source/core/tool/scmatrix.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e2713a0a5677dd92e3a88edc534a2e35ce91a0fb
Author: Eike Rathke
AuthorDate: Wed Jul 8 18:36:59 2020 +0200
Commit: Xisco Fauli
CommitDate: Thu Jul 9 16:51:47 2020 +0200
Resolves: tdf#124454 exec the matrix operator on values converted from
strings
Effectively a fallout from the matrix operations rework started
for tdf#89387 that did not convert strings at all and subsequent
work converted the string according to settings but did not apply
the current operator on the result.
Change-Id: I90c8963021396fd9a46b063f6aee96283f89271a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98385
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit 7ead920f7015bb8e7a4343b86bb26187d9a3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98339
Reviewed-by: Xisco Fauli
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 34ee65302349..4c81a803b110 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -3355,7 +3355,7 @@ public:
double operator()(const svl::SharedString& rStr) const
{
-return convertStringToValue( mpErrorInterpreter, rStr.getString());
+return maOp( convertStringToValue( mpErrorInterpreter,
rStr.getString()), mfVal);
}
TEmptyRes operator()(char) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf83309.docx |binary writerfilter/source/dmapper/NumberingManager.cxx |2 ++ 2 files changed, 2 insertions(+) New commits: commit 989cdd0a5b2efa83ff0b4ca8bc2adb0b64bde1bb Author: Vasily Melenchuk AuthorDate: Thu Jun 25 11:42:02 2020 +0300 Commit: Xisco Fauli CommitDate: Thu Jul 9 16:48:20 2020 +0200 tdf#134260: docx import: allow default value for list tab position It looks like previously used as a testcase document is just a specific case with default values. All other readers (incl. Office 365) displaying that doc with default tab at zero position. Change-Id: I50fe00c7f87b6d790fbe6e2f32a306ac59060c72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97089 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit 7221994b9b29659d3290e95eee92b1a3f80c2b7e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98331 Reviewed-by: Xisco Fauli (cherry picked from commit 54b6a6a5c95ed51ce0cd709d9fd3e477ced5ce8f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98332 Reviewed-by: Michael Stahl diff --git a/sw/qa/extras/ooxmlexport/data/tdf83309.docx b/sw/qa/extras/ooxmlexport/data/tdf83309.docx index 8dfddb6ed201..e8f59bc81969 100644 Binary files a/sw/qa/extras/ooxmlexport/data/tdf83309.docx and b/sw/qa/extras/ooxmlexport/data/tdf83309.docx differ diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index b197e4db80c2..3ea0e2e59da1 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -221,6 +221,8 @@ uno::Sequence ListLevel::GetLevelProperties(bool bDefaults if (m_nTabstop.has_value()) aNumberingProperties.push_back(lcl_makePropVal(PROP_LISTTAB_STOP_POSITION, *m_nTabstop)); +else if (bDefaults) + aNumberingProperties.push_back(lcl_makePropVal(PROP_LISTTAB_STOP_POSITION, 0)); //TODO: handling of nFLegal? //TODO: nFNoRestart lower levels do not restart when higher levels are incremented, like: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - cypress_test/integration_tests cypress_test/package.json
cypress_test/integration_tests/mobile/writer/shape_properties_spec.js |2 +-
cypress_test/package.json |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4a8832172ea16193272a653b4ca82e31205606f7
Author: Tamás Zolnai
AuthorDate: Thu Jul 9 15:43:22 2020 +0200
Commit: Tamás Zolnai
CommitDate: Thu Jul 9 16:36:40 2020 +0200
cypress: disable this unstable test.
The height input field is sometimes just disabled.
Might be a bug in the code.
Change-Id: I1d8dd5dabb1dee33606cab764b05657f4ce9df23
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98438
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git
a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
index 6f5b43321..cda9b8119 100644
--- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
@@ -113,7 +113,7 @@ describe('Change shape properties via mobile wizard.',
function() {
.should('have.attr', 'd', 'M 1965,4863 L 7957,18073
1965,18073 1965,4863 1965,4863 Z');
});
- it('Change size with keep ratio enabled.', function() {
+ it.skip('Change size with keep ratio enabled.', function() {
openPosSizePanel();
// Enable keep ratio
commit b48e9ec34928f4d358ebc19448d4540c6a588486
Author: Tamás Zolnai
AuthorDate: Thu Jul 9 14:23:32 2020 +0200
Commit: Tamás Zolnai
CommitDate: Thu Jul 9 16:36:33 2020 +0200
update cypress: 4.7.0 -> 4.9.0.
Change-Id: I3d1763b171d7163d7a96343f0687a2d64c61e062
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98431
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/package.json b/cypress_test/package.json
index a951edcbe..b44155035 100644
--- a/cypress_test/package.json
+++ b/cypress_test/package.json
@@ -4,7 +4,7 @@
"description": "Cypress integration test suit",
"license": "MPL-2.0",
"dependencies": {
-"cypress": "4.7.0",
+"cypress": "4.9.0",
"cypress-failed-log": "2.7.0",
"cypress-file-upload": "4.0.7",
"cypress-select-tests": "1.5.7",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/uitest/writer_tests/comments.py | 160 ++
1 file changed, 160 insertions(+)
New commits:
commit a5b00f6e9790b17d47a8573b441ce886f5374014
Author: Ahmed ElShreif
AuthorDate: Fri Jun 19 23:29:49 2020 +0200
Commit: Ahmed ElShreif
CommitDate: Thu Jul 9 16:34:17 2020 +0200
uitest : Fix the old demo of writer comments
This test case is added as the old test case here:
https://gerrit.libreoffice.org/c/core/+/96295
makes some randomly fail.
I tried to fix this in the new test case .
By trying to run the old test case multiple times locally .
The problem was when you execute Command to add new comment . Sometimes the
comment doesn't have enough time to be created and added as a child in the
MainWindow Object So test case fails .
So the fix was to use this function:
"ui_test.wait_until_child_is_available(parent, childName)"
This will make sure that that the comment was created successfully and
added as a child in the MainWindow to be selected in next lines .
I tried to run the test case again multiple times in my laptop and it never
fails .
Change-Id: I51e4b0802f3fa92139cbc6cdc7092c119e49d1b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96752
Tested-by: Jenkins
Reviewed-by: Ahmed ElShreif
Reviewed-by: Markus Mohrhard
diff --git a/sw/qa/uitest/writer_tests/comments.py
b/sw/qa/uitest/writer_tests/comments.py
new file mode 100644
index ..c85ed256de37
--- /dev/null
+++ b/sw/qa/uitest/writer_tests/comments.py
@@ -0,0 +1,160 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/.
+#
+
+from uitest.framework import UITestCase
+import time
+from uitest.uihelper.common import get_state_as_dict, type_text
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.debug import sleep
+from uitest.config import DEFAULT_SLEEP
+#test comments
+
+class Comments(UITestCase):
+
+def test_comments_features(self):
+
+xMainDoc = self.ui_test.create_doc_in_start_center("writer")
+
+xMainWindow = self.xUITest.getTopFocusWindow()
+
+xwriter_edit = xMainWindow.getChild("writer_edit")
+xwriter_edit.executeAction("TYPE", mkPropertyValues({"TEXT": "Before
"}))
+
+# adding new Comment
+self.xUITest.executeCommand(".uno:InsertAnnotation")
+
+# wait until the comment is available
+self.ui_test.wait_until_child_is_available(xMainWindow, 'Comment1')
+
+xComment1 = xMainWindow.getChild("Comment1")
+xComment1.executeAction("TYPE", mkPropertyValues({"TEXT": "This is the
First Comment"}))
+self.assertEqual(get_state_as_dict(xComment1)["Text"], "This is the
First Comment" )
+self.assertEqual(get_state_as_dict(xComment1)["Resolved"], "false" )
+self.assertEqual(get_state_as_dict(xComment1)["Author"], "Unknown
Author" )
+self.assertEqual(get_state_as_dict(xComment1)["ReadOnly"], "false" )
+
+xComment1.executeAction("LEAVE", mkPropertyValues({}))
+
+xwriter_edit.executeAction("TYPE", mkPropertyValues({"TEXT": "After"}))
+xwriter_edit.executeAction("SELECT", mkPropertyValues({"END_POS": "0",
"START_POS": "13"}))
+self.assertEqual(get_state_as_dict(xwriter_edit)["SelectedText"],
"Before After" )
+
+# test Resolve Comment
+xComment1.executeAction("RESOLVE", mkPropertyValues({}))
+self.assertEqual(get_state_as_dict(xComment1)["Resolved"], "true" )
+
+# test Select text from Comment
+xComment1.executeAction("SELECT", mkPropertyValues({"FROM": "0", "TO":
"4"}))
+self.assertEqual(get_state_as_dict(xComment1)["SelectedText"], "This" )
+
+# test Hide then Show Comment
+xComment1.executeAction("HIDE", mkPropertyValues({}))
+self.assertEqual(get_state_as_dict(xComment1)["Visible"], "false" )
+xComment1.executeAction("SHOW", mkPropertyValues({}))
+self.assertEqual(get_state_as_dict(xComment1)["Visible"], "true" )
+
+# test delete Comment
+xComment1.executeAction("DELETE", mkPropertyValues({}))
+self.assertTrue("Comment1" not in xMainWindow.getChildren())
+
+self.ui_test.close_doc()
+
+def test_multi_comments(self):
+
+xMainDoc = self.ui_test.create_doc_in_start_center("writer")
+
+xMainWindow = self.xUITest.getTopFocusWindow()
+
+xwriter_edit = xMainWindow.getChild("writer_edit")
+
+# adding 3 new Comment
+xwriter_edit.executeAction("TYPE", mkPropertyValues({"TEXT": "Line
1"}))
+self.xUITest.executeCommand(".uno:InsertAnnotation")
+# wait until the comment is available
+
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sd/source
sd/source/ui/dlg/animobjs.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c09d2e5d7880b6facf905cce97d23e78a90ac53 Author: Caolán McNamara AuthorDate: Thu Jul 9 11:39:43 2020 +0100 Commit: Caolán McNamara CommitDate: Thu Jul 9 16:17:49 2020 +0200 Resolves: tdf#134674 object inserting using dialogs SdrModel not the target Documents one Change-Id: I07088bddc7c15109e7d377f86c6d0a7819faa658 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98347 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 803f55810c9f..c9b66f98df6e 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -1056,7 +1056,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) // the clone remains in the animation; we insert a clone of the // clone into the group pClone = pPage->GetObj(i); -SdrObject* pCloneOfClone(pClone->CloneSdrObject(pPage->getSdrModelFromSdrPage())); +SdrObject* pCloneOfClone(pClone->CloneSdrObject(pTargetSdPage->getSdrModelFromSdrPage())); //SdrObject* pCloneOfClone = pPage->GetObj(i)->Clone(); pObjList->InsertObject(pCloneOfClone); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/util
loleaflet/util/create-l10n-all-js.pl |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 8166a0edaf93ab030af68ddac52910d7a93a2e0a
Author: Tor Lillqvist
AuthorDate: Thu Jul 9 15:55:03 2020 +0300
Commit: Tor Lillqvist
CommitDate: Thu Jul 9 15:46:57 2020 +0200
Fix create-l10n-all-js.pl for languages that include script and territory
On Android and iOS, the window.LANG gets set to a value that uses
hyphens as separators, not underscores. Also, the script is included
for the Chinese variants. While at it, make the code more lenient:
Accept either separator and with script or not.
Change-Id: I5a5319572ec96892d22eb3b30586b5b8203bdee1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98434
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/loleaflet/util/create-l10n-all-js.pl
b/loleaflet/util/create-l10n-all-js.pl
index eb88af715..4cb151fde 100644
--- a/loleaflet/util/create-l10n-all-js.pl
+++ b/loleaflet/util/create-l10n-all-js.pl
@@ -53,7 +53,7 @@ if (false) {
window.LOCALIZATIONS = " . insert('de') . ";
} else if (onlylang == 'el') {
window.LOCALIZATIONS = " . insert('el') . ";
-} else if (window.LANG == 'en_GB') {
+} else if (window.LANG == 'en-GB' || window.LANG == 'en_GB') {
window.LOCALIZATIONS = " . insert('en_GB') . ";
} else if (onlylang == 'es') {
window.LOCALIZATIONS = " . insert('es') . ";
@@ -77,7 +77,7 @@ if (false) {
window.LOCALIZATIONS = " . insert('nn') . ";
} else if (onlylang == 'pl') {
window.LOCALIZATIONS = " . insert('pl') . ";
-} else if (window.LANG == 'pt_BR') {
+} else if (window.LANG == 'pt-BR' || window.LANG == 'pt_BR') {
window.LOCALIZATIONS = " . insert('pt_BR') . ";
} else if (onlylang == 'pt') {
window.LOCALIZATIONS = " . insert('pt') . ";
@@ -91,7 +91,9 @@ if (false) {
window.LOCALIZATIONS = " . insert('tr') . ";
} else if (onlylang == 'uk') {
window.LOCALIZATIONS = " . insert('uk') . ";
-} else if (window.LANG == 'zh_TW') {
+} else if (window.LANG == 'zh-CN' || window.LANG == 'zh-Hans-CN' ||
window.LANG == 'zh_CN' || window.LANG == 'zh_Hans_CN' ) {
+window.LOCALIZATIONS = " . insert('zh_CN') . ";
+} else if (window.LANG == 'zh-TW' || window.LANG == 'zh-Hant-TW' ||
window.LANG == 'zh_TW' || window.LANG == 'zh_Hant_TW') {
window.LOCALIZATIONS = " . insert('zh_TW') . ";
} else {
window.LOCALIZATIONS = {};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - cypress_test/data cypress_test/integration_tests
cypress_test/data/mobile/impress/hamburger_menu.odp
|binary
cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js|
5
cypress_test/integration_tests/mobile/impress/apply_font_spec.js|
1
cypress_test/integration_tests/mobile/impress/apply_paragraph_props_spec.js |
1
cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js|
363 ++
cypress_test/integration_tests/mobile/impress/impress_mobile_helper.js |
3
6 files changed, 370 insertions(+), 3 deletions(-)
New commits:
commit d15e0dea8eaa9a2bb1cab379f2d85bbbc0026b7d
Author: Tamás Zolnai
AuthorDate: Thu Jul 9 14:09:39 2020 +0200
Commit: Tamás Zolnai
CommitDate: Thu Jul 9 15:34:55 2020 +0200
cypress: fix removeTextSelection() helper method.
Change-Id: If0b254eca495b57c8697ad17a53d0f7e952c6fba
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98430
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
b/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
index 229c0be18..e26a84a95 100644
--- a/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
+++ b/cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js
@@ -20,6 +20,11 @@ function removeTextSelection() {
cy.get('.spreadsheet-cell-resize-marker')
.invoke('attr', 'style')
.should('contain', '-8px,');
+
+ var regex = /[A-Z]1:[A-Z]1048576/;
+ cy.get('input#addressInput')
+ .should('have.prop', 'value')
+ .should('match', regex);
}
cy.log('Removing text selection - end.');
commit fb316d601e84b608a01f3c77572c5a6eb710923a
Author: Tamás Zolnai
AuthorDate: Thu Jul 9 11:56:43 2020 +0200
Commit: Tamás Zolnai
CommitDate: Thu Jul 9 15:34:42 2020 +0200
cypress: add some tests for impress's hamburger menu (mobile).
Change-Id: Idc747ac6ebb47b2ec2da086ba7e597d3bc396bf1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98427
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/data/mobile/impress/hamburger_menu.odp
b/cypress_test/data/mobile/impress/hamburger_menu.odp
new file mode 100644
index 0..8907786e3
Binary files /dev/null and
b/cypress_test/data/mobile/impress/hamburger_menu.odp differ
diff --git a/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
b/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
index 71c91b3be..388b32a54 100644
--- a/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/apply_font_spec.js
@@ -20,6 +20,7 @@ describe('Apply font on text and on text shape.', function() {
});
function triggerNewSVG() {
+ mobileHelper.closeMobileWizard();
impressMobileHelper.triggerNewSVGForShapeInTheCenter();
}
diff --git
a/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_spec.js
b/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_spec.js
index a49551dd2..b6539f2d2 100644
---
a/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_spec.js
+++
b/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_spec.js
@@ -20,6 +20,7 @@ describe('Apply paragraph properties.', function() {
});
function triggerNewSVG() {
+ mobileHelper.closeMobileWizard();
impressMobileHelper.triggerNewSVGForShapeInTheCenter();
}
diff --git
a/cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js
b/cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js
new file mode 100644
index 0..8f870fe83
--- /dev/null
+++ b/cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js
@@ -0,0 +1,363 @@
+/* global describe it cy require afterEach expect */
+
+var helper = require('../../common/helper');
+var mobileHelper = require('../../common/mobile_helper');
+var impressMobileHelper = require('./impress_mobile_helper');
+
+describe('Trigger hamburger menu options.', function() {
+ var testFileName = '';
+
+ function before(testFile) {
+ testFileName = testFile;
+ mobileHelper.beforeAllMobile(testFileName, 'impress');
+
+ // Click on edit button
+ mobileHelper.enableEditingMobile();
+ }
+
+ afterEach(function() {
+ helper.afterAll(testFileName);
+ });
+
+ function dblclickOnShape() {
+ cy.get('.transform-handler--rotate')
+ .then(function(items) {
+ expect(items).to.have.length(1);
+ v
[Libreoffice-commits] core.git: vcl/workben
vcl/workben/ww6fuzzer.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit c0a6d6f2bd5de731ebe0cd839f6a62cc5150b05b
Author: Caolán McNamara
AuthorDate: Thu Jul 9 11:47:26 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 14:52:22 2020 +0200
stray remaining emfio_component_getFactory call
Change-Id: I37279fbca3bf83cf2c5609ddf9956ee915ae0b30
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98424
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/workben/ww6fuzzer.cxx b/vcl/workben/ww6fuzzer.cxx
index f0225b20e2ce..b89f80461545 100644
--- a/vcl/workben/ww6fuzzer.cxx
+++ b/vcl/workben/ww6fuzzer.cxx
@@ -44,7 +44,6 @@ lo_get_factory_map(void)
static lib_to_factory_mapping map[] = {
{ "libunoxmllo.a", unoxml_component_getFactory },
{ "libi18npoollo.a", i18npool_component_getFactory },
-{ "libemfiolo.a", emfio_component_getFactory },
{ "libucb1.a", ucb_component_getFactory },
{ 0, 0 }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - writerfilter/source
writerfilter/source/dmapper/NumberingManager.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 28d71f061c665e5052946311358a8df012bafebe
Author: Caolán McNamara
AuthorDate: Thu Jul 9 10:10:03 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 14:51:34 2020 +0200
cid#1465231 Improper user of negative value
Change-Id: I984ae1103152a396cd157c3721a3739455b95997
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98345
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 11b851c7ee8c..805e95498395 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -713,10 +713,10 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
break;
case NS_ooxml::LN_CT_NumLvl_ilvl:
//add a new level to the level vector and make it the current one
-m_pCurrentDefinition->AddLevel(rVal.getString().toInt32());
+m_pCurrentDefinition->AddLevel(rVal.getString().toUInt32());
break;
case NS_ooxml::LN_CT_Lvl_ilvl:
-m_pCurrentDefinition->AddLevel(rVal.getString().toInt32());
+m_pCurrentDefinition->AddLevel(rVal.getString().toUInt32());
break;
case NS_ooxml::LN_CT_AbstractNum_abstractNumId:
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/form/navigatortree.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit a51f99f6ca7e95a4b9e92851ca2cda832584faff Author: Caolán McNamara AuthorDate: Thu Jul 9 10:14:03 2020 +0100 Commit: Caolán McNamara CommitDate: Thu Jul 9 14:49:20 2020 +0200 cid#1465229 Unchecked return value Change-Id: I7e12612f1aa2570df8f5b0347f19dcb96532aa26 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98415 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 70d1e713ac40..8bc70bdb9510 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -711,7 +711,8 @@ namespace svxform sal_Int8 nAction = m_aControlExchange.isClipboardOwner() && doingKeyboardCut( ) ? DND_ACTION_MOVE : DND_ACTION_COPY; std::unique_ptr xSelected(m_xTreeView->make_iterator()); -m_xTreeView->get_selected(xSelected.get()); +if (!m_xTreeView->get_selected(xSelected.get())) +xSelected.reset(); return nAction == implAcceptDataTransfer(aClipboardContent.GetDataFlavorExVector(), nAction, xSelected.get(), false); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/uiview/viewtab.cxx | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 539189a56045ae23cfaf2f4aaf20a00117d42dc6
Author: Caolán McNamara
AuthorDate: Thu Jul 9 10:15:35 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 14:49:49 2020 +0200
cid#1448540 Dereference null return value
Change-Id: Ic5692d2bf5be11881792d7dbfb00b11af927b5e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98416
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/uibase/uiview/viewtab.cxx
b/sw/source/uibase/uiview/viewtab.cxx
index b7f6e02dcc09..33dc8c268a3c 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -2416,14 +2416,17 @@ void SwView::StateTabWin(SfxItemSet& rSet)
rSet.Put( SfxBoolItem(SID_ATTR_PAGE_HEADER, bHeaderOn ) );
if(bHeaderOn)
{
-const SvxLRSpaceItem* rLR = static_cast(
+const SvxLRSpaceItem* pLR = static_cast(
rHeader.GetHeaderFormat()->GetAttrSet().GetItem(SID_ATTR_LRSPACE));
-const SvxULSpaceItem* rUL = static_cast(
+const SvxULSpaceItem* pUL = static_cast(
rHeader.GetHeaderFormat()->GetAttrSet().GetItem(SID_ATTR_ULSPACE));
-SvxLongLRSpaceItem aLR(rLR->GetLeft(), rLR->GetRight(),
SID_ATTR_PAGE_HEADER_LRMARGIN);
-rSet.Put(aLR);
-SvxLongULSpaceItem aUL( rUL->GetUpper(), rUL->GetLower(),
SID_ATTR_PAGE_HEADER_SPACING);
-rSet.Put(aUL);
+if (pLR && pUL)
+{
+SvxLongLRSpaceItem aLR(pLR->GetLeft(), pLR->GetRight(),
SID_ATTR_PAGE_HEADER_LRMARGIN);
+rSet.Put(aLR);
+SvxLongULSpaceItem aUL( pUL->GetUpper(), pUL->GetLower(),
SID_ATTR_PAGE_HEADER_SPACING);
+rSet.Put(aUL);
+}
bool bShared = !rDesc.IsHeaderShared();
bool bFirst = !rDesc.IsFirstShared(); // FIXME control changes
for both header footer - tdf#100287
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source writerfilter/source
cui/source/dialogs/hltpbase.cxx |2 +-
writerfilter/source/dmapper/NumberingManager.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1f6842a5afea1a41ef67b9ee78da9bf30c02
Author: Caolán McNamara
AuthorDate: Thu Jul 9 10:11:58 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 14:48:28 2020 +0200
cid#1465230 Dereference null return value
Change-Id: I494fc9e36324c1940dbc551c2c7d86df70f30711
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98414
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 63d3eb1738c1..f79f5644e710 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -382,7 +382,7 @@ HyperDialogEvent SvxHyperlinkTabPageBase::GetMacroEvents()
const
const SvxHyperlinkItem *pHyperlinkItem = static_cast(
GetItemSet().GetItem
(SID_HYPERLINK_GETLINK));
-return pHyperlinkItem->GetMacroEvents();
+return pHyperlinkItem ? pHyperlinkItem->GetMacroEvents() :
HyperDialogEvent();
}
SvxMacroTableDtor* SvxHyperlinkTabPageBase::GetMacroTable()
commit c11ccaf57bad5d2aa12707abf26ae1fe8edcc4a5
Author: Caolán McNamara
AuthorDate: Thu Jul 9 10:10:03 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 14:48:01 2020 +0200
cid#1465231 Improper user of negative value
Change-Id: I984ae1103152a396cd157c3721a3739455b95997
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98412
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index e5c813d819a5..c30a9a120bee 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -713,10 +713,10 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
break;
case NS_ooxml::LN_CT_NumLvl_ilvl:
//add a new level to the level vector and make it the current one
-m_pCurrentDefinition->AddLevel(rVal.getString().toInt32());
+m_pCurrentDefinition->AddLevel(rVal.getString().toUInt32());
break;
case NS_ooxml::LN_CT_Lvl_ilvl:
-m_pCurrentDefinition->AddLevel(rVal.getString().toInt32());
+m_pCurrentDefinition->AddLevel(rVal.getString().toUInt32());
break;
case NS_ooxml::LN_CT_AbstractNum_abstractNumId:
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/border.cxx | 40 ++--
1 file changed, 26 insertions(+), 14 deletions(-)
New commits:
commit e8a86811c59c173b331e521879085beab895e5ce
Author: Caolán McNamara
AuthorDate: Thu Jul 9 10:08:17 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 14:47:39 2020 +0200
cid#1465232 Dereference null return value
Change-Id: I221af4bce9c5cadabef0acb27177e5bf91f08cd1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98411
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 82f9b6c3e0ab..eb72e3417a42 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -847,35 +847,47 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet*
rCoreAttrs )
if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::TLBR))
{
sal_uInt16 nBorderDiagId = pPool->GetWhich(SID_ATTR_BORDER_DIAG_TLBR);
-SvxLineItem aLineItem(*static_cast(rCoreAttrs->GetItem(nBorderDiagId)));
-
aLineItem.SetLine(m_aFrameSel.GetFrameBorderStyle(svx::FrameBorderType::TLBR));
-rCoreAttrs->Put(aLineItem);
-bAttrsChanged = true;
+if (const SfxPoolItem* pItem = rCoreAttrs->GetItem(nBorderDiagId))
+{
+SvxLineItem aLineItem(*static_cast(pItem));
+
aLineItem.SetLine(m_aFrameSel.GetFrameBorderStyle(svx::FrameBorderType::TLBR));
+rCoreAttrs->Put(aLineItem);
+bAttrsChanged = true;
+}
}
if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::BLTR))
{
sal_uInt16 nBorderDiagId = pPool->GetWhich(SID_ATTR_BORDER_DIAG_BLTR);
-SvxLineItem aLineItem(*static_cast(rCoreAttrs->GetItem(nBorderDiagId)));
-
aLineItem.SetLine(m_aFrameSel.GetFrameBorderStyle(svx::FrameBorderType::BLTR));
-rCoreAttrs->Put(aLineItem);
-bAttrsChanged = true;
+if (const SfxPoolItem* pItem = rCoreAttrs->GetItem(nBorderDiagId))
+{
+SvxLineItem aLineItem(*static_cast(pItem));
+
aLineItem.SetLine(m_aFrameSel.GetFrameBorderStyle(svx::FrameBorderType::BLTR));
+rCoreAttrs->Put(aLineItem);
+bAttrsChanged = true;
+}
}
if (m_xShadowControls && m_xShadowControls->get_value_changed_from_saved())
{
sal_uInt16 nShadowId = pPool->GetWhich(mnShadowSlot);
-const SvxShadowItem& rOldShadowItem = *static_cast(rCoreAttrs->GetItem(nShadowId));
-rCoreAttrs->Put(m_xShadowControls->GetControlValue(rOldShadowItem));
-bAttrsChanged = true;
+if (const SfxPoolItem* pItem = rCoreAttrs->GetItem(nShadowId))
+{
+const SvxShadowItem& rOldShadowItem = *static_cast(pItem);
+
rCoreAttrs->Put(m_xShadowControls->GetControlValue(rOldShadowItem));
+bAttrsChanged = true;
+}
}
if (m_xMarginControls && m_xMarginControls->get_value_changed_from_saved())
{
sal_uInt16 nAlignMarginId = pPool->GetWhich(SID_ATTR_ALIGN_MARGIN);
-const SvxMarginItem& rOldMarginItem = *static_cast(rCoreAttrs->GetItem(nAlignMarginId));
-rCoreAttrs->Put(m_xMarginControls->GetControlValue(rOldMarginItem));
-bAttrsChanged = true;
+if (const SfxPoolItem* pItem = rCoreAttrs->GetItem(nAlignMarginId))
+{
+const SvxMarginItem& rOldMarginItem = *static_cast(pItem);
+
rCoreAttrs->Put(m_xMarginControls->GetControlValue(rOldMarginItem));
+bAttrsChanged = true;
+}
}
if (m_xMergeAdjacentBordersCB->get_state_changed_from_saved())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 4213a0b6929d188d5ec75a6b90e194c2b6ba9d11
Author: Shivam Kumar Singh
AuthorDate: Tue Jul 7 01:06:55 2020 +0530
Commit: Heiko Tietze
CommitDate: Thu Jul 9 14:43:19 2020 +0200
tdf#134562 Added check for textnode
Change-Id: I0a38de547747f04a61a66c9ef62e59a68c4e1826
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98225
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
index dbc22de258b5..0bfafc0a5bc9 100644
--- a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
+++ b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
@@ -20,6 +20,7 @@
#include "WriterInspectorTextPanel.hxx"
#include
#include
+#include
#include
#include
#include
@@ -241,7 +242,7 @@ void WriterInspectorTextPanel::NotifyItemUpdate(const
sal_uInt16 nSId,
case SID_STYLE_FAMILY1:
case SID_STYLE_FAMILY2:
{
-if (pDocSh)
+if (pDocSh &&
pDocSh->GetDoc()->GetEditShell()->GetCursor()->GetNode().GetTextNode())
{
/*
First check in the property set of Character Styles
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/notebookbar.css |8
1 file changed, 8 insertions(+)
New commits:
commit c618fcba64f5ee2398afcd86383a123e3151065c
Author: Szymon Kłos
AuthorDate: Thu Jul 9 13:26:17 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Jul 9 14:28:57 2020 +0200
notebookbar: highlight styles on hover
Change-Id: I41a7715747cb22fe972547d4028c4c0e0899305e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98426
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 94cff1fee..60d851074 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -194,6 +194,14 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
cursor: pointer;
}
+#table-stylescontainer #style1:hover,
+#table-stylescontainer #style2:hover,
+#table-stylescontainer #style3:hover,
+#table-stylescontainer #style4:hover
+{
+ border: 1px solid lightgray;
+}
+
/* Insert Tab */
#InsertReferenceField.notebookbar,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sc/source
sc/source/ui/view/gridwin.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit b771fdd93bc6e904351581b7aa69e0596003dc20 Author: Szymon Kłos AuthorDate: Wed Jul 8 10:08:05 2020 +0200 Commit: Szymon Kłos CommitDate: Thu Jul 9 14:03:02 2020 +0200 Empty reference marks on selection reset Change-Id: Id085b6b608335e1bcc085d7a8c972622a918f1ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98316 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos (cherry picked from commit 7e8bcf38f00b3c45a78ba7a60aeb9e6dee11a23e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98341 diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index b5e19cda389f..48745aec049b 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -6292,6 +6292,8 @@ void ScGridWindow::UpdateSelectionOverlay() pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION, "EMPTY"); pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_SELECTION_AREA, "EMPTY"); SfxLokHelper::notifyOtherViews(pViewShell, LOK_CALLBACK_TEXT_VIEW_SELECTION, "selection", "EMPTY"); +std::vector aReferenceMarks; +ScInputHandler::SendReferenceMarks(pViewShell, aReferenceMarks); } if ( aOldMode != aDrawMode ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: cypress_test/integration_tests loleaflet/css loleaflet/src
cypress_test/integration_tests/common/calc_helper.js |2 -
loleaflet/css/spreadsheet.css|2 -
loleaflet/src/layer/tile/TileLayer.js| 28 ++-
3 files changed, 22 insertions(+), 10 deletions(-)
New commits:
commit d12cc35045c480311f019afec3a3a1771eb65aa0
Author: Szymon Kłos
AuthorDate: Thu Jul 9 11:25:25 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Jul 9 13:15:29 2020 +0200
Make cell markers less heavy on desktop
* Don't show selection resize markers for single cell
selection on desktop
* Use smaller autofill marker on desktop, for single cell
show it in the corner like in the core
Change-Id: Ic36c16213532ec8b615ee808f836b939f35245fd
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98420
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/cypress_test/integration_tests/common/calc_helper.js
b/cypress_test/integration_tests/common/calc_helper.js
index 3fc8a996f..8542f7c3a 100644
--- a/cypress_test/integration_tests/common/calc_helper.js
+++ b/cypress_test/integration_tests/common/calc_helper.js
@@ -44,7 +44,7 @@ function clickOnFirstCell(firstClick = true, dblClick =
false) {
});
if (firstClick && !dblClick)
- cy.get('.spreadsheet-cell-resize-marker')
+ cy.get('.spreadsheet-cell-autofill-marker')
.should('be.visible');
else
cy.get('.leaflet-cursor.blinking-cursor')
diff --git a/loleaflet/css/spreadsheet.css b/loleaflet/css/spreadsheet.css
index a24792192..651dfb97b 100644
--- a/loleaflet/css/spreadsheet.css
+++ b/loleaflet/css/spreadsheet.css
@@ -217,8 +217,6 @@
.spreadsheet-cell-autofill-marker {
margin-left: 0px;
margin-top: 0px;
- width: 16px;
- height: 16px;
background-image: url('images/cell-autofill-marker.svg');
background-size: 100% 100%;
background-repeat: no-repeat;
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 438476c26..92257f195 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -178,7 +178,7 @@ L.TileLayer = L.GridLayer.extend({
this._cellAutofillMarker = L.marker(new L.LatLng(0, 0), {
icon: L.divIcon({
className: 'spreadsheet-cell-autofill-marker',
- iconSize: null
+ iconSize: window.mode.isDesktop() ? [8, 8] :
[16, 16]
}),
draggable: true
});
@@ -3079,7 +3079,12 @@ L.TileLayer = L.GridLayer.extend({
},
_onUpdateCellResizeMarkers: function () {
- if (this._selections.getLayers().length !== 0 ||
(this._cellCursor && !this._isEmptyRectangle(this._cellCursor))) {
+ var singleCellOnDesktop = window.mode.isDesktop()
+ &&
!this._cellSelectionArea
+ &&
(this._cellCursor && !this._isEmptyRectangle(this._cellCursor));
+
+ if (!singleCellOnDesktop &&
+ (this._selections.getLayers().length !== 0 ||
(this._cellCursor && !this._isEmptyRectangle(this._cellCursor {
if (this._isEmptyRectangle(this._cellSelectionArea) &&
this._isEmptyRectangle(this._cellCursor)) {
return;
}
@@ -3107,10 +3112,6 @@ L.TileLayer = L.GridLayer.extend({
this._map.addLayer(this._cellAutofillMarker);
var cellAutoFillMarkerPoisition =
cellRectangle.getCenter();
cellAutoFillMarkerPoisition.lat =
cellRectangle.getSouth();
- cellAutoFillMarkerPoisition =
this._map.project(cellAutoFillMarkerPoisition);
- var sizeAutoFill =
this._cellAutofillMarker._icon.getBoundingClientRect();
- cellAutoFillMarkerPoisition =
cellAutoFillMarkerPoisition.subtract(new L.Point(sizeAutoFill.width / 2,
sizeAutoFill.height / 2));
- cellAutoFillMarkerPoisition =
this._map.unproject(cellAutoFillMarkerPoisition);
this._cellAutofillMarker.setLatLng(cellAutoFillMarkerPoisition);
}
else if (this._cellAutofillMarker) {
@@ -3118,7 +3119,20 @@ L.TileLayer = L.GridLayer.extend({
}
}
}
- else {
+ else if (singleCellOnDesktop) {
+ cellRectangle = t
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/source
vcl/source/control/combobox.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit f15ed9ef890b13394de9b2673c010086063d6e7a
Author: Szymon Kłos
AuthorDate: Wed Jul 8 13:52:43 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Jul 9 13:01:07 2020 +0200
Call modified handler on combobox selection
SelectEntryPos is used by uitest framework
to perform combobox selection action.
Calling handler is required to propagate
changes to the client code.
Change-Id: I83d3d72ee5f17f382ce5f56b35b0a91ec98ebfb3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98370
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 4363f868c482..f8cd09911018 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -452,7 +452,10 @@ IMPL_LINK( ComboBox::Impl, ImplSelectionChangedHdl,
sal_Int32, nChanged, void )
if (!m_pImplLB->IsTrackingSelect())
{
if (!m_pSubEdit->IsReadOnly() &&
m_pImplLB->GetEntryList()->IsEntryPosSelected(nChanged))
+{
m_pSubEdit->SetText(m_pImplLB->GetEntryList()->GetEntryText(nChanged));
+m_pSubEdit->Modify();
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/form/navigatortree.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 1f66b4247334d253c7237ed5447e5f72716c4897
Author: Caolán McNamara
AuthorDate: Thu Jul 9 09:57:21 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 13:00:24 2020 +0200
cid#1465234 Unchecked return value
Change-Id: I56d59de5c65144283595b044142ff3f8988a02a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98409
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svx/source/form/navigatortree.cxx
b/svx/source/form/navigatortree.cxx
index 77300a01b662..70d1e713ac40 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1895,8 +1895,10 @@ namespace svxform
if ((m_arrCurrentSelection.size() == 1) && (m_nFormsSelected == 1))
{
std::unique_ptr
xSelected(m_xTreeView->make_iterator());
-m_xTreeView->get_selected(xSelected.get());
-FmFormData* pSingleSelectionData =
dynamic_cast(reinterpret_cast(m_xTreeView->get_id(*xSelected).toInt64()));
+if (!m_xTreeView->get_selected(xSelected.get()))
+xSelected.reset();
+FmFormData* pSingleSelectionData = xSelected ?
dynamic_cast(reinterpret_cast(m_xTreeView->get_id(*xSelected).toInt64()))
+ : nullptr;
DBG_ASSERT( pSingleSelectionData,
"NavigatorTree::SynchronizeMarkList: invalid selected form!" );
if ( pSingleSelectionData )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/form/datanavi.cxx | 36 ++--
1 file changed, 30 insertions(+), 6 deletions(-)
New commits:
commit 9ff9ad072e4e38e55b75f5b05d40b72c58e47a28
Author: Caolán McNamara
AuthorDate: Thu Jul 9 10:02:25 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 13:00:05 2020 +0200
cid#1465233 Unchecked return value
Change-Id: I078f20bd607110cd526ce40a6391affd238a14d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98410
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index ab8ff5c35007..fc7d8fe26652 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -788,7 +788,11 @@ namespace svxform
try
{
std::unique_ptr
xEntry(m_xItemList->make_iterator());
-m_xItemList->get_selected(xEntry.get());
+if (!m_xItemList->get_selected(xEntry.get()))
+{
+SAL_WARN( "svx.form", "corrupt tree" );
+return;
+}
// #i36262# may be called for submission entry *or* for
// submission children. If we don't have any children, we
@@ -801,24 +805,44 @@ namespace svxform
_rEntry->getPropertyValue( PN_SUBMISSION_BIND ) >>= sTemp;
OUString sEntry = SvxResId( RID_STR_DATANAV_SUBM_BIND ) +
sTemp;
-m_xItemList->iter_children(*xEntry);
+if (!m_xItemList->iter_children(*xEntry))
+{
+SAL_WARN( "svx.form", "corrupt tree" );
+return;
+}
m_xItemList->set_text(*xEntry, sEntry);
_rEntry->getPropertyValue( PN_SUBMISSION_REF ) >>= sTemp;
sEntry = SvxResId( RID_STR_DATANAV_SUBM_REF ) + sTemp;
-m_xItemList->iter_next_sibling(*xEntry);
+if (!m_xItemList->iter_next_sibling(*xEntry))
+{
+SAL_WARN( "svx.form", "corrupt tree" );
+return;
+}
m_xItemList->set_text(*xEntry, sEntry);
_rEntry->getPropertyValue( PN_SUBMISSION_ACTION ) >>= sTemp;
sEntry = SvxResId( RID_STR_DATANAV_SUBM_ACTION ) + sTemp;
-m_xItemList->iter_next_sibling(*xEntry);
+if (!m_xItemList->iter_next_sibling(*xEntry))
+{
+SAL_WARN( "svx.form", "corrupt tree" );
+return;
+}
_rEntry->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp;
sEntry = SvxResId( RID_STR_DATANAV_SUBM_METHOD ) +
m_aMethodString.toUI( sTemp );
-m_xItemList->iter_next_sibling(*xEntry);
+if (!m_xItemList->iter_next_sibling(*xEntry))
+{
+SAL_WARN( "svx.form", "corrupt tree" );
+return;
+}
m_xItemList->set_text(*xEntry, sEntry);
_rEntry->getPropertyValue( PN_SUBMISSION_REPLACE ) >>= sTemp;
sEntry = SvxResId( RID_STR_DATANAV_SUBM_REPLACE ) +
m_aReplaceString.toUI( sTemp );
-m_xItemList->iter_next_sibling(*xEntry);
+if (!m_xItemList->iter_next_sibling(*xEntry))
+{
+SAL_WARN( "svx.form", "corrupt tree" );
+return;
+}
m_xItemList->set_text(*xEntry, sEntry);
}
catch ( Exception const & )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/strings.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 69e3b647d27d4fdb8243d6cca86f9287a5be6026
Author: Samuel Mehrbrodt
AuthorDate: Mon Jul 6 09:05:15 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Jul 9 12:38:26 2020 +0200
Revert "tdf#128526: Make the read-only notification a bit more verbose"
This reverts commit 6c102b0a12ed911b207d8b1da421f2b916c2bcdf.
Reason for revert:
The Infobar has an "Edit Document" button which lets you edit the document
without first saving it in another place.
So at least in that place this verbose message is confusing.
Change-Id: I3bcdd389a560ac4c8ee0f86ca13573bbc05f2ebb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98075
Reviewed-by: Tor Lillqvist
Tested-by: Jenkins
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index d537d14e0208..8f7311dd7ae5 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -272,7 +272,7 @@
#define STR_DONATE_BUTTON NC_("STR_DONATE_BUTTON",
"Donate")
#define STR_WHATSNEW_TEXT NC_("STR_WHATSNEW", "You are
running version %PRODUCTVERSION of %PRODUCTNAME for the first time. Do you want
to learn what's new?")
#define STR_WHATSNEW_BUTTON NC_("STR_WHATSNEW_BUTTON",
"Release Notes")
-#define STR_READONLY_DOCUMENT NC_("STR_READONLY_DOCUMENT",
"This document is open in read-only mode. If you wish to modify the contents,
first save it as another document, in a folder you have write access to.")
+#define STR_READONLY_DOCUMENT NC_("STR_READONLY_DOCUMENT",
"This document is open in read-only mode.")
#define STR_READONLY_PDFNC_("STR_READONLY_PDF", "This
PDF is open in read-only mode to allow signing the existing file.")
#define STR_CLASSIFIED_DOCUMENT NC_("STR_CLASSIFIED_DOCUMENT",
"The classification label of this document is %1.")
#define STR_TARGET_DOC_NOT_CLASSIFIED
NC_("STR_TARGET_DOC_NOT_CLASSIFIED", "This document must be classified before
the clipboard can be pasted.")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/hltpbase.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2a691bfb8c749d25d8776f16977441f927cd3cd7 Author: Caolán McNamara AuthorDate: Thu Jul 9 09:55:38 2020 +0100 Commit: Caolán McNamara CommitDate: Thu Jul 9 12:42:59 2020 +0200 cid#1465235 Dereference null return value Change-Id: I73efddfeca873e43f1505790eebf260c27e248de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98408 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index b3c7b076f1ca..63d3eb1738c1 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -331,7 +331,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, weld::Button&, voi SvxHyperlinkItem *pHyperlinkItem = const_cast(static_cast( GetItemSet().GetItem (SID_HYPERLINK_GETLINK))); -if ( pHyperlinkItem->GetMacroEvents() == HyperDialogEvent::NONE ) +if (!pHyperlinkItem || pHyperlinkItem->GetMacroEvents() == HyperDialogEvent::NONE) return; // get macros from itemset ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/scopetools.hxx |2 +-
sc/source/core/tool/scopetools.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e5edf213a99e8936e1a170673ad1c50b3d7120cd
Author: Caolán McNamara
AuthorDate: Thu Jul 9 09:54:10 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 12:42:33 2020 +0200
cid#1465236 Uncaught exception
Change-Id: I1303fe8ac9a5eecc06d9622893c8643d87120a58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98407
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx
index eb2941f15777..d87cb9b04ad6 100644
--- a/sc/inc/scopetools.hxx
+++ b/sc/inc/scopetools.hxx
@@ -83,7 +83,7 @@ public:
DelayStartListeningFormulaCells(ScColumn& column, bool delay);
DelayStartListeningFormulaCells(ScColumn& column);
DelayStartListeningFormulaCells(const DelayStartListeningFormulaCells&) =
delete;
-~DelayStartListeningFormulaCells();
+~DelayStartListeningFormulaCells() COVERITY_NOEXCEPT_FALSE;
void set();
};
diff --git a/sc/source/core/tool/scopetools.cxx
b/sc/source/core/tool/scopetools.cxx
index 6416e3c2ea89..541ec3e3c3ea 100644
--- a/sc/source/core/tool/scopetools.cxx
+++ b/sc/source/core/tool/scopetools.cxx
@@ -85,7 +85,7 @@
DelayStartListeningFormulaCells::DelayStartListeningFormulaCells(ScColumn& colum
{
}
-DelayStartListeningFormulaCells::~DelayStartListeningFormulaCells()
+DelayStartListeningFormulaCells::~DelayStartListeningFormulaCells()
COVERITY_NOEXCEPT_FALSE
{
mColumn.GetDoc()->EnableDelayStartListeningFormulaCells(&mColumn,
mbOldValue);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zforlist.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit f5bb3096d2574756e0e1e62258b7d7604e9ab88f
Author: Caolán McNamara
AuthorDate: Thu Jul 9 09:52:29 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 12:41:52 2020 +0200
cid#1465237 silence Dereference after null check
Change-Id: I7014da07d88861e4f08fb9e1006dccb6fc2ad245
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98406
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index a1c529bd58bb..7c1fa0da613e 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3049,6 +3049,7 @@ OUString SvNumberFormatter::GenerateFormat(sal_uInt32
nIndex,
if (eType & SvNumFormatType::TIME)
{
+assert(pFormat && "with !pFormat eType can only be
SvNumFormatType::UNDEFINED");
sString = pFormat->GetFormatStringForTimePrecision( nPrecision );
}
else if (nLeadingZeros == 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - chart2/source
chart2/source/view/charttypes/VSeriesPlotter.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit ef3a615ebd899af32c12adcd6cf2c3e89fb60f6f
Author: Caolán McNamara
AuthorDate: Thu Jul 9 09:45:37 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 12:42:12 2020 +0200
cid#1465238 Uninitialized scalar field
Change-Id: Ia0ffb4bad265aabe396ef94e3d9c2bbe79993b4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98344
Reviewed-by: Balazs Varga
Reviewed-by: Caolán McNamara
Tested-by: Jenkins
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 75a0ea173aba..bbc1788ec148 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -150,6 +150,7 @@ VSeriesPlotter::VSeriesPlotter( const
uno::Reference& xChartTypeMode
, m_xColorScheme()
, m_pExplicitCategoriesProvider(nullptr)
, m_bPointsWereSkipped(false)
+, m_bPieLabelsAllowToMove(false)
{
SAL_WARN_IF(!m_xChartTypeModel.is(),"chart2","no XChartType available in
view, fallback to default values may be wrong");
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
16 new defect(s) introduced to LibreOffice found with Coverity Scan.
13 defect(s), reported by Coverity Scan earlier, were marked fixed in the
recent build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 16 of 16 defect(s)
** CID 1465241: Error handling issues (CHECKED_RETURN)
/svx/source/form/datanavi.cxx: 791 in svxform::XFormsPage::EditEntry(const
com::sun::star::uno::Reference &)()
*** CID 1465241: Error handling issues (CHECKED_RETURN)
/svx/source/form/datanavi.cxx: 791 in svxform::XFormsPage::EditEntry(const
com::sun::star::uno::Reference &)()
785
786 if ( DGTSubmission == m_eGroup )
787 {
788 try
789 {
790 std::unique_ptr
xEntry(m_xItemList->make_iterator());
>>> CID 1465241: Error handling issues (CHECKED_RETURN)
>>> Calling "get_selected" without checking return value (as is done
>>> elsewhere 77 out of 94 times).
791 m_xItemList->get_selected(xEntry.get());
792
793 // #i36262# may be called for submission entry *or* for
794 // submission children. If we don't have any children,
we
795 // assume the latter case and use the parent
796 if (!m_xItemList->iter_has_child(*xEntry))
** CID 1465240: Control flow issues (DEADCODE)
/vcl/source/gdi/pdfwriter_impl.cxx: 595 in
vclappendPdfTimeDate(rtl::OStringBuffer &, short, unsigned short,
unsigned short, unsigned short, unsigned short, unsigned short, unsigned int)()
*** CID 1465240: Control flow issues (DEADCODE)
/vcl/source/gdi/pdfwriter_impl.cxx: 595 in
vclappendPdfTimeDate(rtl::OStringBuffer &, short, unsigned short,
unsigned short, unsigned short, unsigned short, unsigned short, unsigned int)()
589 }
590 else
591 {
592 if (tzDelta > 0 )
593 rBuffer.append("+");
594 else
>>> CID 1465240: Control flow issues (DEADCODE)
>>> Execution cannot reach this statement: "rBuffer->append("-");".
595 rBuffer.append("-");
596
597 rBuffer.append(char('0' + ((tzDelta / 36000) % 10)));
598 rBuffer.append(char('0' + ((tzDelta / 3600) % 10)));
599 rBuffer.append("'");
600 rBuffer.append(char('0' + ((tzDelta / 600) % 6)));
** CID 1465239: Null pointer dereferences (FORWARD_NULL)
*** CID 1465239: Null pointer dereferences (FORWARD_NULL)
/vcl/source/filter/ipdf/pdfdocument.cxx: 360 in
vcl::filter::PDFDocument::WriteAppearanceObject(tools::Rectangle &)()
354 aEditBuffer.WriteCharPtr("<>> CID 1465239: Null pointer dereferences (FORWARD_NULL)
>>> Passing null pointer "pPage" to "copyPageResources", which dereferences
>>> it.
360 aCopier.copyPageResources(pPage, aBuffer);
361 aEditBuffer.WriteOString(aBuffer.makeStringAndClear());
362 }
363
364 aEditBuffer.WriteCharPtr("/BBox[0 0 ");
365
aEditBuffer.WriteOString(OString::number(rSignatureRectangle.getWidth()));
** CID 1465238: Uninitialized members (UNINIT_CTOR)
/chart2/source/view/charttypes/VSeriesPlotter.cxx: 155 in
chart::VSeriesPlotter::VSeriesPlotter(const
com::sun::star::uno::Reference &, int,
bool)()
*** CID 1465238: Uninitialized members (UNINIT_CTOR)
/chart2/source/view/charttypes/VSeriesPlotter.cxx: 155 in
chart::VSeriesPlotter::VSeriesPlotter(const
com::sun::star::uno::Reference &, int,
bool)()
149 , m_aNullDate(30,12,1899)
150 , m_xColorScheme()
151 , m_pExplicitCategoriesProvider(nullptr)
152 , m_bPointsWereSkipped(false)
153 {
154 SAL_WARN_IF(!m_xChartTypeModel.is(),"chart2","no XChartType
available in view, fallback to default values may be wrong");
>>> CID 1465238: Uninitialized members (UNINIT_CTOR)
>>> Non-static class member "m_bPieLabelsAllowToMove" is not initialized in
>>> this constructor nor in any functions that it calls.
155 }
156
157 VSeriesPlotter::~VSeriesPlotter()
158 {
159 //delete all data series help objects:
160 for (std::vector & rGroupVector : m_aZSlots)
** CID 1465237: Null pointer dereferences (FORWARD_NULL)
*** CID 1465237: Null pointer dereferences (FORWARD_NULL)
/svl/sour
[Libreoffice-commits] online.git: Branch 'private/tml/ios-gen2' - 2 commits - loleaflet/css loleaflet/src
loleaflet/css/mobilewizard.css |2 +-
loleaflet/src/control/Control.JSDialogBuilder.js |3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 81542ebaeef533a4f0271c37d3a49fcf9fb3df7f
Author: Szymon Kłos
AuthorDate: Wed Jul 8 13:57:05 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Jul 9 12:02:21 2020 +0200
mobile wizard: use listbox for rotation field
Change-Id: If96654e787ebb16c0918d35e60ece42995af2410
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98419
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 41ad87376..38ac8710a 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1415,7 +1415,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
data.id === 'fontnamecombobox' ||
data.id === 'fontsizecombobox' ||
data.id === 'fontsize' ||
- data.id === 'FontBox') {
+ data.id === 'FontBox' ||
+ data.id === 'rotation') {
builder._listboxControl(parentContainer, data, builder);
} else if (data.id === 'searchterm' ||
data.id === 'replaceterm') {
commit 6e09157a3cb50f1370f0d787cbfcfa6d4d160c6a
Author: Szymon Kłos
AuthorDate: Wed Jul 8 13:24:45 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Jul 9 12:02:14 2020 +0200
mobile wizard: spinfield controls visible on smaller screens
On smaller screens value field was too long and plus/minus
buttons were under the field
Change-Id: If88db5702970f73bcc544497544777a3e0455762
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98418
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 00e915a6c..d11ced002 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -697,7 +697,7 @@ a.leaflet-control-zoom-in {
#DecrementIndent + input:disabled{display: none;}
div#mobile-wizard-content input[type=number]{
height: 46px;
- width: 42%;
+ width: 37%;
padding-left: 8%;
border: none;
-moz-appearance: textfield;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'private/tml/ios-gen2' - 155 commits - android/lib android/README common/Authorization.hpp common/FileUtil.cpp common/FileUtil.hpp common/JailUtil.cpp common/L
Rebased ref, commits from common ancestor:
commit 20eaab272069226485c194d639388b6b7038c211
Author: Samuel Mehrbrodt
AuthorDate: Tue Jul 7 21:07:21 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Jul 9 10:25:36 2020 +0200
Log number of active sessions
Change-Id: Id161f09bc637e5dcf5ea0beaf11e360de7aa1fa2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98298
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Samuel Mehrbrodt
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index f198bb8e3..fe9cdb7f0 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -2257,7 +2257,7 @@ void DocumentBroker::broadcastMessage(const std::string&
message)
{
assertCorrectThread();
-LOG_DBG("Broadcasting message [" << message << "] to all sessions.");
+LOG_DBG("Broadcasting message [" << message << "] to all " <<
_sessions.size() << " sessions.");
for (const auto& sessionIt : _sessions)
{
sessionIt.second->sendTextFrame(message);
commit dc5c44f712dfbaa42a8a0fe171638ca241799a93
Author: Tamás Zolnai
AuthorDate: Thu Jul 9 07:54:24 2020 +0200
Commit: Tamás Zolnai
CommitDate: Thu Jul 9 09:09:13 2020 +0200
cypress: avoid failure of time field insertion (impress, mobile).
Change-Id: I0330ae701a8d6a84f2cb57bc5ccef88f9fe56ecf
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98394
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git
a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
index 6c65caf8f..2627c4642 100644
--- a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
@@ -19,7 +19,7 @@ describe('Impress insertion wizard.', function() {
helper.afterAll(testFileName);
});
- function selectionShouldBeTextShape() {
+ function selectionShouldBeTextShape(checkTextShape = true) {
// Check that the shape is there
cy.get('.leaflet-pane.leaflet-overlay-pane svg')
.should(function(svg) {
@@ -27,8 +27,9 @@ describe('Impress insertion wizard.', function() {
expect(svg[0].getBBox().height).to.be.greaterThan(0);
});
- cy.get('.leaflet-pane.leaflet-overlay-pane svg
g.com\\.sun\\.star\\.drawing\\.TextShape')
- .should('exist');
+ if (checkTextShape)
+ cy.get('.leaflet-pane.leaflet-overlay-pane svg
g.com\\.sun\\.star\\.drawing\\.TextShape')
+ .should('exist');
// Check also that the shape is fully visible
// TODO: shapes are hungs out of the slide after insertion
@@ -260,7 +261,7 @@ describe('Impress insertion wizard.', function() {
.click();
// Check that the shape is there
- selectionShouldBeTextShape();
+ selectionShouldBeTextShape(false);
// Check the text
impressMobileHelper.selectTextOfShape();
@@ -280,7 +281,7 @@ describe('Impress insertion wizard.', function() {
.click();
// Check that the shape is there
- selectionShouldBeTextShape();
+ selectionShouldBeTextShape(false);
// Check the text
impressMobileHelper.selectTextOfShape();
commit 83557cbb881f22e0a70c808076176560af5513b9
Author: Michael Meeks
AuthorDate: Wed Jul 8 21:18:55 2020 +0100
Commit: Michael Meeks
CommitDate: Wed Jul 8 23:11:26 2020 +0200
Adapt l10n for latest Android locale goodness.
cf. https://gist.github.com/amake/0ac7724681ac1c178c6f95a5b09f03ce
Change-Id: Ie0cc7f210a800fd835356d246ec661757e9ab89f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98391
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/loleaflet/l10n/admin-localizations.json
b/loleaflet/l10n/admin-localizations.json
index a42f0de97..9ac48be94 100644
--- a/loleaflet/l10n/admin-localizations.json
+++ b/loleaflet/l10n/admin-localizations.json
@@ -122,7 +122,9 @@
"xh": "../l10n/ui-xh.json",
"zh-cn": "../l10n/ui-zh_CN.json",
"zh-CN": "../l10n/ui-zh_CN.json",
+"zh-Hans": "../l10n/ui-zh_CN.json",
"zh-tw": "../l10n/ui-zh_TW.json",
"zh-TW": "../l10n/ui-zh_TW.json",
+"zh-Hant": "../l10n/ui-zh_TW.json",
"zu": "../l10n/ui-zu.json"
}
diff --git a/loleaflet/l10n/help-localizations.json
b/loleaflet/l10n/help-localizations.json
index 6dc5456be..559ac795e 100644
--- a/loleaflet/l10n/help-localizations.json
+++ b/loleaflet/l10n/help-localizations.json
@@ -123,7 +123,9 @@
"xh": "%SERVICE_RO
[Libreoffice-commits] online.git: Branch 'private/tml/ios-gen2' - 138 commits - android/lib common/FileUtil.cpp common/FileUtil.hpp common/JailUtil.cpp common/Log.cpp common/MessageQueue.cpp common/Ut
.gitignore |1 Makefile.am | 13 android/lib/build.gradle |6 android/lib/src/main/cpp/androidapp.cpp |1 common/FileUtil.cpp | 154 common/FileUtil.hpp | 61 common/JailUtil.cpp | 98 common/Log.cpp | 10 common/MessageQueue.cpp | 342 - common/Util.hpp |2 configure.ac |2 cypress_test/Makefile.am |4 cypress_test/data/mobile/calc/hamburger_menu.ods |binary cypress_test/data/mobile/calc/hamburger_menu_sheet.ods |binary cypress_test/data/mobile/calc/hamburger_menu_sort.ods |binary cypress_test/data/mobile/writer/table_properties.odt |binary cypress_test/integration_tests/common/helper.js | 94 cypress_test/integration_tests/common/mobile_helper.js |6 cypress_test/integration_tests/mobile/calc/alignment_options_spec.js | 61 cypress_test/integration_tests/mobile/calc/apply_font_spec.js | 48 cypress_test/integration_tests/mobile/calc/calc_mobile_helper.js | 29 cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js | 52 cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js | 623 +++ cypress_test/integration_tests/mobile/calc/number_format_spec.js | 41 cypress_test/integration_tests/mobile/impress/apply_font_spec.js | 111 cypress_test/integration_tests/mobile/impress/apply_paragraph_props_spec.js | 91 cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js | 11 cypress_test/integration_tests/mobile/impress/slide_properties_spec.js | 132 cypress_test/integration_tests/mobile/writer/apply_font_spec.js | 70 cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js | 105 cypress_test/integration_tests/mobile/writer/focus_spec.js | 11 cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js | 82 cypress_test/integration_tests/mobile/writer/shape_properties_spec.js | 67 cypress_test/integration_tests/mobile/writer/table_properties_spec.js | 117 cypress_test/package.json |1 cypress_test/plugins/blacklists.js | 28 debian/loolwsd.postinst.in |2 gtk/mobile.cpp |2 ios/Mobile/AppDelegate.mm |1 ios/Mobile/CODocument.mm | 10 kit/ChildSession.cpp |6 kit/ForKit.cpp |1 kit/Kit.cpp | 53 kit/Kit.hpp |3 kit/SetupKitEnvironment.hpp | 59 loleaflet/Makefile.am |5 loleaflet/admin/admin.html |1 loleaflet/admin/admin.strings.js |2 loleaflet/admin/adminAnalytics.html |2 loleaflet/admin/admintemplate.html |4 loleaflet/admin/src/AdminSocketOverview.js | 33 loleaflet/css/device-mobile.css |6 loleaflet/css/leaflet.css | 27 loleaflet/css/loleaflet.css | 10 loleaflet/css/notebookbar.css | 10 loleaflet/css/spreadsheet.css
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/ipdf/pdfdocument.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 4cd79ec107b95ffba8f8455e07f824782eab1e34
Author: Caolán McNamara
AuthorDate: Thu Jul 9 09:40:50 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 12:02:37 2020 +0200
cid#1465239 silence Explicit null deferenced
Change-Id: I35135f6522ea64d0a8d7063949cd006278ec6080
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98404
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx
b/vcl/source/filter/ipdf/pdfdocument.cxx
index 541ec2b9a738..04c43b564b39 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -356,6 +356,7 @@ sal_Int32
PDFDocument::WriteAppearanceObject(tools::Rectangle& rSignatureRectang
PDFObjectCopier aCopier(*this);
if (!aContentStreams.empty())
{
+assert(pPage && "aContentStreams is only filled if there was a pPage");
OStringBuffer aBuffer;
aCopier.copyPageResources(pPage, aBuffer);
aEditBuffer.WriteOString(aBuffer.makeStringAndClear());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - loleaflet/css loleaflet/src
loleaflet/css/mobilewizard.css |2 +-
loleaflet/src/control/Control.JSDialogBuilder.js |3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 81542ebaeef533a4f0271c37d3a49fcf9fb3df7f
Author: Szymon Kłos
AuthorDate: Wed Jul 8 13:57:05 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Jul 9 12:02:21 2020 +0200
mobile wizard: use listbox for rotation field
Change-Id: If96654e787ebb16c0918d35e60ece42995af2410
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98419
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 41ad87376..38ac8710a 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1415,7 +1415,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
data.id === 'fontnamecombobox' ||
data.id === 'fontsizecombobox' ||
data.id === 'fontsize' ||
- data.id === 'FontBox') {
+ data.id === 'FontBox' ||
+ data.id === 'rotation') {
builder._listboxControl(parentContainer, data, builder);
} else if (data.id === 'searchterm' ||
data.id === 'replaceterm') {
commit 6e09157a3cb50f1370f0d787cbfcfa6d4d160c6a
Author: Szymon Kłos
AuthorDate: Wed Jul 8 13:24:45 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Jul 9 12:02:14 2020 +0200
mobile wizard: spinfield controls visible on smaller screens
On smaller screens value field was too long and plus/minus
buttons were under the field
Change-Id: If88db5702970f73bcc544497544777a3e0455762
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98418
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 00e915a6c..d11ced002 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -697,7 +697,7 @@ a.leaflet-control-zoom-in {
#DecrementIndent + input:disabled{display: none;}
div#mobile-wizard-content input[type=number]{
height: 46px;
- width: 42%;
+ width: 37%;
padding-left: 8%;
border: none;
-moz-appearance: textfield;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/charttypes/VSeriesPlotter.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit eddc280860360329a6a054710df4ac01ab98e902
Author: Caolán McNamara
AuthorDate: Thu Jul 9 09:45:37 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 9 11:56:47 2020 +0200
cid#1465238 Uninitialized scalar field
Change-Id: Ia0ffb4bad265aabe396ef94e3d9c2bbe79993b4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98405
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 75a0ea173aba..bbc1788ec148 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -150,6 +150,7 @@ VSeriesPlotter::VSeriesPlotter( const
uno::Reference& xChartTypeMode
, m_xColorScheme()
, m_pExplicitCategoriesProvider(nullptr)
, m_bPointsWereSkipped(false)
+, m_bPieLabelsAllowToMove(false)
{
SAL_WARN_IF(!m_xChartTypeModel.is(),"chart2","no XChartType available in
view, fallback to default values may be wrong");
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 886728b5d2f471b7527b9a598cdb161fb992cd1d Author: Olivier Hallot AuthorDate: Thu Jul 9 06:42:26 2020 -0300 Commit: Gerrit Code Review CommitDate: Thu Jul 9 11:42:26 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 5907932eac35843d0cd88adea09ba8890ed59884 - Fix Help after translator review. Many thanks to Mikel Tõnnov. Change-Id: I2858f436fe6fecaac6f50c6912883b5c9c46d050 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/98393 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index de1a815d21e3..5907932eac35 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit de1a815d21e38d3942ce3647ffdabb5544b3636d +Subproject commit 5907932eac35843d0cd88adea09ba8890ed59884 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/0405.xhp |2 +- source/text/shared/01/05020300.xhp |6 +++--- source/text/shared/04/0101.xhp |2 +- 3 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 5907932eac35843d0cd88adea09ba8890ed59884 Author: Olivier Hallot AuthorDate: Wed Jul 8 20:15:06 2020 -0300 Commit: Olivier Hallot CommitDate: Thu Jul 9 11:42:26 2020 +0200 Fix Help after translator review. Many thanks to Mikel Tõnnov. Change-Id: I2858f436fe6fecaac6f50c6912883b5c9c46d050 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/98393 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/0405.xhp b/source/text/shared/01/0405.xhp index 403d79c5b..59aa051e8 100644 --- a/source/text/shared/01/0405.xhp +++ b/source/text/shared/01/0405.xhp @@ -109,7 +109,7 @@ When the cursor is inside a comment, you can press Command+OptionCtrl+Alt+Page Down to jump to the next comment, or press Command+OptionCtrl+Alt+Page Up to jump to the previous comment. -When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous comment anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one comment anchor to the next comment anchor. +When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous comment anchor. You can also open the Navigator to see a list of all comments. Right-click a comment name in the Navigator to edit or delete the comment. diff --git a/source/text/shared/01/05020300.xhp b/source/text/shared/01/05020300.xhp index f6b3bc6df..86d3ea0fa 100644 --- a/source/text/shared/01/05020300.xhp +++ b/source/text/shared/01/05020300.xhp @@ -74,12 +74,12 @@ - Specifies the language setting for the selected fields. With the language set to Default, $[officename] automatically applies the number formats associated with the system default language. Select any language to fix the settings for the selected fields. + Specifies the language setting for the selected fields. With the language set to Default, $[officename] automatically applies the number formats associated with the system default language. - Specifies the language setting for the selected cells. Select any language to fix the settings for the selected cells. + Specifies the language setting for the selected cells. - Specifies the language setting for the selected field. Select any language to fix the settings for the selected fields. + Specifies the language setting for the selected field. diff --git a/source/text/shared/04/0101.xhp b/source/text/shared/04/0101.xhp index 149d44f43..2d48fcf04 100644 --- a/source/text/shared/04/0101.xhp +++ b/source/text/shared/04/0101.xhp @@ -491,7 +491,7 @@ - ⌃MCtrl+M + CommandCtrl+M Removes direct formatting from selected text or objects (as in Format - Clear Direct Formatting). ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3a57c2b6478dfb9d5ffd3245aeafdd747afb69da
Author: Dennis Francis
AuthorDate: Fri Jun 5 18:10:12 2020 +0530
Commit: Dennis Francis
CommitDate: Thu Jul 9 11:28:55 2020 +0200
scPrintTwipsMsgs: Use top-left of output-area as the refpoint
We can't use the transformed version of editeng origin, since it need
not be in client view area depending on text alignment, which is
unusable as far as the clients are concerned. Top-left corner of
output-area is always guaranteed to be in client view area independent
of text-alignment settings.
Change-Id: I5bd20d2b52e146371de4b605bf7934b7e7d6fc5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98131
Tested-by: Jenkins
Reviewed-by: Dennis Francis
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 43165fefc1a0..e235d4eb74a4 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1277,7 +1277,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool
bForceVisCursor )
// Get rectangle in window-coordinates from editeng(doc)
coordinates.
aCursorRectPureLogical =
mpLOKSpecialPositioning->GetWindowPos(aCursorRectPureLogical, eDevUnit);
// Lets use the editeng(doc) origin as the refpoint.
-const Point aCursorOrigin =
mpLOKSpecialPositioning->GetWindowPos(Point(0, 0), eDevUnit);
+const Point aCursorOrigin =
mpLOKSpecialPositioning->GetOutputArea().TopLeft();
// Get the relative coordinates w.r.t aCursorOrigin.
aCursorRectPureLogical.Move(-aCursorOrigin.X(),
-aCursorOrigin.Y());
aMessageParams.put("relrect",
aCursorRectPureLogical.toString());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source include/editeng sc/source
editeng/source/editeng/editview.cxx | 10 +
editeng/source/editeng/impedit.cxx |5 ++--
editeng/source/editeng/impedit.hxx |6 -
include/editeng/editview.hxx|3 ++
sc/source/ui/view/gridwin4.cxx | 37
5 files changed, 58 insertions(+), 3 deletions(-)
New commits:
commit d45b6561ef5a229669b50c65f15c42d47e034434
Author: Dennis Francis
AuthorDate: Wed Jun 3 17:27:28 2020 +0530
Commit: Dennis Francis
CommitDate: Thu Jul 9 11:26:42 2020 +0200
lokit: Avoid sending wrong edit-cursor/selection messages when...
the EditView's output-area needs to be tweaked temporarily to render it
to a tile which is meant for another view.
Change-Id: I2b8fc1986c247ce65c18ea64e3b43d25625c7e9c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98129
Tested-by: Jenkins
Reviewed-by: Dennis Francis
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index 4a8b6873946d..9da4d6cbf8d5 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1602,4 +1602,14 @@ bool EditView::HasLOKSpecialPositioning() const
return pImpEditView->HasLOKSpecialPositioning();
}
+void EditView::SupressLOKMessages(bool bSet)
+{
+pImpEditView->SupressLOKMessages(bSet);
+}
+
+bool EditView::IsSupressLOKMessages() const
+{
+return pImpEditView->IsSupressLOKMessages();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index efc1dee49b63..43165fefc1a0 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -190,7 +190,8 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine*
pEng, vcl::Window* pWindo
eSelectionMode(EESelectionMode::Std),
eAnchorMode(EEAnchorMode::TopLeft),
mpEditViewCallbacks(nullptr),
-mbBroadcastLOKViewCursor(comphelper::LibreOfficeKit::isActive())
+mbBroadcastLOKViewCursor(comphelper::LibreOfficeKit::isActive()),
+mbSupressLOKMessages(false)
{
aEditSelection.Min() = pEng->GetEditDoc().GetStartPaM();
aEditSelection.Max() = pEng->GetEditDoc().GetEndPaM();
@@ -1259,7 +1260,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool
bForceVisCursor )
GetCursor()->SetSize( aCursorSz );
-if (comphelper::LibreOfficeKit::isActive() && mpViewShell)
+if (comphelper::LibreOfficeKit::isActive() && mpViewShell &&
!mbSupressLOKMessages)
{
Point aPos = GetCursor()->GetPos();
boost::property_tree::ptree aMessageParams;
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 0e2b6df1d790..18e1ea9f9308 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -302,7 +302,8 @@ private:
// repaints of the EditView(s)
const EditViewCallbacks* mpEditViewCallbacks;
std::unique_ptr mpLOKSpecialPositioning;
-bool mbBroadcastLOKViewCursor;
+bool mbBroadcastLOKViewCursor:1;
+bool mbSupressLOKMessages:1;
const EditViewCallbacks* getEditViewCallbacks() const
{
@@ -462,6 +463,9 @@ public:
void SetLOKSpecialVisArea(const tools::Rectangle& rVisArea);
tools::Rectangle GetLOKSpecialVisArea() const;
bool HasLOKSpecialPositioning() const;
+
+void SupressLOKMessages(bool bSet) { mbSupressLOKMessages = bSet; }
+bool IsSupressLOKMessages() const { return mbSupressLOKMessages; }
};
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index ccecb8c9da73..5b7f08228cff 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -335,6 +335,9 @@ public:
void SetLOKSpecialVisArea(const tools::Rectangle& rVisArea);
tools::Rectangle GetLOKSpecialVisArea() const;
bool HasLOKSpecialPositioning() const;
+
+void SupressLOKMessages(bool bSet);
+bool IsSupressLOKMessages() const;
};
#endif // INCLUDED_EDITENG_EDITVIEW_HXX
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 17f9b16a8ec9..eb76b69dd590 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -571,6 +571,32 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2,
SCROW nY2, ScUpdateMod
rDoc.PrepareFormulaCalc();
}
+namespace {
+
+class SupressEditViewMessagesGuard
+{
+public:
+SupressEditViewMessagesGuard(EditView& rEditView) :
+mrEditView(rEditView),
+mbOrigSupressFlag(rEditView.IsSupressLOKMessages())
+{
+if (!mbOrigSupressFlag)
+mrEditView.SupressLOKMessages(true);
+}
+
+~SupressEditViewMessagesGuard()
+{
+if (mrEditView.IsSupressLOKMessages() != mbOrigSupressFlag)
+mrEditView.SupressLOKMessages(mbOrigSupressFlag);
+}
+
+private:
+EditView& mrEditView;
+const bool mbOrigSupressFlag;
+};
+
+}
+
void ScGridWindow::DrawContent(O
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/sheet/DocumentSettings.idl |4 1 file changed, 4 insertions(+) New commits: commit cb21c44b01a640fc121c034346d70a02ef67cdb2 Author: Samuel Mehrbrodt AuthorDate: Mon Jul 6 09:34:10 2020 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu Jul 9 11:06:37 2020 +0200 Docs: Add missing property Change-Id: I1f4a0602f23cba86adbf627b0881ae5034db0af8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98188 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/offapi/com/sun/star/sheet/DocumentSettings.idl b/offapi/com/sun/star/sheet/DocumentSettings.idl index 36402ee95dc5..b92f1037dc99 100644 --- a/offapi/com/sun/star/sheet/DocumentSettings.idl +++ b/offapi/com/sun/star/sheet/DocumentSettings.idl @@ -108,6 +108,10 @@ published service DocumentSettings grid settings in the user interface. */ [optional, property] boolean IsRasterAxisSynchronized; + +/** enables the document sharing feature (Tools->Share Spreadsheet) + */ +[optional, property] boolean IsDocumentShared; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin unotools/inc unotools/IwyuFilter_unotools.yaml unotools/Library_utl.mk unotools/source unotools/util
solenv/bin/native-code.py |4 +-
unotools/IwyuFilter_unotools.yaml |3 -
unotools/Library_utl.mk|1
unotools/inc/pch/precompiled_utl.hxx |1
unotools/inc/unotoolsservices.hxx | 22
unotools/source/misc/ServiceDocumenter.cxx | 51 -
unotools/source/misc/ServiceDocumenter.hxx |9 -
unotools/source/misc/unotoolsservices.cxx | 23 -
unotools/source/ucbhelper/XTempFile.hxx|9 -
unotools/source/ucbhelper/xtempfile.cxx| 30 -
unotools/util/utl.component|8 ++--
11 files changed, 89 insertions(+), 72 deletions(-)
New commits:
commit 3cff8c64e916eac04332c91d0bd424d4459a960b
Author: Noel Grandin
AuthorDate: Wed Jul 8 15:44:53 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 9 11:02:45 2020 +0200
unotools: create instances with uno constructors
See tdf#74608 for motivation
Change-Id: I7a68484564aea9b416c12d5364d20ff8af77f40b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98380
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 409fda1798bf..ef2ed63dbf34 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -40,7 +40,6 @@ core_factory_list = [
("libucpfile1.a", "ucpfile_component_getFactory"),
("libucphier1.a", "ucphier1_component_getFactory"),
("libucptdoc1lo.a", "ucptdoc1_component_getFactory"),
-("libutllo.a", "utl_component_getFactory"),
("libxstor.a", "xstor_component_getFactory"),
("libxmlfdlo.a", "xmlfd_component_getFactory"),
("libxmlfalo.a", "xmlfa_component_getFactory"),
@@ -304,6 +303,9 @@ core_constructor_list = [
"stardiv_Toolkit_VCLXPointer_get_implementation",
"stardiv_Toolkit_VCLXPopupMenu_get_implementation",
"stardiv_Toolkit_VCLXToolkit_get_implementation",
+# unotools/util/utl.component
+"unotools_ServiceDocument_get_implementation",
+"unotools_OTempFileService_get_implementation",
# unoxml/source/rdf/unordf.component
"unoxml_rdfRepository_get_implementation",
"unoxml_CURI_get_implementation",
diff --git a/unotools/IwyuFilter_unotools.yaml
b/unotools/IwyuFilter_unotools.yaml
index 74d2033fad7e..f26aa4001590 100644
--- a/unotools/IwyuFilter_unotools.yaml
+++ b/unotools/IwyuFilter_unotools.yaml
@@ -1,9 +1,6 @@
---
assumeFilename: unotools/source/i18n/resmgr.cxx
blacklist:
-unotools/inc/unotoolsservices.hxx:
-# Needed for extern declaration
-- namespace comphelper::service_decl { class ServiceDecl; } }
unotools/source/config/itemholder1.hxx:
# Base class needs complete type
- com/sun/star/lang/XEventListener.hpp
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index b7c06cbf4a7f..84be1bb84b70 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -108,7 +108,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
unotools/source/misc/mediadescriptor \
unotools/source/misc/sharedunocomponent \
unotools/source/misc/syslocale \
-unotools/source/misc/unotoolsservices \
unotools/source/misc/wincodepage \
unotools/source/misc/ServiceDocumenter \
unotools/source/misc/ZipPackageHelper \
diff --git a/unotools/inc/pch/precompiled_utl.hxx
b/unotools/inc/pch/precompiled_utl.hxx
index 56d6decc7aa7..e54f7c9826f4 100644
--- a/unotools/inc/pch/precompiled_utl.hxx
+++ b/unotools/inc/pch/precompiled_utl.hxx
@@ -142,7 +142,6 @@
#include
#include
#include
-#include
#endif // PCH_LEVEL >= 4
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/inc/unotoolsservices.hxx
b/unotools/inc/unotoolsservices.hxx
deleted file mode 100644
index 8a99f09e99ac..
--- a/unotools/inc/unotoolsservices.hxx
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
-/*
- * 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/.
- */
-
-#ifndef INCLUDED_UNOTOOLS_INC_UNOTOOLSSERVICES_HXX
-#define INCLUDED_UNOTOOLS_INC_UNOTOOLSSERVICES_HXX
-
-#include
-
-namespace comphelper::service_decl { class ServiceDecl; }
-
-extern comphelper::service_decl::ServiceDecl const OTempFileServiceDecl;
-extern comphelper::service_decl::ServiceDecl const ServiceDocumenterDecl;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/unotools/source/misc/ServiceDocumenter.cxx
b/unotools/source/misc/ServiceDocumenter.cxx
index 0823d2a6651e..b2decb6b9a53 100644
--- a/unotools/source/misc/ServiceDocumenter.cxx
+++ b/unotools/source/misc/ServiceDocumenter.cxx
@@ -7,10 +7,12 @@
* file, You can ob
[Libreoffice-commits] core.git: chart2/qa chart2/source
chart2/qa/extras/chart2import.cxx | 26 ++
chart2/qa/extras/data/xlsx/tdf134225.xlsx |binary
chart2/source/view/charttypes/PieChart.cxx | 14 +-
3 files changed, 27 insertions(+), 13 deletions(-)
New commits:
commit 57fedb272cfcad3436142dbe9eac2870e3c3e3d2
Author: Balazs Varga
AuthorDate: Tue Jun 23 15:02:59 2020 +0200
Commit: László Németh
CommitDate: Thu Jul 9 10:48:55 2020 +0200
tdf#134225 Chart view: fix moved date label
outside from pie chart. Do not need to check the
sector size of a pie slice, before best fit algorithm,
so we can use the CENTER position as a start position
of BEST_FIT.
Completion of c66cb6d6e4a843dc7c7d06e1c2c0723a6ff85fc5
(tdf#134029 Chart view: enable to move data label)
Change-Id: Ie1a53784e7df2887282155113bf8bb607cdb09e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96945
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index 6e78a08d67d1..9d7b43274a6f 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -161,6 +161,7 @@ public:
void testTdf119138MissingAutoTitleDeleted();
void testStockChartShiftedCategoryPosition();
void testTdf133376();
+void testTdf134225();
void testTdf91250();
CPPUNIT_TEST_SUITE(Chart2ImportTest);
@@ -271,6 +272,7 @@ public:
CPPUNIT_TEST(testTdf119138MissingAutoTitleDeleted);
CPPUNIT_TEST(testStockChartShiftedCategoryPosition);
CPPUNIT_TEST(testTdf133376);
+CPPUNIT_TEST(testTdf134225);
CPPUNIT_TEST(testTdf91250);
CPPUNIT_TEST_SUITE_END();
@@ -2525,6 +2527,30 @@ void Chart2ImportTest::testTdf133376()
CPPUNIT_ASSERT_DOUBLES_EQUAL(5269, aLabelPosition.Y, 30);
}
+void Chart2ImportTest::testTdf134225()
+{
+load("/chart2/qa/extras/data/xlsx/", "tdf134225.xlsx");
+Reference xChartDoc(getChartDocFromSheet(0,
mxComponent),
+UNO_QUERY_THROW);
+
+Reference xDrawPageSupplier(xChartDoc,
UNO_QUERY_THROW);
+Reference xDrawPage(xDrawPageSupplier->getDrawPage(),
UNO_SET_THROW);
+Reference xShapes(xDrawPage->getByIndex(0),
UNO_QUERY_THROW);
+Reference xDataPointLabel1(getShapeByName(xShapes,
+"CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"),
UNO_SET_THROW);
+CPPUNIT_ASSERT(xDataPointLabel1.is());
+awt::Point aLabelPosition1 = xDataPointLabel1->getPosition();
+
+Reference xDataPointLabel2(getShapeByName(xShapes,
+"CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1"),
UNO_SET_THROW);
+CPPUNIT_ASSERT(xDataPointLabel2.is());
+awt::Point aLabelPosition2 = xDataPointLabel2->getPosition();
+
+// Check the distance between the position of the 1st data point label and
the second one
+CPPUNIT_ASSERT_DOUBLES_EQUAL(1800, sal_Int32(aLabelPosition2.X -
aLabelPosition1.X), 30);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(2123, sal_Int32(aLabelPosition2.Y -
aLabelPosition1.Y), 30);
+}
+
void Chart2ImportTest::testTdf91250()
{
load("/chart2/qa/extras/data/docx/", "tdf91250.docx");
diff --git a/chart2/qa/extras/data/xlsx/tdf134225.xlsx
b/chart2/qa/extras/data/xlsx/tdf134225.xlsx
new file mode 100644
index ..ae7bdc66e302
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/tdf134225.xlsx differ
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index 9032b40977f1..5ab60729cf93 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -294,19 +294,7 @@ void PieChart::createTextLabelShape(
//AVOID_OVERLAP is in fact "Best fit" in the UI.
bool bMovementAllowed = ( nLabelPlacement ==
css::chart::DataLabelPlacement::AVOID_OVERLAP );
if( bMovementAllowed )
-{
-// Use center for "Best fit" for now. In the future we
-// may want to implement a real best fit algorithm.
-// But center is good enough, and close to what Excel
-// does.
-
-// Place the label outside if the sector is too small
-// The threshold is set to 2%, but can be improved by making it a
function of
-// label width and radius too ?
-double fFrac = fabs( nVal / rParam.mfLogicYSum );
-nLabelPlacement = ( fFrac <= 0.02 ) ?
css::chart::DataLabelPlacement::OUTSIDE :
-css::chart::DataLabelPlacement::CENTER;
-}
+nLabelPlacement = css::chart::DataLabelPlacement::CENTER;
///for `OUTSIDE` (`INSIDE`) label placements an offset of 150 (-150), in
the
///radius direction, is added to the final screen position of the label
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/cib/libreoffice-6-2' - loleaflet/reference.html
loleaflet/reference.html |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 14f66bce566bc55669008a5986b05a15e8bbff7b Author: Samuel Mehrbrodt AuthorDate: Thu Jul 9 10:22:10 2020 +0200 Commit: Samuel Mehrbrodt CommitDate: Thu Jul 9 10:22:10 2020 +0200 Fix response name diff --git a/loleaflet/reference.html b/loleaflet/reference.html index dfce3de95..f5432fd03 100644 --- a/loleaflet/reference.html +++ b/loleaflet/reference.html @@ -2977,7 +2977,7 @@ Actions response Description - Action_Load_Result + Action_Load_Resp success:result: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp
wsd/DocumentBroker.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 20eaab272069226485c194d639388b6b7038c211
Author: Samuel Mehrbrodt
AuthorDate: Tue Jul 7 21:07:21 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Thu Jul 9 10:25:36 2020 +0200
Log number of active sessions
Change-Id: Id161f09bc637e5dcf5ea0beaf11e360de7aa1fa2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98298
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Samuel Mehrbrodt
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index f198bb8e3..fe9cdb7f0 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -2257,7 +2257,7 @@ void DocumentBroker::broadcastMessage(const std::string&
message)
{
assertCorrectThread();
-LOG_DBG("Broadcasting message [" << message << "] to all sessions.");
+LOG_DBG("Broadcasting message [" << message << "] to all " <<
_sessions.size() << " sessions.");
for (const auto& sessionIt : _sessions)
{
sessionIt.second->sendTextFrame(message);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |1 - 1 file changed, 1 deletion(-) New commits: commit 966ad3db0a7330f29d2056e46d245b9320b3202a Author: Tor Lillqvist AuthorDate: Thu Jul 9 10:04:51 2020 +0300 Commit: Tor Lillqvist CommitDate: Thu Jul 9 10:13:24 2020 +0200 There is no com_sun_star_comp_dbaccess_DatabaseDataProvider_get_implementation Change-Id: I90f61ca1209a213757e60346ce77aff6912c8b58 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98398 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index bdda0b5525ef..409fda1798bf 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -142,7 +142,6 @@ core_constructor_list = [ # cui/util/cui.component "com_sun_star_cui_ColorPicker_get_implementation", # dbaccess/util/dba.component -"com_sun_star_comp_dbaccess_DatabaseDataProvider_get_implementation", "com_sun_star_comp_dba_DataAccessDescriptorFactory", "com_sun_star_comp_dba_OCommandDefinition", "com_sun_star_comp_dba_OComponentDefinition", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |1 - 1 file changed, 1 deletion(-) New commits: commit 5be7042e2df49262d6b0bed1c2247c844ce152f1 Author: Tor Lillqvist AuthorDate: Thu Jul 9 09:57:31 2020 +0300 Commit: Tor Lillqvist CommitDate: Thu Jul 9 09:49:11 2020 +0200 There is no com_sun_star_comp_dba_ODatabaseContext_get_implementation Change-Id: Ic22eb0c075c195d4480c8757642d902003bd22d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98397 Tested-by: Tor Lillqvist Reviewed-by: Tor Lillqvist diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 32972c8a7fae..bdda0b5525ef 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -146,7 +146,6 @@ core_constructor_list = [ "com_sun_star_comp_dba_DataAccessDescriptorFactory", "com_sun_star_comp_dba_OCommandDefinition", "com_sun_star_comp_dba_OComponentDefinition", -"com_sun_star_comp_dba_ODatabaseContext_get_implementation", "com_sun_star_comp_dba_ODatabaseDocument", "com_sun_star_comp_dba_ODatabaseSource", "com_sun_star_comp_dba_ORowSet_get_implementation", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/Library_migrationoo2.mk desktop/Library_migrationoo3.mk desktop/Library_spl.mk desktop/source
desktop/Library_migrationoo2.mk |1
desktop/Library_migrationoo3.mk |1
desktop/Library_spl.mk |1
desktop/source/migration/services/basicmigration.cxx| 36 +-
desktop/source/migration/services/basicmigration.hxx| 10 -
desktop/source/migration/services/cexports.cxx | 62
desktop/source/migration/services/cexportsoo3.cxx | 47 -
desktop/source/migration/services/migrationoo2.component|8 -
desktop/source/migration/services/migrationoo3.component|5
desktop/source/migration/services/oo3extensionmigration.cxx | 31 +-
desktop/source/migration/services/oo3extensionmigration.hxx |8 -
desktop/source/migration/services/wordbookmigration.cxx | 40 +--
desktop/source/migration/services/wordbookmigration.hxx |9 -
desktop/source/offacc/acceptor.cxx | 59 +--
desktop/source/offacc/acceptor.hxx |4
desktop/source/offacc/offacc.component |5
desktop/source/splash/services_spl.cxx | 56 --
desktop/source/splash/spl.component |8 -
desktop/source/splash/splash.cxx| 20 +--
desktop/source/splash/splash.hxx| 49 -
desktop/source/splash/unxsplash.cxx | 35 +-
desktop/source/splash/unxsplash.hxx |5
22 files changed, 62 insertions(+), 438 deletions(-)
New commits:
commit 799e4577dac5d63e249792e2e330f72e9477be0d
Author: Noel Grandin
AuthorDate: Wed Jul 8 21:12:16 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Jul 9 09:25:57 2020 +0200
desktop: create instances with uno constructors
See tdf#74608 for motivation
Change-Id: Id332d79c29c8e5f668663070d83aba596f017908
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98390
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index 21f5c1db175d..fdc8d8a661f5 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -28,7 +28,6 @@ $(eval $(call
gb_Library_set_componentfile,migrationoo2,desktop/source/migration
$(eval $(call gb_Library_add_exception_objects,migrationoo2,\
desktop/source/migration/services/basicmigration \
-desktop/source/migration/services/cexports \
$(if $(ENABLE_JAVA), \
desktop/source/migration/services/jvmfwk) \
desktop/source/migration/services/wordbookmigration \
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
index 73c38bb291f7..10e1b9013b4c 100644
--- a/desktop/Library_migrationoo3.mk
+++ b/desktop/Library_migrationoo3.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_Library_use_libraries,migrationoo3,\
$(eval $(call
gb_Library_set_componentfile,migrationoo3,desktop/source/migration/services/migrationoo3))
$(eval $(call gb_Library_add_exception_objects,migrationoo3,\
-desktop/source/migration/services/cexportsoo3 \
desktop/source/migration/services/oo3extensionmigration \
))
diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
index 89c8e53b9e8a..c79e57b91b1d 100644
--- a/desktop/Library_spl.mk
+++ b/desktop/Library_spl.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,spl,\
$(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl))
$(eval $(call gb_Library_add_exception_objects,spl,\
-desktop/source/splash/services_spl \
desktop/source/splash/splash \
desktop/source/splash/unxsplash \
))
diff --git a/desktop/source/migration/services/basicmigration.cxx
b/desktop/source/migration/services/basicmigration.cxx
index bec200e21a6b..165c73cd3894 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -37,22 +37,6 @@ namespace migration
#define sTargetUserBasic "/user/__basic_80"
-// component operations
-
-
-OUString BasicMigration_getImplementationName()
-{
-return "com.sun.star.comp.desktop.migration.Basic";
-}
-
-
-Sequence< OUString > BasicMigration_getSupportedServiceNames()
-{
-Sequence< OUString > aNames { "com.sun.star.migration.Basic" };
-return aNames;
-}
-
-
// BasicMigration
@@ -148,7 +132,7 @@ namespace migration
OUString BasicMigration::getImplementationName()
{
-return BasicMigration_getImplementationName();
+return "com.sun.star.comp.desktop.migration.Basic";
}
@@ -160,7 +144,7 @@ namespace migration
Sequence< OUString > BasicMigration::getSupportedServiceNames()
{
-return BasicMigration_getSupportedServiceNames();
+return { "com.sun.star.migration.Basic" };
}
@@ -203,17 +18
[Libreoffice-commits] core.git: svx/source sw/source
svx/source/xoutdev/_xoutbmp.cxx |5 -
sw/source/filter/html/htmlflywriter.cxx |2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 7272a2edf113f29edeb8987ce649f85b776d9d23
Author: Julien Nabet
AuthorDate: Tue Jul 7 10:23:28 2020 +0200
Commit: Julien Nabet
CommitDate: Thu Jul 9 09:10:54 2020 +0200
tdf#60684: graphic type content must correspond with graphic type extension
Change-Id: I8075b1b44aa400268b4022decb2a56770c81d83b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98239
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 500a30375c62..15123e853484 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -187,7 +187,10 @@ ErrCode XOutBitmap::WriteGraphic( const Graphic& rGraphic,
OUString& rFileName,
break;
}
-if( !aExt.isEmpty() )
+// tdf#60684: use native format if possible but it must
correspond to filter name
+// or no specific format has been required
+// without this, you may save for example file with png
extension but jpg content
+if( !aExt.isEmpty() && (aExt == rFilterName ||
rFilterName.isEmpty()) )
{
if( !(nFlags & XOutFlags::DontAddExtension) )
aURL.setExtension( aExt );
diff --git a/sw/source/filter/html/htmlflywriter.cxx
b/sw/source/filter/html/htmlflywriter.cxx
index b41568377580..55163aba520d 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -1825,7 +1825,7 @@ static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt,
const SwFrameFormat& rF
aMM100Size = OutputDevice::LogicToLogic( rSize.GetSize(),
MapMode( MapUnit::MapTwip ), MapMode(
MapUnit::Map100thMM ));
-OUString aFilterName("JPG");
+OUString aFilterName("");
if (rHTMLWrt.mbReqIF)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: cypress_test/integration_tests
cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js | 11
+-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit dc5c44f712dfbaa42a8a0fe171638ca241799a93
Author: Tamás Zolnai
AuthorDate: Thu Jul 9 07:54:24 2020 +0200
Commit: Tamás Zolnai
CommitDate: Thu Jul 9 09:09:13 2020 +0200
cypress: avoid failure of time field insertion (impress, mobile).
Change-Id: I0330ae701a8d6a84f2cb57bc5ccef88f9fe56ecf
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98394
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git
a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
index 6c65caf8f..2627c4642 100644
--- a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
@@ -19,7 +19,7 @@ describe('Impress insertion wizard.', function() {
helper.afterAll(testFileName);
});
- function selectionShouldBeTextShape() {
+ function selectionShouldBeTextShape(checkTextShape = true) {
// Check that the shape is there
cy.get('.leaflet-pane.leaflet-overlay-pane svg')
.should(function(svg) {
@@ -27,8 +27,9 @@ describe('Impress insertion wizard.', function() {
expect(svg[0].getBBox().height).to.be.greaterThan(0);
});
- cy.get('.leaflet-pane.leaflet-overlay-pane svg
g.com\\.sun\\.star\\.drawing\\.TextShape')
- .should('exist');
+ if (checkTextShape)
+ cy.get('.leaflet-pane.leaflet-overlay-pane svg
g.com\\.sun\\.star\\.drawing\\.TextShape')
+ .should('exist');
// Check also that the shape is fully visible
// TODO: shapes are hungs out of the slide after insertion
@@ -260,7 +261,7 @@ describe('Impress insertion wizard.', function() {
.click();
// Check that the shape is there
- selectionShouldBeTextShape();
+ selectionShouldBeTextShape(false);
// Check the text
impressMobileHelper.selectTextOfShape();
@@ -280,7 +281,7 @@ describe('Impress insertion wizard.', function() {
.click();
// Check that the shape is there
- selectionShouldBeTextShape();
+ selectionShouldBeTextShape(false);
// Check the text
impressMobileHelper.selectTextOfShape();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
