core.git: Branch 'distro/collabora/co-24.04' - 25 commits - download.lst formula/source i18npool/source include/svtools include/vcl readlicense_oo/license sal/textenc sc/source sd/source sfx2/source s
download.lst |4 formula/source/core/api/FormulaCompiler.cxx |4 i18npool/source/nativenumber/data/numberchar.h |2 include/svtools/editbrowsebox.hxx|2 include/vcl/weld.hxx |4 readlicense_oo/license/CREDITS.fodt | 2782 +-- sal/textenc/tcvtutf8.cxx |3 sc/source/core/tool/interpr4.cxx | 1036 +++ sc/source/filter/oox/numberformatsbuffer.cxx | 16 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |4 sc/source/ui/app/inputwin.cxx| 19 sc/source/ui/condformat/condformatdlgentry.cxx | 68 sc/source/ui/dialogs/searchresults.cxx | 20 sc/source/ui/docshell/dbdocfun.cxx |2 sc/source/ui/docshell/docfunc.cxx|8 sc/source/ui/miscdlgs/mvtabdlg.cxx | 16 sc/source/ui/namedlg/namedefdlg.cxx |8 sc/source/ui/namedlg/namedlg.cxx |4 sc/source/ui/undo/undodat.cxx| 129 sc/source/ui/undo/undotab.cxx| 47 sc/source/ui/view/tabvwsh4.cxx |2 sd/source/ui/view/ToolBarManager.cxx | 67 sfx2/source/control/bindings.cxx |3 sfx2/source/control/dispatch.cxx | 16 sfx2/source/view/viewfrm.cxx |4 svgio/inc/svgstyleattributes.hxx |7 svgio/qa/cppunit/SvgImportTest.cxx |8 svgio/qa/cppunit/data/contextFill.svg|8 svgio/source/svgreader/svgstyleattributes.cxx| 36 svtools/source/brwbox/ebbcontrols.cxx|6 svx/source/fmcomp/gridcell.cxx | 11 sw/qa/extras/uiwriter/uiwriter3.cxx |5 sw/source/core/draw/dcontact.cxx | 16 sw/source/ui/frmdlg/frmpage.cxx |3 sw/source/uibase/utlui/unotools.cxx |2 vcl/inc/osx/a11ywrapper.h|2 vcl/inc/salvtables.hxx |2 vcl/osx/DataFlavorMapping.cxx|3 vcl/osx/a11yactionwrapper.mm | 12 vcl/osx/a11ycomponentwrapper.mm |5 vcl/osx/a11yfactory.mm |3 vcl/osx/a11yrolehelper.mm|4 vcl/osx/a11yselectionwrapper.mm | 12 vcl/osx/a11ytextattributeswrapper.mm | 12 vcl/osx/a11ytextwrapper.mm | 17 vcl/osx/a11ywrapper.mm | 122 vcl/osx/a11ywrapperbutton.mm |2 vcl/osx/a11ywrappercheckbox.mm |4 vcl/osx/a11ywrappercombobox.mm |6 vcl/osx/a11ywrappergroup.mm |2 vcl/osx/a11ywrapperlist.mm |2 vcl/osx/a11ywrapperradiobutton.mm|4 vcl/osx/a11ywrapperradiogroup.mm |2 vcl/osx/a11ywrapperrow.mm|2 vcl/osx/a11ywrapperscrollarea.mm |2 vcl/osx/a11ywrapperscrollbar.mm |2 vcl/osx/a11ywrappersplitter.mm |2 vcl/osx/a11ywrapperstatictext.mm |2 vcl/osx/a11ywrappertabgroup.mm |2 vcl/osx/a11ywrappertextarea.mm |2 vcl/osx/a11ywrappertoolbar.mm|2 vcl/osx/salmenu.cxx |1 vcl/qt5/QtFrame.cxx | 12 vcl/source/app/salvtables.cxx|2 vcl/source/gdi/pdfwriter_impl.cxx| 14 vcl/unx/gtk3/gtkinst.cxx | 16 66 files changed, 2485 insertions(+), 2164 deletions(-) New commits: commit 44fda102b25488de1669c03798f18fc500d03cd5 Author: Jeff Huang AuthorDate: Mon May 27 17:34:35 2024 +0800 Commit: Andras Timar CommitDate: Mon Jun 3 14:33:32 2024 +0200 tdf#161288 Traditional Chinese minus character is U+8CA0(負), not U+5069(偩) Co-authored-by: Firefly Change-Id: I22fe8b31aa59d08f982d2b4586471f4cc13653b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168089 Tested-by: Jenkins Reviewed-by: Eike Rathke (cherry picked from commit a3f537e13ee64c5bf3155864035c1591e7099101) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168314 Reviewed-by: Adolfo Jayme Barrientos diff --git a/i18npool/source/nativenumber/data/numberchar.h b/i18npool/source/nativenumber/data/numberchar.h index a711e960724f..ec647b7b9ce0 100644 ---
core.git: Branch 'libreoffice-24-2' - i18npool/source
i18npool/source/nativenumber/data/numberchar.h |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e92d2444d7bbfc8d7bfd1d91f64fe5161395885e
Author: Jeff Huang
AuthorDate: Mon May 27 17:34:35 2024 +0800
Commit: Adolfo Jayme Barrientos
CommitDate: Sat Jun 1 18:08:13 2024 +0200
tdf#161288 Traditional Chinese minus character is U+8CA0(負), not U+5069(偩)
Co-authored-by: Firefly
Change-Id: I22fe8b31aa59d08f982d2b4586471f4cc13653b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168089
Tested-by: Jenkins
Reviewed-by: Eike Rathke
(cherry picked from commit a3f537e13ee64c5bf3155864035c1591e7099101)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168314
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/i18npool/source/nativenumber/data/numberchar.h
b/i18npool/source/nativenumber/data/numberchar.h
index a711e960724f..ec647b7b9ce0 100644
--- a/i18npool/source/nativenumber/data/numberchar.h
+++ b/i18npool/source/nativenumber/data/numberchar.h
@@ -134,7 +134,7 @@ const sal_Unicode MinusChar[] = {
0xFF0D, // Full Width
0xFF0D, // Chinese Lower
0x8D1F, // S. Chinese Upper
-0x5069, // T. Chinese Upper
+0x8CA0, // T. Chinese Upper
0x2212, // Japanese Modern
0x2212, // Japanese Trad.
0xFF0D, // Korean Lower
core.git: i18npool/source
i18npool/source/nativenumber/data/numberchar.h |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a3f537e13ee64c5bf3155864035c1591e7099101
Author: Jeff Huang
AuthorDate: Mon May 27 17:34:35 2024 +0800
Commit: Eike Rathke
CommitDate: Sat Jun 1 12:43:28 2024 +0200
tdf#161288 Traditional Chinese minus character is U+8CA0(負), not U+5069(偩)
Co-authored-by: Firefly
Change-Id: I22fe8b31aa59d08f982d2b4586471f4cc13653b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168089
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/i18npool/source/nativenumber/data/numberchar.h
b/i18npool/source/nativenumber/data/numberchar.h
index a711e960724f..ec647b7b9ce0 100644
--- a/i18npool/source/nativenumber/data/numberchar.h
+++ b/i18npool/source/nativenumber/data/numberchar.h
@@ -134,7 +134,7 @@ const sal_Unicode MinusChar[] = {
0xFF0D, // Full Width
0xFF0D, // Chinese Lower
0x8D1F, // S. Chinese Upper
-0x5069, // T. Chinese Upper
+0x8CA0, // T. Chinese Upper
0x2212, // Japanese Modern
0x2212, // Japanese Trad.
0xFF0D, // Korean Lower
[Libreoffice-commits] core.git: include/sfx2 sfx2/inc sfx2/source
include/sfx2/strings.hrc|1 -
sfx2/inc/bitmaps.hlst |1 -
sfx2/source/doc/templatedlg.cxx |7 ---
3 files changed, 9 deletions(-)
New commits:
commit 3e5e0c2943e057873952b5394b81dbe6d29ef1e2
Author: Jeff Huang
AuthorDate: Mon Feb 7 15:06:46 2022 +0800
Commit: Heiko Tietze
CommitDate: Wed Feb 9 07:12:58 2022 +0100
tdf#146937 Remove "refresh" command from Template Manager
Change-Id: I12b43c10cca455a6885101909327b81940dafb07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129584
Reviewed-by: Heiko Tietze
Tested-by: Jenkins
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 010b3497b089..a55424982dda 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -58,7 +58,6 @@
#define STR_QRYTEMPL_MESSAGENC_("STR_QRYTEMPL_MESSAGE",
"The template '$(ARG1)' on which this document is based, has been modified. Do
you want to update the styles of the current document, using the modified
template?")
#define STR_QRYTEMPL_UPDATE_BTN NC_("STR_QRYTEMPL_UPDATE_BTN",
"~Update Styles")
#define STR_QRYTEMPL_KEEP_BTN NC_("STR_QRYTEMPL_KEEP_BTN",
"~Keep Old Styles")
-#define STR_ACTION_REFRESH NC_("STR_ACTION_REFRESH",
"~Refresh")
#define STR_CATEGORY_NEWNC_("STR_CATEGORY_NEW", "~New
Category")
#define STR_CATEGORY_DELETE NC_("STR_CATEGORY_DELETE",
"~Delete Category")
#define STR_MSG_EXPORT_SUCCESS NC_("STR_MSG_EXPORT_SUCCESS",
"$1 templates successfully exported.")
diff --git a/sfx2/inc/bitmaps.hlst b/sfx2/inc/bitmaps.hlst
index f48563d83fe9..c3fb205bb7bb 100644
--- a/sfx2/inc/bitmaps.hlst
+++ b/sfx2/inc/bitmaps.hlst
@@ -56,7 +56,6 @@ inline constexpr OUStringLiteral SFX_THUMBNAIL_BASE_256 =
u"res/base_thumbnail_2
inline constexpr OUStringLiteral BMP_RECENTDOC_REMOVE =
u"res/recentdoc_remove.png";
inline constexpr OUStringLiteral BMP_RECENTDOC_REMOVE_HIGHLIGHTED =
u"res/recentdoc_remove_highlighted.png";
inline constexpr OUStringLiteral BMP_DEFAULT = u"res/templatestar.png";
-inline constexpr OUStringLiteral BMP_ACTION_REFRESH = u"res/reload.png";
inline constexpr OUStringLiteral BMP_128X128_CALC_DOC =
u"sfx2/res/128x128_calc_doc-p.png";
inline constexpr OUStringLiteral BMP_128X128_DRAW_DOC =
u"sfx2/res/128x128_draw_doc-p.png";
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 0561c5f380dc..37187ffbc691 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -63,7 +63,6 @@ constexpr OUStringLiteral TM_SETTING_VIEWMODE = u"ViewMode";
#define MNI_ACTION_NEW_FOLDER "new"
#define MNI_ACTION_RENAME_FOLDER "rename"
#define MNI_ACTION_DELETE_FOLDER "delete"
-#define MNI_ACTION_REFRESH "refresh"
#define MNI_ACTION_DEFAULT "default"
#define MNI_ACTION_DEFAULT_WRITER "default_writer"
#define MNI_ACTION_DEFAULT_CALC "default_calc"
@@ -178,7 +177,6 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg(weld::Window
*pParent)
mxActionBar->append_item(MNI_ACTION_RENAME_FOLDER,
SfxResId(STR_CATEGORY_RENAME), BMP_ACTION_RENAME);
mxActionBar->append_item(MNI_ACTION_DELETE_FOLDER,
SfxResId(STR_CATEGORY_DELETE), BMP_ACTION_DELETE_CATEGORY);
mxActionBar->append_separator("separator");
-mxActionBar->append_item(MNI_ACTION_REFRESH, SfxResId(STR_ACTION_REFRESH),
BMP_ACTION_REFRESH);
mxActionBar->append_item(MNI_ACTION_DEFAULT,
SfxResId(STR_ACTION_RESET_ALL_DEFAULT_TEMPLATES));
mxActionBar->append_item(MNI_ACTION_DEFAULT_WRITER,
SfxResId(STR_ACTION_RESET_WRITER_TEMPLATE), BMP_ACTION_DEFAULT_WRITER);
mxActionBar->append_item(MNI_ACTION_DEFAULT_CALC,
SfxResId(STR_ACTION_RESET_CALC_TEMPLATE), BMP_ACTION_DEFAULT_CALC);
@@ -517,11 +515,6 @@ IMPL_LINK(SfxTemplateManagerDlg, MenuSelectHdl, const
OString&, rIdent, void)
OnCategoryRename();
else if (rIdent == MNI_ACTION_DELETE_FOLDER)
OnCategoryDelete();
-else if (rIdent == MNI_ACTION_REFRESH)
-{
-mxLocalView->reload();
-SearchUpdate();
-}
else if (rIdent == MNI_ACTION_DEFAULT)
{
DefaultTemplateMenuSelectHdl(MNI_ACTION_DEFAULT_WRITER);
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 964da41e9dc95318a55cf300bb03bc6f309cb1fc Author: Jeff Huang AuthorDate: Tue Jan 25 20:01:09 2022 +0800 Commit: Gerrit Code Review CommitDate: Tue Jan 25 13:01:09 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 798fa0b98aa4308d1082583966571d4de5f504bb - tdf#139735 Change all "Link to External Data" to "External Links" According to https://bugs.documentfoundation.org/show_bug.cgi?id=139735#c4 , this patch change all of "Link to External Data" sentence to "External Links". Change-Id: I654ad8eeac76589bcd205cb8edf94c218a41 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128911 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 14cfe4926e77..798fa0b98aa4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 14cfe4926e77b4ab9bee348b391c7532c7339349 +Subproject commit 798fa0b98aa4308d1082583966571d4de5f504bb
[Libreoffice-commits] help.git: source/text
source/text/scalc/00/0404.xhp |2 +- source/text/scalc/01/0409.xhp |4 ++-- source/text/scalc/guide/cellreferences_url.xhp |2 +- source/text/scalc/guide/webquery.xhp |2 +- source/text/shared/01/0218.xhp |2 +- 5 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 798fa0b98aa4308d1082583966571d4de5f504bb Author: Jeff Huang AuthorDate: Tue Jan 25 17:15:54 2022 +0800 Commit: Olivier Hallot CommitDate: Tue Jan 25 13:01:06 2022 +0100 tdf#139735 Change all "Link to External Data" to "External Links" According to https://bugs.documentfoundation.org/show_bug.cgi?id=139735#c4 , this patch change all of "Link to External Data" sentence to "External Links". Change-Id: I654ad8eeac76589bcd205cb8edf94c218a41 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/128911 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/00/0404.xhp b/source/text/scalc/00/0404.xhp index 0a889dfcc..d9873d31c 100644 --- a/source/text/scalc/00/0404.xhp +++ b/source/text/scalc/00/0404.xhp @@ -149,7 +149,7 @@ Insert - Function - Category Add-In Choose Insert - Named Range or Expression. -Choose Sheet - Link to External Data. +Choose Sheet - External Links. Choose Sheet - Named Ranges and Expressions - Define. CommandCtrl+F3 diff --git a/source/text/scalc/01/0409.xhp b/source/text/scalc/01/0409.xhp index 618a92604..e78f7a721 100644 --- a/source/text/scalc/01/0409.xhp +++ b/source/text/scalc/01/0409.xhp @@ -22,7 +22,7 @@ - Link to External Data + External Links /text/scalc/01/0409.xhp @@ -34,7 +34,7 @@ -Link to External Data +External Links Inserts data from an HTML, Calc, CSV or Excel file into the current sheet as a link. The data must be located within a named range. diff --git a/source/text/scalc/guide/cellreferences_url.xhp b/source/text/scalc/guide/cellreferences_url.xhp index 6db21a0ec..de83a313c 100644 --- a/source/text/scalc/guide/cellreferences_url.xhp +++ b/source/text/scalc/guide/cellreferences_url.xhp @@ -40,7 +40,7 @@ In a $[officename] Calc document, position the cursor in the cell into which you want to insert the external data. -Choose Sheet - Link to External Data. The External Data dialog appears. +Choose Sheet - External Links. The External Data dialog appears. Enter the URL of the document or Web page in the dialog. The URL must be in the format: http://www.my-bank.com/table.html. The URL for local or local area network files is the path seen in the File - Open dialog. diff --git a/source/text/scalc/guide/webquery.xhp b/source/text/scalc/guide/webquery.xhp index 9b729728d..c98461be3 100644 --- a/source/text/scalc/guide/webquery.xhp +++ b/source/text/scalc/guide/webquery.xhp @@ -49,7 +49,7 @@ Set the cell cursor at the cell where the new content will be inserted. -Choose Sheet - Link to External Data. This opens the External Data dialog. +Choose Sheet - External Links. This opens the External Data dialog. Enter the URL of the HTML document or the name of the spreadsheet. Press Enter when finished. Click the Browse button to open a file selection dialog.only after Enter the URL will be requested from the net. diff --git a/source/text/shared/01/0218.xhp b/source/text/shared/01/0218.xhp index f880e8c3a..a0adb2661 100644 --- a/source/text/shared/01/0218.xhp +++ b/source/text/shared/01/0218.xhp @@ -38,7 +38,7 @@ Edit Links to External Files You can change or remove each link to external files in the current document. You can also update the content of the current file to the most recently saved version of linked external file. This command does not apply to hyperlinks, and is not available if the current document does not contain links to other files. -This command can be used with external file links to sections (place cursor outside of the section), master documents,sheets linked with Sheet - Insert Sheet from File or Sheet - Link to External Data, Function WEBSERVICE, images and OLE objects (when inserted with a link to an external file). +This command can be used with external file links to sections (place cursor outside of the section), master documents,sheets linked with Sheet - Insert Sheet from File or Sheet - External Links, Function WEBSERVICE, images and OLE objects (when inserted with a link to an external file).
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu| 2 +- officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 2 +- officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 6ff04de38652d639694489f9dc8e58c7039e067d Author: Jeff Huang AuthorDate: Fri Jan 21 14:02:32 2022 +0800 Commit: Adolfo Jayme Barrientos CommitDate: Mon Jan 24 13:00:50 2022 +0100 tdf#139735 Change "Links to External Files" to more precise sentence. Change "Links to External Files" to "External Links" for all components. Change-Id: Id6bec316c8ded153c724751d89f6f1a879b9a00e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128718 Tested-by: Jenkins Reviewed-by: Heiko Tietze Reviewed-by: Adolfo Jayme Barrientos diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 12e39a72ed0f..9e5129c7329a 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -235,7 +235,7 @@ - Link to E~xternal Data... + E~xternal Links... 1 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 7d0f7721ab42..a7566af9360f 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -757,7 +757,7 @@ - Lin~ks to External Files... + E~xternal Links... 1 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index ffc66b25c054..c70f51e6b204 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -1486,7 +1486,7 @@ - Lin~ks to External Files... + E~xternal Links... 1
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sc/uiconfig sd/uiconfig
sc/uiconfig/scalc/toolbar/graphicobjectbar.xml |1 sc/uiconfig/scalc/ui/notebookbar_compact.ui | 37 sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 26 -- sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 37 sd/uiconfig/sdraw/ui/notebookbar_single.ui | 37 sd/uiconfig/simpress/ui/notebookbar_compact.ui | 37 sd/uiconfig/simpress/ui/notebookbar_single.ui | 37 7 files changed, 212 deletions(-) New commits: commit 1a78f2b7b79e94b770f1e642cc8c1a5f5cbc3327 Author: Jeff Huang AuthorDate: Wed Jan 5 10:54:49 2022 +0800 Commit: Adolfo Jayme Barrientos CommitDate: Tue Jan 18 03:13:11 2022 +0100 tdf#136362 Remove unnecessary blank area and option in some image toolbar Only in Calc, Draw and Impress. Change-Id: I944aad875fedd1dd19657c49b059e33fd6e9d3f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127984 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit 0596ef354ee8d40976c6be044a646757240f7921) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128443 Reviewed-by: Po-Yen Huang Reviewed-by: Adolfo Jayme Barrientos diff --git a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml index f9f5e97a6e71..9e58a2ef02b3 100644 --- a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml +++ b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml @@ -60,7 +60,6 @@ - diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui index 972d54078d96..02c3004c3e35 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui @@ -9772,43 +9772,6 @@ 21 - - -True -False -center -True - - -True -False -False - - -True -False -.uno:GraphicDialog -sfx2/res/symphony/open_more.png - - -False -True - - - - -False -True -0 - - - - -False -True -22 - - True diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui index 8487e79ac448..4d7f120090f0 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui @@ -5699,32 +5699,6 @@ 0 - - -True -True -end -True -icons -False -1 - - -True -.uno:GraphicDialog - - -False -True - - - - -False -True -1 - - False diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui index
[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig
sc/uiconfig/scalc/toolbar/graphicobjectbar.xml |1 sc/uiconfig/scalc/ui/notebookbar_compact.ui | 37 sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 26 -- sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 37 sd/uiconfig/sdraw/ui/notebookbar_single.ui | 37 sd/uiconfig/simpress/ui/notebookbar_compact.ui | 37 sd/uiconfig/simpress/ui/notebookbar_single.ui | 37 7 files changed, 212 deletions(-) New commits: commit 0596ef354ee8d40976c6be044a646757240f7921 Author: Jeff Huang AuthorDate: Wed Jan 5 10:54:49 2022 +0800 Commit: Heiko Tietze CommitDate: Mon Jan 17 13:10:49 2022 +0100 tdf#136362 Remove unnecessary blank area and option in some image toolbar Only in Calc, Draw and Impress. Change-Id: I944aad875fedd1dd19657c49b059e33fd6e9d3f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127984 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml index f9f5e97a6e71..9e58a2ef02b3 100644 --- a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml +++ b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml @@ -60,7 +60,6 @@ - diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui index 972d54078d96..02c3004c3e35 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui @@ -9772,43 +9772,6 @@ 21 - - -True -False -center -True - - -True -False -False - - -True -False -.uno:GraphicDialog -sfx2/res/symphony/open_more.png - - -False -True - - - - -False -True -0 - - - - -False -True -22 - - True diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui index 8487e79ac448..4d7f120090f0 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui @@ -5699,32 +5699,6 @@ 0 - - -True -True -end -True -icons -False -1 - - -True -.uno:GraphicDialog - - -False -True - - - - -False -True -1 - - False diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui index 74d9cf9757c6..ebdb5b741396 100644 --- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui +++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui @@ -12001,43 +12001,6 @@ 21
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/fontworkalignmentcontrol.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8578add8775a258c79bd32f52a704ab2173bea47 Author: Jeff Huang AuthorDate: Mon Dec 27 11:00:56 2021 +0800 Commit: Thorsten Behrens CommitDate: Wed Dec 29 01:52:41 2021 +0100 tdf#144190 Change _Left Align and _Right Align to Align _Left and Align _Right Change-Id: Ib864f3fb960db47e0f431df6f0c2f985cb276017 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127540 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/svx/uiconfig/ui/fontworkalignmentcontrol.ui b/svx/uiconfig/ui/fontworkalignmentcontrol.ui index c0faa7b990cc..13abbb71ec3b 100644 --- a/svx/uiconfig/ui/fontworkalignmentcontrol.ui +++ b/svx/uiconfig/ui/fontworkalignmentcontrol.ui @@ -42,7 +42,7 @@ 6 -_Left Align +Align _Left True True False @@ -76,7 +76,7 @@ -_Right Align +Align _Right True True False
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - starmath/inc
starmath/inc/strings.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b404a6fbbd254c19599b81a3b2f9ee85f0ac8c04
Author: Jeff Huang
AuthorDate: Fri Dec 24 10:44:58 2021 +0800
Commit: Adolfo Jayme Barrientos
CommitDate: Tue Dec 28 13:37:14 2021 +0100
tdf#140726 Change func func() to func () in Math
Change-Id: I9b28097c0043c7c6daffb047683b6af1f0202223
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127393
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 54115790926a5964534472dff7e4661ea34acb28)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127377
Reviewed-by: Po-Yen Huang
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx
index a9115cc9ea05..863f0dd3e557 100644
--- a/starmath/inc/strings.hxx
+++ b/starmath/inc/strings.hxx
@@ -75,7 +75,7 @@
#define RID_XNSUBSETEQY " nsubseteq "
#define RID_XNSUPSETY " nsupset "
#define RID_XNSUPSETEQY " nsupseteq "
-#define RID_FUNCX "func func() "
+#define RID_FUNCX "func () "
#define RID_ABSX"abs{} "
#define RID_FACTX "fact{} "
#define RID_SQRTX "sqrt{} "
[Libreoffice-commits] core.git: starmath/inc
starmath/inc/strings.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 54115790926a5964534472dff7e4661ea34acb28
Author: Jeff Huang
AuthorDate: Fri Dec 24 10:44:58 2021 +0800
Commit: Mike Kaganski
CommitDate: Fri Dec 24 08:04:59 2021 +0100
tdf#140726 Change func func() to func () in Math
Change-Id: I9b28097c0043c7c6daffb047683b6af1f0202223
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127393
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx
index ccde8244032a..f0796a6622cb 100644
--- a/starmath/inc/strings.hxx
+++ b/starmath/inc/strings.hxx
@@ -75,7 +75,7 @@ inline constexpr OUStringLiteral RID_UNDOFORMATNAME =
u"Format";
#define RID_XNSUBSETEQY " nsubseteq "
#define RID_XNSUPSETY " nsupset "
#define RID_XNSUPSETEQY " nsupseteq "
-#define RID_FUNCX "func func() "
+#define RID_FUNCX "func () "
#define RID_ABSX"abs{} "
#define RID_FACTX "fact{} "
#define RID_SQRTX "sqrt{} "
[Libreoffice-commits] core.git: cui/source vbahelper/source
cui/source/inc/cfg.hxx |4 ++-- vbahelper/source/vbahelper/vbacommandbarhelper.hxx |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 7b0e0409c3f24dfe37d9c43ffa439b56ea719868 Author: Jeff Huang AuthorDate: Fri Nov 5 10:49:09 2021 +0800 Commit: Hossein CommitDate: Thu Nov 25 15:57:44 2021 +0100 tdf#145539 const OUString -> constexpr OUStringLiteral Convert string literals defined as const char[] in header files to constexpr OUStringLiteral Change-Id: I69fdc34cfb663ff87fabc8efc72d6563aa23465b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124724 Tested-by: Jenkins Reviewed-by: Hossein diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 730c6f0ad234..361e801d723c 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -48,7 +48,7 @@ inline constexpr OUStringLiteral ITEM_DESCRIPTOR_LABEL = u"Label"; inline constexpr OUStringLiteral ITEM_DESCRIPTOR_TYPE = u"Type"; inline constexpr OUStringLiteral ITEM_DESCRIPTOR_STYLE = u"Style"; inline constexpr OUStringLiteral ITEM_DESCRIPTOR_ISVISIBLE = u"IsVisible"; -const char ITEM_DESCRIPTOR_RESOURCEURL[] = "ResourceURL"; +inline constexpr OUStringLiteral ITEM_DESCRIPTOR_RESOURCEURL = u"ResourceURL"; inline constexpr OUStringLiteral ITEM_DESCRIPTOR_UINAME = u"UIName"; inline constexpr OUStringLiteral ITEM_MENUBAR_URL = u"private:resource/menubar/menubar"; @@ -56,7 +56,7 @@ inline constexpr OUStringLiteral ITEM_TOOLBAR_URL = u"private:resource/toolbar/" inline constexpr OUStringLiteral CUSTOM_TOOLBAR_STR = u"custom_toolbar_"; -const char aMenuSeparatorStr[] = " | "; +inline constexpr OUStringLiteral aMenuSeparatorStr = u" | "; class SvxConfigEntry; class SvxConfigPage; diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx index 8eda1dbafc3e..c177385cc285 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx @@ -40,8 +40,8 @@ inline constexpr OUStringLiteral ITEM_DESCRIPTOR_ENABLED = u"Enabled"; inline constexpr OUStringLiteral ITEM_MENUBAR_URL = u"private:resource/menubar/menubar"; constexpr char16_t ITEM_TOOLBAR_URL[] = u"private:resource/toolbar/"; -const char CUSTOM_TOOLBAR_STR[] = "custom_toolbar_"; -const char CUSTOM_MENU_STR[] = "vnd.openoffice.org:CustomMenu"; +inline constexpr OUStringLiteral CUSTOM_TOOLBAR_STR = u"custom_toolbar_"; +inline constexpr OUStringLiteral CUSTOM_MENU_STR = u"vnd.openoffice.org:CustomMenu"; class VbaCommandBarHelper; typedef std::shared_ptr< VbaCommandBarHelper > VbaCommandBarHelperRef;
[Libreoffice-commits] core.git: svx/inc
svx/inc/numberingtype.hrc |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3165f0ff32b002a6efbc61af4f778ba4075b496e
Author: Jeff Huang
AuthorDate: Thu Nov 4 11:07:46 2021 +0800
Commit: Mike Kaganski
CommitDate: Thu Nov 4 07:23:47 2021 +0100
tdf#143254 Replaces "Greek Upper Letter" with "Greek Upper Numerals"
Change-Id: If32102394ca4630d8c3d7aa32e45f7770db008d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124665
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/svx/inc/numberingtype.hrc b/svx/inc/numberingtype.hrc
index 404a7534e00b..5ba335ae4eae 100644
--- a/svx/inc/numberingtype.hrc
+++ b/svx/inc/numberingtype.hrc
@@ -54,8 +54,8 @@ const std::pair
RID_SVXSTRARY_NUMBERINGTYPE[] =
{ /* CHARS_CYRILLIC_LOWER_LETTER_SR */
NC_("RID_SVXSTRARY_NUMBERINGTYPE", "а, б, .., аа, аб, ... (Serbian)") , 49
},
{ /* CHARS_CYRILLIC_UPPER_LETTER_N_SR */
NC_("RID_SVXSTRARY_NUMBERINGTYPE", "А, Б, .., Аа, Бб, ... (Serbian)") , 50
},
{ /* CHARS_CYRILLIC_LOWER_LETTER_N_SR */
NC_("RID_SVXSTRARY_NUMBERINGTYPE", "а, б, .., аа, бб, ... (Serbian)") , 51
},
-{ /* CHARS_GREEK_UPPER_LETTER */
NC_("RID_SVXSTRARY_NUMBERINGTYPE", "Α, Β, Γ, ... (Greek Upper Letter)"),52
},
-{ /* CHARS_GREEK_LOWER_LETTER */
NC_("RID_SVXSTRARY_NUMBERINGTYPE", "α, β, γ, ... (Greek Lower Letter)"),53
},
+{ /* CHARS_GREEK_UPPER_LETTER */
NC_("RID_SVXSTRARY_NUMBERINGTYPE", "Α, Β, Γ, ... (Greek Upper Numerals)"),
52 },
+{ /* CHARS_GREEK_LOWER_LETTER */
NC_("RID_SVXSTRARY_NUMBERINGTYPE", "α, β, γ, ... (Greek Lower Numerals)"),
53 },
{ /* NUMBER_HEBREW*/
NC_("RID_SVXSTRARY_NUMBERINGTYPE", "א...י, יא...כ, ...") , 56
},
{ /* CHARS_HEBREW */
NC_("RID_SVXSTRARY_NUMBERINGTYPE", "א...ת, אא...תת, ...") , 33
},
{ /* NUMBER_ARABIC_INDIC */
NC_("RID_SVXSTRARY_NUMBERINGTYPE", "١, ٢, ٣, ٤, ... (Arabic)"), 57
},
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 95e7a57df68c9d631bfce0460b44b9ed966cd5bd Author: Jeff Huang AuthorDate: Wed Nov 3 10:18:18 2021 +0800 Commit: Ilmari Lauhakangas CommitDate: Wed Nov 3 17:59:02 2021 +0100 tdf#143548 Add 3 dots after Select Macro and Select Module strings. Change-Id: Ifc3ea0652b3bda1f8671d88d9b6f7d28a87c53f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124625 Tested-by: Jenkins Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index b3a0a96cd346..cf72101b4b88 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1483,7 +1483,7 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 - Select Macro + Select Macro... 1 @@ -1535,7 +1535,7 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 - Select Module + Select Module... Modules...
[Libreoffice-commits] core.git: cui/source cui/uiconfig officecfg/registry sfx2/source
cui/source/options/optgdlg.cxx | 14 -
cui/source/options/optgdlg.hxx |2
cui/uiconfig/ui/optgeneralpage.ui | 20 -
officecfg/registry/schema/org/openoffice/Office/Common.xcs |8
sfx2/source/control/unoctitm.cxx | 142 -
5 files changed, 4 insertions(+), 182 deletions(-)
New commits:
commit 2c0b84dc65739bfc47dca684e819717eb9cce387
Author: Jeff Huang
AuthorDate: Mon Jul 19 17:00:17 2021 +0800
Commit: Heiko Tietze
CommitDate: Fri Jul 23 13:29:22 2021 +0200
tdf#140107 Remove all collect usage data code.
Remove all collect usage data code because we
don't really use them.
Change-Id: I8d83d57220bed8f8c15bd012584943cd0913500d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119166
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 3870a3df3ca8..83fd85d8a074 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -161,9 +161,9 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage,
weld::DialogController* p
, m_xYearFrame(m_xBuilder->weld_widget("yearframe"))
, m_xYearValueField(m_xBuilder->weld_spin_button("year"))
, m_xToYearFT(m_xBuilder->weld_label("toyear"))
-, m_xCollectUsageInfo(m_xBuilder->weld_check_button("collectusageinfo"))
, m_xCrashReport(m_xBuilder->weld_check_button("crashreport"))
, m_xQuickStarterFrame(m_xBuilder->weld_widget("quickstarter"))
+, m_xHelpImproveLabel(m_xBuilder->weld_label("label7")) //"Help Improve"
#if defined(UNX)
, m_xQuickLaunchCB(m_xBuilder->weld_check_button("systray"))
#else
@@ -188,6 +188,8 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage,
weld::DialogController* p
//Only available in Win or if building the gtk systray
#if !defined(_WIN32)
m_xQuickStarterFrame->hide();
+//Hide frame label in case of no content
+m_xHelpImproveLabel->hide();
#endif
#if defined(_WIN32)
@@ -251,12 +253,6 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
rSet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) );
}
-if (m_xCollectUsageInfo->get_state_changed_from_saved())
-{
-
officecfg::Office::Common::Misc::CollectUsageInformation::set(m_xCollectUsageInfo->get_active(),
batch);
-bModified = true;
-}
-
#if HAVE_FEATURE_BREAKPAD
if (m_xCrashReport->get_state_changed_from_saved())
{
@@ -309,10 +305,6 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
else
m_xYearFrame->set_sensitive(false);
-
m_xCollectUsageInfo->set_active(officecfg::Office::Common::Misc::CollectUsageInformation::get());
-
m_xCollectUsageInfo->set_sensitive(!officecfg::Office::Common::Misc::CollectUsageInformation::isReadOnly());
-m_xCollectUsageInfo->save_state();
-
#if HAVE_FEATURE_BREAKPAD
m_xCrashReport->set_active(officecfg::Office::Common::Misc::CrashReport::get()
&& CrashReporter::IsDumpEnable());
m_xCrashReport->set_sensitive(!officecfg::Office::Common::Misc::CrashReport::isReadOnly()
&& CrashReporter::IsDumpEnable());
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 38731cefd043..3d4c342a73a6 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -44,9 +44,9 @@ private:
std::unique_ptr m_xYearFrame;
std::unique_ptr m_xYearValueField;
std::unique_ptr m_xToYearFT;
-std::unique_ptr m_xCollectUsageInfo;
std::unique_ptr m_xCrashReport;
std::unique_ptr m_xQuickStarterFrame;
+std::unique_ptr m_xHelpImproveLabel;
std::unique_ptr m_xQuickLaunchCB;
#if defined(_WIN32)
std::unique_ptr m_xFileAssocFrame;
diff --git a/cui/uiconfig/ui/optgeneralpage.ui
b/cui/uiconfig/ui/optgeneralpage.ui
index 6d9512d72cab..363ed4633a76 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -279,26 +279,6 @@
False
12
6
-
-
-Collect usage data and send it to The
Document Foundation
-True
-True
-False
-1
-True
-True
-
-
-Send usage data to
help The Document Foundation improve the software usability.
-
-
-
-
-0
-0
-
-
Sen_d crash reports to The Document
Foundation
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index d74a9411ca3c..c9940001b573 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source
sw/source/core/frmedt/feshview.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 925ed355f096c0b005cfddbbe4c78400472de5bc
Author: Jeff Huang
AuthorDate: Mon Apr 12 14:16:02 2021 +0800
Commit: Michael Stahl
CommitDate: Tue Apr 20 10:42:46 2021 +0200
tdf#141525 Fix "Line with Arrow/Circle" insertion error.
When you insert "Line with Arrow/Circle" from "Lines and Arrows", it will
show
"Line Starts with Arrow" instead of "Line with Arrow/Circle". This patch can
fix this issue. (This issue exists at least since 6.3 series.)
Change-Id: I827b9582951fe359d89245970e73d63f7697553f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113963
Tested-by: Jenkins
Reviewed-by: Mark Hung
(cherry picked from commit 2b498e380a91a536d177376e854cf3a6e2fb0b35)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114179
Reviewed-by: Po-Yen Huang
Reviewed-by: Xisco Fauli
(cherry picked from commit 4ee3d213e8d3c4afdc3714b50def117dfe5c8023)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114275
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/frmedt/feshview.cxx
b/sw/source/core/frmedt/feshview.cxx
index 9da71abf8b8c..33134f5858a6 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1005,6 +1005,14 @@ void SwFEShell::SetLineEnds(SfxItemSet& rAttr, SdrObject
const & rObj, sal_uInt1
// and again, for the still missing ends
switch (nSlotId)
{
+case SID_LINE_ARROW_CIRCLE:
+{
+// circle end
+rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
+rAttr.Put(XLineEndWidthItem(nWidth));
+}
+break;
+
case SID_LINE_CIRCLE_ARROW:
{
// circle start
___
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' - sw/source
sw/source/core/frmedt/feshview.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 4ee3d213e8d3c4afdc3714b50def117dfe5c8023
Author: Jeff Huang
AuthorDate: Mon Apr 12 14:16:02 2021 +0800
Commit: Xisco Fauli
CommitDate: Mon Apr 19 09:10:59 2021 +0200
tdf#141525 Fix "Line with Arrow/Circle" insertion error.
When you insert "Line with Arrow/Circle" from "Lines and Arrows", it will
show
"Line Starts with Arrow" instead of "Line with Arrow/Circle". This patch can
fix this issue. (This issue exists at least since 6.3 series.)
Change-Id: I827b9582951fe359d89245970e73d63f7697553f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113963
Tested-by: Jenkins
Reviewed-by: Mark Hung
(cherry picked from commit 2b498e380a91a536d177376e854cf3a6e2fb0b35)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114179
Reviewed-by: Po-Yen Huang
Reviewed-by: Xisco Fauli
diff --git a/sw/source/core/frmedt/feshview.cxx
b/sw/source/core/frmedt/feshview.cxx
index 767e4e7f16e8..439d99e9e2d7 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1004,6 +1004,14 @@ void SwFEShell::SetLineEnds(SfxItemSet& rAttr, SdrObject
const & rObj, sal_uInt1
// and again, for the still missing ends
switch (nSlotId)
{
+case SID_LINE_ARROW_CIRCLE:
+{
+// circle end
+rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
+rAttr.Put(XLineEndWidthItem(nWidth));
+}
+break;
+
case SID_LINE_CIRCLE_ARROW:
{
// circle start
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/frmedt/feshview.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 2b498e380a91a536d177376e854cf3a6e2fb0b35
Author: Jeff Huang
AuthorDate: Mon Apr 12 14:16:02 2021 +0800
Commit: Mark Hung
CommitDate: Fri Apr 16 15:19:36 2021 +0200
tdf#141525 Fix "Line with Arrow/Circle" insertion error.
When you insert "Line with Arrow/Circle" from "Lines and Arrows", it will
show
"Line Starts with Arrow" instead of "Line with Arrow/Circle". This patch can
fix this issue. (This issue exists at least since 6.3 series.)
Change-Id: I827b9582951fe359d89245970e73d63f7697553f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113963
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/sw/source/core/frmedt/feshview.cxx
b/sw/source/core/frmedt/feshview.cxx
index af410a803af9..31c30e3c31ec 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1005,6 +1005,14 @@ void SwFEShell::SetLineEnds(SfxItemSet& rAttr, SdrObject
const & rObj, sal_uInt1
// and again, for the still missing ends
switch (nSlotId)
{
+case SID_LINE_ARROW_CIRCLE:
+{
+// circle end
+rAttr.Put(XLineEndItem(SvxResId(RID_SVXSTR_CIRCLE), aCircle));
+rAttr.Put(XLineEndWidthItem(nWidth));
+}
+break;
+
case SID_LINE_CIRCLE_ARROW:
{
// circle start
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
