[Libreoffice-commits] core.git: include/xmloff reportdesign/source sc/source sw/source xmloff/inc xmloff/source
include/xmloff/XMLBase64ImportContext.hxx |5 include/xmloff/XMLCharContext.hxx | 14 include/xmloff/XMLTextShapeImportHelper.hxx |2 include/xmloff/shapeimport.hxx | 35 include/xmloff/txtimp.hxx |9 include/xmloff/xmlictxt.hxx | 26 include/xmloff/xmlimp.hxx |3 reportdesign/source/filter/xml/xmlCell.cxx |2 reportdesign/source/filter/xml/xmlSubDocument.cxx |2 sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 81 - sc/source/filter/xml/XMLTableShapeImportHelper.hxx |2 sc/source/filter/xml/XMLTableShapesContext.cxx |2 sc/source/filter/xml/XMLTrackedChangesContext.cxx |2 sc/source/filter/xml/importcontext.cxx |5 sc/source/filter/xml/importcontext.hxx |2 sc/source/filter/xml/xmlannoi.cxx |4 sc/source/filter/xml/xmlcelli.cxx |2 sc/source/filter/xml/xmlconti.cxx |9 sc/source/filter/xml/xmlconti.hxx |3 sc/source/filter/xml/xmlstyli.cxx |1 sw/source/filter/xml/xmlfmt.cxx |2 sw/source/filter/xml/xmlimp.cxx | 26 sw/source/filter/xml/xmltbli.cxx| 137 -- sw/source/filter/xml/xmltbli.hxx|2 sw/source/filter/xml/xmltexti.cxx |4 sw/source/filter/xml/xmltexti.hxx |4 xmloff/inc/XMLImageMapContext.hxx |2 xmloff/inc/XMLReplacementImageContext.hxx |5 xmloff/inc/txtfldi.hxx | 185 -- xmloff/inc/txtvfldi.hxx | 49 xmloff/source/chart/SchXMLChartContext.cxx |2 xmloff/source/chart/SchXMLPlotAreaContext.cxx |4 xmloff/source/core/XMLBase64ImportContext.cxx |9 xmloff/source/core/xmlictxt.cxx | 94 - xmloff/source/core/xmlimp.cxx | 103 - xmloff/source/draw/QRCodeContext.cxx| 68 - xmloff/source/draw/QRCodeContext.hxx|4 xmloff/source/draw/SignatureLineContext.cxx | 51 xmloff/source/draw/SignatureLineContext.hxx |4 xmloff/source/draw/XMLImageMapContext.cxx |4 xmloff/source/draw/XMLNumberStyles.cxx |2 xmloff/source/draw/XMLReplacementImageContext.cxx | 29 xmloff/source/draw/descriptionimp.cxx |7 xmloff/source/draw/descriptionimp.hxx |8 xmloff/source/draw/eventimp.cxx |5 xmloff/source/draw/eventimp.hxx |3 xmloff/source/draw/shapeexport.cxx |4 xmloff/source/draw/shapeimport.cxx | 219 +-- xmloff/source/draw/ximp3dobject.cxx | 86 - xmloff/source/draw/ximp3dobject.hxx | 12 xmloff/source/draw/ximp3dscene.cxx | 35 xmloff/source/draw/ximp3dscene.hxx |6 xmloff/source/draw/ximpcustomshape.cxx |3 xmloff/source/draw/ximpcustomshape.hxx |4 xmloff/source/draw/ximpgrp.cxx | 40 xmloff/source/draw/ximpgrp.hxx |5 xmloff/source/draw/ximplink.cxx | 18 xmloff/source/draw/ximplink.hxx |2 xmloff/source/draw/ximppage.cxx |2 xmloff/source/draw/ximpshap.cxx | 1073 ++-- xmloff/source/draw/ximpshap.hxx | 120 - xmloff/source/table/XMLTableImport.cxx | 128 - xmloff/source/text/XMLAutoMarkFileContext.cxx |6 xmloff/source/text/XMLAutoMarkFileContext.hxx |4 xmloff/source/text/XMLCalculationSettingsContext.cxx| 30 xmloff/source/text/XMLCalculationSettingsContext.hxx|5 xmloff/source/text/XMLChangedRegionImportContext.cxx|9 xmloff/source/text/XMLFootnoteImportContext.cxx |1 xmloff/source/text/XMLIndexTOCContext.cxx | 13 xmloff/source/text/XMLIndexTOCContext.hxx |5 xmloff/source/text/XMLSectionImportContext.cxx | 30 xmloff/source/text/XMLSectionImportContext.hxx |5 xmloff/source/text/XMLSectionSourceDDEImportContext.cxx |4 xmloff/source/text/XMLSectionSourceDDEImportContext.hxx |3 xmloff/source/text/XMLTextFrameContext.cxx | 416 ++ xmloff/source/text/XMLTextFrameContext.hxx |7 xmloff/source/text/XML
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 121464be43830a6f6bfbc27a17c8e0bc7577f455 Author: Seth Chaiklin AuthorDate: Mon Dec 7 08:36:48 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Dec 7 08:36:48 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to c878f6d6a31245cf2dcebbbf27a17defc3d96660 - tdf#126492 update help information about Crash Report Tool This patch updates the Error Reporting help to the Crash Report Tool, which was introduced in 2016. The same basic form is used, with details adjusted to correspond to the new tool. Also corrected the name of Windows system tool that collects memory traces. The Crash Report uses Breakpad, a third-party general library, which can be used to customize the minidump sent to crashreport.libreoffice.org. The present patch is constructed partly from some general information about what is collected that appears on Markus Mohrhard's blog [1], the documentation for breakpad (in general)[2], and from looking at actual reports in crashreport.libreoffice.org. Information sources: [1] https://mmohrhard.wordpress.com/2016/06/19/crash-reporting-for-libreoffice/ [2] https://chromium.googlesource.com/breakpad/breakpad/+/master/docs/ Change-Id: I45657601ddc1f1463e8a3e6c93614d154f19b388 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106230 Tested-by: Jenkins Reviewed-by: Seth Chaiklin Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index a2bd1ce7cf53..c878f6d6a312 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a2bd1ce7cf53abd37db55422c9b99a4e50d9d463 +Subproject commit c878f6d6a31245cf2dcebbbf27a17defc3d96660 ___ 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/guide/error_report.xhp | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) New commits: commit c878f6d6a31245cf2dcebbbf27a17defc3d96660 Author: Seth Chaiklin AuthorDate: Fri Nov 20 11:07:27 2020 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Mon Dec 7 08:36:48 2020 +0100 tdf#126492 update help information about Crash Report Tool This patch updates the Error Reporting help to the Crash Report Tool, which was introduced in 2016. The same basic form is used, with details adjusted to correspond to the new tool. Also corrected the name of Windows system tool that collects memory traces. The Crash Report uses Breakpad, a third-party general library, which can be used to customize the minidump sent to crashreport.libreoffice.org. The present patch is constructed partly from some general information about what is collected that appears on Markus Mohrhard's blog [1], the documentation for breakpad (in general)[2], and from looking at actual reports in crashreport.libreoffice.org. Information sources: [1] https://mmohrhard.wordpress.com/2016/06/19/crash-reporting-for-libreoffice/ [2] https://chromium.googlesource.com/breakpad/breakpad/+/master/docs/ Change-Id: I45657601ddc1f1463e8a3e6c93614d154f19b388 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/106230 Tested-by: Jenkins Reviewed-by: Seth Chaiklin Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/shared/guide/error_report.xhp b/source/text/shared/guide/error_report.xhp index 9f3744a0f..baba5ba3b 100644 --- a/source/text/shared/guide/error_report.xhp +++ b/source/text/shared/guide/error_report.xhp @@ -20,7 +20,7 @@ -Error Report Tool +Crash Report Tool /text/shared/guide/error_report.xhp @@ -28,31 +28,31 @@ - Error Report Tool - reports;error reports + Crash Report Tool + reports;crash reports crash reports - activating;Error Report Tool + activating;Crash Report Tool -MW changed "reporting..." to "reports;" -Error Report Tool -The Error Report Tool starts automatically when a program crash occurs.removed sentene about manually - i96770 -The Error Report Tool gathers all necessary information that can help the program developers to improve the code, so that in later versions this error can possibly be avoided. Please help us to improve the software and send the generated error report. +Crash Report Tool +The Crash Report Tool starts automatically after a program crash occurs. +The Crash Report Tool gathers necessary information that can help the program developers to improve the code, so that in later versions this error can possibly be avoided. Please help us to improve the software and send the generated crash report. -Starting the Error Report Tool -With most program crashes the Error Report Tool will start automatically. +Starting the Crash Report Tool +With most program crashes the Crash Report Tool will start automatically. -Completing the Report -On the main Error Report Tool dialog, you can enter some additional information that may help the developers to localize the error. For example, if the error only appears after a change in your hardware or software environment, or if you clicked on a button, please include that information. +Sending the Crash Report +Select the checkbox if you want to restart %PRODUCTNAME in safe mode. Then click the Send Crash Report button. +If a crash report is sent successfully, then a dialog box will provide a URL for the report. To see the report, copy the URL and paste into a webbrowser. -Sending the Error Report -The Error Report Tool uses the HTTP PUT / SOAP protocol to send the report data. You may optionally enter some descriptive text that will help us to identify the context of the program crash. Then click the Send button. -You will not get an answer to your error report. If you need support, please visit the support forum on the Internet. -You may choose to respond to questions that the developers may have about the reported error. Mark the check box if you want to be contacted by email, should additional information be required. By default this box is not marked, so you will not get any email. +You will not get an answer to your crash report. If you need support, please visit https://www.libreoffice.org/get-help/community-support/";>Community Assistance for an overview of different possibilities. -What Data is Sent? -The error report consists of several files. The main file contains information about the error type, operating system name and version, memory usage, and the description that you entered. You can click the Show Report button on the main dialog of the Error Report Tool to view what will get sent in the main file. -In addition, relevant memory contents and stack traces are gathered by som
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eafbf15d68afee5b57e0f1c87f73762ac057a12f Author: Seth Chaiklin AuthorDate: Mon Dec 7 08:33:41 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Dec 7 08:33:41 2020 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-7-1' to e2c545ce9755cbdbcd02be09c963da8566386446 - tdf#105719 tdf#122720 tdf#107229 help for making default template ( shared/guide/standard_template.xhp ) * Modify title to Creating and Changing Default and Custom Templates * Move isolated listitem into procedure for creating default * Update procedure for making default template + Make separate procedure for updating existing default template + Add procedure for setting a template to default + Rework/elaborate section on Custom templates + Elaborate section about saving templates (tdf#122720) + add bookmark for creating templates * update to: ,, ( shared/01/01110300.xhp ) [ File - Template menu ] + add related topics section and link to standard_template * update to: , ( swriter/guide/templates_styles.xhp ) * update to: ( swriter/guide/main.xhp ) * update to: ,some ( shared/guide/main.xhp ) * update to: , Change-Id: I9507c70862dfdd9d844d2c53e4833bbc9bfe71a1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105855 Tested-by: Jenkins Reviewed-by: Seth Chaiklin (cherry picked from commit a2bd1ce7cf53abd37db55422c9b99a4e50d9d463) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107300 Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index ce1a6e03a6ad..e2c545ce9755 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ce1a6e03a6ad57f68a4da315df26fc0ff10c142a +Subproject commit e2c545ce9755cbdbcd02be09c963da8566386446 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-7-1' - source/text
source/text/shared/01/01110300.xhp | 11 +- source/text/shared/guide/main.xhp | 20 ++--- source/text/shared/guide/standard_template.xhp | 99 +++-- source/text/swriter/guide/main.xhp |8 -- source/text/swriter/guide/templates_styles.xhp | 13 +-- 5 files changed, 103 insertions(+), 48 deletions(-) New commits: commit e2c545ce9755cbdbcd02be09c963da8566386446 Author: Seth Chaiklin AuthorDate: Sun Nov 15 16:59:52 2020 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Mon Dec 7 08:33:41 2020 +0100 tdf#105719 tdf#122720 tdf#107229 help for making default template ( shared/guide/standard_template.xhp ) * Modify title to Creating and Changing Default and Custom Templates * Move isolated listitem into procedure for creating default * Update procedure for making default template + Make separate procedure for updating existing default template + Add procedure for setting a template to default + Rework/elaborate section on Custom templates + Elaborate section about saving templates (tdf#122720) + add bookmark for creating templates * update to: ,, ( shared/01/01110300.xhp ) [ File - Template menu ] + add related topics section and link to standard_template * update to: , ( swriter/guide/templates_styles.xhp ) * update to: ( swriter/guide/main.xhp ) * update to: ,some ( shared/guide/main.xhp ) * update to: , Change-Id: I9507c70862dfdd9d844d2c53e4833bbc9bfe71a1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105855 Tested-by: Jenkins Reviewed-by: Seth Chaiklin (cherry picked from commit a2bd1ce7cf53abd37db55422c9b99a4e50d9d463) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107300 Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/shared/01/01110300.xhp b/source/text/shared/01/01110300.xhp index b8c55e33c..8f14b07c0 100644 --- a/source/text/shared/01/01110300.xhp +++ b/source/text/shared/01/01110300.xhp @@ -29,20 +29,23 @@ -Save as Template +Save as Template Saves the current document as a template. Choose File - Templates - Save as Template. -Template Name +Template Name Enter a name for the template. -Template Category +Template Category Select a category in which to save the new template. -Set as default template +Set as default template The new template will be used as the default template. + + + diff --git a/source/text/shared/guide/main.xhp b/source/text/shared/guide/main.xhp index 4b8c5de51..b8446b92f 100644 --- a/source/text/shared/guide/main.xhp +++ b/source/text/shared/guide/main.xhp @@ -31,9 +31,9 @@ instructions; general -General Instructions for %PRODUCTNAME +General Instructions for %PRODUCTNAME -Opening and Saving Documents and Templates +Opening and Saving Documents and Templates @@ -63,7 +63,7 @@ -Using Windows, Menus and Icons +Using Windows, Menus and Icons @@ -73,7 +73,7 @@ -Accessibility +Accessibility @@ -99,7 +99,7 @@ -Copying Data by Drag and Drop or Menu Commands +Copying Data by Drag and Drop or Menu Commands @@ -112,7 +112,7 @@ -Data Sources +Data Sources Working with databases in %PRODUCTNAME Table Wizard Query Wizard @@ -129,7 +129,7 @@ -Recording Changes (Revision Marking) +Recording Changes (Revision Marking) @@ -138,7 +138,7 @@ -Configuring and Modifying %PRODUCTNAME +Configuring and Modifying %PRODUCTNAME @@ -160,14 +160,14 @@ -Charts +Charts -Miscellaneous +Miscellaneous General Terminology Internet Terminology diff --git a/source/text/shared/guide/standard_template.xhp b/source/text/shared/guide/standard_template.xhp index 3abbc7f6a..68f6fafac 100644 --- a/source/text/shared/guide/standard_template.xhp +++ b/source/text/shared/guide/standard_template.xhp @@ -1,7 +1,5 @@ - - - + - - -Changing Default Templates +Creating and Changing Default and Custom Templates /text/shared/guide/standard_template.xhp @@ -32,6 +28,7 @@ modifying, see changing changing, see also editing and replacing default templates; changing +default templates; creating defaults;documents custom templates updating; templates @@ -39,36 +36,94 @@ templates;editing and saving saving;templates resetting;templates -MW deleted "changing;"Changing Default Templates - + +Creating and Changing Default and Custom Templates + When you open a new document with File - New, a blank document appears based on a $[officename] template. You can edit, modify, or replace this template so that the new document contains your customized Styles or other contents. -Modifying Default Templates - +You can define document templates for each $[officename] module. +Creating a Default Template + -First, open either
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/loader/pythonloader.py | 21 ++---
1 file changed, 10 insertions(+), 11 deletions(-)
New commits:
commit 3e524922b93b1fe811d3b20f8f6cdf01461348ac
Author: Mike Kaganski
AuthorDate: Mon Dec 7 09:09:24 2020 +0300
Commit: Mike Kaganski
CommitDate: Mon Dec 7 08:14:46 2020 +0100
Wrap "open" into "with"
Change-Id: I1ecc16ddf565ac1f7306289fd51b673ed928cc20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107329
Tested-by: Jenkins
Reviewed-by: Noel Grandin
Reviewed-by: Mike Kaganski
diff --git a/pyuno/source/loader/pythonloader.py
b/pyuno/source/loader/pythonloader.py
index 7c16e226bad9..9a7114aea210 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -90,17 +90,16 @@ class Loader( XImplementationLoader, XServiceInfo,
unohelper.Base ):
# read the file
filename = unohelper.fileUrlToSystemPath( url )
-fileHandle = open( filename, encoding='utf_8' )
-src = fileHandle.read().replace("\r","")
-if not src.endswith( "\n" ):
-src = src + "\n"
-
-# compile and execute the module
-codeobject = compile( src, encfile(filename), "exec" )
-mod.__file__ = filename
-exec(codeobject, mod.__dict__)
-g_loadedComponents[url] = mod
-fileHandle.close()
+with open( filename, encoding='utf_8' ) as fileHandle:
+src = fileHandle.read().replace("\r","")
+if not src.endswith( "\n" ):
+src = src + "\n"
+
+# compile and execute the module
+codeobject = compile( src, encfile(filename), "exec" )
+mod.__file__ = filename
+exec(codeobject, mod.__dict__)
+g_loadedComponents[url] = mod
return mod
elif "vnd.openoffice.pymodule" == protocol:
nSlash = dependent.rfind('/')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/cmd/32/addfield.png |binary icon-themes/elementary/cmd/32/alignblock.png |binary icon-themes/elementary/cmd/32/alignhorizontalcenter.png|binary icon-themes/elementary/cmd/32/alignleft.png|binary icon-themes/elementary/cmd/32/alignright.png |binary icon-themes/elementary/cmd/32/alphaliststyle.png |binary icon-themes/elementary/cmd/32/alphalowliststyle.png|binary icon-themes/elementary/cmd/32/ar/alphaliststyle.png|binary icon-themes/elementary/cmd/32/ar/alphalowliststyle.png |binary icon-themes/elementary/cmd/32/ar/bulletsandnumberingdialog.png |binary icon-themes/elementary/cmd/32/ar/defaultbullet.png |binary icon-themes/elementary/cmd/32/ar/defaultnumbering.png |binary icon-themes/elementary/cmd/32/ar/insertneutralparagraph.png|binary icon-themes/elementary/cmd/32/ar/numberingstart.png|binary icon-themes/elementary/cmd/32/ar/outlinebullet.png |binary icon-themes/elementary/cmd/32/ar/recsave.png |binary icon-themes/elementary/cmd/32/ar/removebullets.png |binary icon-themes/elementary/cmd/32/ar/romanliststyle.png|binary icon-themes/elementary/cmd/32/ar/romanlowliststyle.png |binary icon-themes/elementary/cmd/32/ar/setoutline.png|binary icon-themes/elementary/cmd/32/bulletsandnumberingdialog.png|binary icon-themes/elementary/cmd/32/decrementindent.png |binary icon-themes/elementary/cmd/32/defaultbullet.png|binary icon-themes/elementary/cmd/32/defaultnumbering.png |binary icon-themes/elementary/cmd/32/dsbinsertcontent.png |binary icon-themes/elementary/cmd/32/hangingindent.png|binary icon-themes/elementary/cmd/32/incrementindent.png |binary icon-themes/elementary/cmd/32/insertfield.png |binary icon-themes/elementary/cmd/32/insertmath.png |binary icon-themes/elementary/cmd/32/insertneutralparagraph.png |binary icon-themes/elementary/cmd/32/mailmergesavedocuments.png |binary icon-themes/elementary/cmd/32/numberingstart.png |binary icon-themes/elementary/cmd/32/outlinebullet.png|binary icon-themes/elementary/cmd/32/paraspacedecrease.png|binary icon-themes/elementary/cmd/32/paraspaceincrease.png|binary icon-themes/elementary/cmd/32/protectfields.png|binary icon-themes/elementary/cmd/32/recsave.png |binary icon-themes/elementary/cmd/32/removebullets.png|binary icon-themes/elementary/cmd/32/romanliststyle.png |binary icon-themes/elementary/cmd/32/romanlowliststyle.png|binary icon-themes/elementary/cmd/32/save.png |binary icon-themes/elementary/cmd/32/saveacopy.png|binary icon-themes/elementary/cmd/32/saveall.png |binary icon-themes/elementary/cmd/32/saveas.png |binary icon-themes/elementary/cmd/32/saveasremote.png |binary icon-themes/elementary/cmd/32/savebackground.png |binary icon-themes/elementary/cmd/32/setoutline.png |binary icon-themes/elementary/cmd/32/spacepara1.png |binary icon-themes/elementary/cmd/32/spacepara15.png |binary icon-themes/elementary/cmd/32/spacepara2.png |binary icon-themes/elementary/cmd/32/wraptext.png |binary icon-themes/elementary/cmd/ar/lc_alphaliststyle.png|binary icon-themes/elementary/cmd/ar/lc_alphalowliststyle.png |binary icon-themes/elementary/cmd/ar/lc_bulletsandnumberingdialog.png |binary icon-themes/elementary/cmd/ar/lc_defaultbullet.png |binary icon-themes/elementary/cmd/ar/lc_defaultnumbering.png |binary icon-themes/elementary/cmd/ar/lc_insertneutralparagraph.png|binary icon-themes/elementary/cmd/ar/lc_numberingstart.png|binary icon-themes/elementary/cmd/ar/lc_outlinebullet.png |binary icon-themes/elementary/cmd/ar/lc_recsave.png |binary icon-themes/elementary/cmd/ar/lc_removebullets.png |binary icon-themes/elementary/cmd/ar/lc_romanliststyle.png|binary icon-themes/elementary/cmd/ar/lc_romanlowliststyle.png |binary icon-themes/elementary/cmd/ar/lc_setoutline.png|binary icon-themes/elementary/cmd/ar/sc_alphaliststyle.png|binary icon-themes/elementary/cmd/ar/sc_alphalowliststyle.png
[Libreoffice-commits] core.git: Branch 'private/tml/lov-7.0.3.3' - external/nss
external/nss/nss_macosx.patch | 21 +++--
1 file changed, 19 insertions(+), 2 deletions(-)
New commits:
commit bd06a23df7b7a355136126487c01df3df14ff3a8
Author: Tor Lillqvist
AuthorDate: Sun Dec 6 18:43:10 2020 +0200
Commit: Tor Lillqvist
CommitDate: Mon Dec 7 03:26:32 2020 +0200
More NSS fixes for macOS on arm64
I think the attempt to set CPU_ARCH in
external/nss/ExternalProject_nss.mk does not actually work. And
anyway, it should be arm64 for macOS on arm64, not aarch64.
Now NSS configury correctly finds the APIs present in the system when
building for macOS on arm64. Previously, it attempted to compile the
test snippets for PowerPC... which caused for instance dladdr() not to
be found, which caused the softokn3 loading to fail.
(It's somewhat surprising that the NSS configury still has "support"
for MacOS on PowerPC... Do people really build latest and greatest NSS
on such machines? Or is it just a leftover and the NSS people never,
ever, remove anything?)
Change-Id: I0dc35df0460db7997efcfdf92594fd8ae352aa49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107316
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index c45c5107f094..07b60a5ed00d 100644
--- a/external/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
@@ -1,7 +1,17 @@
diff -ru a/nspr/configure b/nspr/configure
--- a/a/nspr/configure 2014-09-29 16:50:33.907375937 +0100
+++ b/b/nspr/configure 2014-09-29 16:51:59.213931947 +0100
-@@ -6577,7 +6579,7 @@
+@@ -6453,6 +6453,9 @@
+ AS='$(CC) -x assembler-with-cpp'
+ CFLAGS="$CFLAGS -Wall -fno-common"
+ case "${target_cpu}" in
++aarch64)
++CPU_ARCH=arm64
++;;
+ arm*)
+ CPU_ARCH=arm
+ ;;
+@@ -6578,7 +6579,7 @@
DSO_CFLAGS=-fPIC
@@ -31,7 +41,14 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
override CPU_ARCH = x86
endif
else
-@@ -40,12 +48,16 @@
+@@ -40,19 +48,20 @@
+ ifeq (arm,$(CPU_ARCH))
+ # Nothing set for arm currently.
+ else
+-OS_REL_CFLAGS = -Dppc
+-CC += -arch ppc
+-CCC += -arch ppc
+ endif
endif
ifneq (,$(MACOS_SDK_DIR))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/cmd/32/addfield.png |binary icon-themes/elementary/cmd/32/alignblock.png |binary icon-themes/elementary/cmd/32/alignhorizontalcenter.png|binary icon-themes/elementary/cmd/32/alignleft.png|binary icon-themes/elementary/cmd/32/alignright.png |binary icon-themes/elementary/cmd/32/alphaliststyle.png |binary icon-themes/elementary/cmd/32/alphalowliststyle.png|binary icon-themes/elementary/cmd/32/ar/alphaliststyle.png|binary icon-themes/elementary/cmd/32/ar/alphalowliststyle.png |binary icon-themes/elementary/cmd/32/ar/bulletsandnumberingdialog.png |binary icon-themes/elementary/cmd/32/ar/defaultbullet.png |binary icon-themes/elementary/cmd/32/ar/defaultnumbering.png |binary icon-themes/elementary/cmd/32/ar/insertneutralparagraph.png|binary icon-themes/elementary/cmd/32/ar/numberingstart.png|binary icon-themes/elementary/cmd/32/ar/outlinebullet.png |binary icon-themes/elementary/cmd/32/ar/recsave.png |binary icon-themes/elementary/cmd/32/ar/removebullets.png |binary icon-themes/elementary/cmd/32/ar/romanliststyle.png|binary icon-themes/elementary/cmd/32/ar/romanlowliststyle.png |binary icon-themes/elementary/cmd/32/ar/setoutline.png|binary icon-themes/elementary/cmd/32/bulletsandnumberingdialog.png|binary icon-themes/elementary/cmd/32/decrementindent.png |binary icon-themes/elementary/cmd/32/defaultbullet.png|binary icon-themes/elementary/cmd/32/defaultnumbering.png |binary icon-themes/elementary/cmd/32/dsbinsertcontent.png |binary icon-themes/elementary/cmd/32/hangingindent.png|binary icon-themes/elementary/cmd/32/incrementindent.png |binary icon-themes/elementary/cmd/32/insertfield.png |binary icon-themes/elementary/cmd/32/insertmath.png |binary icon-themes/elementary/cmd/32/insertneutralparagraph.png |binary icon-themes/elementary/cmd/32/mailmergesavedocuments.png |binary icon-themes/elementary/cmd/32/numberingstart.png |binary icon-themes/elementary/cmd/32/outlinebullet.png|binary icon-themes/elementary/cmd/32/paraspacedecrease.png|binary icon-themes/elementary/cmd/32/paraspaceincrease.png|binary icon-themes/elementary/cmd/32/protectfields.png|binary icon-themes/elementary/cmd/32/recsave.png |binary icon-themes/elementary/cmd/32/removebullets.png|binary icon-themes/elementary/cmd/32/romanliststyle.png |binary icon-themes/elementary/cmd/32/romanlowliststyle.png|binary icon-themes/elementary/cmd/32/save.png |binary icon-themes/elementary/cmd/32/saveacopy.png|binary icon-themes/elementary/cmd/32/saveall.png |binary icon-themes/elementary/cmd/32/saveas.png |binary icon-themes/elementary/cmd/32/saveasremote.png |binary icon-themes/elementary/cmd/32/savebackground.png |binary icon-themes/elementary/cmd/32/setoutline.png |binary icon-themes/elementary/cmd/32/spacepara1.png |binary icon-themes/elementary/cmd/32/spacepara15.png |binary icon-themes/elementary/cmd/32/spacepara2.png |binary icon-themes/elementary/cmd/32/wraptext.png |binary icon-themes/elementary/cmd/ar/lc_alphaliststyle.png|binary icon-themes/elementary/cmd/ar/lc_alphalowliststyle.png |binary icon-themes/elementary/cmd/ar/lc_bulletsandnumberingdialog.png |binary icon-themes/elementary/cmd/ar/lc_defaultbullet.png |binary icon-themes/elementary/cmd/ar/lc_defaultnumbering.png |binary icon-themes/elementary/cmd/ar/lc_insertneutralparagraph.png|binary icon-themes/elementary/cmd/ar/lc_numberingstart.png|binary icon-themes/elementary/cmd/ar/lc_outlinebullet.png |binary icon-themes/elementary/cmd/ar/lc_recsave.png |binary icon-themes/elementary/cmd/ar/lc_removebullets.png |binary icon-themes/elementary/cmd/ar/lc_romanliststyle.png|binary icon-themes/elementary/cmd/ar/lc_romanlowliststyle.png |binary icon-themes/elementary/cmd/ar/lc_setoutline.png|binary icon-themes/elementary/cmd/ar/sc_alphaliststyle.png|binary icon-themes/elementary/cmd/ar/sc_alphalowliststyle.png
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - external/nss
external/nss/nss_macosx.patch | 21 +++--
1 file changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 35098b992589ffa29403a3406540f9afabaee9d2
Author: Tor Lillqvist
AuthorDate: Sun Dec 6 18:43:10 2020 +0200
Commit: Tor Lillqvist
CommitDate: Mon Dec 7 01:43:17 2020 +0100
More NSS fixes for macOS on arm64
I think the attempt to set CPU_ARCH in
external/nss/ExternalProject_nss.mk does not actually work. And
anyway, it should be arm64 for macOS on arm64, not aarch64.
Now NSS configury correctly finds the APIs present in the system when
building for macOS on arm64. Previously, it attempted to compile the
test snippets for PowerPC... which caused for instance dladdr() not to
be found, which caused the softokn3 loading to fail.
(It's somewhat surprising that the NSS configury still has "support"
for MacOS on PowerPC... Do people really build latest and greatest NSS
on such machines? Or is it just a leftover and the NSS people never,
ever, remove anything?)
Change-Id: I0dc35df0460db7997efcfdf92594fd8ae352aa49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107316
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107325
diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index c45c5107f094..07b60a5ed00d 100644
--- a/external/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
@@ -1,7 +1,17 @@
diff -ru a/nspr/configure b/nspr/configure
--- a/a/nspr/configure 2014-09-29 16:50:33.907375937 +0100
+++ b/b/nspr/configure 2014-09-29 16:51:59.213931947 +0100
-@@ -6577,7 +6579,7 @@
+@@ -6453,6 +6453,9 @@
+ AS='$(CC) -x assembler-with-cpp'
+ CFLAGS="$CFLAGS -Wall -fno-common"
+ case "${target_cpu}" in
++aarch64)
++CPU_ARCH=arm64
++;;
+ arm*)
+ CPU_ARCH=arm
+ ;;
+@@ -6578,7 +6579,7 @@
DSO_CFLAGS=-fPIC
@@ -31,7 +41,14 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
override CPU_ARCH = x86
endif
else
-@@ -40,12 +48,16 @@
+@@ -40,19 +48,20 @@
+ ifeq (arm,$(CPU_ARCH))
+ # Nothing set for arm currently.
+ else
+-OS_REL_CFLAGS = -Dppc
+-CC += -arch ppc
+-CCC += -arch ppc
+ endif
endif
ifneq (,$(MACOS_SDK_DIR))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - extensions/source sfx2/source
extensions/source/macosx/spotlight/OOoContentDataParser.h |2 -
extensions/source/macosx/spotlight/OOoContentDataParser.m |7 -
extensions/source/macosx/spotlight/OOoMetaDataParser.h|2 -
extensions/source/macosx/spotlight/OOoMetaDataParser.m|6
sfx2/source/appl/shutdowniconaqua.mm | 18 ++
5 files changed, 7 insertions(+), 28 deletions(-)
New commits:
commit fcb8162f979b3828ac5fa1ab5c3711c657658e60
Author: Tor Lillqvist
AuthorDate: Sat Dec 5 18:16:37 2020 +0200
Commit: Tor Lillqvist
CommitDate: Mon Dec 7 01:40:52 2020 +0100
Remove remaining bogus use of objc_msgSend()
Follow-up to 5bf61e98b0746a4afeb68a80e54b4eb4bf4ea89f.
Should avoid crashes when running as arm64 code on macOS on arm64.
Change-Id: Id05d182684df82c8a7bf09f6bb7e8ccb01997b62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107259
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107324
diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.h
b/extensions/source/macosx/spotlight/OOoContentDataParser.h
index 7112497cf7de..dc07a3166122 100644
--- a/extensions/source/macosx/spotlight/OOoContentDataParser.h
+++ b/extensions/source/macosx/spotlight/OOoContentDataParser.h
@@ -19,7 +19,7 @@
#import
-@interface OOoContentDataParser : NSObject {
+@interface OOoContentDataParser : NSObject {
// indicates if we are interested in an element's content
BOOL shouldReadCharacters;
diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.m
b/extensions/source/macosx/spotlight/OOoContentDataParser.m
index d3ecf16ffaab..e1f51e5b90c7 100644
--- a/extensions/source/macosx/spotlight/OOoContentDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoContentDataParser.m
@@ -47,12 +47,7 @@
NSXMLParser *parser = [[NSXMLParser alloc] initWithData:data];
-// Once again...
-// class 'OOoContentDataParser' does not implement the
'NSXMLParserDelegate' protocol
-// So instead of this:
-// [parser setDelegate:self];
-// do this:
-((id (*)(id, SEL, ...))objc_msgSend)(parser, @selector(setDelegate:),
self);
+[parser setDelegate:self];
[parser setShouldResolveExternalEntities:NO];
[parser parse];
diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.h
b/extensions/source/macosx/spotlight/OOoMetaDataParser.h
index 5db7634cce0c..85d48b1735d7 100644
--- a/extensions/source/macosx/spotlight/OOoMetaDataParser.h
+++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.h
@@ -20,7 +20,7 @@
#import
-@interface OOoMetaDataParser : NSObject {
+@interface OOoMetaDataParser : NSObject {
//indicates if content should be read
BOOL shouldReadCharacters;
//indicates if the current element is a custom metadata tag
diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.m
b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
index 2b4dac82c555..1e7cac685b88 100644
--- a/extensions/source/macosx/spotlight/OOoMetaDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
@@ -91,11 +91,7 @@ static NSDictionary *metaXML2MDIKeys;
NSXMLParser *parser = [[NSXMLParser alloc] initWithData:data];
-// class 'OOoMetaDataParser' does not implement the 'NSXMLParserDelegate'
protocol
-// So instead of this:
-// [parser setDelegate:self];
-// do this:
-((id (*)(id, SEL, ...))objc_msgSend)(parser, @selector(setDelegate:),
self);
+[parser setDelegate:self];
[parser setShouldResolveExternalEntities:NO];
[parser parse];
diff --git a/sfx2/source/appl/shutdowniconaqua.mm
b/sfx2/source/appl/shutdowniconaqua.mm
index 3fa4d61443a0..028a9a6e64ec 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -146,7 +146,7 @@ class RecentFilesStringLength : public
::cppu::WeakImplHelper< css::util::XStrin
}
-@interface RecentMenuDelegate : NSObject
+@interface RecentMenuDelegate : NSObject
{
std::vector< RecentMenuEntry >* m_pRecentFilesItems;
}
@@ -347,16 +347,7 @@ static void appendRecentMenu( NSMenu* i_pMenu, NSMenu*
i_pDockMenu, const OUStri
[pItem setEnabled: YES];
NSMenu* pRecentMenu = [[NSMenu alloc] initWithTitle:
getAutoreleasedString( i_rTitle ) ];
-// When compiling against 10.6 SDK, we get the warning:
-// class 'RecentMenuDelegate' does not implement the 'NSMenuDelegate'
protocol
-
-// No idea if that is a bogus warning, or if the way this is
-// implemented just is so weird that the compiler gets
-// confused. Anyway, to avoid warnings, instead of this:
-// [pRecentMenu setDelegate: pRecentDelegate];
-// do this:
-reinterpret_cast(objc_msgSend)(
-pRecentMenu, @selector(setDelegate:), pRecentDelegate);
+[pRecentMenu setDelegate: pRecentDelegate];
[pRecentMenu setAutoenablesItems: NO];
[pItem setSubmenu: pRe
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - fpicker/source
fpicker/source/aqua/AquaFilePickerDelegate.hxx |2 +-
fpicker/source/aqua/SalAquaFilePicker.mm |8 +---
2 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 43c572fa90e26bd9b47a9eecfd67f6e2220095b1
Author: Tor Lillqvist
AuthorDate: Sat Dec 5 17:25:30 2020 +0200
Commit: Tor Lillqvist
CommitDate: Mon Dec 7 01:40:19 2020 +0100
Fix crash or hang on macOS on arm64 when opening a file picker
There is no reason to not mention the NSOpenSavePanelDelegate protocol
that AquaFilePickerDelegate implements.
The way we used objc_msgSend() caused a crash or hang. (I saw both,
depending on whether the code was built for debugging or not). For
some reason we used to cast it to a function with variadic parameters
like:
reinterpret_cast(objc_msgSend)(
m_pDialog, @selector(setDelegate:), m_pDelegate);
This does not work in arm64 code on macOS. (See
https://developer.apple.com/documentation/apple_silicon/addressing_architectural_differences_in_your_macos_code?language=objc
, the "Don't Redeclare a Function to Have Variable Parameters"
section.)
We could have replaced the ellipsis with the actual type of the first
real parameter in this call, or just "id" would have worked fine. But
it is much simpler to just do what we mean directly:
[m_pDialog setDelegate:m_pDelegate];
I need to look through the code for other places where we have used
objc_msgSend() in a similar fashion.
Change-Id: Ia93b2007ed8f263eaf99d604a3c88e857efbb421
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107257
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107323
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.hxx
b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
index eb7e1ce402e6..fb158cd67633 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.hxx
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.hxx
@@ -27,7 +27,7 @@
class SalAquaFilePicker;
class FilterHelper;
-@interface AquaFilePickerDelegate : NSObject
+@interface AquaFilePickerDelegate : NSObject
{
SalAquaFilePicker* filePicker;
FilterHelper* filterHelper;
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm
b/fpicker/source/aqua/SalAquaFilePicker.mm
index deff8783bbe9..069a2411f6a5 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -154,13 +154,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute()
//Set the delegate to be notified of certain events
-// I don't know why, but with gcc 4.2.1, this line results in the warning:
-// class 'AquaFilePickerDelegate' does not implement the
'NSOpenSavePanelDelegate' protocol
-// So instead of:
-// [m_pDialog setDelegate:m_pDelegate];
-// do:
-reinterpret_cast(objc_msgSend)(
-m_pDialog, @selector(setDelegate:), m_pDelegate);
+[m_pDialog setDelegate:m_pDelegate];
int nStatus = runandwaitforresult();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Math/Formula visual editing
(Not really involved in any form of math writing, but this detail caught my eye: On Sun, 6 Dec 2020 at 21:57, Peter Gervai wrote: > The main reason for the speed is its universal hotkey (backslash) > which pops up a selection box anywhere. > Note that in many not uncommon non-English keyboard layouts, the backslash is not that trivial to type. For instance, for the keyboard layout I personally use all the time, the Finnish layout on macOS (basically identical to the Swedish one), typing a backslash requires three keys being held: Right Alt (or "option"), Shift, and 7. Sure, as I am a programmer that needs backslashes very often, and use this same keyboard layout all the time, I know that by heart and it isn't especially hard for me. But for more typical users of this keyboard layout it might be a very uncommon character to input. In the Finnish Windows keyboard layout, backslash requires just two keys: AltGr and +, but stil. Thus, in my humble opinion, shortcuts intended to be used a lot and intended to be easy to learn should not involve characters that actually vary wildly in their ease of use depending on keyboard layout. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Math/Formula visual editing
Hi Peter, LibreOffice has an in-line formula editor. But no one has improved it in the last seven years, so it is still an "experimental feature". You are welcome to bring it to the regular UI. With this editor you write the formula directly into the main window and the markup is automatically generated in the command window. You can enable it in Tools > Options > LibreOffice > Advanced. Kind regards Regina Peter Gervai schrieb am 06-Dec-20 um 20:56: Hello Devs! [..] I was looking around formula input tools, from LyX through various tools to LO Math (or Formula, it is sometimes referenced either this or that). Basically what's usable was LyX, but it's clunky and hard to use for non-technical people and LO, which is rather easy to use. (And you can edit TeX source, but that's absolutely not user friendly.) None of them was really _good_or _simple_. I'm here to help LO Formula/Math to be the best. [..] Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/nss
external/nss/nss_macosx.patch | 21 +++--
1 file changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 796c7f612603490dda9277ced0f6ab3cce3bc116
Author: Tor Lillqvist
AuthorDate: Sun Dec 6 18:43:10 2020 +0200
Commit: Tor Lillqvist
CommitDate: Mon Dec 7 00:01:35 2020 +0100
More NSS fixes for macOS on arm64
I think the attempt to set CPU_ARCH in
external/nss/ExternalProject_nss.mk does not actually work. And
anyway, it should be arm64 for macOS on arm64, not aarch64.
Now NSS configury correctly finds the APIs present in the system when
building for macOS on arm64. Previously, it attempted to compile the
test snippets for PowerPC... which caused for instance dladdr() not to
be found, which caused the softokn3 loading to fail.
(It's somewhat surprising that the NSS configury still has "support"
for MacOS on PowerPC... Do people really build latest and greatest NSS
on such machines? Or is it just a leftover and the NSS people never,
ever, remove anything?)
Change-Id: I0dc35df0460db7997efcfdf92594fd8ae352aa49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107316
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index c45c5107f094..07b60a5ed00d 100644
--- a/external/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
@@ -1,7 +1,17 @@
diff -ru a/nspr/configure b/nspr/configure
--- a/a/nspr/configure 2014-09-29 16:50:33.907375937 +0100
+++ b/b/nspr/configure 2014-09-29 16:51:59.213931947 +0100
-@@ -6577,7 +6579,7 @@
+@@ -6453,6 +6453,9 @@
+ AS='$(CC) -x assembler-with-cpp'
+ CFLAGS="$CFLAGS -Wall -fno-common"
+ case "${target_cpu}" in
++aarch64)
++CPU_ARCH=arm64
++;;
+ arm*)
+ CPU_ARCH=arm
+ ;;
+@@ -6578,7 +6579,7 @@
DSO_CFLAGS=-fPIC
@@ -31,7 +41,14 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
override CPU_ARCH = x86
endif
else
-@@ -40,12 +48,16 @@
+@@ -40,19 +48,20 @@
+ ifeq (arm,$(CPU_ARCH))
+ # Nothing set for arm currently.
+ else
+-OS_REL_CFLAGS = -Dppc
+-CC += -arch ppc
+-CCC += -arch ppc
+ endif
endif
ifneq (,$(MACOS_SDK_DIR))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/impgraph.cxx | 40 ++--
1 file changed, 18 insertions(+), 22 deletions(-)
New commits:
commit bba0fa96e37f866bba871693bbc6363feb08ea3b
Author: Tomaž Vajngerl
AuthorDate: Sun Dec 6 21:01:40 2020 +0900
Commit: Tomaž Vajngerl
CommitDate: Sun Dec 6 23:34:13 2020 +0100
graphic: clean-up and simplify GetChecksum in ImpGraphic
- rearrange the switch statement for GraphicTypes
- remove the unneeded aRet variable
Change-Id: I1be95db377548cf1a6db430fe66ce06bc7f93d97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107286
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index b1bab153deff..aed7f2e86772 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1747,36 +1747,32 @@ BitmapChecksum ImpGraphic::ImplGetChecksum() const
if (mnChecksum != 0)
return mnChecksum;
-BitmapChecksum nRet = 0;
-
ensureAvailable();
-if( ImplIsSupportedGraphic() && !isSwappedOut() )
+switch (meType)
{
-switch( meType )
-{
-case GraphicType::Default:
+case GraphicType::NONE:
+case GraphicType::Default:
break;
-case GraphicType::Bitmap:
-{
-if(maVectorGraphicData)
-nRet = maVectorGraphicData->GetChecksum();
-else if( mpAnimation )
-nRet = mpAnimation->GetChecksum();
-else
-nRet = maBitmapEx.GetChecksum();
-}
-break;
+case GraphicType::Bitmap:
+{
+if (maVectorGraphicData)
+mnChecksum = maVectorGraphicData->GetChecksum();
+else if (mpAnimation)
+mnChecksum = mpAnimation->GetChecksum();
+else
+mnChecksum = maBitmapEx.GetChecksum();
+}
+break;
-default:
-nRet = maMetaFile.GetChecksum();
-break;
+case GraphicType::GdiMetafile:
+{
+mnChecksum = maMetaFile.GetChecksum();
}
+break;
}
-
-mnChecksum = nRet;
-return nRet;
+return mnChecksum;
}
bool ImpGraphic::ImplExportNative( SvStream& rOStm ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/impgraph.cxx | 190 +++-
1 file changed, 102 insertions(+), 88 deletions(-)
New commits:
commit 2b46b310c0b5371bf929d298b602f405e276d7d2
Author: Tomaž Vajngerl
AuthorDate: Sat Nov 28 21:35:47 2020 +0900
Commit: Tomaž Vajngerl
CommitDate: Sun Dec 6 23:33:51 2020 +0100
graphic: clean-up switches GDIMetafile shouldn't be default
There are many switches ime ImpGraphic depending on the graphic
type. The default many times assumes to be GDIMetafile, which is
kind-of dangerous. Add all GraphicType cases to the switch (so
to handle "NONE" type if they weren't present) and add GdiMetaFile
type switch instead of default. No default is needed because all
the types are handled and if a new type is added, we will get an
warning - which is what we want.
Change-Id: I2ed5e7bce604c7215ce7101db9a04125c7a9244e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107285
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index d06911a0bde5..b1bab153deff 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -328,7 +328,7 @@ bool ImpGraphic::operator==( const ImpGraphic& rImpGraphic
) const
}
break;
-default:
+case GraphicType::Default:
break;
}
}
@@ -769,15 +769,11 @@ Size ImpGraphic::ImplGetPrefSize() const
}
else
{
-switch( meType )
+switch (meType)
{
-case GraphicType::NONE:
-case GraphicType::Default:
-break;
-
case GraphicType::Bitmap:
{
-if(maVectorGraphicData && maBitmapEx.IsEmpty())
+if (maVectorGraphicData && maBitmapEx.IsEmpty())
{
if (!maExPrefSize.getWidth() || !maExPrefSize.getHeight())
{
@@ -803,57 +799,61 @@ Size ImpGraphic::ImplGetPrefSize() const
}
break;
-default:
+case GraphicType::GdiMetafile:
{
-if( ImplIsSupportedGraphic() )
+if (ImplIsSupportedGraphic())
aSize = maMetaFile.GetPrefSize();
}
break;
+
+case GraphicType::NONE:
+case GraphicType::Default:
+break;
}
}
return aSize;
}
-void ImpGraphic::ImplSetPrefSize( const Size& rPrefSize )
+void ImpGraphic::ImplSetPrefSize(const Size& rPrefSize)
{
ensureAvailable();
-switch( meType )
+switch (meType)
{
-case GraphicType::NONE:
-case GraphicType::Default:
-break;
-
case GraphicType::Bitmap:
{
// used when importing a writer FlyFrame with SVG as graphic,
added conversion
// to allow setting the PrefSize at the BitmapEx to hold it
-if(maVectorGraphicData && maBitmapEx.IsEmpty())
+if (maVectorGraphicData && maBitmapEx.IsEmpty())
{
maExPrefSize = rPrefSize;
}
// #108077# Push through pref size to animation object,
// will be lost on copy otherwise
-if( ImplIsAnimated() )
+if (ImplIsAnimated())
{
-const_cast< BitmapEx&
>(mpAnimation->GetBitmapEx()).SetPrefSize( rPrefSize );
+const_cast< BitmapEx&
>(mpAnimation->GetBitmapEx()).SetPrefSize(rPrefSize);
}
if (!maExPrefSize.getWidth() || !maExPrefSize.getHeight())
{
-maBitmapEx.SetPrefSize( rPrefSize );
+maBitmapEx.SetPrefSize(rPrefSize);
}
}
break;
-default:
+case GraphicType::GdiMetafile:
{
-if( ImplIsSupportedGraphic() )
-maMetaFile.SetPrefSize( rPrefSize );
+if (ImplIsSupportedGraphic())
+maMetaFile.SetPrefSize(rPrefSize);
}
break;
+
+case GraphicType::NONE:
+case GraphicType::Default:
+break;
}
}
@@ -867,54 +867,49 @@ MapMode ImpGraphic::ImplGetPrefMapMode() const
}
else
{
-switch( meType )
+switch (meType)
{
-case GraphicType::NONE:
-case GraphicType::Default:
-break;
-
case GraphicType::Bitmap:
{
-if(maVectorGraphicData && maBitmapEx.IsEmpty())
+if (maVectorGraphicData && maBitmapEx.IsEmpty())
{
// svg not yet buffered in maBitmapEx, return default
PrefMapMode
aMapMode = MapMode(MapUnit::Map100thMM);
}
else
{
-const Size aSize( maBitmapEx.GetPrefSize() );
+cons
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/impgraph.hxx|2
vcl/source/gdi/impgraph.cxx | 268 +++-
2 files changed, 265 insertions(+), 5 deletions(-)
New commits:
commit fcd617586ea577a234739cb21248f411e7eda402
Author: Tomaž Vajngerl
AuthorDate: Sat Nov 28 11:13:09 2020 +0900
Commit: Tomaž Vajngerl
CommitDate: Sun Dec 6 23:33:34 2020 +0100
vcl: duplicate {Read,Write}ImpGraphic for swapping
For swapping we can change the algroithm of saving and rading
graphics to/from the swap file as the file format doesn't need to
be stable. This duplicates the algorithm, but doesn't change it
yet.
Change-Id: I0b0854b19f4e3f9a34d278f44bd61cd94e133def
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107284
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 9ad34e6f57b1..de5df4a1ac57 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -170,9 +170,11 @@ private:
private:
// swapping methods
bool swapInFromStream(SvStream& rStream);
+void swapInGraphic(SvStream& rStream);
bool swapInContent(SvStream& rStream);
bool swapOutContent(SvStream& rStream);
+bool swapOutGraphic(SvStream& rStream);
// end swapping
std::shared_ptr& ImplGetContext() { return mpContext;}
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 42de58769aca..d06911a0bde5 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1113,11 +1113,11 @@ bool ImpGraphic::swapInContent(SvStream& rStream)
Size aSize;
sal_uInt32 nId;
sal_Int32 nType;
-sal_Int32 nPageIndex = -1;
+sal_Int32 nPageIndex = -1;
const SvStreamEndian nOldFormat = rStream.GetEndian();
-rStream.SetEndian( SvStreamEndian::LITTLE );
-rStream.ReadUInt32( nId );
+rStream.SetEndian(SvStreamEndian::LITTLE);
+rStream.ReadUInt32(nId);
// check version
if (GRAPHIC_FORMAT_50 != nId)
@@ -1166,7 +1166,7 @@ bool ImpGraphic::swapInContent(SvStream& rStream)
if( meType == GraphicType::Bitmap || meType ==
GraphicType::GdiMetafile )
{
-ReadImpGraphic(rStream, *this);
+swapInGraphic(rStream);
bRet = rStream.GetError() == ERRCODE_NONE;
}
else if( sal::static_int_cast(meType) >= SYS_WINMETAFILE
@@ -1212,6 +1212,103 @@ bool ImpGraphic::swapInContent(SvStream& rStream)
return bRet;
}
+bool ImpGraphic::swapOutGraphic(SvStream& rStream)
+{
+if (rStream.GetError())
+return false;
+
+ensureAvailable();
+
+if (isSwappedOut())
+{
+rStream.SetError(SVSTREAM_GENERALERROR);
+return false;
+}
+
+if (rStream.GetVersion() >= SOFFICE_FILEFORMAT_50 &&
+rStream.GetCompressMode() & SvStreamCompressFlags::NATIVE &&
+mpGfxLink && mpGfxLink->IsNative())
+{
+// native format
+rStream.WriteUInt32(NATIVE_FORMAT_50);
+
+// write compat info, destructor writes stuff into the header
+{
+VersionCompat aCompat(rStream, StreamMode::WRITE, 1);
+}
+mpGfxLink->SetPrefMapMode(ImplGetPrefMapMode());
+mpGfxLink->SetPrefSize(ImplGetPrefSize());
+TypeSerializer aSerializer(rStream);
+aSerializer.writeGfxLink(*mpGfxLink);
+}
+else
+{
+switch (ImplGetType())
+{
+case GraphicType::NONE:
+case GraphicType::Default:
+break;
+
+case GraphicType::Bitmap:
+{
+if (getVectorGraphicData())
+{
+// stream out Vector Graphic defining data (length, byte
array and evtl. path)
+// this is used e.g. in swapping out graphic data and in
transporting it over UNO API
+// as sequence of bytes, but AFAIK not written anywhere to
any kind of file, so it should be
+// no problem to extend it; only used at runtime
+switch (getVectorGraphicData()->getVectorGraphicDataType())
+{
+case VectorGraphicDataType::Wmf:
+{
+rStream.WriteUInt32(constWmfMagic);
+break;
+}
+case VectorGraphicDataType::Emf:
+{
+rStream.WriteUInt32(constEmfMagic);
+break;
+}
+case VectorGraphicDataType::Svg:
+{
+rStream.WriteUInt32(constSvgMagic);
+break;
+}
+case VectorGraphicDataType::Pdf:
+{
+rStream.WriteUInt32(constPdfMagic);
+break;
+}
+
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/impgraph.cxx | 137
1 file changed, 39 insertions(+), 98 deletions(-)
New commits:
commit 947a38ed1d0e2e2041e1ce4c426caa606ea86cc8
Author: Tomaž Vajngerl
AuthorDate: Fri Nov 27 20:37:23 2020 +0900
Commit: Tomaž Vajngerl
CommitDate: Sun Dec 6 23:33:13 2020 +0100
vcl: remove the old (<5.0) graphic swap file version
Always use the 5.0 Graphic swap file version. Actually for swap
the version doesn't really matter as we don't have to have a
stable file structure for the swap files (all the files are
removed when LibreOffice shuts down).
Change-Id: Ib1a94d7a9681ba51b4061e86d0d42080fb0f7f17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107283
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index d251eab7a6c9..42de58769aca 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1105,78 +1105,37 @@ void ImpGraphic::ImplSetContext( const
std::shared_ptr& pReader )
bool ImpGraphic::swapInContent(SvStream& rStream)
{
+bool bRet = false;
+
ensureAvailable();
-MapMode aMapMode;
-SizeaSize;
-sal_uInt32 nId;
-sal_Int32 nType;
-sal_Int32 nPageIndex = -1;
+MapMode aMapMode;
+Size aSize;
+sal_uInt32 nId;
+sal_Int32 nType;
+sal_Int32 nPageIndex = -1;
const SvStreamEndian nOldFormat = rStream.GetEndian();
-boolbRet = false;
rStream.SetEndian( SvStreamEndian::LITTLE );
rStream.ReadUInt32( nId );
// check version
-if( GRAPHIC_FORMAT_50 == nId )
-{
-// read new style header
-VersionCompat aCompat( rStream, StreamMode::READ );
+if (GRAPHIC_FORMAT_50 != nId)
+return false;
-rStream.ReadInt32( nType );
-sal_Int32 nLen;
-rStream.ReadInt32( nLen );
-TypeSerializer aSerializer(rStream);
-aSerializer.readSize(aSize);
-ReadMapMode( rStream, aMapMode );
+// read new style header
+VersionCompat aCompat(rStream, StreamMode::READ);
-if (aCompat.GetVersion() >= 2)
-{
-rStream.ReadInt32(nPageIndex);
-}
-}
-else
-{
-// read old style header
-sal_Int32 nWidth, nHeight;
-sal_Int32 nMapMode, nScaleNumX, nScaleDenomX;
-sal_Int32 nScaleNumY, nScaleDenomY, nOffsX, nOffsY;
-
-rStream.SeekRel(-4);
-
-sal_Int32 nLen;
-rStream.ReadInt32(nType);
-rStream.ReadInt32(nLen);
-rStream.ReadInt32(nWidth);
-rStream.ReadInt32(nHeight);
-rStream.ReadInt32(nMapMode);
-rStream.ReadInt32(nScaleNumX);
-rStream.ReadInt32(nScaleDenomX);
-rStream.ReadInt32(nScaleNumY);
-rStream.ReadInt32(nScaleDenomY);
-rStream.ReadInt32(nOffsX);
-rStream.ReadInt32(nOffsY);
-
-// swapped
-if( nType > 100 )
-{
-nType = OSL_SWAPDWORD( nType );
-nWidth = OSL_SWAPDWORD( nWidth );
-nHeight = OSL_SWAPDWORD( nHeight );
-nMapMode = OSL_SWAPDWORD( nMapMode );
-nScaleNumX = OSL_SWAPDWORD( nScaleNumX );
-nScaleDenomX = OSL_SWAPDWORD( nScaleDenomX );
-nScaleNumY = OSL_SWAPDWORD( nScaleNumY );
-nScaleDenomY = OSL_SWAPDWORD( nScaleDenomY );
-nOffsX = OSL_SWAPDWORD( nOffsX );
-nOffsY = OSL_SWAPDWORD( nOffsY );
-}
+rStream.ReadInt32(nType);
+sal_Int32 nLen;
+rStream.ReadInt32(nLen);
+TypeSerializer aSerializer(rStream);
+aSerializer.readSize(aSize);
+ReadMapMode(rStream, aMapMode);
-aSize = Size( nWidth, nHeight );
-aMapMode = MapMode( static_cast(nMapMode), Point( nOffsX,
nOffsY ),
-Fraction( nScaleNumX, nScaleDenomX ),
-Fraction( nScaleNumY, nScaleDenomY ) );
+if (aCompat.GetVersion() >= 2)
+{
+rStream.ReadInt32(nPageIndex);
}
meType = static_cast(nType);
@@ -1237,7 +1196,7 @@ bool ImpGraphic::swapInContent(SvStream& rStream)
meType = GraphicType::Default;
}
-if( bRet )
+if (bRet)
{
ImplSetPrefMapMode( aMapMode );
ImplSetPrefSize( aSize );
@@ -1248,7 +1207,7 @@ bool ImpGraphic::swapInContent(SvStream& rStream)
else
bRet = true;
-rStream.SetEndian( nOldFormat );
+rStream.SetEndian(nOldFormat);
return bRet;
}
@@ -1257,65 +1216,47 @@ bool ImpGraphic::swapOutContent(SvStream& rOStm)
{
ensureAvailable();
-if( ( meType == GraphicType::NONE ) || ( meType == GraphicType::Default )
|| isSwappedOut() )
+if (meType == GraphicType::NONE || meType == GraphicType::Default ||
isSwappedOut())
return false;
-const MapMode aMapMode( ImplGetPrefMapMode() );
-const Size aS
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/SwapFile.hxx| 72
vcl/source/gdi/impgraph.cxx | 38 ++-
2 files changed, 76 insertions(+), 34 deletions(-)
New commits:
commit b50c64eb28af7b6f95edb9cd5098d49d5701b5b0
Author: Tomaž Vajngerl
AuthorDate: Wed Nov 25 16:23:09 2020 +0900
Commit: Tomaž Vajngerl
CommitDate: Sun Dec 6 23:32:56 2020 +0100
vcl: extract SwapFile impl. into its own class and use in Graphic
Change-Id: Ib4c06b81b4ed87cf6b461a67a28bae90b2b26535
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107282
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/vcl/SwapFile.hxx b/include/vcl/SwapFile.hxx
new file mode 100644
index ..55146d608eb8
--- /dev/null
+++ b/include/vcl/SwapFile.hxx
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include
+#include
+#include
+#include
+#include
+
+namespace vcl
+{
+class VCL_DLLPUBLIC SwapFile
+{
+private:
+INetURLObject maSwapURL;
+
+public:
+SwapFile(INetURLObject const& rSwapURL)
+: maSwapURL(rSwapURL)
+{
+}
+
+~SwapFile() COVERITY_NOEXCEPT_FALSE
+{
+
utl::UCBContentHelper::Kill(maSwapURL.GetMainURL(INetURLObject::DecodeMechanism::NONE));
+}
+
+INetURLObject getSwapURL() const { return maSwapURL; }
+
+OUString getSwapURLString() const
+{
+return maSwapURL.GetMainURL(INetURLObject::DecodeMechanism::NONE);
+}
+
+std::unique_ptr openOutputStream()
+{
+OUString sSwapURL = getSwapURLString();
+if (!sSwapURL.isEmpty())
+{
+try
+{
+return utl::UcbStreamHelper::CreateStream(
+sSwapURL, StreamMode::READWRITE |
StreamMode::SHARE_DENYWRITE);
+}
+catch (const css::uno::Exception&)
+{
+}
+}
+return std::unique_ptr();
+}
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 6bb3489c2562..d251eab7a6c9 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -20,6 +20,8 @@
#include
#include
+#include
+
#include
#include
#include
@@ -67,51 +69,19 @@ constexpr sal_uInt32 constPdfMagic((sal_uInt32('s') << 24)
| (sal_uInt32('v') <<
using namespace com::sun::star;
-class ImpSwapFile
+class ImpSwapFile : public vcl::SwapFile
{
private:
-INetURLObject maSwapURL;
OUString maOriginURL;
public:
ImpSwapFile(INetURLObject const & rSwapURL, OUString const & rOriginURL)
-: maSwapURL(rSwapURL)
+: SwapFile(rSwapURL)
, maOriginURL(rOriginURL)
{
}
-~ImpSwapFile() COVERITY_NOEXCEPT_FALSE
-{
-
utl::UCBContentHelper::Kill(maSwapURL.GetMainURL(INetURLObject::DecodeMechanism::NONE));
-}
-
-INetURLObject getSwapURL() const
-{
-return maSwapURL;
-}
-
-OUString getSwapURLString() const
-{
-return maSwapURL.GetMainURL(INetURLObject::DecodeMechanism::NONE);
-}
-
OUString const & getOriginURL() const { return maOriginURL; }
-
-std::unique_ptr openOutputStream()
-{
-OUString sSwapURL = getSwapURLString();
-if (!sSwapURL.isEmpty())
-{
-try
-{
-return utl::UcbStreamHelper::CreateStream(sSwapURL,
StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE);
-}
-catch (const css::uno::Exception&)
-{
-}
-}
-return std::unique_ptr();
-}
};
OUString ImpGraphic::getSwapFileURL() const
___
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/dbgui/validate.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9cb1c7e5d7434a64ada279ad264182286f907d7c Author: Roman Kuznetsov AuthorDate: Fri Dec 4 19:12:23 2020 +0100 Commit: Roman Kuznetsov CommitDate: Sun Dec 6 21:16:52 2020 +0100 tdf#131815 Reduce Validity dialog height Change-Id: I90ec0a85bd8cf0761459e61bc26e619153597088 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107209 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 3d73a72f99af..cd9097c0ff48 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -373,7 +373,7 @@ ScTPValidationValue::ScTPValidationValue(weld::Container* pPage, weld::DialogCon m_xEdMin->SetReferences(nullptr, m_xFtMin.get()); Size aSize(m_xEdList->get_approximate_digit_width() * 40, - m_xEdList->get_height_rows(25)); + m_xEdList->get_height_rows(10)); m_xEdList->set_size_request(aSize.Width(), aSize.Height()); m_xEdMax->SetReferences(nullptr, m_xFtMax.get()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Math/Formula visual editing
On 6.12.2020 21.56, Peter Gervai wrote: I write this email instead of opening a bugzilla enhancement issue mainly because I am not even sure anyone intends to work on Math/Formula and I do not want to annoy anyone with new unsolvable bugs staying there forever. Please, just create the Bugzilla report. There is activity in Math recently (thanks to Dante Doménech). Ilmari ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Math/Formula visual editing
Hello Devs!
I write this email instead of opening a bugzilla enhancement issue
mainly because I am not even sure anyone intends to work on
Math/Formula and I do not want to annoy anyone with new unsolvable
bugs staying there forever.
I try to phrase it as short as I can, I can expand on request. I can
offer to create a more detailed specification, if there's a point
doing so.
I was looking around formula input tools, from LyX through various
tools to LO Math (or Formula, it is sometimes referenced either this
or that). Basically what's usable was LyX, but it's clunky and hard to
use for non-technical people and LO, which is rather easy to use. (And
you can edit TeX source, but that's absolutely not user friendly.)
None of them was really _good_or _simple_. I'm here to help LO
Formula/Math to be the best.
My trigger was https://mathcha.io/ a math notebook service; you can
follow me faster if you go and check it out, it's free to some
extents. Anyway, the main thing is that it is:
- a WYSIWYG editor, so you edit the formula visually, and
- provides VERY fast input, and rather easy to use.
The main reason for the speed is its universal hotkey (backslash)
which pops up a selection box anywhere.
The box is immediately in search mode, so, for example, to start a
fraction requires three keys: \ f ENTER. The box contains multiple
search terms for objects: some unique (to make it searchable, like
"left(") and others logical (the one you would look for if you don't
remember the name, like "(").
The box is also clickable, or cursor selectable.
The search list is context sensitive, so usually what you need at a
specific place can be reached by fewer characters. The search list
order is also frequency based so often used functions tend to get on
top.
The searching box also offers categories (similar to Formula menus)
which can be used to find an unknown object. This way it has a super
fast way for the experienced, a pretty fast way for the rookies and
clickable categories for the absolute newbies.
Main points:
- If you get some experience (an hour seems to be enough) you do not
need to touch the mouse,
- if you get some experience (and remember the names of yor operators
and symbols) typing is _very_ efficient, usually require *ten times
less* keystrokes than typing Formula source,
- visual input generates the source, and not vice versa, which is way
more Average Joe User friendly.
Some people using Formula prefer to write the source, but it's okay:
if you edit the visual part the source gets updated - if you edit the
source the visual part gets updated (as it does now).
I can help in writing a more detailed spec. I cannot help in coding,
or organise coders. If there is nobody interested I would not waste
time to detail it, but if anyone feels like caring, ping me please, if
you believe I can help.
Or if you would rather see this in bugzilla... I can out it there.
Any feedback welcome.
Thanks,
Peter 'grin' Gervai
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/shared/vtablefactory.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit cca1240fe5884f184af489f5326e96892d1ae975
Author: Stephan Bergmann
AuthorDate: Sun Dec 6 16:44:40 2020 +0100
Commit: Stephan Bergmann
CommitDate: Sun Dec 6 18:36:55 2020 +0100
Related tdf#134754: Detect failed mmap on macOS
Change-Id: I21202d25e4851725198c58c29d9820bda00f2b30
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107315
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx
b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 52309c6ec617..73dc42ef6dfc 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -85,6 +85,11 @@ extern "C" void * allocExec(
p = mmap(
nullptr, n, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON
| MAP_JIT, -1,
0);
+if (p == MAP_FAILED) {
+auto const e = errno;
+SAL_WARN("bridges.osx", "mmap failed with " << e << ", " <<
strerror(e));
+p = nullptr;
+}
#else
p = mmap(
nullptr, n, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/Library_sd.mk
sd/Library_sd.mk |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 9c98bf224d1dc8c5cb91d49273836eeb6111d697 Author: Rene Engelhard AuthorDate: Thu Dec 3 23:21:49 2020 +0100 Commit: David Tardon CommitDate: Sun Dec 6 18:03:12 2020 +0100 move bluez_bluetooth_headers use_externals into ENABLE_SDREMOTE_BLUETOOTH case ... since it's where it is used, and otherwise one gets a -I$S/external/bluez_bluetooth when we don't want or even need that Change-Id: If3757adb7960ad5adfc857052bb8322f8754ecdb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107178 Tested-by: Jenkins Reviewed-by: David Tardon diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 9d399e8e3f5a..d70b5216fe05 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -99,7 +99,6 @@ $(eval $(call gb_Library_use_libraries,sd,\ )) $(eval $(call gb_Library_use_externals,sd,\ - bluez_bluetooth_headers \ boost_headers \ libxml2 \ dbus \ @@ -575,6 +574,10 @@ $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE_BLUETOOTH \ )) +$(eval $(call gb_Library_use_externals,sd,\ + bluez_bluetooth_headers \ +)) + endif # ENABLE_SDREMOTE_BLUETOOTH=TRUE endif # ENABLE_SDREMOTE=TRUE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: osx/soffice.xcodeproj
osx/soffice.xcodeproj/project.pbxproj | 90 --
1 file changed, 86 insertions(+), 4 deletions(-)
New commits:
commit 9ec77701907342b051855f302d2bae0a427ba0ae
Author: Tor Lillqvist
AuthorDate: Sun Dec 6 14:33:09 2020 +0200
Commit: Tor Lillqvist
CommitDate: Sun Dec 6 18:54:48 2020 +0200
Add source files from dbaccess/source/ui/misc
(Xcode also insists on moving a couple of other lines around, oh
well.)
Change-Id: I7b295f51ca5b38bfcace464f9d06bfe2d93de066
diff --git a/osx/soffice.xcodeproj/project.pbxproj
b/osx/soffice.xcodeproj/project.pbxproj
index 78be443864a2..9b96702b03b3 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -99,6 +99,35 @@
BE02FCEB171335B80069F37F /* vendorbase.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
vendorbase.cxx; path = ../jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx;
sourceTree = ""; };
BE02FCEC171335B80069F37F /* vendorlist.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
vendorlist.cxx; path = ../jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx;
sourceTree = ""; };
BE145F5C17B24BA4004CBBBA /* sunjavaplugin.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
sunjavaplugin.cxx; path =
../jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx; sourceTree = "";
};
+ BE286950257D06C5000E863E /* TokenWriter.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
TokenWriter.cxx; path = ../dbaccess/source/ui/misc/TokenWriter.cxx; sourceTree
= ""; };
+ BE286951257D06C5000E863E /* WNameMatch.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
WNameMatch.cxx; path = ../dbaccess/source/ui/misc/WNameMatch.cxx; sourceTree =
""; };
+ BE286952257D06C5000E863E /* singledoccontroller.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
singledoccontroller.cxx; path =
../dbaccess/source/ui/misc/singledoccontroller.cxx; sourceTree = ""; };
+ BE286953257D06C5000E863E /* DExport.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = DExport.cxx;
path = ../dbaccess/source/ui/misc/DExport.cxx; sourceTree = ""; };
+ BE286954257D06C5000E863E /* WTypeSelect.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
WTypeSelect.cxx; path = ../dbaccess/source/ui/misc/WTypeSelect.cxx; sourceTree
= ""; };
+ BE286955257D06C5000E863E /* dsmeta.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dsmeta.cxx;
path = ../dbaccess/source/ui/misc/dsmeta.cxx; sourceTree = ""; };
+ BE286956257D06C5000E863E /* HtmlReader.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
HtmlReader.cxx; path = ../dbaccess/source/ui/misc/HtmlReader.cxx; sourceTree =
""; };
+ BE286957257D06C5000E863E /* WExtendPages.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
WExtendPages.cxx; path = ../dbaccess/source/ui/misc/WExtendPages.cxx;
sourceTree = ""; };
+ BE286958257D06C5000E863E /* charsets.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = charsets.cxx;
path = ../dbaccess/source/ui/misc/charsets.cxx; sourceTree = ""; };
+ BE286959257D06C5000E863E /* linkeddocuments.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
linkeddocuments.cxx; path = ../dbaccess/source/ui/misc/linkeddocuments.cxx;
sourceTree = ""; };
+ BE28695A257D06C5000E863E /* UpdateHelperImpl.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name =
UpdateHelperImpl.hxx; path = ../dbaccess/source/ui/misc/UpdateHelperImpl.hxx;
sourceTree = ""; };
+ BE28695B257D06C5000E863E /* imageprovider.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
imageprovider.cxx; path = ../dbaccess/source/ui/misc/imageprovider.cxx;
sourceTree = ""; };
+ BE28695C257D06C5000E863E /* WColumnSelect.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
WColumnSelect.cxx; path = ../dbaccess/source/ui/misc/WColumnSelect.cxx;
sourceTree = ""; };
+ BE28695D257D06C5000E863E /* WCopyTable.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
WCopyTable.cxx; path = ../dbaccess/source/ui/misc/WCopyTable.cxx; sourceTree =
""; };
+ BE28695E257D06C5000E863E /* UITools.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UITools.cxx;
path = ../dbaccess/source/ui/misc/UITools.cxx; sourceTree = ""; };
+ BE28695F257D06C5000E863E /* RowSetDrop.cxx */ = {isa =
PBXFileReference; la
[Libreoffice-commits] core.git: wizards/source
wizards/source/scriptforge/SF_Root.xba|2 wizards/source/scriptforge/po/ScriptForge.pot |6 - wizards/source/scriptforge/po/en.po |6 - wizards/source/sfdialogs/SF_DialogControl.xba | 142 +- 4 files changed, 146 insertions(+), 10 deletions(-) New commits: commit 7fad2ed06ecd61d2752e676dfe4b3822b993e495 Author: Jean-Pierre Ledure AuthorDate: Sun Dec 6 14:15:03 2020 +0100 Commit: Jean-Pierre Ledure CommitDate: Sun Dec 6 16:54:29 2020 +0100 ScriptForge - (SF_DialogControl) FindNode() for tree controls FindNode() traverses a tree recursively and stops at the 1st node meeting either: - DisplayValue is like a given string pattern - DataValue is equal to a given scalar value The returned node can easily be made current The commit includes a check on the control type of all methods reserved for tree controls This has a minor impact on po files The version number of the po files is incremented Change-Id: I9f418df35bd4e58e0bfccc0606f5e0a5e7ac955e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107288 Tested-by: Jean-Pierre Ledure Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure diff --git a/wizards/source/scriptforge/SF_Root.xba b/wizards/source/scriptforge/SF_Root.xba index 339cc9db81bc..74154285f551 100644 --- a/wizards/source/scriptforge/SF_Root.xba +++ b/wizards/source/scriptforge/SF_Root.xba @@ -752,7 +752,7 @@ Try: ' SF_DialogControl._SetProperty .AddText( Context := "CONTROLTYPE" _ , MsgId := "The control '%1' in dialog '%2' is of type '%3'.\n" _ - & "The property '%4' is not applicable on that type of dialog controls." _ + & "The property or method '%4' is not applicable on that type of dialog controls." _ , Comment := "SF_DialogControl property setting\n" _ & "%1: An identifier\n" _ & "%2: An identifier\n" _ diff --git a/wizards/source/scriptforge/po/ScriptForge.pot b/wizards/source/scriptforge/po/ScriptForge.pot index 0741eff67d62..ea7209881cb7 100644 --- a/wizards/source/scriptforge/po/ScriptForge.pot +++ b/wizards/source/scriptforge/po/ScriptForge.pot @@ -7,14 +7,14 @@ # *** are part of the LibreOffice project. *** # * # -# ScriptForge Release 7.1 +# ScriptForge Release 7.2 # --- # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2020-10-10 16:05:30\n" +"POT-Creation-Date: 2020-12-06 12:16:30\n" "PO-Revision-Date: -MM-DD HH:MM:SS\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -766,7 +766,7 @@ msgstr "" msgctxt "CONTROLTYPE" msgid "" "The control '%1' in dialog '%2' is of type '%3'.\n" -"The property '%4' is not applicable on that type of dialog controls." +"The property or method '%4' is not applicable on that type of dialog controls." msgstr "" #. SF_DialogControl add line in textbox diff --git a/wizards/source/scriptforge/po/en.po b/wizards/source/scriptforge/po/en.po index 0741eff67d62..ea7209881cb7 100644 --- a/wizards/source/scriptforge/po/en.po +++ b/wizards/source/scriptforge/po/en.po @@ -7,14 +7,14 @@ # *** are part of the LibreOffice project. *** # * # -# ScriptForge Release 7.1 +# ScriptForge Release 7.2 # --- # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2020-10-10 16:05:30\n" +"POT-Creation-Date: 2020-12-06 12:16:30\n" "PO-Revision-Date: -MM-DD HH:MM:SS\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -766,7 +766,7 @@ msgstr "" msgctxt "CONTROLTYPE" msgid "" "The control '%1' in dialog '%2' is of type '%3'.\n" -"The property '%4' is not applicable on that type of dialog controls." +"The property or method '%4' is not applicable on that type of dialog controls." msgstr "" #. SF_DialogControl add line in textbox diff --git a/wizards/source/sfdialogs/SF_DialogControl.xba b/wizards/source/sfdialogs/SF_DialogControl.xba index d7bfd7d6f44d..95f99a245f33 100644 --- a/wizards/source/sfdialogs/SF_DialogControl.xba +++ b/wizards/source/sfdialogs/SF_DialogControl.xba @@ -
[Libreoffice-commits] core.git: include/xmloff xmloff/inc xmloff/source
include/xmloff/xmlimp.hxx |3
xmloff/inc/txtfldi.hxx | 12
xmloff/source/core/xmlimp.cxx | 30
xmloff/source/text/XMLChangeImportContext.cxx |4
xmloff/source/text/XMLChangeImportContext.hxx |2
xmloff/source/text/XMLFootnoteImportContext.cxx |6
xmloff/source/text/XMLFootnoteImportContext.hxx |4
xmloff/source/text/XMLTextFrameContext.cxx |3
xmloff/source/text/XMLTextFrameContext.hxx |2
xmloff/source/text/XMLTextFrameHyperlinkContext.cxx | 53 +
xmloff/source/text/XMLTextFrameHyperlinkContext.hxx |4
xmloff/source/text/XMLTextMarkImportContext.cxx |6
xmloff/source/text/XMLTextMarkImportContext.hxx |4
xmloff/source/text/txtfldi.cxx | 38 +
xmloff/source/text/txtimp.cxx |5
xmloff/source/text/txtparai.cxx | 655
xmloff/source/text/txtparai.hxx |5
17 files changed, 406 insertions(+), 430 deletions(-)
New commits:
commit 387a7dcfe7c2a5c32b9fa7678f722845775041ba
Author: Noel Grandin
AuthorDate: Sun Dec 6 14:04:11 2020 +0200
Commit: Noel Grandin
CommitDate: Sun Dec 6 15:45:47 2020 +0100
fastparser in XMLImpSpanContext_Impl
Change-Id: Iba1b61c607f5f748f5acf4ce16d2c0cce8dee72e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107281
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index ae165a2201b8..4599bcbd751b 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -384,6 +384,9 @@ public:
// get import helper for events
XMLEventImportHelper& GetEventImport();
+css::uno::Reference< css::xml::sax::XAttributeList > convertToSlowAttrList(
+const css::uno::Reference< css::xml::sax::XFastAttributeList > &
Attribs);
+
static const OUString & getNameFromToken( sal_Int32 nToken );
static OUString getPrefixAndNameFromToken( sal_Int32 nToken );
static OUString getNamespacePrefixFromToken(sal_Int32 nToken, const
SvXMLNamespaceMap* pMap);
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 10c33b3bfa31..b8560b17b3d6 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -69,6 +69,10 @@ public:
const char* pService, /// name of SO API service
sal_uInt16 nPrfx, /// namespace prefix
const OUString& rLocalName); /// element name w/o prefix
+XMLTextFieldImportContext(
+SvXMLImport& rImport, /// XML Import
+XMLTextImportHelper& rHlp, /// Text import helper
+const char* pService); /// name of SO API service
/// process character data: will be collected in member sContentBuffer
virtual void SAL_CALL characters( const OUString& sContent ) override;
@@ -89,6 +93,10 @@ public:
sal_uInt16 nPrefix,
const OUString& rName,
sal_uInt16 nToken);
+static XMLTextFieldImportContext* CreateTextFieldImportContext(
+SvXMLImport& rImport,
+XMLTextImportHelper& rHlp,
+sal_Int32 nElement);
protected:
/// get helper
@@ -985,9 +993,7 @@ class XMLUrlFieldImportContext final : public
XMLTextFieldImportContext
public:
XMLUrlFieldImportContext(SvXMLImport& rImport,
- XMLTextImportHelper& rHlp,
- sal_uInt16 nPrfx,
- const OUString& sLocalName);
+ XMLTextImportHelper& rHlp);
private:
/// no attributes -> empty method
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 5178cd732b05..03e076c0cba3 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1582,6 +1582,36 @@ XMLEventImportHelper& SvXMLImport::GetEventImport()
return *mpEventImportHelper;
}
+css::uno::Reference< css::xml::sax::XAttributeList >
SvXMLImport::convertToSlowAttrList(const uno::Reference<
xml::sax::XFastAttributeList > & Attribs)
+{
+maAttrList->Clear();
+
+if ( Attribs.is() )
+{
+for( auto &it : sax_fastparser::castToFastAttributeList( Attribs ) )
+{
+sal_Int32 nToken = it.getToken();
+const OUString& rAttrNamespacePrefix =
SvXMLImport::getNamespacePrefixFromToken(nToken, &GetNamespaceMap());
+OUString sAttrName = SvXMLImport::getNameFromToken( nToken );
+if ( !rAttrNamespacePrefix.isEmpty() )
+sAttrName = rAttrNamespacePrefix +
SvXMLImport::aNamespaceSeparator + sAttrName;
+
+maAttrList->AddAttribute( sAttrName, "CDATA", it.toString() );
+}
+
+const uno::Sequence< xml::Attribute > unknownAttribs =
Attribs->getUnknownAttributes();
+for ( const auto& rUnknownAttrib : un
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - connectivity/source
connectivity/source/drivers/firebird/DatabaseMetaData.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9ccfe37486cb8caa018c714a670514fcedbe4a0f Author: Julien Nabet AuthorDate: Sun Dec 6 11:02:31 2020 +0100 Commit: Julien Nabet CommitDate: Sun Dec 6 14:33:43 2020 +0100 tdf#125957: FIREBIRD Datatype Binary(fix)[CHAR] couldn't be filled with content Really use sCharsetName which is xRow->getString(13) trimmed See commit bf662904c4b60e93c6b86e06288d41996eed12a2 Author: Tamas Bunth Date: Sat Dec 16 12:57:43 2017 +0100 tdf#104734 Firebird: Add Binary (fix) type There is no explicit binary type in Firebird. It can be accomplished using the CHAR type with a special character set, which tells the database that it is binary data and there is no collation. (called OCTETS). Because of that, we also need the character set to decide the exact column type. And also refactor some parts of the driver: - Create class to determine internal type from firebird type, subtype, scale and character set. - Use internal type (DataType::XXX) in XDatabaseMetaData::getTypeInfo() indirectly. (We want to return a Firebird type for each internal type, not in the opposite direction. Change-Id: I3c9c764d353eeead5e8c00f1142846725eecce15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107295 Reviewed-by: Lionel Mamane Tested-by: Jenkins diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx index fdcfd1d64f89..229642d73a5b 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx @@ -1195,7 +1195,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( // result field may be filled with spaces sCharsetName = sCharsetName.trim(); ColumnTypeInfo aInfo(aType, xRow->getShort(7), aScale, -xRow->getString(13)); +sCharsetName); aCurrentRow[5] = new ORowSetValueDecorator(aInfo.getSdbcType()); // 6. Typename (SQL_*) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/webdav-neon/NeonUri.cxx | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit b0e4f29560671d48c3943b6d0165c91c7ba91fd5
Author: Stephan Bergmann
AuthorDate: Sun Dec 6 10:36:41 2020 +0100
Commit: Stephan Bergmann
CommitDate: Sun Dec 6 14:19:48 2020 +0100
Avoid relying on OString(char const *) ctor's undocumented behavior
...of treating nullptr like an empty string
Change-Id: I41b8b88f27ed3d3c404781f897952b7d1e0e01e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107279
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx
b/ucb/source/ucp/webdav-neon/NeonUri.cxx
index c1c263421de4..f3f142123a40 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx
@@ -49,24 +49,24 @@ using namespace webdav_ucp;
namespace {
const ne_uri g_sUriDefaultsHTTP = { const_cast("http"),
- nullptr,
- nullptr,
+ const_cast(""),
+ const_cast(""),
DEFAULT_HTTP_PORT,
- nullptr,
+ const_cast(""),
nullptr,
nullptr };
const ne_uri g_sUriDefaultsHTTPS = { const_cast("https"),
- nullptr,
- nullptr,
+ const_cast(""),
+ const_cast(""),
DEFAULT_HTTPS_PORT,
- nullptr,
+ const_cast(""),
nullptr,
nullptr };
const ne_uri g_sUriDefaultsFTP = { const_cast("ftp"),
- nullptr,
- nullptr,
+ const_cast(""),
+ const_cast(""),
DEFAULT_FTP_PORT,
- nullptr,
+ const_cast(""),
nullptr,
nullptr };
} // namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: osx/soffice.xcodeproj
osx/soffice.xcodeproj/project.pbxproj | 38 +-
1 file changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 606b731289631d6f58dea7745d0d12830f9033bc
Author: Tor Lillqvist
AuthorDate: Sun Dec 6 14:26:42 2020 +0200
Commit: Tor Lillqvist
CommitDate: Sun Dec 6 14:29:37 2020 +0200
Fix some bogus paths
Note that what osx/README says still holds. This Xcode project is for
making debugging easier only.
Change-Id: I8ebbad2a2de5366616ad7304125bdd05ae001489
diff --git a/osx/soffice.xcodeproj/project.pbxproj
b/osx/soffice.xcodeproj/project.pbxproj
index f67dc0577ed1..78be443864a2 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -562,23 +562,23 @@
BEBF3ED42472B21600415E87 /* dp_dependencies.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
dp_dependencies.cxx; path =
../desktop/source/deployment/misc/dp_dependencies.cxx; sourceTree = "";
};
BEBF3ED52472B21600415E87 /* dp_ucb.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dp_ucb.cxx;
path = ../desktop/source/deployment/misc/dp_ucb.cxx; sourceTree = ""; };
BEC676DE17461A720069E01D /* dbggui.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbggui.cxx;
path = ../vcl/source/app/dbggui.cxx; sourceTree = ""; };
- BEDCC8B92459A10600FB02BD /* unointerfaceproxy.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
unointerfaceproxy.cxx; path =
../../bridges/source/cpp_uno/shared/unointerfaceproxy.cxx; sourceTree =
""; };
- BEDCC8BA2459A10600FB02BD /* types.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = types.cxx;
path = ../../bridges/source/cpp_uno/shared/types.cxx; sourceTree = ""; };
- BEDCC8BB2459A10600FB02BD /* vtables.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vtables.cxx;
path = ../../bridges/source/cpp_uno/shared/vtables.cxx; sourceTree = "";
};
- BEDCC8BC2459A10600FB02BD /* vtablefactory.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
vtablefactory.cxx; path =
../../bridges/source/cpp_uno/shared/vtablefactory.cxx; sourceTree = "";
};
- BEDCC8BD2459A10600FB02BD /* bridge.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = bridge.cxx;
path = ../../bridges/source/cpp_uno/shared/bridge.cxx; sourceTree = "";
};
- BEDCC8BE2459A10600FB02BD /* component.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = component.cxx;
path = ../../bridges/source/cpp_uno/shared/component.cxx; sourceTree =
""; };
- BEDCC8BF2459A10600FB02BD /* cppinterfaceproxy.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
cppinterfaceproxy.cxx; path =
../../bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx; sourceTree =
""; };
- BEDCC8C12459A12E00FB02BD /* uno2cpp.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uno2cpp.cxx;
path = "../../../bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx";
sourceTree = ""; };
- BEDCC8C22459A12E00FB02BD /* cpp2uno.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cpp2uno.cxx;
path = "../../../bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx";
sourceTree = ""; };
- BEDCC8C32459A12E00FB02BD /* share.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = share.hxx; path
= "../../../bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx"; sourceTree =
""; };
- BEDCC8C42459A12E00FB02BD /* except.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = except.cxx;
path = "../../../bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx";
sourceTree = ""; };
- BEDCC8C52459A12E00FB02BD /* abi.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = abi.cxx; path
= "../../../bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx"; sourceTree =
""; };
- BEDCC8C62459A12E00FB02BD /* call.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = call.cxx; path
= "../../../bridges/source/cpp_uno/gcc3_macosx_x86-64/call.cxx"; sourceTree =
""; };
- BEDCC8C72459A12E00FB02BD /* call.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = call.hxx; path =
"../../../bridges/source/cpp_uno/gcc3_macosx_x86-64/call.hxx"; sourceTree =
""; };
- BEDCC8C82459A12E00FB02BD /* abi.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = abi.hxx; path =
"../../../bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.hxx"; sourceTree =
""; };
- BEDCC8
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - connectivity/source
connectivity/source/drivers/firebird/DatabaseMetaData.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 581f17605985fe659141e67f692215974880ae55 Author: Julien Nabet AuthorDate: Sun Dec 6 11:02:31 2020 +0100 Commit: Julien Nabet CommitDate: Sun Dec 6 13:22:01 2020 +0100 tdf#125957: FIREBIRD Datatype Binary(fix)[CHAR] couldn't be filled with content Really use sCharsetName which is xRow->getString(13) trimmed See commit bf662904c4b60e93c6b86e06288d41996eed12a2 Author: Tamas Bunth Date: Sat Dec 16 12:57:43 2017 +0100 tdf#104734 Firebird: Add Binary (fix) type There is no explicit binary type in Firebird. It can be accomplished using the CHAR type with a special character set, which tells the database that it is binary data and there is no collation. (called OCTETS). Because of that, we also need the character set to decide the exact column type. And also refactor some parts of the driver: - Create class to determine internal type from firebird type, subtype, scale and character set. - Use internal type (DataType::XXX) in XDatabaseMetaData::getTypeInfo() indirectly. (We want to return a Firebird type for each internal type, not in the opposite direction. Change-Id: I3c9c764d353eeead5e8c00f1142846725eecce15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107294 Reviewed-by: Lionel Mamane Tested-by: Jenkins diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx index 9aabd39cb52a..d06e7cc71985 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx @@ -1194,7 +1194,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( // result field may be filled with spaces sCharsetName = sCharsetName.trim(); ColumnTypeInfo aInfo(aType, xRow->getShort(7), aScale, -xRow->getString(13)); +sCharsetName); aCurrentRow[5] = new ORowSetValueDecorator(aInfo.getSdbcType()); // 6. Typename (SQL_*) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/crashreport.cxx | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
New commits:
commit c2319b41261ae13c31a16274334dc8971f2d
Author: Stephan Bergmann
AuthorDate: Sun Dec 6 10:29:46 2020 +0100
Commit: Stephan Bergmann
CommitDate: Sun Dec 6 13:21:13 2020 +0100
Clean up CrashReporter::IsDumpEnable
...avoiding construction of an OString from a potentially null pointer,
which
relied on undocumented behavior of the OString ctor
Change-Id: I8f65375ba29cf345b35409019a39de1bac397625
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107278
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/desktop/source/app/crashreport.cxx
b/desktop/source/app/crashreport.cxx
index 432be67cdcd3..3689613cb359 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -222,16 +222,17 @@ void CrashReporter::removeExceptionHandler()
bool CrashReporter::IsDumpEnable()
{
-OUString sToken;
-OString sEnvVar(std::getenv("CRASH_DUMP_ENABLE"));
-bool bEnable = true; // default, always on
+auto const env = std::getenv("CRASH_DUMP_ENABLE");
+if (env != nullptr && env[0] != '\0') {
+return true;
+}
// read configuration item 'CrashDumpEnable' -> bool on/off
-if (rtl::Bootstrap::get("CrashDumpEnable", sToken) && sEnvVar.isEmpty())
+OUString sToken;
+if (rtl::Bootstrap::get("CrashDumpEnable", sToken))
{
-bEnable = sToken.toBoolean();
+return sToken.toBoolean();
}
-
-return bEnable;
+return true; // default, always on
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/qa
desktop/qa/desktop_lib/test_desktop_lib.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 30d2b76e0ed081bed545820e459af56e45fecbdd Author: Stephan Bergmann AuthorDate: Sun Dec 6 10:27:24 2020 +0100 Commit: Stephan Bergmann CommitDate: Sun Dec 6 13:20:35 2020 +0100 Directly check for nullptr ...instead of relying on the OString(pText) ctor's undocumented behavior of treating a null pText as an empty string Change-Id: I884c789b9b4c63bc1f013ed6bbf6c3ab9880f0e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107277 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 701f624038c5..8a5b3f54d81a 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -2738,7 +2738,7 @@ void DesktopLOKTest::testTextSelectionHandles() pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 0, com::sun::star::awt::Key::ESCAPE); Scheduler::ProcessEventsToIdle(); pText = pDocument->pClass->getTextSelection(pDocument, "text/plain;charset=utf-8", nullptr); -CPPUNIT_ASSERT_EQUAL(OString(), OString(pText)); +CPPUNIT_ASSERT_EQUAL(static_cast(nullptr), pText); free(pText); CPPUNIT_ASSERT_EQUAL(OString(), m_aTextSelectionStart); CPPUNIT_ASSERT_EQUAL(OString(), m_aTextSelectionEnd); ___ 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 566282469ddd89f287c004c847de15f719b06d97 Author: Seth Chaiklin AuthorDate: Sun Dec 6 13:01:03 2020 +0100 Commit: Gerrit Code Review CommitDate: Sun Dec 6 13:01:03 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to a2bd1ce7cf53abd37db55422c9b99a4e50d9d463 - tdf#105719 tdf#122720 tdf#107229 help for making default template ( shared/guide/standard_template.xhp ) * Modify title to Creating and Changing Default and Custom Templates * Move isolated listitem into procedure for creating default * Update procedure for making default template + Make separate procedure for updating existing default template + Add procedure for setting a template to default + Rework/elaborate section on Custom templates + Elaborate section about saving templates (tdf#122720) + add bookmark for creating templates * update to: ,, ( shared/01/01110300.xhp ) [ File - Template menu ] + add related topics section and link to standard_template * update to: , ( swriter/guide/templates_styles.xhp ) * update to: ( swriter/guide/main.xhp ) * update to: ,some ( shared/guide/main.xhp ) * update to: , Change-Id: I9507c70862dfdd9d844d2c53e4833bbc9bfe71a1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105855 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/helpcontent2 b/helpcontent2 index 609d466f02d6..a2bd1ce7cf53 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 609d466f02d63c43d42636627ee3b35e26df4661 +Subproject commit a2bd1ce7cf53abd37db55422c9b99a4e50d9d463 ___ 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/01110300.xhp | 11 +- source/text/shared/guide/main.xhp | 20 ++--- source/text/shared/guide/standard_template.xhp | 99 +++-- source/text/swriter/guide/main.xhp |8 -- source/text/swriter/guide/templates_styles.xhp | 13 +-- 5 files changed, 103 insertions(+), 48 deletions(-) New commits: commit a2bd1ce7cf53abd37db55422c9b99a4e50d9d463 Author: Seth Chaiklin AuthorDate: Sun Nov 15 16:59:52 2020 +0100 Commit: Seth Chaiklin CommitDate: Sun Dec 6 13:01:03 2020 +0100 tdf#105719 tdf#122720 tdf#107229 help for making default template ( shared/guide/standard_template.xhp ) * Modify title to Creating and Changing Default and Custom Templates * Move isolated listitem into procedure for creating default * Update procedure for making default template + Make separate procedure for updating existing default template + Add procedure for setting a template to default + Rework/elaborate section on Custom templates + Elaborate section about saving templates (tdf#122720) + add bookmark for creating templates * update to: ,, ( shared/01/01110300.xhp ) [ File - Template menu ] + add related topics section and link to standard_template * update to: , ( swriter/guide/templates_styles.xhp ) * update to: ( swriter/guide/main.xhp ) * update to: ,some ( shared/guide/main.xhp ) * update to: , Change-Id: I9507c70862dfdd9d844d2c53e4833bbc9bfe71a1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/105855 Tested-by: Jenkins Reviewed-by: Seth Chaiklin diff --git a/source/text/shared/01/01110300.xhp b/source/text/shared/01/01110300.xhp index b8c55e33c..8f14b07c0 100644 --- a/source/text/shared/01/01110300.xhp +++ b/source/text/shared/01/01110300.xhp @@ -29,20 +29,23 @@ -Save as Template +Save as Template Saves the current document as a template. Choose File - Templates - Save as Template. -Template Name +Template Name Enter a name for the template. -Template Category +Template Category Select a category in which to save the new template. -Set as default template +Set as default template The new template will be used as the default template. + + + diff --git a/source/text/shared/guide/main.xhp b/source/text/shared/guide/main.xhp index 4b8c5de51..b8446b92f 100644 --- a/source/text/shared/guide/main.xhp +++ b/source/text/shared/guide/main.xhp @@ -31,9 +31,9 @@ instructions; general -General Instructions for %PRODUCTNAME +General Instructions for %PRODUCTNAME -Opening and Saving Documents and Templates +Opening and Saving Documents and Templates @@ -63,7 +63,7 @@ -Using Windows, Menus and Icons +Using Windows, Menus and Icons @@ -73,7 +73,7 @@ -Accessibility +Accessibility @@ -99,7 +99,7 @@ -Copying Data by Drag and Drop or Menu Commands +Copying Data by Drag and Drop or Menu Commands @@ -112,7 +112,7 @@ -Data Sources +Data Sources Working with databases in %PRODUCTNAME Table Wizard Query Wizard @@ -129,7 +129,7 @@ -Recording Changes (Revision Marking) +Recording Changes (Revision Marking) @@ -138,7 +138,7 @@ -Configuring and Modifying %PRODUCTNAME +Configuring and Modifying %PRODUCTNAME @@ -160,14 +160,14 @@ -Charts +Charts -Miscellaneous +Miscellaneous General Terminology Internet Terminology diff --git a/source/text/shared/guide/standard_template.xhp b/source/text/shared/guide/standard_template.xhp index 3abbc7f6a..68f6fafac 100644 --- a/source/text/shared/guide/standard_template.xhp +++ b/source/text/shared/guide/standard_template.xhp @@ -1,7 +1,5 @@ - - - + - - -Changing Default Templates +Creating and Changing Default and Custom Templates /text/shared/guide/standard_template.xhp @@ -32,6 +28,7 @@ modifying, see changing changing, see also editing and replacing default templates; changing +default templates; creating defaults;documents custom templates updating; templates @@ -39,36 +36,94 @@ templates;editing and saving saving;templates resetting;templates -MW deleted "changing;"Changing Default Templates - + +Creating and Changing Default and Custom Templates + When you open a new document with File - New, a blank document appears based on a $[officename] template. You can edit, modify, or replace this template so that the new document contains your customized Styles or other contents. -Modifying Default Templates - +You can define document templates for each $[officename] module. +Creating a Default Template + -First, open either an existing $[officename] template and modify it, or open a new document and edit it as necessary to create the desired template. +First, open either an existing $[officename] template an
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4d28d2c6b6da3bcfaef752218efaf8b89c2a7f82 Author: Seth Chaiklin AuthorDate: Sun Dec 6 12:55:49 2020 +0100 Commit: Gerrit Code Review CommitDate: Sun Dec 6 12:55:49 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 609d466f02d63c43d42636627ee3b35e26df4661 - tdf#65991 improve help for keyboard navigation with footnotes and endnotes + add instructions for keyboard shortcut from text to footnote + add icon table for "Insert Endnote" with instructions for inserting endnotes directly + tip that shortcut keys can be made + add link to "Marking Shortcut Keys * update icon size to "1cm" * update to ,, Change-Id: I9e65002236d7cf006df36b7e7ed4881658ab89cc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107212 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas Reviewed-by: Seth Chaiklin diff --git a/helpcontent2 b/helpcontent2 index 7ad3201bf8bc..609d466f02d6 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7ad3201bf8bc895e9cc8742fe51ac94431ec50bf +Subproject commit 609d466f02d63c43d42636627ee3b35e26df4661 ___ 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/swriter/guide/footnote_usage.xhp | 29 --- 1 file changed, 22 insertions(+), 7 deletions(-) New commits: commit 609d466f02d63c43d42636627ee3b35e26df4661 Author: Seth Chaiklin AuthorDate: Sat Dec 5 11:05:53 2020 +0100 Commit: Seth Chaiklin CommitDate: Sun Dec 6 12:55:49 2020 +0100 tdf#65991 improve help for keyboard navigation with footnotes and endnotes + add instructions for keyboard shortcut from text to footnote + add icon table for "Insert Endnote" with instructions for inserting endnotes directly + tip that shortcut keys can be made + add link to "Marking Shortcut Keys * update icon size to "1cm" * update to ,, Change-Id: I9e65002236d7cf006df36b7e7ed4881658ab89cc Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107212 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas Reviewed-by: Seth Chaiklin diff --git a/source/text/swriter/guide/footnote_usage.xhp b/source/text/swriter/guide/footnote_usage.xhp index 87889a19c..b4db4b377 100644 --- a/source/text/swriter/guide/footnote_usage.xhp +++ b/source/text/swriter/guide/footnote_usage.xhp @@ -35,12 +35,11 @@ organizing;footnotes footnotes; inserting and editing -MW deleted "removing;.." -Inserting and Editing Footnotes or Endnotes +Inserting and Editing Footnotes or Endnotes Footnotes reference more information about a topic at the bottom of a page and endnotes reference information at the end of the document. $[officename] automatically numbers the footnotes and endnotes. -To Insert a Footnote or Endnote +To Insert a Footnote or Endnote @@ -66,7 +65,7 @@ - Icon + Icon You can also insert footnotes by clicking the Insert Footnote Directly icon on the Insert toolbar. @@ -74,8 +73,21 @@ + + + + +Insert Endnote Icon + + + + You can insert endnotes directly by clicking the Insert Endnote icon on the Standard or Insert toolbar or choose Insert - Footnote and Endnote - Endnote. + + + + -To Edit a Footnote or Endnote +To Edit a Footnote or Endnote @@ -84,7 +96,7 @@ -To edit the text of a footnote or endnote, click in the note, or click the anchor for the note in the text. +To edit the text of a footnote or endnote, click in the note, or click the anchor for the note in the text, or press Ctrl+Shift+PageDown. To change the format of a footnote, click in the footnote, press Command+T @@ -107,9 +119,12 @@ To remove a footnote, delete the footnote anchor in the text. - +Shortcut keys can be made to insert, edit, and navigate to footnotes and endnotes. Choose Tools - Customize - Keyboard tab and enter note in the Functions box to see possibilities. + +Making a Shortcut Key + \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/DatabaseMetaData.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f26949e23d13d1b94d4b2bdfe8c4432d720d0fc8 Author: Julien Nabet AuthorDate: Sun Dec 6 11:02:31 2020 +0100 Commit: Julien Nabet CommitDate: Sun Dec 6 12:50:02 2020 +0100 tdf#125957: FIREBIRD Datatype Binary(fix)[CHAR] couldn't be filled with content Really use sCharsetName which is xRow->getString(13) trimmed See commit bf662904c4b60e93c6b86e06288d41996eed12a2 Author: Tamas Bunth Date: Sat Dec 16 12:57:43 2017 +0100 tdf#104734 Firebird: Add Binary (fix) type There is no explicit binary type in Firebird. It can be accomplished using the CHAR type with a special character set, which tells the database that it is binary data and there is no collation. (called OCTETS). Because of that, we also need the character set to decide the exact column type. And also refactor some parts of the driver: - Create class to determine internal type from firebird type, subtype, scale and character set. - Use internal type (DataType::XXX) in XDatabaseMetaData::getTypeInfo() indirectly. (We want to return a Firebird type for each internal type, not in the opposite direction. Change-Id: I3c9c764d353eeead5e8c00f1142846725eecce15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107280 Reviewed-by: Julien Nabet Reviewed-by: Lionel Mamane Tested-by: Jenkins diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx index 9aabd39cb52a..d06e7cc71985 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx @@ -1194,7 +1194,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( // result field may be filled with spaces sCharsetName = sCharsetName.trim(); ColumnTypeInfo aInfo(aType, xRow->getShort(7), aScale, -xRow->getString(13)); +sCharsetName); aCurrentRow[5] = new ORowSetValueDecorator(aInfo.getSdbcType()); // 6. Typename (SQL_*) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/fmtftn.hxx |4 +---
sw/source/core/txtnode/atrftn.cxx | 11 ++-
2 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 2e6a67f3dd1c349135c7842253673d8e1720023c
Author: Bjoern Michaelsen
AuthorDate: Sun Dec 6 04:11:23 2020 +0100
Commit: Bjoern Michaelsen
CommitDate: Sun Dec 6 11:43:38 2020 +0100
SwFormatFootname: Modify no more
Change-Id: I0617605a078aa10fc57bade9f6943138183bb591
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107274
Tested-by: Jenkins
Reviewed-by: Bjoern Michaelsen
diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx
index 2ce85ff0728b..d6f80da2ee66 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.hxx
@@ -61,9 +61,7 @@ public:
virtual booloperator==( const SfxPoolItem& ) const override;
virtual SwFormatFootnote* Clone( SfxItemPool* pPool = nullptr ) const
override;
-// SwClient
-virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew)
-override;
+virtual void SwClientNotify(const SwModify&, const SfxHint&) override;
void InvalidateFootnote();
diff --git a/sw/source/core/txtnode/atrftn.cxx
b/sw/source/core/txtnode/atrftn.cxx
index 7f7e6e1dba4c..5ec1f6f93a01 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -151,13 +151,14 @@ SwFormatFootnote* SwFormatFootnote::Clone( SfxItemPool* )
const
return pNew;
}
-void SwFormatFootnote::Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew)
+void SwFormatFootnote::SwClientNotify(const SwModify&, const SfxHint& rHint)
{
-NotifyClients(pOld, pNew);
-if (pOld && (RES_REMOVE_UNO_OBJECT == pOld->Which()))
-{ // invalidate cached UNO object
+auto pLegacy = dynamic_cast(&rHint);
+if(!pLegacy)
+return;
+CallSwClientNotify(rHint);
+if(RES_REMOVE_UNO_OBJECT == pLegacy->GetWhich())
SetXFootnote(css::uno::Reference(nullptr));
-}
}
void SwFormatFootnote::InvalidateFootnote()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/fmtrfmrk.hxx |3 +--
sw/source/core/txtnode/atrref.cxx | 11 ++-
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 49e364b2ca63c01853b3d88aa950e3ca081c10b2
Author: Bjoern Michaelsen
AuthorDate: Sun Dec 6 04:18:17 2020 +0100
Commit: Bjoern Michaelsen
CommitDate: Sun Dec 6 11:43:16 2020 +0100
SwFormatRefMark: Modify no more
Change-Id: Ic27ae029740909d229a9a6ce03b0a9b8b88b55c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107275
Tested-by: Jenkins
Reviewed-by: Bjoern Michaelsen
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index 0d037a669db6..698e084ab939 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -55,8 +55,7 @@ public:
virtual SwFormatRefMark* Clone( SfxItemPool* pPool = nullptr ) const
override;
// SwClient
-virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew)
-override;
+virtual void SwClientNotify(const SwModify&, const SfxHint&) override;
void InvalidateRefMark();
diff --git a/sw/source/core/txtnode/atrref.cxx
b/sw/source/core/txtnode/atrref.cxx
index c4be350c3445..fdea6ce5dad7 100644
--- a/sw/source/core/txtnode/atrref.cxx
+++ b/sw/source/core/txtnode/atrref.cxx
@@ -54,13 +54,14 @@ SwFormatRefMark* SwFormatRefMark::Clone( SfxItemPool* )
const
return new SwFormatRefMark( *this );
}
-void SwFormatRefMark::Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew)
+void SwFormatRefMark::SwClientNotify(const SwModify&, const SfxHint& rHint)
{
-NotifyClients(pOld, pNew);
-if (pOld && (RES_REMOVE_UNO_OBJECT == pOld->Which()))
-{ // invalidate cached UNO object
+auto pLegacy = dynamic_cast(&rHint);
+if(!pLegacy)
+return;
+CallSwClientNotify(rHint);
+if(RES_REMOVE_UNO_OBJECT == pLegacy->GetWhich())
SetXRefMark(css::uno::Reference(nullptr));
-}
}
void SwFormatRefMark::InvalidateRefMark()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/text/XMLTextFrameContext.cxx | 24
1 file changed, 8 insertions(+), 16 deletions(-)
New commits:
commit 32df28ba6c81a9ff29dfbeb39f2d83917dd69b33
Author: Noel Grandin
AuthorDate: Sun Dec 6 09:35:55 2020 +0200
Commit: Noel Grandin
CommitDate: Sun Dec 6 11:00:27 2020 +0100
fastparser in XMLTextFrameContext_Impl
Change-Id: I69ca9141ccbedeb92909c782dcacd791d3517c2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107276
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx
b/xmloff/source/text/XMLTextFrameContext.cxx
index b764d59ca4f6..efa08da145f7 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -404,10 +404,6 @@ public:
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext(
sal_Int32 nElement, const css::uno::Reference<
css::xml::sax::XFastAttributeList >& AttrList ) override;
-SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
-const OUString& rLocalName,
- const css::uno::Reference< css::xml::sax::XAttributeList > &
xAttrList ) override;
-
void SetHyperlink( const OUString& rHRef,
const OUString& rName,
const OUString& rTargetFrameName,
@@ -1219,23 +1215,19 @@ css::uno::Reference< css::xml::sax::XFastContextHandler
> XMLTextFrameContext_Im
return pEContext;
}
}
-return nullptr;
-}
-
-SvXMLImportContextRef XMLTextFrameContext_Impl::CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const Reference< XAttributeList > & xAttrList )
-{
-SvXMLImportContext *pContext = nullptr;
if( xOldTextCursor.is() ) // text-box
-pContext = GetImport().GetTextImport()->CreateTextChildContext(
-GetImport(), nPrefix, rLocalName, xAttrList,
+{
+auto p = GetImport().GetTextImport()->CreateTextChildContext(
+GetImport(), nElement, xAttrList,
XMLTextType::TextBox );
+if (p)
+return p;
+}
+XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement);
-return pContext;
+return nullptr;
}
void XMLTextFrameContext_Impl::characters( const OUString& rChars )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
