[Libreoffice-commits] core.git: cui/inc cui/source

[Julien Nabet (via logerrit)]

 cui/inc/personas.hrc   |   30 ++
 cui/source/options/personalization.cxx |9 +++--
 2 files changed, 37 insertions(+), 2 deletions(-)

New commits:
commit a6dc2a42263816461600307b5f8271a5c5d8d031
Author: Julien Nabet 
AuthorDate: Sat Dec 2 11:36:06 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 4 17:20:07 2023 +0100

tdf#157402: translate personas

Change-Id: I6b2bc6f8fa76ddb669a71d0858a43c62bf51d58d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160240
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/cui/inc/personas.hrc b/cui/inc/personas.hrc
new file mode 100644
index ..6b101717dcaa
--- /dev/null
+++ b/cui/inc/personas.hrc
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include 
+#include 
+
+#include 
+
+#define NC_(Context, String) TranslateId(Context, u8##String)
+
+// it must be synchronized with 
extras/source/gallery/personas/personas_list.txt
+std::pair RID_PERSONAS_COLOR[] =
+{
+{ NC_("RID_CUI_PERSONAS_COLOR", "White") , 0 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Gray") , 1 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Dark") , 2 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Pink") , 3 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Sand") , 4 },
+{ NC_("RID_CUI_PERSONAS_COLOR", "Green") , 5 },
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 6311fd491141..657344d60c75 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -11,6 +11,8 @@
 
 #include "personalization.hxx"
 
+#include 
+
 #include 
 #include 
 #include 
@@ -21,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -144,6 +147,7 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 bool foundOne = false;
 
 OStringBuffer aLine;
+int nLineNumberFilePersona = 0;
 while (aStream.IsOpen() && !aStream.eof() && nIndex < MAX_DEFAULT_PERSONAS)
 {
 OUString aPersonaSetting, aPreviewFile, aName;
@@ -151,8 +155,8 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 
 aStream.ReadLine(aLine);
 aPersonaSetting = OStringToOUString(aLine, RTL_TEXTENCODING_UTF8);
-aName = aPersonaSetting.getToken(1, ';', nParseIndex);
-aPreviewFile = aPersonaSetting.getToken(0, ';', nParseIndex);
+aName = CuiResId(RID_PERSONAS_COLOR[nLineNumberFilePersona].first);
+aPreviewFile = aPersonaSetting.getToken(2, ';', nParseIndex);
 
 if (aPreviewFile.isEmpty())
 break;
@@ -175,6 +179,7 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 m_vDefaultPersonaImages[nIndex]->set_tooltip_text(aName);
 m_vDefaultPersonaImages[nIndex++]->show();
 foundOne = true;
+++nLineNumberFilePersona;
 }
 
 m_xDefaultPersona->set_sensitive(foundOne);

[Libreoffice-commits] core.git: cui/inc cui/source include/cui

[Julien Nabet (via logerrit)]

 cui/inc/dlgname.hxx   |2 +-
 cui/source/customize/SvxMenuConfigPage.cxx|2 +-
 cui/source/customize/SvxToolbarConfigPage.cxx |2 +-
 cui/source/dialogs/dlgname.cxx|2 +-
 cui/source/factory/dlgfact.cxx|1 -
 cui/source/factory/dlgfact.hxx|2 +-
 cui/source/options/optaboutconfig.cxx |1 -
 cui/source/options/optaboutconfig.hxx |2 +-
 8 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 8c3e4dba01fa3bac6ddf16ebe75f3e169e458068
Author: Julien Nabet 
AuthorDate: Mon Nov 27 15:04:55 2023 +0100
Commit: Julien Nabet 
CommitDate: Mon Nov 27 20:20:55 2023 +0100

Move a cui header inside the module

+ fix building issues about "cuidllapi.h"
+ remove #include  in some cxx since their corresponding 
hxx already contains the include

Change-Id: I2396104fbcbca2e1aca29cdb2324ae0f4daf63cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159996
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/cui/dlgname.hxx b/cui/inc/dlgname.hxx
similarity index 99%
rename from include/cui/dlgname.hxx
rename to cui/inc/dlgname.hxx
index e06c56c0f010..3876585e1947 100644
--- a/include/cui/dlgname.hxx
+++ b/cui/inc/dlgname.hxx
@@ -18,7 +18,7 @@
  */
 #pragma once
 
-#include "cuidllapi.h"
+#include 
 
 #include 
 #include 
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx 
b/cui/source/customize/SvxMenuConfigPage.cxx
index 3ec1f2a531e1..4ee5ce9be0ca 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -20,7 +20,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx 
b/cui/source/customize/SvxToolbarConfigPage.cxx
index be34445cf19f..035059ea8e83 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -38,7 +38,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 
 SvxToolbarConfigPage::SvxToolbarConfigPage(weld::Container* pPage,
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 8164bf1c2b40..09b6158fde00 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
+#include 
 
 #include 
 
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 42a2b19fbaee..fbdea49672ef 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -33,7 +33,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 137a5a033294..b6120dcfb2ef 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -27,7 +27,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index f191a59bd2ee..885ea189a8c5 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -33,7 +33,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/cui/source/options/optaboutconfig.hxx 
b/cui/source/options/optaboutconfig.hxx
index 17aea23a997e..7bfce2ab85aa 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -11,7 +11,7 @@
 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig editeng/source filter/source filter/uiconfig include/jvmfwk include/svl officecfg/registry readlicense_oo/docs reportbuilder/Package_tem

[t-aswath (via logerrit)]

 cui/inc/tipoftheday.hrc|8 +++---
 cui/inc/treeopt.hrc|4 +--
 cui/source/inc/treeopt.hxx |2 -
 cui/source/tabpages/numfmt.cxx |2 -
 cui/uiconfig/ui/numberingformatpage.ui |2 -
 cui/uiconfig/ui/opthtmlpage.ui |2 -
 editeng/source/editeng/editview.cxx|8 +++---
 filter/source/msfilter/svdfppt.cxx |2 -
 filter/uiconfig/ui/pdfviewpage.ui  |2 -
 include/jvmfwk/framework.hxx   |2 -
 include/svl/zforlist.hxx   |2 -
 officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs |2 -
 officecfg/registry/schema/org/openoffice/Setup.xcs |6 ++--
 readlicense_oo/docs/readme.xrm |2 -
 reportbuilder/Package_templates.mk |2 -
 sc/source/filter/excel/xestyle.cxx |2 -
 scaddins/source/analysis/analysishelper.hxx|4 +--
 sd/source/ui/docshell/docshel3.cxx |2 -
 setup_native/source/mac/macinstall.ulf |2 -
 svtools/uiconfig/ui/restartdialog.ui   |2 -
 svx/inc/svxerr.hrc |2 -
 sw/qa/uitest/findReplace/tdf118208.py  |   13 
+-
 sw/source/core/access/AccessibilityIssue.cxx   |2 -
 sw/source/filter/ww8/wrtw8sty.cxx  |2 -
 sw/source/uibase/shells/langhelper.cxx |2 -
 sw/source/uibase/shells/textsh1.cxx|2 -
 sw/uiconfig/swriter/ui/textgridpage.ui |2 -
 27 files changed, 43 insertions(+), 42 deletions(-)

New commits:
commit 0264999bb3746a9c68938edd1a6fc05a8e40b406
Author: t-aswath 
AuthorDate: Sat Nov 11 14:19:08 2023 +0530
Commit: Eike Rathke 
CommitDate: Sat Nov 18 16:01:33 2023 +0100

tdf#157716 - Rename "Language settings" to "Languages and Locales"

Change-Id: Idd31b18c87998b03d884e7aa17197c459241abf9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159315
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 7f1dca4441d9..ed4b7b72eb3d 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -135,7 +135,7 @@ const std::tuple TIPOFTHEDAY_STRINGA
  { NC_("RID_CUI_TIPOFTHEDAY", "In %PRODUCTNAME Impress, use Insert ▸ Media 
▸ Photo Album to create a slideshow from a series of pictures with the “Photo 
Album” feature."), "", "", simpress},
  { NC_("RID_CUI_TIPOFTHEDAY", "You can show formulas instead of results 
with View ▸ Show Formula (or Tools ▸ Options ▸ %PRODUCTNAME Calc ▸ View ▸ 
Display ▸ Formulas)."), "", "", scalc},
  { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME is developed by a friendly 
community, made up of hundreds of contributors around the world. Join us with 
your skills beyond coding."), 
"https://www.libreoffice.org/community/get-involved/;, "", soffice},
- { NC_("RID_CUI_TIPOFTHEDAY", "Left-handed? Enable Tools ▸ Options ▸ 
Language Settings ▸ Languages ▸ Asian and check Tools ▸ Options ▸ %PRODUCTNAME 
Writer ▸ View ▸ Ruler ▸ Right-aligned, which displays the scrollbar to the 
left."), "", "", swriter},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Left-handed? Enable Tools ▸ Options ▸ 
Languages and Locales ▸ General ▸ Asian and check Tools ▸ Options ▸ 
%PRODUCTNAME Writer ▸ View ▸ Ruler ▸ Right-aligned, which displays the 
scrollbar to the left."), "", "", swriter},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want headings to always begin a page? Edit 
the paragraph style applied to the headings. Check “Insert” on the “Text Flow” 
tab, with Type “Page” and Position “Before”."), 
"cui/ui/textflowpage/checkInsert", "", swriter},
  { NC_("RID_CUI_TIPOFTHEDAY", "Date/time value is just a number of days 
since a chosen day zero; in the number, integer part represents date, and 
fractional part is time (elapsed part of a day), with 0.5 representing noon."), 
"", "", scalc},
  { NC_("RID_CUI_TIPOFTHEDAY", "Shift+%MOD1+Del deletes from cursor to the 
end of the current sentence."), "", "", swriter},
@@ -185,7 +185,7 @@ const std::tuple TIPOFTHEDAY_STRINGA
  { NC_("RID_CUI_TIPOFTHEDAY", "Your donations support our worldwide 
community."), "https://www.libreoffice.org/donate/;, "", soffice},
  { NC_("RID_CUI_TIPOFTHEDAY", "You want to add x months to a date? Use 
=EDATE(date;months)."), 
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/func_edate.html;,
 "", scalc}, //local help missing
  { NC_("RID_CUI_TIPOFTHEDAY", "To select a 

[Libreoffice-commits] core.git: cui/inc cui/source editeng/source include/editeng officecfg/registry sw/inc sw/qa sw/source

[Darshan-upadhyay1110 (via logerrit)]

 cui/inc/strings.hrc|1 
 cui/source/inc/autocdlg.hxx|1 
 cui/source/tabpages/autocdlg.cxx   |8 ++
 editeng/source/misc/acorrcfg.cxx   |3 
 editeng/source/misc/swafopt.cxx|1 
 include/editeng/swafopt.hxx|1 
 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8 ++
 sw/inc/editsh.hxx  |2 
 sw/qa/core/doc/doc.cxx |   51 +
 sw/qa/uitest/writer_tests/tdf156165.py |4 -
 sw/source/core/edit/autofmt.cxx|   46 ---
 sw/source/uibase/docvw/edtwin.cxx  |   15 +++
 sw/source/uibase/shells/textsh1.cxx|4 -
 13 files changed, 129 insertions(+), 16 deletions(-)

New commits:
commit c4fc18308074634e9578ad12d94d937f259aa22a
Author: Darshan-upadhyay1110 
AuthorDate: Fri Sep 1 16:08:58 2023 +0530
Commit: Szymon Kłos 
CommitDate: Thu Sep 7 09:18:50 2023 +0200

Autocorrect: Add option for autoformat bulleted lists after space

Enable option in Autocoorect => bulleted lists after pressing space
Example: press * or - and space will change into bullets

Change-Id: I9741ad4c3eb4123074f06b762b58fe7ffdb44613
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156616
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index ffcf10e73556..29126053d968 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -334,6 +334,7 @@
 // To translators: %1 will be replaced with a percentage, e.g. "10%"
 #define RID_CUISTR_RIGHT_MARGIN 
NC_("RID_SVXSTR_RIGHT_MARGIN", "Combine single line paragraphs if length 
greater than %1")
 #define RID_CUISTR_NUM  NC_("RID_SVXSTR_NUM", 
"Bulleted and numbered lists. Bullet symbol: %1")
+#define RID_SVXSTR_NUM_FORMAT_AFTER_SPACE   
NC_("RID_SVXSTR_NUM_FORMAT_AFTER_SPACE", "Bulleted and numbered lists immediate 
after pressing space")
 #define RID_CUISTR_BORDER   NC_("RID_SVXSTR_BORDER", 
"Apply border")
 #define RID_CUISTR_CREATE_TABLE 
NC_("RID_SVXSTR_CREATE_TABLE", "Create table")
 #define RID_CUISTR_REPLACE_TEMPLATES
NC_("RID_SVXSTR_REPLACE_TEMPLATES", "Apply Styles")
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 2357677ef65f..2677b8535ebe 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -97,6 +97,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
 OUStringsDash;
 OUStringsRightMargin;
 OUStringsNum;
+OUStringsBulletsAfterSpace;
 OUStringsBorder;
 OUStringsTable;
 OUStringsReplaceTemplates;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index a23fc2015ebf..282e8b5405a1 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -344,6 +344,7 @@ enum OfaAutoFmtOptions
 IGNORE_DBLSPACE,
 CORRECT_CAPS_LOCK,
 APPLY_NUMBERING,
+APPLY_NUMBERING_AFTER_SPACE,
 INSERT_BORDER,
 CREATE_TABLE,
 REPLACE_STYLES,
@@ -372,6 +373,7 @@ 
OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage(weld::Container* pPage, weld::D
 , sDash(CuiResId(RID_CUISTR_DASH))
 , sRightMargin(CuiResId(RID_CUISTR_RIGHT_MARGIN))
 , sNum(CuiResId(RID_CUISTR_NUM))
+, sBulletsAfterSpace(CuiResId(RID_SVXSTR_NUM_FORMAT_AFTER_SPACE))
 , sBorder(CuiResId(RID_CUISTR_BORDER))
 , sTable(CuiResId(RID_CUISTR_CREATE_TABLE))
 , sReplaceTemplates(CuiResId(RID_CUISTR_REPLACE_TEMPLATES))
@@ -498,6 +500,10 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet*  )
 bModified |= pOpt->bSetNumRule != bCheck;
 pOpt->bSetNumRule = bCheck;
 
+bCheck = m_xCheckLB->get_toggle(APPLY_NUMBERING_AFTER_SPACE, CBCOL_SECOND) 
== TRISTATE_TRUE;
+bModified |= pOpt->bSetNumRuleAfterSpace != bCheck;
+pOpt->bSetNumRuleAfterSpace = bCheck;
+
 bCheck = m_xCheckLB->get_toggle(INSERT_BORDER, CBCOL_SECOND) == 
TRISTATE_TRUE;
 bModified |= pOpt->bSetBorder != bCheck;
 pOpt->bSetBorder = bCheck;
@@ -578,6 +584,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
 CreateEntry(sNoDblSpaces,   CBCOL_SECOND);
 CreateEntry(sCorrectCapsLock,   CBCOL_SECOND);
 CreateEntry(sNum.replaceFirst("%1", sBulletChar), CBCOL_SECOND);
+CreateEntry(sBulletsAfterSpace,  CBCOL_SECOND);
 CreateEntry(sBorder,CBCOL_SECOND);
 CreateEntry(sTable, CBCOL_SECOND);
 CreateEntry(sReplaceTemplates,  CBCOL_SECOND);
@@ -607,6 +614,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
 m_xCheckLB->set_toggle(IGNORE_DBLSPACE, bool(nFlags 

[Libreoffice-commits] core.git: cui/inc cui/source

[Mike Kaganski (via logerrit)]

 cui/inc/strings.hrc|1 +
 cui/source/options/optlanguagetool.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 7c6c58197a84cf22789ca3dc97e863390c31a2f9
Author: Mike Kaganski 
AuthorDate: Wed Jun 14 17:01:32 2023 +0300
Commit: Mike Kaganski 
CommitDate: Wed Jun 14 20:59:03 2023 +0200

Related: tdf#150494 add placeholder text to the REST protocol field

Change-Id: I8aab941d9dd03e54a3a39ccb643a5a628d6c5be7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153061
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 98c6cc50b2d3..84a2c9f859a1 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -407,6 +407,7 @@
 #define RID_CUISTR_OPT_READONLY 
NC_("RID_CUISTR_OPT_READONLY", "This property is locked for editing.")
 
 #define RID_LANGUAGETOOL_LEAVE_EMPTY
NC_("RID_LANGUAGETOOL_LEAVE_EMPTY", "Leave this field empty to use the free 
version")
+#define RID_LANGUAGETOOL_REST_LEAVE_EMPTY   
NC_("RID_LANGUAGETOOL_REST_LEAVE_EMPTY", "Leave this field empty to use 
LanguageTool protocol")
 
 // Translatable names of color schemes
 #define RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC  
NC_("RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC", "Automatic")
diff --git a/cui/source/options/optlanguagetool.cxx 
b/cui/source/options/optlanguagetool.cxx
index 485e8ecb1be6..e1f4806f47f3 100644
--- a/cui/source/options/optlanguagetool.cxx
+++ b/cui/source/options/optlanguagetool.cxx
@@ -45,6 +45,7 @@ 
OptLanguageToolTabPage::OptLanguageToolTabPage(weld::Container* pPage,
 m_xBaseURLED->set_placeholder_text(CuiResId(RID_LANGUAGETOOL_LEAVE_EMPTY));
 
m_xUsernameED->set_placeholder_text(CuiResId(RID_LANGUAGETOOL_LEAVE_EMPTY));
 m_xApiKeyED->set_placeholder_text(CuiResId(RID_LANGUAGETOOL_LEAVE_EMPTY));
+
m_xRestProtocol->set_placeholder_text(CuiResId(RID_LANGUAGETOOL_REST_LEAVE_EMPTY));
 }
 
 OptLanguageToolTabPage::~OptLanguageToolTabPage() {}

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig

[Samuel Mehrbrodt (via logerrit)]

 cui/inc/strings.hrc   |1 
 cui/source/options/optaboutconfig.cxx |   53 ++
 cui/source/options/optaboutconfig.hxx |3 +
 cui/uiconfig/ui/aboutconfigdialog.ui  |   21 +
 4 files changed, 72 insertions(+), 6 deletions(-)

New commits:
commit efa965969c6d3dfe5745a535605a6b9a482a03bd
Author: Samuel Mehrbrodt 
AuthorDate: Thu May 11 10:17:18 2023 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon May 15 13:31:35 2023 +0200

tdf#104005 Don't allow changing finalized properties

Change-Id: Ic9e42ba6aed2fadd0f28dfc6be0a639cdd16bb34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151660
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 442ac515ef8c..98c6cc50b2d3 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -404,6 +404,7 @@
 #define RID_CUISTR_CLICK_RESULT 
NC_("RID_CUISTR_CLICK_RESULT", "(Click on any test to view its resultant bitmap 
image)")
 #define RID_CUISTR_ZIPFAIL  NC_("RID_CUISTR_ZIPFAIL", 
"Creation of ZIP file failed.")
 #define RID_CUISTR_SAVEDNC_("RID_CUISTR_SAVED", 
"The results have been successfully saved in the file 
'GraphicTestResults.zip'!")
+#define RID_CUISTR_OPT_READONLY 
NC_("RID_CUISTR_OPT_READONLY", "This property is locked for editing.")
 
 #define RID_LANGUAGETOOL_LEAVE_EMPTY
NC_("RID_LANGUAGETOOL_LEAVE_EMPTY", "Leave this field empty to use the free 
version")
 
diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index 0914310f2800..4578bc027581 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -16,8 +16,10 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -35,6 +37,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 #include 
 #include 
 #include 
@@ -63,18 +68,21 @@ struct Prop_Impl
 struct UserData
 {
 bool bIsPropertyPath;
+bool bIsReadOnly;
 OUString sPropertyPath;
 int aLineage;
 Reference aXNameAccess;
 
-explicit UserData( OUString aPropertyPath )
+explicit UserData( OUString aPropertyPath, bool isReadOnly )
 : bIsPropertyPath( true )
+, bIsReadOnly( isReadOnly )
 , sPropertyPath(std::move(aPropertyPath))
 , aLineage(0)
 {}
 
 explicit UserData( Reference const & rXNameAccess, int rIndex 
)
 : bIsPropertyPath( false )
+, bIsReadOnly( false )
 , aLineage(rIndex)
 , aXNameAccess( rXNameAccess )
 {}
@@ -171,6 +179,19 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage(weld::Window* 
pParent)
 o3tl::narrowing(fWidth * 8)
 };
 m_xPrefBox->set_column_fixed_widths(aWidths);
+
+m_xPrefBox->connect_query_tooltip(LINK(this, CuiAboutConfigTabPage, 
QueryTooltip));
+}
+
+IMPL_LINK(CuiAboutConfigTabPage, QueryTooltip, const weld::TreeIter&, rIter, 
OUString)
+{
+UserData *pUserData = weld::fromId(m_xPrefBox->get_id(rIter));
+if (pUserData && pUserData->bIsReadOnly)
+{
+return CuiResId(RID_CUISTR_OPT_READONLY);
+}
+
+return OUString();
 }
 
 IMPL_LINK(CuiAboutConfigTabPage, HeaderBarClick, int, nColumn, void)
@@ -210,9 +231,9 @@ CuiAboutConfigTabPage::~CuiAboutConfigTabPage()
 
 void CuiAboutConfigTabPage::InsertEntry(const OUString& rPropertyPath, const 
OUString& rProp, const OUString& rStatus,
 const OUString& rType, const OUString& 
rValue, const weld::TreeIter* pParentEntry,
-bool bInsertToPrefBox)
+bool bInsertToPrefBox, bool 
bIsReadOnly)
 {
-m_vectorUserData.push_back(std::make_unique(rPropertyPath));
+m_vectorUserData.push_back(std::make_unique(rPropertyPath, 
bIsReadOnly));
 if (bInsertToPrefBox)
 {
 OUString sId(weld::toId(m_vectorUserData.back().get()));
@@ -220,6 +241,7 @@ void CuiAboutConfigTabPage::InsertEntry(const OUString& 
rPropertyPath, const OUS
 m_xPrefBox->set_text(*m_xScratchIter, rStatus, 1);
 m_xPrefBox->set_text(*m_xScratchIter, rType, 2);
 m_xPrefBox->set_text(*m_xScratchIter, rValue, 3);
+m_xPrefBox->set_sensitive(*m_xScratchIter, !bIsReadOnly, -1);
 }
 else
 {
@@ -304,6 +326,7 @@ void CuiAboutConfigTabPage::FillItems(const Reference< 
XNameAccess >& xNameAcces
 m_xPrefBox->set_text(*m_xScratchIter, "", 1);
 m_xPrefBox->set_text(*m_xScratchIter, "", 2);
 m_xPrefBox->set_text(*m_xScratchIter, "", 3);
+m_xPrefBox->set_sensitive(*m_xScratchIter, true);
 }
 }
 else
@@ -318,6 +341,22 @@ void CuiAboutConfigTabPage::FillItems(const Reference< 
XNameAccess >& xNameAcces
   }
 );
 
+  

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig include/vcl vcl/skia

[Heiko Tietze (via logerrit)]

 cui/inc/bitmaps.hlst|1 +
 cui/source/options/optgdlg.cxx  |   19 +++
 cui/source/options/optgdlg.hxx  |2 ++
 cui/uiconfig/ui/optviewpage.ui  |   14 +-
 include/vcl/skia/SkiaHelper.hxx |2 ++
 vcl/skia/SkiaHelper.cxx |   12 
 6 files changed, 49 insertions(+), 1 deletion(-)

New commits:
commit 4356790bdf493c68ab609468603ec57e98dd2dae
Author: Heiko Tietze 
AuthorDate: Fri May 12 11:34:02 2023 +0200
Commit: Heiko Tietze 
CommitDate: Mon May 15 08:45:11 2023 +0200

Resolves tdf#155070 - Easy access to skia.log

Change-Id: I2aac7a060bbb1d31510da67120728c8a24f0de88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151699
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
index 5e10e014b446..db0a6ae98d11 100644
--- a/cui/inc/bitmaps.hlst
+++ b/cui/inc/bitmaps.hlst
@@ -71,6 +71,7 @@ inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP3 = 
u"svx/res/legtyp3.png";
 
 inline constexpr OUStringLiteral RID_SVXBMP_COMPONENT = 
u"res/component_16.png";
 inline constexpr OUStringLiteral RID_SVXBMP_MACRO = u"svx/res/id018.png";
+inline constexpr OUStringLiteral RID_SVXBMP_COPY = u"cmd/sc_copy.png";
 
 inline constexpr OUStringLiteral RID_SVXBMP_STARS_FULL = 
u"cmd/sc_stars-full.png";
 
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 04de401c4121..369e48ae265a 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -81,11 +81,15 @@
 #include 
 #include 
 #include 
+#include 
+
 #include "optgdlg.hxx"
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #if defined(_WIN32)
 #include 
@@ -537,6 +541,7 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, 
weld::DialogController* p
 , m_xForceSkiaRaster(m_xBuilder->weld_check_button("forceskiaraster"))
 , m_xSkiaStatusEnabled(m_xBuilder->weld_label("skiaenabled"))
 , m_xSkiaStatusDisabled(m_xBuilder->weld_label("skiadisabled"))
+, m_xSkiaLog(m_xBuilder->weld_button("btnSkialog"))
 , m_xMouseMiddleLB(m_xBuilder->weld_combo_box("mousemiddle"))
 , m_xMoreIcons(m_xBuilder->weld_button("btnMoreIcons"))
 , m_xRunGPTests(m_xBuilder->weld_button("btn_rungptest"))
@@ -550,6 +555,7 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, 
weld::DialogController* p
 m_xFontAntiAliasing->connect_toggled( LINK( this, OfaViewTabPage, 
OnAntialiasingToggled ) );
 
 m_xUseSkia->connect_toggled(LINK(this, OfaViewTabPage, OnUseSkiaToggled));
+m_xSkiaLog->connect_clicked(LINK(this, OfaViewTabPage, OnCopySkiaLog));
 
 UpdateIconThemes();
 
@@ -611,12 +617,25 @@ IMPL_LINK_NOARG(OfaViewTabPage, OnUseSkiaToggled, 
weld::Toggleable&, void)
 UpdateSkiaStatus();
 }
 
+IMPL_LINK_NOARG(OfaViewTabPage, OnCopySkiaLog, weld::Button&, void)
+{
+#if HAVE_FEATURE_SKIA
+css::uno::Reference xClipboard =
+css::datatransfer::clipboard::SystemClipboard::create(
+comphelper::getProcessComponentContext());
+OUString sInfo = SkiaHelper::readLog();
+vcl::unohelper::TextDataObject::CopyStringTo(sInfo, xClipboard);
+m_xSkiaLog->set_from_icon_name(RID_SVXBMP_COPY);
+#endif
+}
+
 void OfaViewTabPage::HideSkiaWidgets()
 {
 m_xUseSkia->hide();
 m_xForceSkiaRaster->hide();
 m_xSkiaStatusEnabled->hide();
 m_xSkiaStatusDisabled->hide();
+m_xSkiaLog->hide();
 }
 
 void OfaViewTabPage::UpdateSkiaStatus()
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 9b22c0b9bb9d..c0d2439593ce 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -104,6 +104,7 @@ private:
 
 std::unique_ptr m_xSkiaStatusEnabled;
 std::unique_ptr m_xSkiaStatusDisabled;
+std::unique_ptr m_xSkiaLog;
 
 std::unique_ptr m_xMouseMiddleLB;
 std::unique_ptr m_xMoreIcons;
@@ -113,6 +114,7 @@ private:
 
 DECL_LINK(OnAntialiasingToggled, weld::Toggleable&, void);
 DECL_LINK(OnUseSkiaToggled, weld::Toggleable&, void);
+DECL_LINK(OnCopySkiaLog, weld::Button&, void);
 DECL_STATIC_LINK(OfaViewTabPage, OnMoreIconsClick, weld::Button&, void);
 DECL_LINK(OnRunGPTestClick, weld::Button&, void);
 void UpdateSkiaStatus();
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index a063a4f6d36d..d24f7ef7285a 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -412,7 +412,7 @@
 0
 none
 
-  
+  
   
 True
 False
@@ -520,6 +520,18 @@
 5
   
 
+
+  
+Copy skia.log
+True
+True
+True
+  
+  
+0
+6
+  
+
   
   

[Libreoffice-commits] core.git: cui/inc cui/source editeng/source include/editeng include/svl officecfg/registry svl/qa svl/source sw/inc sw/source

[Baole Fang (via logerrit)]

 cui/inc/strings.hrc|1 
 cui/source/inc/autocdlg.hxx|2 
 cui/source/tabpages/autocdlg.cxx   |   15 +++
 editeng/source/misc/acorrcfg.cxx   |   18 +++
 editeng/source/misc/svxacorr.cxx   |   18 +++
 editeng/source/misc/swafopt.cxx|1 
 include/editeng/svxacorr.hxx   |6 +
 include/editeng/swafopt.hxx|1 
 include/svl/urihelper.hxx  |5 +
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   10 ++
 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8 +
 svl/qa/unit/test_URIHelper.cxx |   54 +++
 svl/source/misc/urihelper.cxx  |   59 +
 sw/inc/comcore.hxx |3 
 sw/inc/utlui.hrc   |3 
 sw/source/core/edit/autofmt.cxx|9 +
 sw/source/uibase/docvw/edtwin.cxx  |5 -
 sw/source/uibase/shells/textsh.cxx |3 
 sw/source/uibase/wrtsh/wrtsh1.cxx  |3 
 19 files changed, 210 insertions(+), 14 deletions(-)

New commits:
commit a772976f047882918d5386a3ef9226c4aa2aa118
Author: Baole Fang 
AuthorDate: Tue Apr 25 00:33:01 2023 -0400
Commit: Stephan Bergmann 
CommitDate: Thu Apr 27 15:27:33 2023 +0200

tdf#145925: Add DOI recognition

Detect DOI string in the form of "doi:10.*" and add hyperlink to it.
It works the same way as url recognition.

Change-Id: I3c4e78a110fd81ad7e727d5e9acee7e51127466a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150954
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Stephan Bergmann 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 498e60e75bc2..442ac515ef8c 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -332,6 +332,7 @@
 #define RID_CUISTR_BOLD_UNDER   
NC_("RID_SVXSTR_BOLD_UNDER", "Automatic *bold*, /italic/, -strikeout- and 
_underline_")
 #define RID_CUISTR_NO_DBL_SPACES
NC_("RID_SVXSTR_NO_DBL_SPACES", "Ignore double spaces")
 #define RID_CUISTR_DETECT_URL   
NC_("RID_SVXSTR_DETECT_URL", "URL Recognition")
+#define RID_CUISTR_DETECT_DOI   
NC_("RID_SVXSTR_DETECT_DOI", "DOI citation recognition")
 #define RID_CUISTR_DASH NC_("RID_SVXSTR_DASH", 
"Replace dashes")
 #define RID_CUISTR_CORRECT_ACCIDENTAL_CAPS_LOCK 
NC_("RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK", "Correct accidental use of cAPS 
LOCK key")
 #define RID_CUISTR_NON_BREAK_SPACE  
NC_("RID_SVXSTR_NON_BREAK_SPACE", "Add non-breaking space before specific 
punctuation marks in French text")
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 7b4842314779..2357677ef65f 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -57,6 +57,7 @@ private:
 OUString m_sStartCap;
 OUString m_sBoldUnderline;
 OUString m_sURL;
+OUString m_sDOI;
 OUString m_sNoDblSpaces;
 OUString m_sDash;
 OUString m_sAccidentalCaps;
@@ -92,6 +93,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
 OUStringsNoDblSpaces;
 OUStringsCorrectCapsLock;
 OUStringsDetectURL;
+OUStringsDetectDOI;
 OUStringsDash;
 OUStringsRightMargin;
 OUStringsNum;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index aea3f7d9727e..38a261ad5737 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -189,6 +189,7 @@ 
OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(weld::Container* pPage, weld::Dia
 , m_sStartCap(CuiResId(RID_CUISTR_CPTL_STT_SENT))
 , m_sBoldUnderline(CuiResId(RID_CUISTR_BOLD_UNDER))
 , m_sURL(CuiResId(RID_CUISTR_DETECT_URL))
+, m_sDOI(CuiResId(RID_CUISTR_DETECT_DOI))
 , m_sNoDblSpaces(CuiResId(RID_CUISTR_NO_DBL_SPACES))
 , m_sDash(CuiResId(RID_CUISTR_DASH))
 , m_sAccidentalCaps(CuiResId(RID_CUISTR_CORRECT_ACCIDENTAL_CAPS_LOCK))
@@ -223,6 +224,7 @@ bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet* )
 pAutoCorrect->SetAutoCorrFlag(ACFlags::CapitalStartSentence, 
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
 pAutoCorrect->SetAutoCorrFlag(ACFlags::ChgWeightUnderl,  
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
 pAutoCorrect->SetAutoCorrFlag(ACFlags::SetINetAttr,  
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
+pAutoCorrect->SetAutoCorrFlag(ACFlags::SetDOIAttr,   
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
 pAutoCorrect->SetAutoCorrFlag(ACFlags::ChgToEnEmDash,

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig include/vcl officecfg/registry sc/inc sc/source svtools/source sw/qa sw/source vcl/source

[Heiko Tietze (via logerrit)]

 cui/inc/strings.hrc|1 
 cui/source/options/optcolor.cxx|   36 +
 cui/source/options/optcolor.hxx|3 
 cui/uiconfig/ui/optappearancepage.ui   |  220 -
 include/vcl/settings.hxx   |3 
 officecfg/registry/data/org/openoffice/Office/UI.xcu   |  303 -
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   25 +
 sc/inc/viewopti.hxx|2 
 sc/source/ui/view/gridwin4.cxx |2 
 svtools/source/config/colorcfg.cxx |  121 ++---
 sw/qa/extras/tiledrendering/tiledrendering.cxx |   20 
 sw/source/uibase/uno/unotxdoc.cxx  |2 
 vcl/source/app/settings.cxx|   12 
 13 files changed, 261 insertions(+), 489 deletions(-)

New commits:
commit 5675937f7564fa5614f7be5aec0d7f20ba91d02c
Author: Heiko Tietze 
AuthorDate: Fri Mar 17 16:10:39 2023 +0100
Commit: Heiko Tietze 
CommitDate: Wed Mar 29 10:34:27 2023 +

Resolves tdf#152184 - Application color should follow system color

This patch reverts the previously added "LibreOffice Dark" application 
color set and adds it to the automatic colors. Switching between light and dark 
changes the Automatic color accordingly instead switching to another color 
scheme. The added System Theme option makes Light/Dark follow the actual OS 
appearance.

Reverts 6dfc49bb6a72bf6bb79167b12f0d2d0c5a155d06 (Introduce dark color set),
546ad5d17d3e363b75337c336cfb2b2f8acc55e3 (color scheme translatable),
9f0cf00d29298ed55737928ec4dddc50ac850cd8 (Update view options string based 
on theme)

Change-Id: Ibf491f2e510fac5f1d27a7166560c4ec281d98d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149059
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 0cd2d2cd4566..498e60e75bc2 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -408,6 +408,5 @@
 
 // Translatable names of color schemes
 #define RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC  
NC_("RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC", "Automatic")
-#define RID_COLOR_SCHEME_LIBREOFFICE_DARK   
NC_("RID_COLOR_SCHEME_LIBREOFFICE_DARK", "Dark")
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 4ad5d2b5e93f..15d3dadcf244 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -34,7 +34,8 @@
 #include 
 #include "optcolor.hxx"
 #include 
-
+#include 
+#include 
 using namespace ::com::sun::star;
 using namespace ::svtools;
 
@@ -165,7 +166,6 @@ const std::map ()
 {
 static std::map const vColorSchemes = {
 {"COLOR_SCHEME_LIBREOFFICE_AUTOMATIC", 
CuiResId(RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC)},
-{"COLOR_SCHEME_LIBREOFFICE_DARK",  
CuiResId(RID_COLOR_SCHEME_LIBREOFFICE_DARK)}
 };
 return vColorSchemes;
 };
@@ -204,6 +204,7 @@ public:
   Link const&,
   weld::ScrolledWindow& rScroll);
 void Update(EditableColorConfig const*, EditableExtendedColorConfig 
const*);
+void UpdateEntries();
 void ClickHdl(EditableColorConfig*, const weld::Toggleable&);
 void ColorHdl(EditableColorConfig*, EditableExtendedColorConfig*, const 
ColorListBox*);
 
@@ -528,6 +529,16 @@ void ColorConfigWindow_Impl::Update (
 }
 }
 
+void ColorConfigWindow_Impl::UpdateEntries()
+{
+for (unsigned i = 0; i != ColorConfigEntryCount; ++i)
+{
+ColorConfigEntry const aEntry = static_cast(i);
+Color aColor = ColorConfig::GetDefaultColor(aEntry);
+vEntries[i]->m_xColorList->SetAutoDisplayColor(aColor);
+}
+}
+
 // ClickHdl()
 void ColorConfigWindow_Impl::ClickHdl(EditableColorConfig* pConfig, const 
weld::Toggleable& rBox)
 {
@@ -627,6 +638,7 @@ public:
 void SetConfig (EditableColorConfig& rConfig) { pColorConfig =  }
 void SetExtendedConfig (EditableExtendedColorConfig& rConfig) { 
pExtColorConfig =  }
 void Update();
+void UpdateEntries();
 tools::Long GetScrollPosition() const
 {
 return m_xVScroll->vadjustment_get_value();
@@ -670,6 +682,11 @@ void ColorConfigCtrl_Impl::Update ()
 m_xScrollWindow->Update(pColorConfig, pExtColorConfig);
 }
 
+void ColorConfigCtrl_Impl::UpdateEntries()
+{
+m_xScrollWindow->UpdateEntries();
+}
+
 IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, weld::Toggleable&, rBox, void)
 {
 DBG_ASSERT(pColorConfig, "Configuration not set");
@@ -726,6 +743,7 @@ 
SvxColorOptionsTabPage::SvxColorOptionsTabPage(weld::Container* pPage, weld::Dia
 : SfxTabPage(pPage, pController, "cui/ui/optappearancepage.ui", 
"OptAppearancePage", )
 , bFillItemSetCalled(false)
 , m_nSizeAllocEventId(nullptr)
+, 

[Libreoffice-commits] core.git: cui/inc cui/source extras/source icon-themes/colibre vcl/Package_tipoftheday.mk

[Heiko Tietze (via logerrit)]

 cui/inc/bitmaps.hlst|6 
 cui/inc/tipoftheday.hrc |  456 ++--
 cui/source/dialogs/tipofthedaydlg.cxx   |   23 +
 extras/source/tipoftheday/tipoftheday.svg   |1 
 extras/source/tipoftheday/tipoftheday_c.svg |1 
 extras/source/tipoftheday/tipoftheday_d.svg |1 
 extras/source/tipoftheday/tipoftheday_i.svg |1 
 extras/source/tipoftheday/tipoftheday_w.svg |1 
 vcl/Package_tipoftheday.mk  |5 
 9 files changed, 254 insertions(+), 241 deletions(-)

New commits:
commit 49379a0b3fc7b263a7e5be2ecbb018e9248d01f2
Author: Heiko Tietze 
AuthorDate: Thu Mar 9 12:47:05 2023 +0100
Commit: Heiko Tietze 
CommitDate: Thu Mar 9 17:07:04 2023 +

Resolves tdf#131177 - Replace Hard-Coded TotD bulb by themeable icon

Change-Id: I25006f64436a72f554450929b1b649478b02cbc8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148536
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
index e36184208fc5..5e10e014b446 100644
--- a/cui/inc/bitmaps.hlst
+++ b/cui/inc/bitmaps.hlst
@@ -74,4 +74,10 @@ inline constexpr OUStringLiteral RID_SVXBMP_MACRO = 
u"svx/res/id018.png";
 
 inline constexpr OUStringLiteral RID_SVXBMP_STARS_FULL = 
u"cmd/sc_stars-full.png";
 
+inline constexpr OUStringLiteral RID_SVXBMP_TOTD_WRITER = 
u"res/tipoftheday_w.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TOTD_CALC = 
u"res/tipoftheday_c.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TOTD_DRAW = 
u"res/tipoftheday_d.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TOTD_IMPRESS = 
u"res/tipoftheday_i.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TOTD_SOFFICE = 
u"res/tipoftheday.png";
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 9dc6a3d81488..2248f60562fd 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -27,7 +27,7 @@
 #include 
 
 /*
- * std:tuple consists of 
+ * std:tuple consists of 
  * text:
* escape backslash, ie. use \\ to show \
* Use %MOD1 for Ctrl/Cmd and %MOD2 for Alt/Option depending on OS 
(uppercase required)
@@ -43,236 +43,240 @@
* leave the image string empty for the default tipoftheday.png
* place new images at extra/source/tipoftheday and do not forget to add the 
files to vcl/Package_tipoftheday.mk
* images are scaled to 150x150px; const ThumbSize() in tipoftheday.cxx
+ * module
+   * use on of the options below; an overlay is drawn on the default image 
tipoftheday.png except for the generic soffice (and of course not if an image 
is set)
 */
+enum tipModule : sal_uInt8
+{ swriter, scalc, sdraw, simpress, soffice };
 
-const std::tuple TIPOFTHEDAY_STRINGARRAY[] =
+const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
 {
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME offers a variety of user 
interface options to make you feel at home"), ".uno:ToolbarModeUI", 
"toolbarmode.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Need to allow changes to parts of a 
read-only document in Writer? Insert frames or sections that can authorize 
changes."), 
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/section_edit.html;,
 "tipoftheday_w.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "To print the notes of your slides go to 
File ▸ Print ▸ %PRODUCTNAME Impress tab and select Notes under Document ▸ 
Type."), "", "printnote.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "To start temporarily with a fresh user 
profile, or to restore a non-working %PRODUCTNAME, use Help ▸ Restart in Safe 
Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/profile_safe_mode.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Writing a book? %PRODUCTNAME master 
document lets you manage large documents as a container for individual 
%PRODUCTNAME Writer files."), 
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/globaldoc.html;,
 "tipoftheday_w.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "You can create editable Hybrid PDFs with 
%PRODUCTNAME."), 
"https://wiki.documentfoundation.org/Documentation/HowTo/CreateAHybridPDF;, 
"hybrid_pdf.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Explore the ten different functions in the 
status bar (at the bottom of the document window). Place the cursor over each 
field for an explanation. If not visible, use View ▸ Status Bar."), "", 
"tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Want to sum a cell through several sheets? 
Refer to the range of sheets e.g. =SUM(Sheet1.A1:Sheet3.A1)."), "", 
"sum_sheets.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "You can create fillable form documents 
(even PDFs) with %PRODUCTNAME."), 
"https://www.techrepublic.com/article/how-to-create-interactive-pdfs-with-libreoffice;,
 

[Libreoffice-commits] core.git: cui/inc cui/source officecfg/registry

[Rafael Lima (via logerrit)]

 cui/inc/strings.hrc  |4 ++
 cui/source/options/optcolor.cxx  |   35 ---
 officecfg/registry/data/org/openoffice/Office/UI.xcu |6 +--
 3 files changed, 38 insertions(+), 7 deletions(-)

New commits:
commit 546ad5d17d3e363b75337c336cfb2b2f8acc55e3
Author: Rafael Lima 
AuthorDate: Thu Jan 19 13:12:42 2023 +
Commit: Heiko Tietze 
CommitDate: Tue Feb 21 16:30:38 2023 +

tdf#143660 Make color scheme names translatable

The color scheme names defined in UI.xcu are currently not translatable.

This patch makes them translatable by mapping the names in the UI.xcu file 
to a translated string.

Change-Id: I10ab3bbcc9b028955c3c179558f8040b3b1d6c9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145732
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 8228eea8f1fa..0cd2d2cd4566 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -406,4 +406,8 @@
 
 #define RID_LANGUAGETOOL_LEAVE_EMPTY
NC_("RID_LANGUAGETOOL_LEAVE_EMPTY", "Leave this field empty to use the free 
version")
 
+// Translatable names of color schemes
+#define RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC  
NC_("RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC", "Automatic")
+#define RID_COLOR_SCHEME_LIBREOFFICE_DARK   
NC_("RID_COLOR_SCHEME_LIBREOFFICE_DARK", "Dark")
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 3c66f4ba49d5..2cb20a2650fa 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -160,6 +160,33 @@ const vEntryInfo[] =
 #undef IDS
 };
 
+// Maps the names of default color schemes to the corresponding TranslateId
+std::map const vColorSchemes = {
+{"COLOR_SCHEME_LIBREOFFICE_AUTOMATIC", 
CuiResId(RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC)},
+{"COLOR_SCHEME_LIBREOFFICE_DARK",  
CuiResId(RID_COLOR_SCHEME_LIBREOFFICE_DARK)}
+};
+
+// If the color scheme name has a translated string, then return the 
translation
+// Or else simply return the input string
+// For non-translatable color schemes, the ID and the name are the same
+OUString lcl_SchemeIdToTranslatedName(const OUString& sSchemeId)
+{
+auto it = vColorSchemes.find(sSchemeId);
+if (it != vColorSchemes.end())
+return it->second;
+return sSchemeId;
+}
+
+// Given a translated color scheme name, return the scheme ID used in the 
UI.xcu file
+// For non-translatable color schemes, the ID and the name are the same
+OUString lcl_TranslatedNameToSchemeId(const OUString& sName)
+{
+for (auto it = vColorSchemes.begin(); it != vColorSchemes.end(); ++it)
+if (it->second == sName)
+return it->first;
+return sName;
+}
+
 // ColorConfigWindow_Impl
 
 class ColorConfigWindow_Impl
@@ -787,8 +814,8 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet* )
 m_xColorSchemeLB->clear();
 const uno::Sequence< OUString >  aSchemes = pColorConfig->GetSchemeNames();
 for(const OUString& s : aSchemes)
-m_xColorSchemeLB->append_text(s);
-m_xColorSchemeLB->set_active_text(pColorConfig->GetCurrentSchemeName());
+m_xColorSchemeLB->append_text(lcl_SchemeIdToTranslatedName(s));
+
m_xColorSchemeLB->set_active_text(lcl_SchemeIdToTranslatedName(pColorConfig->GetCurrentSchemeName()));
 m_xColorSchemeLB->save_value();
 m_xDeleteSchemePB->set_sensitive( aSchemes.getLength() > 1 );
 UpdateColorConfig();
@@ -809,8 +836,8 @@ void SvxColorOptionsTabPage::UpdateColorConfig()
 
 IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, weld::ComboBox&, 
rBox, void)
 {
-pColorConfig->LoadScheme(rBox.get_active_text());
-pExtColorConfig->LoadScheme(rBox.get_active_text());
+
pColorConfig->LoadScheme(lcl_TranslatedNameToSchemeId(rBox.get_active_text()));
+
pExtColorConfig->LoadScheme(lcl_TranslatedNameToSchemeId(rBox.get_active_text()));
 UpdateColorConfig();
 }
 
diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI.xcu
index 18aa40bbfa8b..b7d704d43f81 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu
@@ -134,10 +134,10 @@
   
   
 
-  ${PRODUCTNAME}
+  COLOR_SCHEME_LIBREOFFICE_AUTOMATIC
 
 
-  
+  
 
   
 
@@ -440,7 +440,7 @@
   
 
   
-  
+  
 
   
 1842204

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig

[Szymon Kłos (via logerrit)]

 cui/inc/widgettestdlg.hxx|4 
 cui/source/dialogs/widgettestdlg.cxx |   26 
 cui/uiconfig/ui/widgettestdialog.ui  |  200 +++
 3 files changed, 210 insertions(+), 20 deletions(-)

New commits:
commit 24c9373409dda957ad6e1f1b4e3ec6c7135ecf1a
Author: Szymon Kłos 
AuthorDate: Thu Dec 15 13:59:15 2022 +0100
Commit: Szymon Kłos 
CommitDate: Thu Jan 19 13:03:59 2023 +

jsdialog: add TreeView to TestWidgetDialog

Change-Id: I5c4f70d98dd8ea03c137cd368a2c097cd866609d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144222
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Rashesh Padia 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145067
Tested-by: Jenkins

diff --git a/cui/inc/widgettestdlg.hxx b/cui/inc/widgettestdlg.hxx
index dabc2ee14e75..02ab7f317894 100644
--- a/cui/inc/widgettestdlg.hxx
+++ b/cui/inc/widgettestdlg.hxx
@@ -18,10 +18,14 @@ class WidgetTestDialog final : public 
weld::GenericDialogController
 private:
 std::unique_ptr m_xOKButton;
 std::unique_ptr m_xCancelButton;
+std::unique_ptr m_xTreeView;
+std::unique_ptr m_xTreeView2;
 
 DECL_LINK(OkHdl, weld::Button&, void);
 DECL_LINK(CancelHdl, weld::Button&, void);
 
+void FillTreeView();
+
 public:
 WidgetTestDialog(weld::Window* pParent);
 ~WidgetTestDialog();
diff --git a/cui/source/dialogs/widgettestdlg.cxx 
b/cui/source/dialogs/widgettestdlg.cxx
index 5475151a9af2..51ecef3105d0 100644
--- a/cui/source/dialogs/widgettestdlg.cxx
+++ b/cui/source/dialogs/widgettestdlg.cxx
@@ -8,15 +8,20 @@
 */
 
 #include 
+#include 
 
 WidgetTestDialog::WidgetTestDialog(weld::Window* pParent)
 : GenericDialogController(pParent, "cui/ui/widgettestdialog.ui", 
"WidgetTestDialog")
 {
 m_xOKButton = m_xBuilder->weld_button("ok_btn");
 m_xCancelButton = m_xBuilder->weld_button("cancel_btn");
+m_xTreeView = m_xBuilder->weld_tree_view("contenttree");
+m_xTreeView2 = m_xBuilder->weld_tree_view("contenttree2");
 
 m_xOKButton->connect_clicked(LINK(this, WidgetTestDialog, OkHdl));
 m_xCancelButton->connect_clicked(LINK(this, WidgetTestDialog, CancelHdl));
+
+FillTreeView();
 }
 
 WidgetTestDialog::~WidgetTestDialog() {}
@@ -28,4 +33,25 @@ IMPL_LINK_NOARG(WidgetTestDialog, CancelHdl, weld::Button&, 
void)
 m_xDialog->response(RET_CANCEL);
 }
 
+void WidgetTestDialog::FillTreeView()
+{
+OUString aImage1(RID_SVXBMP_CELL_LR);
+OUString aImage2(RID_SVXBMP_SHADOW_BOT_LEFT);
+
+for (size_t nCount = 0; nCount < 4; nCount++)
+{
+OUString sText = OUString::Concat("Test ") + 
OUString::Concat(OUString::number(nCount));
+std::unique_ptr xEntry = m_xTreeView->make_iterator();
+m_xTreeView->insert(nullptr, -1, , , nullptr, nullptr, 
false, xEntry.get());
+m_xTreeView->set_image(*xEntry, (nCount % 2 == 0) ? aImage1 : aImage2);
+
+m_xTreeView2->append();
+m_xTreeView2->set_image(nCount, (nCount % 2 == 0) ? aImage1 : aImage2);
+m_xTreeView2->set_text(nCount, "First Column", 0);
+m_xTreeView2->set_text(
+nCount, OUString::Concat("Row ") + 
OUString::Concat(OUString::number(nCount)), 1);
+m_xTreeView2->set_id(nCount, OUString::number(nCount));
+}
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/widgettestdialog.ui 
b/cui/uiconfig/ui/widgettestdialog.ui
index 787deda37171..4f4b3cfc23b9 100644
--- a/cui/uiconfig/ui/widgettestdialog.ui
+++ b/cui/uiconfig/ui/widgettestdialog.ui
@@ -8,11 +8,8 @@
 dialog
 
   
-True
-False
-vertical
-5
-
+  vertical
+  
   
 False
 end
@@ -46,9 +43,16 @@
   
 False
 False
-0
+1
   
 
+  
+  
+  
+True
+False
+5
+5
 
   
   
@@ -286,18 +290,8 @@
   
 False
 True
-0
-  
-
-
-  
-True
-False
-  
-  
-False
-True
-1
+0
+0
   
 
 
@@ -455,11 +449,151 @@
   
 False
 True
-2
+0
+1
+  
+
+
+  
+True
+False
+True
+True
+vertical
+
+  
+True
+True
+True
+True
+in
+
+  
+-1
+True
+True
+True
+True
+True
+True
+liststore2
+False
+   

[Libreoffice-commits] core.git: cui/inc cui/source include/linguistic include/unotools lingucomponent/source linguistic/source linguistic/workben offapi/com offapi/type_reference officecfg/registry un

[László Németh (via logerrit)]

 cui/inc/strings.hrc|2 
 cui/source/inc/optlingu.hxx|2 
 cui/source/options/optlingu.cxx|   26 +-
 include/linguistic/lngprophelp.hxx |8 +
 include/unotools/lingucfg.hxx  |8 +
 include/unotools/linguprops.hxx|8 -
 lingucomponent/source/spellcheck/spell/sspellimp.cxx   |   25 -
 lingucomponent/source/spellcheck/spell/sspellimp.hxx   |2 
 linguistic/source/iprcache.cxx |6 -
 linguistic/source/lngopt.cxx   |8 +
 linguistic/source/lngopt.hxx   |8 +
 linguistic/source/lngprophelp.cxx  |   42 
++
 linguistic/workben/sprophelp.cxx   |   35 
 offapi/com/sun/star/linguistic2/XLinguProperties.idl   |   14 +++
 offapi/type_reference/offapi.idl   |2 
 officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs |   16 +++
 unotools/source/config/lingucfg.cxx|   19 
 17 files changed, 211 insertions(+), 20 deletions(-)

New commits:
commit 57d79744c77eef96b4c2bd3b16e0a04317ffcf9e
Author: László Németh 
AuthorDate: Fri Dec 30 10:26:07 2022 +0100
Commit: László Németh 
CommitDate: Fri Dec 30 11:03:39 2022 +

tdf#136306 offapi linguistic: add options to disable rule-based compounding

Add two new spell checking options to disable rule-based closed
and hyphenated compound word recognition with Hunspell dictionaries:

com::sun::star::linguistic2::XLinguProperties::IsSpellClosedCompound
com::sun::star::linguistic2::XLinguProperties::IsSpellHyphenatedCompound

For professional proofreaders, it can be more important to avoid
of the mistakes of the rule-based compound word recognition, than
to speed up proofreading. Disabling the following two new options
will report all rule-based closed compound words (default in
Dutch, German, Hungarian etc. dictionaries) and rule-based
hyphenated compound words (all languages with BREAK usage in
their Hunspell dictionaries):

- "Accept possible closed compound words"

- "Accept possible hyphenated compound words"

For example, disabling the second one, dictionary word "scot-free"
will be still correct word in English spell checking, but not
the previously accepted compound "arbitrary-word-with-hyphen".

Note: the second option works with the update to Hunspell 1.7.2.

Change-Id: Id879610927d5e8269fda5ad207c1c2fe1f57a0b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144875
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 1d4fe526dabd..0d311518ad53 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -293,6 +293,8 @@
 #define RID_CUISTR_CAPITAL_WORDS
NC_("RID_SVXSTR_CAPITAL_WORDS", "Check uppercase words")
 #define RID_CUISTR_WORDS_WITH_DIGITS
NC_("RID_SVXSTR_WORDS_WITH_DIGITS", "Check words with numbers ")
 #define RID_CUISTR_SPELL_SPECIAL
NC_("RID_SVXSTR_SPELL_SPECIAL", "Check special regions")
+#define RID_CUISTR_SPELL_CLOSED_COMPOUND
NC_("RID_SVXSTR_SPELL_CLOSED_COMPOUND", "Accept possible closed compound words")
+#define RID_CUISTR_SPELL_HYPHENATED_COMPOUND
NC_("RID_SVXSTR_SPELL_HYPHENATED_COMPOUND", "Accept possible hyphenated 
compound words")
 #define RID_CUISTR_SPELL_AUTO   
NC_("RID_SVXSTR_SPELL_AUTO", "Check spelling as you type")
 #define RID_CUISTR_GRAMMAR_AUTO 
NC_("RID_SVXSTR_GRAMMAR_AUTO", "Check grammar as you type")
 #define RID_CUISTR_NUM_MIN_WORDLEN  
NC_("RID_SVXSTR_NUM_MIN_WORDLEN", "Minimal number of characters for 
hyphenation: ")
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 365acfbbb0fb..29adee861417 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -84,6 +84,8 @@ private:
 OUStringsWordsWithDigits;
 OUStringsSpellSpecial;
 OUStringsSpellAuto;
+OUStringsSpellClosedCompound;
+OUStringsSpellHyphenatedCompound;
 OUStringsGrammarAuto;
 OUStringsNumMinWordlen;
 OUStringsNumPreBreak;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 6db7634159b1..b80343657f22 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -193,7 +193,9 @@ enum EID_OPTIONS
 EID_NUM_PRE_BREAK,
 EID_NUM_POST_BREAK,
 EID_HYPH_AUTO,
-EID_HYPH_SPECIAL
+EID_HYPH_SPECIAL,
+EID_SPELL_CLOSED_COMPOUND,
+

[Libreoffice-commits] core.git: cui/inc cui/source

[Noel Grandin (via logerrit)]

 cui/inc/strings.hrc|1 -
 cui/source/customize/cfg.cxx   |1 -
 cui/source/customize/cfgutil.cxx   |2 --
 cui/source/dialogs/AdditionsDialog.cxx |4 
 cui/source/dialogs/DiagramDialog.cxx   |1 -
 cui/source/dialogs/hlmailtp.cxx|1 -
 cui/source/inc/AdditionsDialog.hxx |4 
 cui/source/inc/DiagramDialog.hxx   |1 -
 cui/source/inc/SpellDialog.hxx |1 -
 cui/source/inc/cfg.hxx |1 -
 cui/source/inc/hlmailtp.hxx|1 -
 cui/source/inc/page.hxx|1 -
 cui/source/inc/paragrph.hxx|1 -
 cui/source/options/optcolor.cxx|1 -
 cui/source/options/optcolor.hxx|1 -
 cui/source/options/optgdlg.cxx |1 -
 cui/source/options/optgdlg.hxx |1 -
 cui/source/tabpages/page.cxx   |1 -
 cui/source/tabpages/paragrph.cxx   |1 -
 19 files changed, 26 deletions(-)

New commits:
commit a7674cc127c9987622cb69d7a23468df3f10ff21
Author: Noel Grandin 
AuthorDate: Mon Nov 21 11:24:52 2022 +0200
Commit: Noel Grandin 
CommitDate: Tue Nov 22 11:06:29 2022 +0100

loplugin:unusedfields

Change-Id: I4487f1b3bb051e1eb48226eb52a6706b22493fec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143088
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index b4b232b9ac5d..1d4fe526dabd 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -110,7 +110,6 @@
 #define RID_CUISTR_EDITHINT NC_("RID_SVXSTR_EDITHINT", 
"[Enter text here]")
 #define RID_CUISTR_HANGUL   NC_("RID_SVXSTR_HANGUL", 
"Hangul")
 #define RID_CUISTR_HANJANC_("RID_SVXSTR_HANJA", 
"Hanja")
-#define RID_CUISTR_BASICMACROS  
NC_("RID_SVXSTR_BASICMACROS", "BASIC Macros")
 #define RID_CUISTR_GROUP_STYLES 
NC_("RID_SVXSTR_GROUP_STYLES", "Styles")
 #define RID_CUISTR_GROUP_SIDEBARDECKS   
NC_("RID_SVXSTR_GROUP_SIDEBARDECKS", "Sidebar Decks")
 
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 9baf31e61065..030307879738 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2680,7 +2680,6 @@ void ToolbarSaveInData::LoadToolbar(
 SvxNewToolbarDialog::SvxNewToolbarDialog(weld::Window* pWindow, const 
OUString& rName)
 : GenericDialogController(pWindow, "cui/ui/newtoolbardialog.ui", 
"NewToolbarDialog")
 , m_xEdtName(m_xBuilder->weld_entry("edit"))
-, m_xBtnOK(m_xBuilder->weld_button("ok"))
 , m_xSaveInListBox(m_xBuilder->weld_combo_box("savein"))
 {
 m_xEdtName->set_text(rName);
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 0314f1810c47..9f2c3bfd9ec6 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -347,7 +347,6 @@ struct SvxConfigGroupBoxResource_Impl
 {
 OUString m_sMyMacros;
 OUString m_sProdMacros;
-OUString m_sMacros;
 OUString m_sDlgMacros;
 OUString m_aStrGroupStyles;
 OUString m_aStrGroupSidebarDecks;
@@ -358,7 +357,6 @@ struct SvxConfigGroupBoxResource_Impl
 SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
 m_sMyMacros(CuiResId(RID_CUISTR_MYMACROS)),
 m_sProdMacros(CuiResId(RID_CUISTR_PRODMACROS)),
-m_sMacros(CuiResId(RID_CUISTR_BASICMACROS)),
 m_sDlgMacros(CuiResId(RID_CUISTR_PRODMACROS)),
 m_aStrGroupStyles(CuiResId(RID_CUISTR_GROUP_STYLES)),
 m_aStrGroupSidebarDecks(CuiResId(RID_CUISTR_GROUP_SIDEBARDECKS))
diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index 76b215a0b777..dfa7f12858b5 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -604,19 +604,15 @@ AdditionsItem::AdditionsItem(weld::Widget* pParent, 
AdditionsDialog* pParentDial
 , m_xLinkButtonWebsite(m_xBuilder->weld_link_button("btnWebsite"))
 , m_xLabelName(m_xBuilder->weld_label("lbName"))
 , m_xLabelAuthor(m_xBuilder->weld_label("labelAuthor"))
-, m_xLabelDesc(m_xBuilder->weld_label("labelDesc")) // no change (print 
description)
 , m_xLabelDescription(m_xBuilder->weld_label("labelDescription"))
 , m_xLabelLicense(m_xBuilder->weld_label("lbLicenseText"))
 , m_xLabelVersion(m_xBuilder->weld_label("lbVersionText"))
-, m_xLabelComments(m_xBuilder->weld_label("labelComments")) // no change
 , m_xLinkButtonComments(m_xBuilder->weld_link_button("linkButtonComments"))
 , m_xImageVoting1(m_xBuilder->weld_image("imageVoting1"))
 , m_xImageVoting2(m_xBuilder->weld_image("imageVoting2"))
 , m_xImageVoting3(m_xBuilder->weld_image("imageVoting3"))
 , m_xImageVoting4(m_xBuilder->weld_image("imageVoting4"))
 , m_xImageVoting5(m_xBuilder->weld_image("imageVoting5"))
-, m_xLabelNoVoting(m_xBuilder->weld_label("votingLabel"))
-, 

[Libreoffice-commits] core.git: cui/inc cui/source

[Rafael Lima (via logerrit)]

 cui/inc/strings.hrc|2 ++
 cui/source/options/optlanguagetool.cxx |   25 +++--
 cui/source/options/optlanguagetool.hxx |3 +++
 3 files changed, 28 insertions(+), 2 deletions(-)

New commits:
commit 2c8a760a18501acaa6e4ff2a2dee76b0bad275f1
Author: Rafael Lima 
AuthorDate: Thu Nov 3 14:52:13 2022 +0200
Commit: Rafael Lima 
CommitDate: Wed Nov 9 16:06:12 2022 +0100

tdf#150494 LanguageTool: Add placeholder text with default value info

With this patch, the Language Tool dialog works as follows:

- The first time the tool is enabled, a default URL is entered as text

- If the URL is left empty, a placeholder text is shown saying that leaving 
this entry empty will cause the default URL to be used

- If another URL is defined by the user, than this is the one used

Change-Id: Id31fca0e44091aff3c77a9be8b639a20437b1b7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142197
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index cea0b183e33a..b4b232b9ac5d 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -403,4 +403,6 @@
 #define RID_CUISTR_ZIPFAIL  NC_("RID_CUISTR_ZIPFAIL", 
"Creation of ZIP file failed.")
 #define RID_CUISTR_SAVEDNC_("RID_CUISTR_SAVED", 
"The results have been successfully saved in the file 
'GraphicTestResults.zip'!")
 
+#define RID_LANGUAGETOOL_LEAVE_EMPTY
NC_("RID_LANGUAGETOOL_LEAVE_EMPTY", "Leave this field empty to use the free 
version")
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optlanguagetool.cxx 
b/cui/source/options/optlanguagetool.cxx
index 38807bc337d3..309ff2a09b52 100644
--- a/cui/source/options/optlanguagetool.cxx
+++ b/cui/source/options/optlanguagetool.cxx
@@ -20,6 +20,8 @@
 #include "optlanguagetool.hxx"
 #include 
 #include 
+#include 
+#include 
 
 OptLanguageToolTabPage::OptLanguageToolTabPage(weld::Container* pPage,
weld::DialogController* 
pController,
@@ -34,6 +36,11 @@ 
OptLanguageToolTabPage::OptLanguageToolTabPage(weld::Container* pPage,
 m_xActivateBox->connect_toggled(LINK(this, OptLanguageToolTabPage, 
CheckHdl));
 SvxLanguageToolOptions& rLanguageOpts = SvxLanguageToolOptions::Get();
 EnableControls(rLanguageOpts.getEnabled());
+
+// tdf#150494 Set default values as placeholder text
+m_xBaseURLED->set_placeholder_text(CuiResId(RID_LANGUAGETOOL_LEAVE_EMPTY));
+
m_xUsernameED->set_placeholder_text(CuiResId(RID_LANGUAGETOOL_LEAVE_EMPTY));
+m_xApiKeyED->set_placeholder_text(CuiResId(RID_LANGUAGETOOL_LEAVE_EMPTY));
 }
 
 OptLanguageToolTabPage::~OptLanguageToolTabPage() {}
@@ -54,7 +61,14 @@ IMPL_LINK_NOARG(OptLanguageToolTabPage, CheckHdl, 
weld::Toggleable&, void)
 void OptLanguageToolTabPage::Reset(const SfxItemSet*)
 {
 SvxLanguageToolOptions& rLanguageOpts = SvxLanguageToolOptions::Get();
-m_xBaseURLED->set_text(rLanguageOpts.getBaseURL());
+
+// tdf#150494 If no URL has been set, use the default URL
+OUString aBaseURL = rLanguageOpts.getBaseURL();
+if (aBaseURL.isEmpty())
+m_xBaseURLED->set_text(LANGUAGETOOL_DEFAULT_URL);
+else
+m_xBaseURLED->set_text(rLanguageOpts.getBaseURL());
+
 m_xUsernameED->set_text(rLanguageOpts.getUsername());
 m_xApiKeyED->set_text(rLanguageOpts.getApiKey());
 }
@@ -62,7 +76,14 @@ void OptLanguageToolTabPage::Reset(const SfxItemSet*)
 bool OptLanguageToolTabPage::FillItemSet(SfxItemSet*)
 {
 SvxLanguageToolOptions& rLanguageOpts = SvxLanguageToolOptions::Get();
-rLanguageOpts.setBaseURL(m_xBaseURLED->get_text());
+
+// tdf#150494 If no URL has been set, then save the default URL
+OUString aBaseURL = m_xBaseURLED->get_text();
+if (aBaseURL.isEmpty())
+rLanguageOpts.setBaseURL(LANGUAGETOOL_DEFAULT_URL);
+else
+rLanguageOpts.setBaseURL(aBaseURL);
+
 rLanguageOpts.setUsername(m_xUsernameED->get_text());
 rLanguageOpts.setApiKey(m_xApiKeyED->get_text());
 return false;
diff --git a/cui/source/options/optlanguagetool.hxx 
b/cui/source/options/optlanguagetool.hxx
index 46a60ecbe103..8ee83ed4e367 100644
--- a/cui/source/options/optlanguagetool.hxx
+++ b/cui/source/options/optlanguagetool.hxx
@@ -18,6 +18,9 @@
  */
 #pragma once
 #include 
+#include 
+
+inline constexpr OUStringLiteral LANGUAGETOOL_DEFAULT_URL = 
u"https://api.languagetool.org/v2;;
 
 class OptLanguageToolTabPage : public SfxTabPage
 {

[Libreoffice-commits] core.git: cui/inc cui/source officecfg/registry

[Samuel Mehrbrodt (via logerrit)]

 cui/inc/strings.hrc|2 +-
 cui/source/dialogs/about.cxx   |2 +-
 officecfg/registry/data/org/openoffice/Office/Common.xcu   |3 +++
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |5 +
 4 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 96607133f4457b31ddaee5808c04e96243ed99c6
Author: Samuel Mehrbrodt 
AuthorDate: Thu Jan 20 13:05:39 2022 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jan 20 16:45:32 2022 +0100

Move credits link to config

as all other related URLs

and replace with a hub link, see 
https://redmine.documentfoundation.org/issues/3569

Change-Id: Ic30f2a5980ae17b5dfff184ead391b21cff7ab7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128660
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index eb7d701db964..df987aa0501e 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -367,7 +367,6 @@
 #define RID_CUISTR_CANNOTCONVERTURL_ERR 
NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a 
filesystem path.")
 
 #define RID_CUISTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2022 LibreOffice contributors.")
-#define RID_CUISTR_ABOUT_CREDITS_URLNC_("aboutdialog|link", 
"https://www.libreoffice.org/about-us/credits/;)
 #define RID_CUISTR_ABOUT_VENDOR NC_("aboutdialog|vendor", 
"This release was supplied by %OOOVENDOR.")
 #define RID_CUISTR_ABOUT_BASED_ON   
NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
 #define RID_CUISTR_ABOUT_DERIVEDNC_("aboutdialog|derived", 
"%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
@@ -403,4 +402,5 @@
 #define RID_CUISTR_CLICK_RESULT 
NC_("RID_CUISTR_CLICK_RESULT", "(Click on any test to view its resultant bitmap 
image)")
 #define RID_CUISTR_ZIPFAIL  NC_("RID_CUISTR_ZIPFAIL", 
"Creation of Zip file failed!")
 #define RID_CUISTR_SAVEDNC_("RID_CUISTR_SAVED", 
"The results have been successfully saved in the file 
'GraphicTestResults.zip'!")
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index ae17508cebcd..dd5df31db6ae 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -117,7 +117,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
   }
 
   // Links
-  m_pCreditsButton->set_uri(CuiResId(RID_CUISTR_ABOUT_CREDITS_URL));
+  
m_pCreditsButton->set_uri(officecfg::Office::Common::Menus::CreditsURL::get());
 
   OUString sURL(officecfg::Office::Common::Help::StartCenter::InfoURL::get());
   localizeWebserviceURI(sURL);
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index f543b6ebb3c9..4694135efce7 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -360,6 +360,9 @@
 
   https://hub.libreoffice.org/ReleaseNotes/
 
+
+  https://hub.libreoffice.org/credits/
+
 
   https://hub.libreoffice.org/HyphenationMissing/
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 2f3846e4e8bf..dd896317adda 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2103,6 +2103,11 @@
   Specifies the URL used with the UNO command WhatsNew 
(SID_WHATSNEW).
 
   
+  
+
+  Specifies the URL for the LibreOffice Credits page.
+
+  
   
 
   Specifies the URL used with the UNO command HyphenationMissing 
(SID_HYPHENATIONMISSING).

[Libreoffice-commits] core.git: cui/inc cui/source

[Gabor Kelemen (via logerrit)]

 cui/inc/strings.hrc|1 -
 cui/source/dialogs/cuihyperdlg.cxx |   23 +--
 cui/source/dialogs/hldocntp.cxx|   19 ---
 cui/source/dialogs/hltpbase.cxx|7 ---
 cui/source/inc/cuihyperdlg.hxx |2 +-
 cui/source/inc/hldocntp.hxx|1 -
 cui/source/inc/hltpbase.hxx|1 -
 7 files changed, 10 insertions(+), 44 deletions(-)

New commits:
commit c6620b4e538d21c1dfa321dde31b568eb8b8bd32
Author: Gabor Kelemen 
AuthorDate: Fri Jan 14 21:01:34 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Jan 18 23:21:06 2022 +0100

tdf#146612 Drop confirmation question when applying new doc hyperlink

To be consistent with other tabs of the dialog where Apply does
not show a similar question

Change-Id: Id3bced8ec861b7166974da5ad223513dbfec25c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128424
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Thorsten Behrens 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index e2c56b8a0d45..eb7d701db964 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -76,7 +76,6 @@
 #define RID_CUISTR_HYPDLG_MACROACT1 
NC_("RID_SVXSTR_HYPDLG_MACROACT1", "Mouse over object")
 #define RID_CUISTR_HYPDLG_MACROACT2 
NC_("RID_SVXSTR_HYPDLG_MACROACT2", "Trigger hyperlink")
 #define RID_CUISTR_HYPDLG_MACROACT3 
NC_("RID_SVXSTR_HYPDLG_MACROACT3", "Mouse leaves object")
-#define RID_CUISTR_HYPDLG_NOVALIDFILENAME   
NC_("RID_SVXSTR_HYPDLG_NOVALIDFILENAME", "Please type in a valid file name.")
 #define RID_CUISTR_HYPERDLG_FORM_BUTTON 
NC_("RID_SVXSTR_HYPERDLG_FORM_BUTTON", "Button")
 #define RID_CUISTR_HYPERDLG_FROM_TEXT   
NC_("RID_SVXSTR_HYPERDLG_FROM_TEXT", "Text")
 #define RID_CUISTR_HYPERDLG_QUERYOVERWRITE  
NC_("RID_SVXSTR_HYPERDLG_QUERYOVERWRITE", "The file already exists. Overwrite?")
diff --git a/cui/source/dialogs/cuihyperdlg.cxx 
b/cui/source/dialogs/cuihyperdlg.cxx
index 3eef90cdf696..20c1b1e26f85 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -182,32 +182,27 @@ void SvxHpLinkDlg::Close()
 pViewFrame->ToggleChildWindow(SID_HYPERLINK_DIALOG);
 }
 
-void SvxHpLinkDlg::Apply( bool bWarn )
+void SvxHpLinkDlg::Apply()
 {
 SfxItemSetFixed aItemSet( 
SfxGetpApp()->GetPool() );
 
 SvxHyperlinkTabPageBase* pCurrentPage = 
static_cast(
 GetTabPage( GetCurPageId() ) );
 
-// tdf#109390: only show warning that the dialog was not filled properly
-// if the user pressed Apply
-if ( pCurrentPage->AskApply( bWarn ) )
-{
-pCurrentPage->FillItemSet(  );
+pCurrentPage->FillItemSet(  );
 
-const SvxHyperlinkItem *aItem = 
aItemSet.GetItem(SID_HYPERLINK_SETLINK);
-if ( !aItem->GetURL().isEmpty() )
-GetDispatcher()->ExecuteList(SID_HYPERLINK_SETLINK,
-SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, { aItem });
+const SvxHyperlinkItem *aItem = aItemSet.GetItem(SID_HYPERLINK_SETLINK);
+if ( !aItem->GetURL().isEmpty() )
+GetDispatcher()->ExecuteList(SID_HYPERLINK_SETLINK,
+SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, { aItem });
 
-static_cast( GetTabPage( GetCurPageId() ) 
)->DoApply();
-}
+static_cast( GetTabPage( GetCurPageId() ) 
)->DoApply();
 }
 
 /// Click on OK button
 IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl, weld::Button&, void)
 {
-Apply( false );
+Apply();
 m_xDialog->response(RET_OK);
 }
 
@@ -218,7 +213,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl, 
weld::Button&, void)
 |/
 IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl, weld::Button&, void)
 {
-Apply( true );
+Apply();
 }
 
 /*
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 93921c0bd302..c8233360ce7a 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -234,25 +234,6 @@ void SvxHyperlinkNewDocTp::SetInitFocus()
 m_xCbbPath->grab_focus();
 }
 
-/*
-|*
-|* Ask page whether an insert is possible
-|*
-\/
-bool SvxHyperlinkNewDocTp::AskApply( bool bShowWarning )
-{
-INetURLObject aINetURLObject;
-bool bRet = ImplGetURLObject(m_xCbbPath->get_active_text(), 
m_xCbbPath->GetBaseURL(), aINetURLObject);
-if ( !bRet && bShowWarning )
-{
-std::unique_ptr 
xWarn(Application::CreateMessageDialog(mpDialog->getDialog(),
-   VclMessageType::Warning, 
VclButtonsType::Ok,
-   

[Libreoffice-commits] core.git: cui/inc cui/source

[Gabor Kelemen (via logerrit)]

 cui/inc/strings.hrc|5 +
 cui/source/dialogs/AdditionsDialog.cxx |   25 +++--
 2 files changed, 28 insertions(+), 2 deletions(-)

New commits:
commit b957454e5ed46029ea0ca06a7d345d9608bfa4a1
Author: Gabor Kelemen 
AuthorDate: Tue Jan 11 20:00:18 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Jan 12 02:40:38 2022 +0100

tdf#142564 Localize extension category names

Change-Id: I57ca7cb194bd325f621841edc24e3af9ef7c3b3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128305
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 92e9cb7ed7ae..e2c56b8a0d45 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -391,6 +391,11 @@
 #define RID_CUISTR_ADDITIONS_SEARCHING  
NC_("RID_SVXSTR_ADDITIONS_SEARCHING", "Searching...")
 #define RID_CUISTR_ADDITIONS_LOADING
NC_("RID_SVXSTR_ADDITIONS_LOADING", "Loading...")
 #define RID_CUISTR_ADDITIONS_DIALOG_TITLE_PREFIX
NC_("RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX", "Extensions")
+#define RID_CUISTR_ADDITIONS_DICTIONARY 
NC_("RID_SVXSTR_ADDITIONS_DICTIONARY", "Extensions: Dictionary")
+#define RID_CUISTR_ADDITIONS_GALLERY
NC_("RID_SVXSTR_ADDITIONS_GALLERY", "Extensions: Gallery")
+#define RID_CUISTR_ADDITIONS_ICONS  
NC_("RID_SVXSTR_ADDITIONS_ICONS", "Extensions: Icons")
+#define RID_CUISTR_ADDITIONS_PALETTES   
NC_("RID_SVXSTR_ADDITIONS_PALETTES", "Extensions: Color Palette")
+#define RID_CUISTR_ADDITIONS_TEMPLATES  
NC_("RID_SVXSTR_ADDITIONS_TEMPLATES", "Extensions: Templates")
 
 #define RID_CUISTR_UI_APPLYALL  
NC_("RID_SVXSTR_UI_APPLYALL", "Apply to %MODULE")
 
diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index d5b58b5c8aba..d2337d7333a5 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -452,8 +452,29 @@ AdditionsDialog::AdditionsDialog(weld::Window* pParent, 
const OUString& sAdditio
 
 OUString titlePrefix = CuiResId(RID_CUISTR_ADDITIONS_DIALOG_TITLE_PREFIX);
 if (!m_sTag.isEmpty())
-{
-this->set_title(titlePrefix + ": " + sAdditionsTag);
+{ // tdf#142564 localize extension category names
+OUString sDialogTitle = "";
+if (sAdditionsTag == "Templates")
+{
+sDialogTitle = CuiResId(RID_CUISTR_ADDITIONS_TEMPLATES);
+}
+else if (sAdditionsTag == "Dictionary")
+{
+sDialogTitle = CuiResId(RID_CUISTR_ADDITIONS_DICTIONARY);
+}
+else if (sAdditionsTag == "Gallery")
+{
+sDialogTitle = CuiResId(RID_CUISTR_ADDITIONS_GALLERY);
+}
+else if (sAdditionsTag == "Icons")
+{
+sDialogTitle = CuiResId(RID_CUISTR_ADDITIONS_ICONS);
+}
+else if (sAdditionsTag == "Color Palette")
+{
+sDialogTitle = CuiResId(RID_CUISTR_ADDITIONS_PALETTES);
+}
+this->set_title(sDialogTitle);
 }
 else
 {

[Libreoffice-commits] core.git: cui/inc cui/source include/svl include/vcl vcl/backendtest vcl/inc

[Gabor Kelemen (via logerrit)]

 cui/inc/strings.hrc   |3 +
 cui/source/dialogs/GraphicTestsDialog.cxx |   28 ---
 include/svl/svl.hrc   |6 +++
 include/vcl/test/GraphicsRenderTests.hxx  |4 +-
 vcl/backendtest/GraphicsRenderTests.cxx   |   56 ++
 vcl/inc/strings.hrc   |5 ++
 6 files changed, 81 insertions(+), 21 deletions(-)

New commits:
commit cf3840931454553ff25e488dc1ede2af65e0016b
Author: Gabor Kelemen 
AuthorDate: Thu Jan 6 12:38:13 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Jan 11 09:22:52 2022 +0100

tdf#145919 Localize strings in Graphics Test dialog

but not in the saved log file

Change-Id: I65c580e7b8762b654f1812c96bc53841b882a960
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128087
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index fd91ae802b42..92e9cb7ed7ae 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -396,4 +396,7 @@
 
 #define RID_CUISTR_OLE_INSERT   
NC_("RID_SVXSTR_OLE_INSERT", "Inserting OLE object...")
 
+#define RID_CUISTR_CLICK_RESULT 
NC_("RID_CUISTR_CLICK_RESULT", "(Click on any test to view its resultant bitmap 
image)")
+#define RID_CUISTR_ZIPFAIL  NC_("RID_CUISTR_ZIPFAIL", 
"Creation of Zip file failed!")
+#define RID_CUISTR_SAVEDNC_("RID_CUISTR_SAVED", 
"The results have been successfully saved in the file 
'GraphicTestResults.zip'!")
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/GraphicTestsDialog.cxx 
b/cui/source/dialogs/GraphicTestsDialog.cxx
index 555ef3bd888c..c6232c2e8868 100644
--- a/cui/source/dialogs/GraphicTestsDialog.cxx
+++ b/cui/source/dialogs/GraphicTestsDialog.cxx
@@ -14,6 +14,11 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+
+#include 
+#include 
 
 GraphicTestEntry::GraphicTestEntry(weld::Container* pParent, weld::Dialog* 
pDialog,
OUString aTestName, OUString aTestStatus, 
Bitmap aTestBitmap)
@@ -28,17 +33,18 @@ GraphicTestEntry::GraphicTestEntry(weld::Container* 
pParent, weld::Dialog* pDial
 m_xTestButton->set_label(aTestStatus);
 m_xTestButton->set_tooltip_text(aTestName);
 m_xTestButton->set_background(
-aTestStatus == "PASSED"
+aTestStatus == SvlResId(GRTSTR_PASSED)
 ? COL_LIGHTGREEN
-: aTestStatus == "QUIRKY" ? COL_YELLOW
-  : aTestStatus == "FAILED" ? COL_LIGHTRED 
: COL_LIGHTGRAY);
+: aTestStatus == SvlResId(GRTSTR_QUIRKY)
+  ? COL_YELLOW
+  : aTestStatus == SvlResId(GRTSTR_FAILED) ? COL_LIGHTRED : 
COL_LIGHTGRAY);
 m_xTestButton->connect_clicked(LINK(this, GraphicTestEntry, 
HandleResultViewRequest));
 m_xContainer->show();
 }
 
 IMPL_LINK(GraphicTestEntry, HandleResultViewRequest, weld::Button&, rButton, 
void)
 {
-if (rButton.get_label() == "SKIPPED")
+if (rButton.get_label() == SvlResId(GRTSTR_SKIPPED))
 {
 return;
 }
@@ -64,14 +70,14 @@ short GraphicsTestsDialog::run()
 {
 GraphicsRenderTests aTestObject;
 aTestObject.run(true);
-OUString aResultLog = aTestObject.getResultString()
-  + "\n(Click on any test to view its resultant bitmap 
image)";
+OUString aResultLog
+= aTestObject.getResultString(true) + "\n" + 
CuiResId(RID_CUISTR_CLICK_RESULT);
 m_xResultLog->set_text(aResultLog);
 sal_Int32 nTestNumber = 0;
-for (const VclTestResult& test : aTestObject.getTestResults())
+for (VclTestResult& test : aTestObject.getTestResults())
 {
 auto xGpTest = 
std::make_unique(m_xContainerBox.get(), m_xDialog.get(),
-  test.getTestName(), 
test.getStatus(),
+  test.getTestName(), 
test.getStatus(true),
   test.getBitmap());
 m_xContainerBox->reorder_child(xGpTest->get_widget(), nTestNumber++);
 m_xGraphicTestEntries.push_back(std::move(xGpTest));
@@ -92,13 +98,11 @@ IMPL_LINK_NOARG(GraphicsTestsDialog, HandleDownloadRequest, 
weld::Button&, void)
 {
 std::unique_ptr xBox(
 Application::CreateMessageDialog(m_xDialog.get(), 
VclMessageType::Warning,
- VclButtonsType::Ok, "Creation of 
Zip file failed!"));
+ VclButtonsType::Ok, 
CuiResId(RID_CUISTR_ZIPFAIL)));
 xBox->run();
 return;
 }
-FileExportedDialog aDialog(
-m_xDialog.get(),
-"The results have been successfully saved in the file 
'GraphicTestResults.zip' !");
+FileExportedDialog aDialog(m_xDialog.get(), CuiResId(RID_CUISTR_SAVED));
 

[Libreoffice-commits] core.git: cui/inc cui/source

[Noel Grandin (via logerrit)]

 cui/inc/bitmaps.hlst |   34 +-
 cui/source/inc/cfg.hxx   |2 +-
 cui/source/inc/helpids.h |   47 +++
 3 files changed, 45 insertions(+), 38 deletions(-)

New commits:
commit a029e07ffbd6ea4a4a191188c5be2eca7e10066d
Author: Noel Grandin 
AuthorDate: Thu Nov 18 15:41:17 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 25 12:23:00 2021 +0100

loplugin:stringliteraldefine in cui

Change-Id: I3b0c8811b583d6edf48ccd7e368e50228e70c362
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125480
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
index 3c0faced780b..1fa444fc6da4 100644
--- a/cui/inc/bitmaps.hlst
+++ b/cui/inc/bitmaps.hlst
@@ -48,33 +48,33 @@
 #define RID_SVXBMP_SHADOW_TOP_LEFT  "svx/res/sh05.png"
 #define RID_SVXBMP_SHADOW_TOP_LEFT_32   "svx/res/shadow_top_left_32.png"
 
-#define RID_SVXBMP_BOTTOMLOCK   "svx/res/lo01.png"
-#define RID_SVXBMP_TOPLOCK  "svx/res/lo02.png"
-#define RID_SVXBMP_CELLLOCK "svx/res/lo03.png"
+inline constexpr OUStringLiteral RID_SVXBMP_BOTTOMLOCK = u"svx/res/lo01.png";
+inline constexpr OUStringLiteral RID_SVXBMP_TOPLOCK = u"svx/res/lo02.png";
+inline constexpr OUStringLiteral RID_SVXBMP_CELLLOCK = u"svx/res/lo03.png";
 
-#define RID_SVXBMP_LOCK "res/lock.png"
+inline constexpr OUStringLiteral RID_SVXBMP_LOCK = u"res/lock.png";
 
-#define RID_SVXBMP_THEME_NORMAL_BIG "svx/res/galnorl.png"
-#define RID_SVXBMP_THEME_READONLY_BIG   "svx/res/galrdol.png"
-#define RID_SVXBMP_THEME_DEFAULT_BIG"svx/res/galdefl.png"
+inline constexpr OUStringLiteral RID_SVXBMP_THEME_NORMAL_BIG = 
u"svx/res/galnorl.png";
+inline constexpr OUStringLiteral RID_SVXBMP_THEME_READONLY_BIG = 
u"svx/res/galrdol.png";
+inline constexpr OUStringLiteral RID_SVXBMP_THEME_DEFAULT_BIG = 
u"svx/res/galdefl.png";
 
-#define RID_CUIBMP_HARDDISK "res/harddisk_16.png"
-#define RID_CUIBMP_LIB  "res/im30820.png"
-#define RID_CUIBMP_MACRO"res/im30821.png"
-#define RID_CUIBMP_DOC  "res/im30826.png"
+inline constexpr OUStringLiteral RID_CUIBMP_HARDDISK = u"res/harddisk_16.png";
+inline constexpr OUStringLiteral RID_CUIBMP_LIB = u"res/im30820.png";
+inline constexpr OUStringLiteral RID_CUIBMP_MACRO = u"res/im30821.png";
+inline constexpr OUStringLiteral RID_CUIBMP_DOC = u"res/im30826.png";
 #define RID_CUIBMP_COLLAPSED"res/plus.png"
 #define RID_CUIBMP_EXPANDED "res/minus.png"
 
-#define RID_SVXBMP_SCRIPT   "res/script.png"
+inline constexpr OUStringLiteral RID_SVXBMP_SCRIPT = u"res/script.png";
 
 #define RID_SVXBMP_COLLAPSEDNODE"res/sx18002.png"
 #define RID_SVXBMP_EXPANDEDNODE "res/sx18003.png"
 
-#define RID_SVXBMP_LEGTYP1  "svx/res/legtyp1.png"
-#define RID_SVXBMP_LEGTYP2  "svx/res/legtyp2.png"
-#define RID_SVXBMP_LEGTYP3  "svx/res/legtyp3.png"
+inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP1 = u"svx/res/legtyp1.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP2 = u"svx/res/legtyp2.png";
+inline constexpr OUStringLiteral RID_SVXBMP_LEGTYP3 = u"svx/res/legtyp3.png";
 
-#define RID_SVXBMP_COMPONENT"res/component_16.png"
-#define RID_SVXBMP_MACRO"svx/res/id018.png"
+inline constexpr OUStringLiteral RID_SVXBMP_COMPONENT = 
u"res/component_16.png";
+inline constexpr OUStringLiteral RID_SVXBMP_MACRO = u"svx/res/id018.png";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index b143367a547f..730c6f0ad234 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -40,7 +40,7 @@
 #include "cfgutil.hxx"
 #include "CommandCategoryListBox.hxx"
 
-#define notebookbarTabScope "notebookbarTabScope"
+inline constexpr OUStringLiteral notebookbarTabScope = u"notebookbarTabScope";
 
 inline constexpr OUStringLiteral ITEM_DESCRIPTOR_COMMANDURL  = u"CommandURL";
 inline constexpr OUStringLiteral ITEM_DESCRIPTOR_CONTAINER = 
u"ItemDescriptorContainer";
diff --git a/cui/source/inc/helpids.h b/cui/source/inc/helpids.h
index 437552504d95..2ac2fbd0b02c 100644
--- a/cui/source/inc/helpids.h
+++ b/cui/source/inc/helpids.h
@@ -18,26 +18,33 @@
  */
 #pragma once
 
-#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME 
"CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
-#define HID_OFA_FONT_SUBST_CLB "CUI_HID_OFA_FONT_SUBST_CLB"
-#define HID_DBPATH_CTL_PATH "CUI_HID_DBPATH_CTL_PATH"
+inline constexpr OStringLiteral HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
+= "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME";
+inline constexpr OStringLiteral HID_OFA_FONT_SUBST_CLB = 
"CUI_HID_OFA_FONT_SUBST_CLB";
+inline constexpr OStringLiteral HID_DBPATH_CTL_PATH = 
"CUI_HID_DBPATH_CTL_PATH";
 #define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR"
-#define 

[Libreoffice-commits] core.git: cui/inc cui/source

[Miklos Vajna (via logerrit)]

 cui/inc/strings.hrc   |2 ++
 cui/source/dialogs/insdlg.cxx |8 +++-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3d32baa4df8d4061efcd5c5aa0a381e9a75240fa
Author: Miklos Vajna 
AuthorDate: Thu Sep 30 10:56:52 2021 +0200
Commit: Miklos Vajna 
CommitDate: Thu Sep 30 13:46:39 2021 +0200

cui: better label for the OLE insert progressbar

It's inserting an OLE object, not really loading a document.

Change-Id: Ie33e5ef8e80acbd2bfebd68119540c6d168ab120
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122877
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 6d8d75fae35f..44b6a063ae1e 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -394,4 +394,6 @@
 
 #define RID_SVXSTR_UI_APPLYALL  
NC_("RID_SVXSTR_UI_APPLYALL", "Apply to %MODULE")
 
+#define RID_SVXSTR_OLE_INSERT   
NC_("RID_SVXSTR_OLE_INSERT", "Inserting OLE object...")
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index a8b9507db640..2440d2ef0c0d 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -51,8 +51,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 
 #include 
 
@@ -210,7 +208,7 @@ short SvInsertOleDlg::run()
 xProgress = 
xProgressFactory->createStatusIndicator();
 if (xProgress)
 {
-aProgressText = 
SvxResId(RID_SVXSTR_DOC_LOAD);
+aProgressText = 
CuiResId(RID_SVXSTR_OLE_INSERT);
 }
 }
 }
@@ -316,8 +314,8 @@ short SvInsertOleDlg::run()
 xProgress = xProgressFactory->createStatusIndicator();
 if (xProgress)
 {
-OUString aDocLoad(SvxResId(RID_SVXSTR_DOC_LOAD));
-xProgress->start(aDocLoad, 100);
+OUString 
aOleInsert(CuiResId(RID_SVXSTR_OLE_INSERT));
+xProgress->start(aOleInsert, 100);
 }
 }
 }

[Libreoffice-commits] core.git: cui/inc cui/source

[Muhammet Kara (via logerrit)]

 cui/inc/strings.hrc  |1 +
 cui/source/customize/cfg.cxx |   10 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 487dbbb69bfcf7c0368e9dc17e5aae1f17f8187f
Author: Muhammet Kara 
AuthorDate: Sun May 23 11:22:57 2021 +0300
Commit: Heiko Tietze 
CommitDate: Wed Jun 2 16:13:24 2021 +0200

tdf#116491: Customize: Add indication for experimental commands

Change-Id: Id485f86598aa89cbce6d742c0207c178e5208ee2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116014
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 9ee8d66b2e89..2e6b1276739e 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -380,6 +380,7 @@
 #define RID_SVXSTR_COMMANDLABEL 
NC_("RID_SVXSTR_COMMANDLABEL", "Label")
 #define RID_SVXSTR_COMMANDNAME  
NC_("RID_SVXSTR_COMMANDLABEL", "Command")
 #define RID_SVXSTR_COMMANDTIP   
NC_("RID_SVXSTR_COMMANDLABEL", "Tooltip")
+#define RID_SVXSTR_COMMANDEXPERIMENTAL  
NC_("RID_SVXSTR_COMMANDEXPERIMENTAL", "Experimental")
 
 #define RID_SVXSTR_QRCODEDATALONG   
NC_("RID_SVXSTR_QRCODEDATALONG", "The URL or text is too long for the current 
error correction level. Either shorten the text or decrease the correction 
level.")
 #define RID_SVXSTR_DELETEUSERCOLOR1 
NC_("RID_SVXSTR_DELETEUSERCOLOR1", "You can only delete user-defined colors")
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index ef65977d3382..25f973016043 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -88,6 +88,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace uno = com::sun::star::uno;
 namespace frame = com::sun::star::frame;
@@ -1620,10 +1621,17 @@ IMPL_LINK_NOARG(SvxConfigPage, SelectFunctionHdl, 
weld::TreeView&, void)
 SfxGroupInfo_Impl *pData = 
reinterpret_cast(m_xFunctions->get_selected_id().toInt64());
 if (pData)
 {
+bool bIsExperimental
+= 
vcl::CommandInfoProvider::IsExperimental(pData->sCommand, m_aModuleId);
+
+OUString aExperimental = "\n" + 
CuiResId(RID_SVXSTR_COMMANDEXPERIMENTAL);
 OUString aLabel = CuiResId(RID_SVXSTR_COMMANDLABEL) + ": " + 
pData->sLabel + "\n";
 OUString aName = CuiResId(RID_SVXSTR_COMMANDNAME) + ": " + 
pData->sCommand + "\n";
 OUString aTip = CuiResId(RID_SVXSTR_COMMANDTIP) + ": " + 
pData->sTooltip;
-m_xDescriptionField->set_text(aLabel + aName + aTip);
+if (bIsExperimental)
+m_xDescriptionField->set_text(aLabel + aName + aTip + 
aExperimental);
+else
+m_xDescriptionField->set_text(aLabel + aName + aTip);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source include/sfx2 officecfg/registry sfx2/sdi sfx2/source sw/inc sw/sdi sw/source

[Jim Raykowski (via logerrit)]

 cui/inc/strings.hrc  |
1 
 cui/source/customize/cfgutil.cxx |   
39 -
 cui/source/inc/cfgutil.hxx   |
3 
 include/sfx2/sfxsids.hrc |
2 
 include/sfx2/sidebar/Context.hxx |
4 
 include/sfx2/sidebar/ResourceManager.hxx |
4 
 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu   |   
78 +-
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|
5 
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   
20 ++
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   
23 ++
 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |   
14 -
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |   
10 -
 sfx2/sdi/frmslots.sdi|
4 
 sfx2/sdi/sfx.sdi |   
18 ++
 sfx2/source/view/viewfrm.cxx |   
13 +
 sw/inc/cmdid.h   |
2 
 sw/sdi/_viewsh.sdi   |
4 
 sw/sdi/swriter.sdi   |   
15 -
 sw/source/uibase/uiview/view2.cxx|
8 -
 19 files changed, 214 insertions(+), 53 deletions(-)

New commits:
commit a80eefb7413245f81692c443b06f7d3a6a92f28c
Author: Jim Raykowski 
AuthorDate: Thu Oct 1 22:29:35 2020 -0800
Commit: Jim Raykowski 
CommitDate: Tue May 11 06:53:36 2021 +0200

tdf#84502 CuiConfigGroupListBox Macros,Styles like category for Sidebar

Decks

Change-Id: I4d41952547c98ba66c40c1aa1e9776cdf31304c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100455
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 1ba91c27c747..9ee8d66b2e89 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -114,6 +114,7 @@
 #define RID_SVXSTR_HANJANC_("RID_SVXSTR_HANJA", 
"Hanja")
 #define RID_SVXSTR_BASICMACROS  
NC_("RID_SVXSTR_BASICMACROS", "BASIC Macros")
 #define RID_SVXSTR_GROUP_STYLES 
NC_("RID_SVXSTR_GROUP_STYLES", "Styles")
+#define RID_SVXSTR_GROUP_SIDEBARDECKS   
NC_("RID_SVXSTR_GROUP_SIDEBARDECKS", "Sidebar Decks")
 
 #define RID_SVXSTR_EVENT_STARTAPP   
NC_("RID_SVXSTR_EVENT_STARTAPP", "Start Application")
 #define RID_SVXSTR_EVENT_CLOSEAPP   
NC_("RID_SVXSTR_EVENT_CLOSEAPP", "Close Application")
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 5ac0eda55edb..685af57c83b7 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -55,6 +55,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::script;
@@ -346,6 +349,7 @@ struct SvxConfigGroupBoxResource_Impl
 OUString m_sMacros;
 OUString m_sDlgMacros;
 OUString m_aStrGroupStyles;
+OUString m_aStrGroupSidebarDecks;
 
 SvxConfigGroupBoxResource_Impl();
 };
@@ -355,7 +359,8 @@ 
SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
 m_sProdMacros(CuiResId(RID_SVXSTR_PRODMACROS)),
 m_sMacros(CuiResId(RID_SVXSTR_BASICMACROS)),
 m_sDlgMacros(CuiResId(RID_SVXSTR_PRODMACROS)),
-m_aStrGroupStyles(CuiResId(RID_SVXSTR_GROUP_STYLES))
+m_aStrGroupStyles(CuiResId(RID_SVXSTR_GROUP_STYLES)),
+m_aStrGroupSidebarDecks(CuiResId(RID_SVXSTR_GROUP_SIDEBARDECKS))
 {
 }
 
@@ -676,13 +681,18 @@ void CuiConfigGroupListBox::Init(const 
css::uno::Reference< css::uno::XComponent
 }
 }
 
-// add styles
+// add styles and sidebar decks
 if ( bEventMode )
 {
 aArr.push_back( std::make_unique( 
SfxCfgKind::GROUP_STYLES, 0, nullptr ) ); // TODO last parameter should contain 
user data
 OUString sStyle(xImp->m_aStrGroupStyles);
 OUString 
sId(OUString::number(reinterpret_cast(aArr.back().get(;
 m_xTreeView->insert(nullptr, -1, , , nullptr, nullptr, 
true, nullptr);
+
+aArr.push_back( 
std::make_unique(SfxCfgKind::GROUP_SIDEBARDECKS, 0));
+OUString sSidebarDecks(xImp->m_aStrGroupSidebarDecks);
+sId = OUString::number(reinterpret_cast(aArr.back().get()));
+m_xTreeView->insert(nullptr, -1, , , nullptr, 
nullptr, false, nullptr);
 }
 
 m_xTreeView->thaw();
@@ -933,6 +943,31 @@ void CuiConfigGroupListBox::GroupSelected()
 break;
 }
 
+case SfxCfgKind::GROUP_SIDEBARDECKS:
+

[Libreoffice-commits] core.git: cui/inc cui/source

[Gabor Kelemen (via logerrit)]

 cui/inc/strings.hrc   |5 +
 cui/source/customize/SvxNotebookbarConfigPage.cxx |   10 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 8ebb54c6c4937a151f2185e8f54b2c39e446368a
Author: Gabor Kelemen 
AuthorDate: Wed Apr 21 08:22:12 2021 +0200
Commit: Andras Timar 
CommitDate: Tue Apr 27 15:27:32 2021 +0200

tdf#138751 Localize items in Notebookbar customization dropdowns

Change-Id: Idb1483e083f7758acb83da6c3ca9403c40ac9a40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114447
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Andras Timar 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 9ec01b758738..1ba91c27c747 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -67,6 +67,11 @@
 #define RID_SVXSTR_LABEL_NEW_NAME   
NC_("RID_SVXSTR_LABEL_NEW_NAME", "~New name")
 #define RID_SVXSTR_RENAME_MENU  
NC_("RID_SVXSTR_RENAME_MENU", "Rename Menu")
 #define RID_SVXSTR_RENAME_TOOLBAR   
NC_("RID_SVXSTR_RENAME_TOOLBAR", "Rename Toolbar")
+#define RID_SVXSTR_ALL_COMMANDS 
NC_("RID_SVXSTR_ALL_COMMANDS", "All Commands")
+#define RID_SVXSTR_TABBED   NC_("RID_SVXSTR_TABBED", 
"Tabbed")
+#define RID_SVXSTR_TABBED_COMPACT   
NC_("RID_SVXSTR_TABBED_COMPACT", "Tabbed Compact")
+#define RID_SVXSTR_GROUPEDBAR   
NC_("RID_SVXSTR_GROUPEDBAR", "Groupedbar")
+#define RID_SVXSTR_GROUPEDBAR_COMPACT   
NC_("RID_SVXSTR_GROUPEDBAR_COMPACT", "Groupedbar Compact")
 
 #define RID_SVXSTR_HYPDLG_CLOSEBUT  
NC_("RID_SVXSTR_HYPDLG_CLOSEBUT", "Close")
 #define RID_SVXSTR_HYPDLG_MACROACT1 
NC_("RID_SVXSTR_HYPDLG_MACROACT1", "Mouse over object")
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx 
b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index 7e93dae121af..978055e1a1bc 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -70,13 +70,13 @@ static OUString charToString(const char* cString)
 static OUString getFileName(std::u16string_view aFileName)
 {
 if (aFileName == u"notebookbar.ui")
-return "Tabbed";
+return CuiResId(RID_SVXSTR_TABBED);
 else if (aFileName == u"notebookbar_compact.ui")
-return "TabbedCompact";
+return CuiResId(RID_SVXSTR_TABBED_COMPACT);
 else if (aFileName == u"notebookbar_groupedbar_full.ui")
-return "Groupedbar";
+return CuiResId(RID_SVXSTR_GROUPEDBAR);
 else if (aFileName == u"notebookbar_groupedbar_compact.ui")
-return "GroupedbarCompact";
+return CuiResId(RID_SVXSTR_GROUPEDBAR_COMPACT);
 else
 return "None";
 }
@@ -154,7 +154,7 @@ void SvxNotebookbarConfigPage::Init()
 m_xSaveInListBox->append(sSaveInListBoxID, sScopeName);
 m_xSaveInListBox->set_active_id(sSaveInListBoxID);
 
-m_xTopLevelListBox->append("NotebookBar", "All Commands");
+m_xTopLevelListBox->append("NotebookBar", 
CuiResId(RID_SVXSTR_ALL_COMMANDS));
 m_xTopLevelListBox->set_active_id("NotebookBar");
 SelectElement();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source

[Heiko Tietze (via logerrit)]

 cui/inc/tipoftheday.hrc   |2 +-
 cui/source/dialogs/tipofthedaydlg.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d553366978bef46f353c99f4fda2c8476a39
Author: Heiko Tietze 
AuthorDate: Tue Mar 30 11:26:59 2021 +0200
Commit: Rizal Muttaqin 
CommitDate: Tue Mar 30 16:43:31 2021 +0200

tdf#140839 - TotD image size

Previous size of 100x120 has shown to be too small for
thumbnails so we agreed on 150x150

Change-Id: Ia43bc424a164024e8a4ecf851cad3fab4f342e67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113343
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 107e39cf803f..401ff2c4907a 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -41,7 +41,7 @@
  * image:
* leave the image string empty for the default tipoftheday.png
* place new images at extra/source/tipoftheday and do not forget to add the 
files to vcl/Package_tipoftheday.mk
-   * do not exceed 100x120px too much - images do not get scaled
+   * images are scaled to 150x150px; const ThumbSize() in tipoftheday.cxx
 */
 
 const std::tuple TIPOFTHEDAY_STRINGARRAY[] =
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx 
b/cui/source/dialogs/tipofthedaydlg.cxx
index 478780578b56..9d43fd21f4ba 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -43,7 +43,7 @@
 #include 
 
 //size of preview
-const Size ThumbSize(100, 120);
+const Size ThumbSize(150, 150);
 
 TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
 : GenericDialogController(pParent, "cui/ui/tipofthedaydialog.ui", 
"TipOfTheDayDialog")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source include/svx

[Michael Weghorn (via logerrit)]

 cui/inc/strings.hrc|   12 
 cui/source/tabpages/border.cxx |1 +
 include/svx/strings.hrc|   15 +++
 3 files changed, 16 insertions(+), 12 deletions(-)

New commits:
commit 0cbd8a5d4571cdf3601ca8deb64d734d35e234f9
Author: Michael Weghorn 
AuthorDate: Wed Mar 3 11:03:42 2021 +0100
Commit: Michael Weghorn 
CommitDate: Thu Mar 4 08:14:54 2021 +0100

tdf#140762  Move RIDs related to borders to include/svx

They'll be reused for the items in the "Borders" dropdown
button in Calc's formatting toolbar in a subsequent step.

Change-Id: I895d787d185a69f7aa7d3db3c490271184152ddb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111870
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 257fa4ae554f..9ec01b758738 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -349,18 +349,6 @@
 #define RID_SVXSTR_STARTQUOTE   
NC_("RID_SVXSTR_STARTQUOTE", "Start Quote")
 #define RID_SVXSTR_ENDQUOTE NC_("RID_SVXSTR_ENDQUOTE", 
"End Quote")
 
-#define RID_SVXSTR_TABLE_PRESET_NONE
NC_("RID_SVXSTR_TABLE_PRESET_NONE", "Set No Borders")
-#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER   
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Set Outer Border Only")
-#define RID_SVXSTR_TABLE_PRESET_OUTERHORI   
NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Set Outer Border and Horizontal 
Lines")
-#define RID_SVXSTR_TABLE_PRESET_OUTERALL
NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Set Outer Border and All Inner Lines")
-#define RID_SVXSTR_TABLE_PRESET_OUTERINNER  
NC_("RID_SVXSTR_TABLE_PRESET_OUTERINNER", "Set Outer Border Without Changing 
Inner Lines")
-#define RID_SVXSTR_PARA_PRESET_DIAGONAL 
NC_("RID_SVXSTR_PARA_PRESET_DIAGONAL", "Set Diagonal Lines Only")
-#define RID_SVXSTR_PARA_PRESET_ALL  
NC_("RID_SVXSTR_PARA_PRESET_ALL", "Set All Four Borders")
-#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT
NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Set Left and Right Borders Only")
-#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM
NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Set Top and Bottom Borders Only")
-#define RID_SVXSTR_PARA_PRESET_ONLYLEFT 
NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFT", "Set Left Border Only")
-#define RID_SVXSTR_HOR_PRESET_ONLYHOR   
NC_("RID_SVXSTR_HOR_PRESET_ONLYHOR", "Set Top and Bottom Borders, and All Inner 
Lines")
-#define RID_SVXSTR_VER_PRESET_ONLYVER   
NC_("RID_SVXSTR_VER_PRESET_ONLYVER", "Set Left and Right Borders, and All Inner 
Lines")
 #define RID_SVXSTR_SHADOW_STYLE_NONE
NC_("RID_SVXSTR_SHADOW_STYLE_NONE", "No Shadow")
 #define RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT 
NC_("RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT", "Cast Shadow to Bottom Right")
 #define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT
NC_("RID_SVXSTR_SHADOW_STYLE_TOPRIGHT", "Cast Shadow to Top Right")
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index b6e3d8d39ed5..cb7429928d44 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -22,6 +22,7 @@
 #include 
 
 #include 
+#include 
 #include 
 
 #include 
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index b2c3822757dd..c8f71976d322 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1759,6 +1759,21 @@
 
 #define RID_SVXSTR_TRANSPARENCY 
NC_("RID_SVXSTR_TRANSPARENCY", "Transparency:")
 
+
+// strings related to borders
+#define RID_SVXSTR_TABLE_PRESET_NONE
NC_("RID_SVXSTR_TABLE_PRESET_NONE", "Set No Borders")
+#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER   
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Set Outer Border Only")
+#define RID_SVXSTR_TABLE_PRESET_OUTERHORI   
NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Set Outer Border and Horizontal 
Lines")
+#define RID_SVXSTR_TABLE_PRESET_OUTERALL
NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Set Outer Border and All Inner Lines")
+#define RID_SVXSTR_TABLE_PRESET_OUTERINNER  
NC_("RID_SVXSTR_TABLE_PRESET_OUTERINNER", "Set Outer Border Without Changing 
Inner Lines")
+#define RID_SVXSTR_PARA_PRESET_DIAGONAL 
NC_("RID_SVXSTR_PARA_PRESET_DIAGONAL", "Set Diagonal Lines Only")
+#define RID_SVXSTR_PARA_PRESET_ALL  
NC_("RID_SVXSTR_PARA_PRESET_ALL", "Set All Four Borders")
+#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT
NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Set Left and Right Borders Only")
+#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM
NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Set Top and Bottom Borders Only")
+#define RID_SVXSTR_PARA_PRESET_ONLYLEFT 
NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFT", "Set Left Border Only")
+#define RID_SVXSTR_HOR_PRESET_ONLYHOR   
NC_("RID_SVXSTR_HOR_PRESET_ONLYHOR", "Set Top and Bottom 

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig extras/source vcl/Package_tipoftheday.mk

[Heiko Tietze (via logerrit)]

 cui/inc/tipoftheday.hrc|2 
 cui/source/dialogs/tipofthedaydlg.cxx  |   28 --
 cui/source/inc/tipofthedaydlg.hxx  |7 ++
 cui/uiconfig/ui/tipofthedaydialog.ui   |   79 +
 extras/source/tipoftheday/marchingants.gif |binary
 vcl/Package_tipoftheday.mk |1 
 6 files changed, 56 insertions(+), 61 deletions(-)

New commits:
commit 92ab0afa1c36bfbc99de25a53a108b6f28e0e627
Author: Heiko Tietze 
AuthorDate: Fri Oct 23 13:30:17 2020 +0200
Commit: Heiko Tietze 
CommitDate: Sat Oct 24 10:12:08 2020 +0200

Show animated GIFs in TotD

marchingants.gif added as an example

Change-Id: I555aebc4a4e191b8afb4be06dfc1e5f3e6d1a911
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104718
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index e78d4aaa019d..0448f6dd87cc 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -133,7 +133,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Date/time value is just a number of days 
since a chosen day zero; in the number, integer part represents date, and 
fractional part is time (elapsed part of a day), with 0.5 representing noon."), 
"", "tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Shift+%MOD1+Del deletes from cursor to the 
end of the current sentence."), "", "tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Use column or row labels in formulas. For 
example, if you have two columns, “Time” and “KM”, use =Time/KM to get minutes 
per kilometer."), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Annoyed by the “marching ants” around cells 
in Calc? Press escape to stop them; the copied content will remain available 
for pasting."), "", "tipoftheday_c.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Annoyed by the “marching ants” around cells 
in Calc? Press escape to stop them; the copied content will remain available 
for pasting."), "", "marchingants.gif"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to become a %PRODUCTNAME Ambassador? 
There are certifications for developers, admins, and trainers."), 
"http://www.documentfoundation.org/certification;, ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "Mix portrait and landscape orientations in 
a Calc spreadsheet by applying different page styles on sheets."), "", 
"tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Click on the special character icon in the 
toolbar to get quick access to favorite and recent characters to insert."), "", 
""},
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx 
b/cui/source/dialogs/tipofthedaydlg.cxx
index beed468ba5b6..b88369890529 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -25,8 +25,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 
 #include 
 #include 
@@ -46,11 +44,11 @@
 
 TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
 : GenericDialogController(pParent, "cui/ui/tipofthedaydialog.ui", 
"TipOfTheDayDialog")
-, m_pImage(m_xBuilder->weld_image("imImage"))
 , m_pText(m_xBuilder->weld_label("lbText"))
 , m_pShowTip(m_xBuilder->weld_check_button("cbShowTip"))
 , m_pNext(m_xBuilder->weld_button("btnNext"))
 , m_pLink(m_xBuilder->weld_link_button("btnLink"))
+, m_pPreview(new weld::CustomWeld(*m_xBuilder, "imPreview", m_aPreview))
 {
 
m_pShowTip->set_active(officecfg::Office::Common::Misc::ShowTipOfTheDay::get());
 m_pNext->connect_clicked(LINK(this, TipOfTheDayDialog, OnNextClick));
@@ -62,6 +60,8 @@ TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
 if (m_nDay > officecfg::Office::Common::Misc::LastTipOfTheDayShown::get())
 m_nCurrentTip++;
 
+m_aPreview.init(_aGraphic, LINK(this, TipOfTheDayDialog, ImplModifyHdl));
+
 UpdateTip();
 }
 
@@ -172,20 +172,16 @@ void TipOfTheDayDialog::UpdateTip()
 // image
 OUString aURL("$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/tipoftheday/");
 rtl::Bootstrap::expandMacros(aURL);
-OUString aImage = sImage;
+OUString aImageName = sImage;
 // use default image if none is available with the number
-if (aImage.isEmpty() || !file_exists(aURL + aImage))
-aImage = "tipoftheday.png";
-// draw image
-Graphic aGraphic;
-if (GraphicFilter::LoadGraphic(aURL + aImage, OUString(), aGraphic) == 
ERRCODE_NONE)
-{
-ScopedVclPtr m_pVirDev = 
m_pImage->create_virtual_device();
-m_pVirDev->SetOutputSizePixel(aGraphic.GetSizePixel());
-m_pVirDev->DrawBitmapEx(Point(0, 0), aGraphic.GetBitmapEx());
-m_pImage->set_image(m_pVirDev.get());
-m_pVirDev.disposeAndClear();
-}
+if (aImageName.isEmpty() || !file_exists(aURL + aImageName))
+aImageName = "tipoftheday.png";
+GraphicFilter::LoadGraphic(aURL + aImageName, OUString(), m_aGraphic);
+}
+

[Libreoffice-commits] core.git: cui/inc cui/source framework/uiconfig officecfg/registry

[Heiko Tietze (via logerrit)]

 cui/inc/tipoftheday.hrc  |1 
 cui/source/dialogs/tipofthedaydlg.cxx|   48 
+-
 framework/uiconfig/startmodule/menubar/menubar.xml   |1 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 
 4 files changed, 48 insertions(+), 5 deletions(-)

New commits:
commit 31763e5af060f598c1699662adefe43f13d4db0e
Author: Heiko Tietze 
AuthorDate: Tue Oct 20 12:11:20 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu Oct 22 11:50:39 2020 +0200

Resolves tdf#137607 and tdf#137500 - Improvements to TotD

Shows tooltip for UNO commands
Check if the UNO command is available in the current module
Don't show the menu entry on the start center

Change-Id: I5c67ec3f8543b5442a6e2c2a478bfeb4ec0e1f3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104558
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 33b551ecc2fc..e78d4aaa019d 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -32,6 +32,7 @@
  * uri:
* if uri is empty, do not show any link
* if uri starts with "http", show the link directly in the browser
+   * if uri starts with ".uno:", run the command if available in the current 
module
* all other strings are converted to a link for the offline help
* to find the right uri, look in instdir/help/hid2file.js after building 
--with-help=html
* structure of hid2file.js  'uri' : 'rest of URL' (that starts: 
https://help.libreoffice.org/latest/en-US/)
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx 
b/cui/source/dialogs/tipofthedaydlg.cxx
index 88b61a8d0b2b..beed468ba5b6 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -21,11 +21,19 @@
 #include 
 #include 
 
+#include 
+#include 
 #include 
 #include 
 #include 
 #include 
 
+#include 
+#include 
+#include 
+#include 
+#include 
+
 #include 
 #include 
 #include 
@@ -105,10 +113,42 @@ void TipOfTheDayDialog::UpdateTip()
 }
 else if (sLink.startsWith(".uno:"))
 {
-m_pLink->set_uri(sLink);
-m_pLink->set_label(CuiResId(STR_UNO_LINK));
-m_pLink->set_visible(true);
-m_pLink->connect_activate_link(LINK(this, TipOfTheDayDialog, 
OnLinkClick));
+m_pLink->set_visible(false);
+//show the link only if the UNO command is available in the current 
module
+SfxViewFrame* pViewFrame = SfxViewFrame::Current();
+if (pViewFrame)
+{
+const auto xFrame = pViewFrame->GetFrame().GetFrameInterface();
+const css::uno::Reference 
xDispatchProvider(
+xFrame, css::uno::UNO_QUERY);
+if (xDispatchProvider.is())
+{
+css::util::URL aCommandURL;
+aCommandURL.Complete = sLink;
+const css::uno::Reference xContext
+= comphelper::getProcessComponentContext();
+const css::uno::Reference xParser
+= css::util::URLTransformer::create(xContext);
+xParser->parseStrict(aCommandURL);
+const css::uno::Reference xDisp
+= xDispatchProvider->queryDispatch(aCommandURL, 
OUString(), 0);
+if (xDisp.is())
+{
+m_pLink->set_label(CuiResId(STR_UNO_LINK));
+m_pLink->set_uri(sLink);
+
+const OUString aModuleName(
+vcl::CommandInfoProvider::GetModuleIdentifier(xFrame));
+const auto aProperties
+= 
vcl::CommandInfoProvider::GetCommandProperties(sLink, aModuleName);
+m_pLink->set_tooltip_text(
+vcl::CommandInfoProvider::GetTooltipForCommand(sLink, 
aProperties, xFrame));
+
+m_pLink->set_visible(true);
+m_pLink->connect_activate_link(LINK(this, 
TipOfTheDayDialog, OnLinkClick));
+}
+}
+}
 }
 else if (sLink.startsWith("http"))
 {
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml 
b/framework/uiconfig/startmodule/menubar/menubar.xml
index eb0532080155..96ac15d10f81 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -61,7 +61,6 @@
 
 
 
-
 
 
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 240a86d8487e..d7e9837838ad 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6233,6 +6233,9 @@
 
 

[Libreoffice-commits] core.git: cui/inc cui/source

[Heiko Tietze (via logerrit)]

 cui/inc/tipoftheday.hrc   |1 
 cui/source/dialogs/tipofthedaydlg.cxx |   81 +-
 cui/source/inc/tipofthedaydlg.hxx |5 --
 3 files changed, 33 insertions(+), 54 deletions(-)

New commits:
commit 1d66b9970b7ecf8d8e144cfa3b2fbb7ce3dd1a08
Author: Heiko Tietze 
AuthorDate: Thu Oct 15 12:18:28 2020 +0200
Commit: Mike Kaganski 
CommitDate: Tue Oct 20 11:18:35 2020 +0200

Beautification of code and fix for on-/offline help

Change-Id: I0c731f2c472ceb435f529956011a7fd5a00a27ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104358
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index acb7bdd15d3e..33b551ecc2fc 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -272,7 +272,6 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
 #define STR_HELP_LINK   NC_("STR_HELP_LINK", "%PRODUCTNAME 
Help")
 #define STR_MORE_LINK   NC_("STR_MORE_LINK", "More info")
 #define STR_UNO_LINKNC_("STR_UNO_LINK", "Run this action 
now...")
-#define STR_UNO_EXECUTE NC_("STR_UNO_EXECUTE", "Execute the 
command %COMMAND") //tooltip for STR_UNO_LINK
 #define STR_TITLE   NC_("STR_TITLE", "Tip of the Day: 
%CURRENT/%TOTAL")
 #define STR_CMD NC_("STR_CMD", "⌘ Cmd") //use narrow 
no-break space U+202F here
 #define STR_CTRLNC_("STR_CTRL", "Ctrl")
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx 
b/cui/source/dialogs/tipofthedaydlg.cxx
index 005584027547..88b61a8d0b2b 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -47,12 +47,12 @@ TipOfTheDayDialog::TipOfTheDayDialog(weld::Window* pParent)
 
m_pShowTip->set_active(officecfg::Office::Common::Misc::ShowTipOfTheDay::get());
 m_pNext->connect_clicked(LINK(this, TipOfTheDayDialog, OnNextClick));
 
-nCurrentTip = officecfg::Office::Common::Misc::LastTipOfTheDayID::get();
+m_nCurrentTip = officecfg::Office::Common::Misc::LastTipOfTheDayID::get();
 
 const auto t0 = std::chrono::system_clock::now().time_since_epoch();
-nDay = std::chrono::duration_cast(t0).count() / 24; 
//days since 1970-01-01
-if (nDay > officecfg::Office::Common::Misc::LastTipOfTheDayShown::get())
-nCurrentTip++;
+m_nDay = std::chrono::duration_cast(t0).count() / 24;
+if (m_nDay > officecfg::Office::Common::Misc::LastTipOfTheDayShown::get())
+m_nCurrentTip++;
 
 UpdateTip();
 }
@@ -61,8 +61,8 @@ TipOfTheDayDialog::~TipOfTheDayDialog()
 {
 std::shared_ptr xChanges(
 comphelper::ConfigurationChanges::create());
-officecfg::Office::Common::Misc::LastTipOfTheDayShown::set(nDay, xChanges);
-officecfg::Office::Common::Misc::LastTipOfTheDayID::set(nCurrentTip, 
xChanges);
+officecfg::Office::Common::Misc::LastTipOfTheDayShown::set(m_nDay, 
xChanges);
+officecfg::Office::Common::Misc::LastTipOfTheDayID::set(m_nCurrentTip, 
xChanges);
 
officecfg::Office::Common::Misc::ShowTipOfTheDay::set(m_pShowTip->get_active(), 
xChanges);
 xChanges->commit();
 }
@@ -77,16 +77,17 @@ void TipOfTheDayDialog::UpdateTip()
 {
 constexpr sal_Int32 nNumberOfTips = 
SAL_N_ELEMENTS(TIPOFTHEDAY_STRINGARRAY);
 
-if ((nCurrentTip >= nNumberOfTips) || (nCurrentTip < 0))
-nCurrentTip = 0;
+if ((m_nCurrentTip >= nNumberOfTips) || (m_nCurrentTip < 0))
+m_nCurrentTip = 0;
 
 //title
 m_xDialog->set_title(CuiResId(STR_TITLE)
- .replaceFirst("%CURRENT", 
OUString::number(nCurrentTip + 1))
+ .replaceFirst("%CURRENT", 
OUString::number(m_nCurrentTip + 1))
  .replaceFirst("%TOTAL", 
OUString::number(nNumberOfTips)));
 
+auto[sTip, sLink, sImage] = TIPOFTHEDAY_STRINGARRAY[m_nCurrentTip];
+
 // text
-OUString aText = 
CuiResId(std::get<0>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip]));
 //replace MOD1 & MOD2 shortcuts depending on platform
 #ifdef MACOSX
 const OUString aMOD1 = CuiResId(STR_CMD);
@@ -95,64 +96,43 @@ void TipOfTheDayDialog::UpdateTip()
 const OUString aMOD1 = CuiResId(STR_CTRL);
 const OUString aMOD2 = CuiResId(STR_Alt);
 #endif
-sal_Int32 aPos;
-aPos = aText.indexOf("%MOD1");
-while (aPos != -1)
-{
-aText = aText.replaceAt(aPos, 5, aMOD1);
-aPos = aText.indexOf("%MOD1");
-}
-aPos = aText.indexOf("%MOD2");
-while (aPos != -1)
-{
-aText = aText.replaceAt(aPos, 5, aMOD2);
-aPos = aText.indexOf("%MOD2");
-}
-m_pText->set_label(aText);
+m_pText->set_label(CuiResId(sTip).replaceAll("%MOD1", 
aMOD1).replaceAll("%MOD2", aMOD2));
 
 // hyperlink
-aLink = std::get<1>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip]);
-if (aLink.isEmpty())
+if (sLink.isEmpty())
 {
 m_pLink->set_visible(false);
 }
-

[Libreoffice-commits] core.git: cui/inc cui/source officecfg/registry

[Heiko Tietze (via logerrit)]

 cui/inc/tipoftheday.hrc|2 -
 cui/source/dialogs/tipofthedaydlg.cxx  |   17 +++--
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 -
 3 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 728548f8d7698d06c21ae37b2e03fa8e73676341
Author: Heiko Tietze 
AuthorDate: Wed Oct 14 12:38:44 2020 +0200
Commit: Heiko Tietze 
CommitDate: Wed Oct 14 15:09:28 2020 +0200

Fixes to TipOfTheDay dialog

* Reverts 231a4e024b85aa0ad06a5632d3f514152babea30 and sets
initial value to -1 to start from zero
* Improves translatability of string

Change-Id: Ib541a72fa3f6eecdf5bbdf17ce2a4e56ff90c397
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104276
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index f464a1f3d936..acb7bdd15d3e 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -273,7 +273,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
 #define STR_MORE_LINK   NC_("STR_MORE_LINK", "More info")
 #define STR_UNO_LINKNC_("STR_UNO_LINK", "Run this action 
now...")
 #define STR_UNO_EXECUTE NC_("STR_UNO_EXECUTE", "Execute the 
command %COMMAND") //tooltip for STR_UNO_LINK
-#define STR_TITLE   NC_("STR_TITLE", "Tip of the Day")
+#define STR_TITLE   NC_("STR_TITLE", "Tip of the Day: 
%CURRENT/%TOTAL")
 #define STR_CMD NC_("STR_CMD", "⌘ Cmd") //use narrow 
no-break space U+202F here
 #define STR_CTRLNC_("STR_CTRL", "Ctrl")
 #define STR_Alt NC_("STR_CMD", "Alt")
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx 
b/cui/source/dialogs/tipofthedaydlg.cxx
index ee4a9edebb50..d4f7d8f1c860 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -76,13 +76,16 @@ static bool file_exists(const OUString& fileName)
 
 void TipOfTheDayDialog::UpdateTip()
 {
-if ((nCurrentTip > nNumberOfTips) || (nCurrentTip < 1))
-nCurrentTip = 1;
-m_xDialog->set_title(CuiResId(STR_TITLE) + ": " + 
OUString::number(nCurrentTip) + "/"
- + OUString::number(nNumberOfTips));
+if ((nCurrentTip >= nNumberOfTips) || (nCurrentTip < 0))
+nCurrentTip = 0;
+
+//title
+m_xDialog->set_title(CuiResId(STR_TITLE)
+ .replaceFirst("%CURRENT", 
OUString::number(nCurrentTip + 1))
+ .replaceFirst("%TOTAL", 
OUString::number(nNumberOfTips)));
 
 // text
-OUString aText = CuiResId(std::get<0>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip 
- 1]));
+OUString aText = 
CuiResId(std::get<0>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip]));
 //replace MOD1 & MOD2 shortcuts depending on platform
 #ifdef MACOSX
 const OUString aMOD1 = CuiResId(STR_CMD);
@@ -107,7 +110,7 @@ void TipOfTheDayDialog::UpdateTip()
 m_pText->set_label(aText);
 
 // hyperlink
-aLink = std::get<1>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip - 1]);
+aLink = std::get<1>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip]);
 if (aLink.isEmpty())
 {
 m_pLink->set_visible(false);
@@ -148,7 +151,7 @@ void TipOfTheDayDialog::UpdateTip()
 // image
 OUString aURL("$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/tipoftheday/");
 rtl::Bootstrap::expandMacros(aURL);
-OUString aImage = std::get<2>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip - 1]);
+OUString aImage = std::get<2>(TIPOFTHEDAY_STRINGARRAY[nCurrentTip]);
 // use default image if none is available with the number
 if (aImage.isEmpty() || !file_exists(aURL + aImage))
 aImage = "tipoftheday.png";
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index b5bcb9c8bde0..f0420ec158cd 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5621,7 +5621,7 @@
   
   The last shown Tip-of-the-Day.
   
-  0
+  -1
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source

[Heiko Tietze (via logerrit)]

 cui/inc/toolbarmode.hrc   |4 ++--
 cui/source/dialogs/toolbarmodedlg.cxx |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c35db66435cfecaa957b469d96ca70a31187a224
Author: Heiko Tietze 
AuthorDate: Tue Oct 13 13:02:57 2020 +0200
Commit: Heiko Tietze 
CommitDate: Tue Oct 13 14:46:27 2020 +0200

Resolves tdf#137424 - UI Picker missing 'Contextual single'

Exclusion by experimental on/off updated

Change-Id: I714b8ffc5a148d09607ab20763b6d35de2a9e2be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104231
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/toolbarmode.hrc b/cui/inc/toolbarmode.hrc
index 7e7510b08eda..602d066e8fe1 100644
--- a/cui/inc/toolbarmode.hrc
+++ b/cui/inc/toolbarmode.hrc
@@ -31,7 +31,7 @@ const std::tuple 
TOOLBARMODES_ARRAY[] =
 };
 
 //hide experimental UIs
-constexpr int nContextSingle = 7;
-constexpr int nContextGroup = 8;
+constexpr int nGroupedbarFull = 6;
+constexpr int nContextualGroups = 8;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/toolbarmodedlg.cxx 
b/cui/source/dialogs/toolbarmodedlg.cxx
index 21bd7055bd96..7362ad22e54b 100644
--- a/cui/source/dialogs/toolbarmodedlg.cxx
+++ b/cui/source/dialogs/toolbarmodedlg.cxx
@@ -118,8 +118,8 @@ ToolbarmodeDialog::ToolbarmodeDialog(weld::Window* pParent)
 
 if (!SvtMiscOptions().IsExperimentalMode())
 {
-m_pRadioButtons[nContextSingle]->set_visible(false);
-m_pRadioButtons[nContextGroup]->set_visible(false);
+m_pRadioButtons[nGroupedbarFull]->set_visible(false);
+m_pRadioButtons[nContextualGroups]->set_visible(false);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig icon-themes/breeze icon-themes/breeze_dark icon-themes/colibre icon-themes/elementary icon-themes/karasa_jaga icon-themes/sifr icon-them

[Heiko Tietze (via logerrit)]

 cui/inc/strings.hrc|2 
 cui/source/dialogs/AdditionsDialog.cxx |   58 +++-
 cui/source/inc/AdditionsDialog.hxx |3 
 cui/uiconfig/ui/additionsdialog.ui |   31 +-
 cui/uiconfig/ui/additionsfragment.ui   |  402 +++--
 icon-themes/breeze/links.txt   |3 
 icon-themes/breeze_dark/links.txt  |3 
 icon-themes/colibre/links.txt  |3 
 icon-themes/elementary/links.txt   |3 
 icon-themes/karasa_jaga/links.txt  |2 
 icon-themes/sifr/links.txt |3 
 icon-themes/sifr_dark/links.txt|3 
 icon-themes/sukapura/links.txt |3 
 13 files changed, 317 insertions(+), 202 deletions(-)

New commits:
commit 479363562b2148481b3808250575379ca2c9c37e
Author: Heiko Tietze 
AuthorDate: Thu Oct 8 11:29:10 2020 +0200
Commit: Heiko Tietze 
CommitDate: Mon Oct 12 16:59:52 2020 +0200

Resolves tdf#135270 - Make the tight extensions dialog shiny

Information rearranged, empty icons instead of hidden,
background and scaling of thumbnail

Change-Id: Iae095134a717cb50670bf5d1786774c6424d283e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104079
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index e96e76e85fd2..19b7730b60a4 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -394,8 +394,6 @@
 #define RID_SVXSTR_ADDITIONS_INSTALLBUTTON  
NC_("RID_SVXSTR_ADDITIONS_INSTALLBUTTON", "Install")
 #define RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON
NC_("RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON", "Installed")
 #define RID_SVXSTR_ADDITIONS_INSTALLING 
NC_("RID_SVXSTR_ADDITIONS_INSTALLING", "Installing")
-#define RID_SVXSTR_ADDITIONS_LICENCE
NC_("RID_SVXSTR_ADDITIONS_LICENCE", "License:")
-#define RID_SVXSTR_ADDITIONS_REQUIREDVERSION
NC_("RID_SVXSTR_ADDITIONS_REQUIREDVERSION","Required version: >=")
 #define RID_SVXSTR_ADDITIONS_SEARCHING  
NC_("RID_SVXSTR_ADDITIONS_SEARCHING", "Searching...")
 #define RID_SVXSTR_ADDITIONS_LOADING
NC_("RID_SVXSTR_ADDITIONS_LOADING", "Loading...")
 #define RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX
NC_("RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX", "Extensions")
diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index 7d5d953ad976..ad8f5de0928b 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -282,6 +282,8 @@ bool getPreviewFile(const AdditionInfo& aAdditionInfo, 
OUString& sPreviewFile)
 
 void LoadImage(const OUString& rPreviewFile, std::shared_ptr 
pCurrentItem)
 {
+const sal_Int8 Margin = 6;
+
 SolarMutexGuard aGuard;
 
 GraphicFilter aFilter;
@@ -292,11 +294,30 @@ void LoadImage(const OUString& rPreviewFile, 
std::shared_ptr pCur
 // for VCL to be able to create bitmaps / do visual changes in the thread
 aFilter.ImportGraphic(aGraphic, aURLObj);
 BitmapEx aBmp = aGraphic.GetBitmapEx();
+Size aBmpSize = aBmp.GetSizePixel();
+Size aThumbSize(pCurrentItem->m_xImageScreenshot->get_size_request());
+if (!aBmp.IsEmpty())
+{
+double aScale;
+if (aBmpSize.Width() > aThumbSize.Width() - 2 * Margin)
+{
+aScale = static_cast(aBmpSize.Width()) / 
(aThumbSize.Width() - 2 * Margin);
+aBmp.Scale(Size(aBmpSize.Width() / aScale, aBmpSize.Height() / 
aScale));
+}
+else if (aBmpSize.Height() > aThumbSize.Height() - 2 * Margin)
+{
+aScale = static_cast(aBmpSize.Height()) / 
(aThumbSize.Height() - 2 * Margin);
+aBmp.Scale(Size(aBmpSize.Width() / aScale, aBmpSize.Height() / 
aScale));
+};
+aBmpSize = aBmp.GetSizePixel();
+}
 
 ScopedVclPtr xVirDev = 
pCurrentItem->m_xImageScreenshot->create_virtual_device();
-xVirDev->SetOutputSizePixel(aBmp.GetSizePixel());
-xVirDev->DrawBitmapEx(Point(0, 0), aBmp);
-
+xVirDev->SetOutputSizePixel(aThumbSize);
+//white background since images come with a white border
+xVirDev->SetBackground(Wallpaper(COL_WHITE));
+xVirDev->Erase();
+xVirDev->DrawBitmapEx(Point(aThumbSize.Width() / 2 - aBmpSize.Width() / 2, 
Margin), aBmp);
 pCurrentItem->m_xImageScreenshot->set_image(xVirDev.get());
 xVirDev.disposeAndClear();
 }
@@ -606,12 +627,13 @@ AdditionsItem::AdditionsItem(weld::Widget* pParent, 
AdditionsDialog* pParentDial
 , m_xContainer(m_xBuilder->weld_widget("additionsEntry"))
 , m_xImageScreenshot(m_xBuilder->weld_image("imageScreenshot"))
 , m_xButtonInstall(m_xBuilder->weld_button("buttonInstall"))
-, m_xLinkButtonName(m_xBuilder->weld_link_button("linkButtonName"))
+, m_xLinkButtonWebsite(m_xBuilder->weld_link_button("btnWebsite"))
+, m_xLabelName(m_xBuilder->weld_label("lbName"))
 , m_xLabelAuthor(m_xBuilder->weld_label("labelAuthor"))
 , 

[Libreoffice-commits] core.git: cui/inc cui/source

[George Bateman (via logerrit)]

 cui/inc/bitmaps.hlst   |5 +
 cui/inc/numcategories.hrc  |5 +
 cui/inc/strings.hrc|4 +---
 cui/inc/strings.hxx|5 +
 cui/inc/tipoftheday.hrc|5 +
 cui/inc/treeopt.hrc|5 +
 cui/inc/twolines.hrc   |5 +
 cui/source/factory/dlgfact.hxx |5 +
 cui/source/inc/DiagramDialog.hxx   |5 +
 cui/source/inc/FontFeaturesDialog.hxx  |5 +
 cui/source/inc/QrCodeGenDialog.hxx |5 +
 cui/source/inc/SignSignatureLineDialog.hxx |5 +
 cui/source/inc/SignatureLineDialog.hxx |5 +
 cui/source/inc/SignatureLineDialogBase.hxx |5 +
 cui/source/inc/SpellDialog.hxx |5 +
 cui/source/inc/about.hxx   |5 +
 cui/source/inc/align.hxx   |5 +
 cui/source/inc/autocdlg.hxx|5 +
 cui/source/inc/backgrnd.hxx|5 +
 cui/source/inc/bbdlg.hxx   |5 +
 cui/source/inc/border.hxx  |5 +
 cui/source/inc/cfgutil.hxx |5 +
 cui/source/inc/chardlg.hxx |5 +
 cui/source/inc/connect.hxx |5 +
 cui/source/inc/cuifmsearch.hxx |5 +
 cui/source/inc/cuigaldlg.hxx   |5 +
 cui/source/inc/cuigrfflt.hxx   |5 +
 cui/source/inc/cuihyperdlg.hxx |5 +
 cui/source/inc/cuiimapwnd.hxx  |5 +
 cui/source/inc/cuioptgenrl.hxx |5 +
 cui/source/inc/cuisrchdlg.hxx  |5 +
 cui/source/inc/cuitabarea.hxx  |5 +
 cui/source/inc/cuitabline.hxx  |5 +
 cui/source/inc/cuitbxform.hxx  |5 +
 cui/source/inc/dbregister.hxx  |5 +
 cui/source/inc/defdlgname.hxx  |5 +
 cui/source/inc/dlgname.hxx |5 +
 cui/source/inc/dstribut.hxx|5 +
 cui/source/inc/grfpage.hxx |5 +
 cui/source/inc/hangulhanjadlg.hxx  |5 +
 cui/source/inc/headertablistbox.hxx|5 +
 cui/source/inc/helpids.h   |5 +
 cui/source/inc/hldocntp.hxx|5 +
 cui/source/inc/hldoctp.hxx |5 +
 cui/source/inc/hlinettp.hxx|5 +
 cui/source/inc/hlmailtp.hxx|5 +
 cui/source/inc/hlmarkwn.hxx|5 +
 cui/source/inc/hlmarkwn_def.hxx|5 +
 cui/source/inc/hltpbase.hxx|5 +
 cui/source/inc/hyphen.hxx  |5 +
 cui/source/inc/iconcdlg.hxx|5 +
 cui/source/inc/insdlg.hxx  |5 +
 cui/source/inc/insrc.hxx   |5 +
 cui/source/inc/labdlg.hxx  |5 +
 cui/source/inc/linkdlg.hxx |5 +
 cui/source/inc/macroass.hxx|5 +
 cui/source/inc/macropg.hxx |5 +
 cui/source/inc/measure.hxx |5 +
 cui/source/inc/multipat.hxx|5 +
 cui/source/inc/newtabledlg.hxx |5 +
 cui/source/inc/numfmt.hxx  |5 +
 cui/source/inc/numpages.hxx|5 +
 cui/source/inc/optasian.hxx|5 +
 cui/source/inc/optdict.hxx |5 +
 cui/source/inc/optlingu.hxx|5 +
 cui/source/inc/optpath.hxx |5 +
 cui/source/inc/page.hxx|5 +
 cui/source/inc/paragrph.hxx|5 +
 cui/source/inc/passwdomdlg.hxx |5 +
 cui/source/inc/pastedlg.hxx|5 +
 cui/source/inc/postdlg.hxx |5 +
 cui/source/inc/screenshotannotationdlg.hxx |5 +
 cui/source/inc/scriptdlg.hxx   |5 +
 cui/source/inc/sdrcelldlg.hxx  |5 +
 cui/source/inc/showcols.hxx|5 +
 cui/source/inc/splitcelldlg.hxx|5 +
 cui/source/inc/srchxtra.hxx|5 +
 cui/source/inc/swpossizetabpage.hxx|5 +
 cui/source/inc/tabstpge.hxx|5 +
 cui/source/inc/textanim.hxx|5 +
 cui/source/inc/textattr.hxx|5 +
 cui/source/inc/thesdlg.hxx |5 +
 cui/source/inc/tipofthedaydlg.hxx  |5 +
 cui/source/inc/transfrm.hxx|5 +
 cui/source/inc/treeopt.hxx |5 +
 cui/source/inc/zoom.hxx|5 +
 cui/source/options/optbasic.hxx|5 +
 cui/source/options/optchart.hxx 

[Libreoffice-commits] core.git: cui/inc cui/source

[Muhammet Kara (via logerrit)]

 cui/inc/strings.hrc|3 ++-
 cui/source/dialogs/AdditionsDialog.cxx |   19 ++-
 2 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 627e13079adb5ff6281530c9584da9065d6410ab
Author: Muhammet Kara 
AuthorDate: Fri Sep 11 00:44:03 2020 +0300
Commit: Muhammet Kara 
CommitDate: Fri Sep 11 10:26:38 2020 +0200

Additions: Clean-up and localize labels

Change-Id: I7073df0d277399745a9c7e0de4d240121ce7b37b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102410
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index d1b39a67e541..92f5b665c7ee 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -393,11 +393,12 @@
 #define RID_SVXSTR_DELETEUSERCOLOR2 
NC_("RID_SVXSTR_DELETEUSERCOLOR2", "Please select the color to delete")
 
 #define RID_SVXSTR_ADDITIONS_INSTALLBUTTON  
NC_("RID_SVXSTR_ADDITIONS_INSTALLBUTTON", "Install")
+#define RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON
NC_("RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON", "Installed")
+#define RID_SVXSTR_ADDITIONS_INSTALLING 
NC_("RID_SVXSTR_ADDITIONS_INSTALLING", "Installing")
 #define RID_SVXSTR_ADDITIONS_LICENCE
NC_("RID_SVXSTR_ADDITIONS_LICENCE", "License:")
 #define RID_SVXSTR_ADDITIONS_REQUIREDVERSION
NC_("RID_SVXSTR_ADDITIONS_REQUIREDVERSION","Required version: >=")
 #define RID_SVXSTR_ADDITIONS_SEARCHING  
NC_("RID_SVXSTR_ADDITIONS_SEARCHING", "Searching...")
 #define RID_SVXSTR_ADDITIONS_LOADING
NC_("RID_SVXSTR_ADDITIONS_LOADING", "Loading...")
-#define RID_SVXSTR_ADDITIONS_NORESULTS  
NC_("ID_SVXSTR_ADDITIONS_NORESULTS", "No results found")
 #define RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX
NC_("RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX", "Extensions")
 #endif
 
diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index fcae696e7e5f..c9b70b2bf908 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -408,7 +408,8 @@ void SearchAndParseThread::CheckInstalledExtensions()
 else
 {
 rInfo->m_xButtonInstall->set_sensitive(false);
-rInfo->m_xButtonInstall->set_label("Installed");
+rInfo->m_xButtonInstall->set_label(
+CuiResId(RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON));
 }
 }
 }
@@ -756,14 +757,14 @@ IMPL_LINK_NOARG(AdditionsItem, ShowMoreHdl, 
weld::Button&, void)
 
 IMPL_LINK_NOARG(AdditionsItem, InstallHdl, weld::Button&, void)
 {
-m_xButtonInstall->set_label("Installing");
+m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLING));
 m_xButtonInstall->set_sensitive(false);
 OUString aExtensionFile;
 bool bResult = getExtensionFile(aExtensionFile); // info vector json data
 
 if (!bResult)
 {
-m_xButtonInstall->set_label("Install");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON));
 m_xButtonInstall->set_sensitive(true);
 
 SAL_INFO("cui.dialogs", "Couldn't get the extension file.");
@@ -778,36 +779,36 @@ IMPL_LINK_NOARG(AdditionsItem, InstallHdl, weld::Button&, 
void)
 {
 m_pParentDialog->m_xExtensionManager->addExtension(
 aExtensionFile, uno::Sequence(), "user", 
xAbortChannel, xCmdEnv);
-m_xButtonInstall->set_label("Installed");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON));
 }
 catch (const ucb::CommandFailedException)
 {
 SAL_WARN("cui.dialogs", "Additions: addExtension 
CommandFailedException occurred.");
-m_xButtonInstall->set_label("Install");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON));
 m_xButtonInstall->set_sensitive(true);
 }
 catch (const ucb::CommandAbortedException)
 {
 SAL_WARN("cui.dialogs", "Additions: addExtension 
CommandAbortedException occurred.");
-m_xButtonInstall->set_label("Install");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON));
 m_xButtonInstall->set_sensitive(true);
 }
 catch (const deployment::DeploymentException)
 {
 SAL_WARN("cui.dialogs", "Additions: addExtension DeploymentException 
occurred.");
-m_xButtonInstall->set_label("Install");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON));
 m_xButtonInstall->set_sensitive(true);
 }
 catch (const lang::IllegalArgumentException)
 {
 SAL_WARN("cui.dialogs", "Additions: addExtension 
IllegalArgumentException occurred.");
-m_xButtonInstall->set_label("Install");
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON));
 

[Libreoffice-commits] core.git: cui/inc cui/source include/sfx2 include/vcl sc/source sd/source sfx2/sdi sfx2/source sw/source

[Yusuf Keten (via logerrit)]

 cui/inc/strings.hrc|2 +-
 cui/source/dialogs/AdditionsDialog.cxx |   26 --
 cui/source/factory/dlgfact.cxx |6 +++---
 cui/source/factory/dlgfact.hxx |2 +-
 cui/source/inc/AdditionsDialog.hxx |3 ++-
 include/sfx2/sfxsids.hrc   |1 +
 include/vcl/abstdlg.hxx|2 +-
 sc/source/ui/view/tabvwshb.cxx |   21 ++---
 sd/source/ui/view/drviews2.cxx |8 +++-
 sfx2/sdi/sfx.sdi   |2 +-
 sfx2/source/appl/appuno.cxx|1 +
 sw/source/uibase/uiview/viewdlg2.cxx   |   10 +-
 12 files changed, 61 insertions(+), 23 deletions(-)

New commits:
commit 6e50e03262aa12921f108b502d3c76ce983d54f1
Author: Yusuf Keten 
AuthorDate: Sun Jul 19 20:22:23 2020 +0300
Commit: Muhammet Kara 
CommitDate: Tue Jul 21 22:25:13 2020 +0200

tdf#133026: Additions - Parameter support to UNO Command

After this patch, parameter support to uno command(.uno:AdditionsDialog) 
will be available.
To use parameter, add "?AdditionsTag:string=YourParameter" to UNO command. 
Parameters are the tags of extensions on webpage.

Change-Id: I0072c7340bda14ee13c21c347e06a04545cba69a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99007
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index be9c3f7d3a3e..d1b39a67e541 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -398,7 +398,7 @@
 #define RID_SVXSTR_ADDITIONS_SEARCHING  
NC_("RID_SVXSTR_ADDITIONS_SEARCHING", "Searching...")
 #define RID_SVXSTR_ADDITIONS_LOADING
NC_("RID_SVXSTR_ADDITIONS_LOADING", "Loading...")
 #define RID_SVXSTR_ADDITIONS_NORESULTS  
NC_("ID_SVXSTR_ADDITIONS_NORESULTS", "No results found")
-
+#define RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX
NC_("RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX", "Extensions")
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index 73b0247b8b0a..975fa57415fd 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -207,7 +207,7 @@ void parseResponse(const std::string& rResponse, 
std::vector& aAdd
   RTL_TEXTENCODING_UTF8),
 
OStringToOUString(OString(arrayElement.child("author").string_value().get()),
   RTL_TEXTENCODING_UTF8),
-
OStringToOUString(OString(arrayElement.child("URL").string_value().get()),
+
OStringToOUString(OString(arrayElement.child("url").string_value().get()),
   RTL_TEXTENCODING_UTF8),
 
OStringToOUString(OString(arrayElement.child("screenshotURL").string_value().get()),
   RTL_TEXTENCODING_UTF8),
@@ -219,13 +219,13 @@ void parseResponse(const std::string& rResponse, 
std::vector& aAdd
 RTL_TEXTENCODING_UTF8),
 OStringToOUString(OString(arrayElement.child("releases")
   .child(0)
-  .child("compatibleVersion")
+  .child("compatibility")
   .string_value()
   .get()),
   RTL_TEXTENCODING_UTF8),
 OStringToOUString(OString(arrayElement.child("releases")
   .child(0)
-  .child("releaseNumber")
+  .child("releaseName")
   .string_value()
   .get()),
   RTL_TEXTENCODING_UTF8),
@@ -414,7 +414,7 @@ void SearchAndParseThread::execute()
 m_pAdditionsDialog->SetProgress(sProgress);
 }
 
-AdditionsDialog::AdditionsDialog(weld::Window* pParent)
+AdditionsDialog::AdditionsDialog(weld::Window* pParent, const OUString& 
sAdditionsTag)
 : GenericDialogController(pParent, "cui/ui/additionsdialog.ui", 
"AdditionsDialog")
 , m_aSearchDataTimer("SearchDataTimer")
 , m_xEntrySearch(m_xBuilder->weld_entry("entrySearch"))
@@ -430,8 +430,22 @@ AdditionsDialog::AdditionsDialog(weld::Window* pParent)
 m_xEntrySearch->connect_changed(LINK(this, AdditionsDialog, 
SearchUpdateHdl));
 m_xEntrySearch->connect_focus_out(LINK(this, AdditionsDialog, 
FocusOut_Impl));
 
-// TODO - Temporary URL
-OString rURL = "https://yusufketen.com/extensionTest.json;;
+m_sTag = OUStringToOString(sAdditionsTag, RTL_TEXTENCODING_UTF8);
+
+OUString titlePrefix = CuiResId(RID_SVXSTR_ADDITIONS_DIALOG_TITLE_PREFIX);
+if 

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig

[Yusuf Keten (via logerrit)]

 cui/inc/strings.hrc|3 
 cui/source/dialogs/AdditionsDialog.cxx |  301 +++--
 cui/source/inc/AdditionsDialog.hxx |   30 +++
 cui/uiconfig/ui/additionsdialog.ui |   47 -
 4 files changed, 323 insertions(+), 58 deletions(-)

New commits:
commit daefcf77bd99d9dae9aaa08695c40c2a99d753d7
Author: Yusuf Keten 
AuthorDate: Tue Jul 7 03:22:01 2020 +0300
Commit: Muhammet Kara 
CommitDate: Fri Jul 10 12:39:56 2020 +0200

tdf#133026: Tight integration of extensions - Adding thread structure

- Add new class - SearchAndParseThread.
- Add new label to show progress such as not found, loading, searching, etc.
- Add cache to prevent unnecessary data transfers.

Change-Id: Ieb5dbdabc3c9b5224e89be959728ca9b6d5c63b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98226
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index d54a0f9cd370..be9c3f7d3a3e 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -395,6 +395,9 @@
 #define RID_SVXSTR_ADDITIONS_INSTALLBUTTON  
NC_("RID_SVXSTR_ADDITIONS_INSTALLBUTTON", "Install")
 #define RID_SVXSTR_ADDITIONS_LICENCE
NC_("RID_SVXSTR_ADDITIONS_LICENCE", "License:")
 #define RID_SVXSTR_ADDITIONS_REQUIREDVERSION
NC_("RID_SVXSTR_ADDITIONS_REQUIREDVERSION","Required version: >=")
+#define RID_SVXSTR_ADDITIONS_SEARCHING  
NC_("RID_SVXSTR_ADDITIONS_SEARCHING", "Searching...")
+#define RID_SVXSTR_ADDITIONS_LOADING
NC_("RID_SVXSTR_ADDITIONS_LOADING", "Loading...")
+#define RID_SVXSTR_ADDITIONS_NORESULTS  
NC_("ID_SVXSTR_ADDITIONS_NORESULTS", "No results found")
 
 #endif
 
diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index 5ed8ad97e46c..ba49e07b9365 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -7,23 +7,41 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  */
+#include 
 
 #include 
+
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -40,14 +58,25 @@ using ::com::sun::star::graphic::XGraphicProvider;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::PropertyValue;
 using ::com::sun::star::graphic::XGraphic;
+using namespace com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::ucb;
+using namespace ::com::sun::star::beans;
+
+#ifdef UNX
+const char kUserAgent[] = "LibreOffice AdditionsDownloader/1.0 (Linux)";
+#else
+const char kUserAgent[] = "LibreOffice AdditionsDownloader/1.0 (unknown 
platform)";
+#endif
 
 namespace
 {
 struct AdditionInfo
 {
+OUString sExtensionID;
 OUString sName;
 OUString sAuthorName;
-OUString sPreviewURL;
+OUString sExtensionURL;
 OUString sScreenshotURL;
 OUString sIntroduction;
 OUString sDescription;
@@ -72,6 +101,18 @@ size_t WriteCallback(void* ptr, size_t size, size_t nmemb, 
void* userp)
 return real_size;
 }
 
+// Callback to get the response data from server to a file.
+size_t WriteCallbackFile(void* ptr, size_t size, size_t nmemb, void* userp)
+{
+if (!userp)
+return 0;
+
+SvStream* response = static_cast(userp);
+size_t real_size = size * nmemb;
+response->WriteBytes(ptr, real_size);
+return real_size;
+}
+
 // Gets the content of the given URL and returns as a standard string
 std::string curlGet(const OString& rURL)
 {
@@ -104,6 +145,36 @@ std::string curlGet(const OString& rURL)
 return response_body;
 }
 
+// Downloads and saves the file at the given rURL to a local path (sFileURL)
+void curlDownload(const OString& rURL, const OUString& sFileURL)
+{
+CURL* curl = curl_easy_init();
+SvFileStream aFile(sFileURL, StreamMode::WRITE);
+
+if (!curl)
+return;
+
+curl_easy_setopt(curl, CURLOPT_URL, rURL.getStr());
+curl_easy_setopt(curl, CURLOPT_USERAGENT, kUserAgent);
+
+curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallbackFile);
+curl_easy_setopt(curl, CURLOPT_WRITEDATA, static_cast());
+
+CURLcode cc = curl_easy_perform(curl);
+long http_code = 0;
+curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, _code);
+
+if (http_code != 200)
+{
+SAL_WARN("cui.dialogs", "Download failed. Error code: " << http_code);
+}
+
+if (cc != CURLE_OK)
+{
+SAL_WARN("cui.dialogs", "curl error: " << cc);
+}
+}
+
 void parseResponse(const std::string& rResponse, std::vector& 
aAdditions)
 {
 orcus::json::document_tree aJsonDoc;
@@ -130,6 +201,8 @@ void parseResponse(const std::string& rResponse, 

[Libreoffice-commits] core.git: cui/inc cui/source editeng/source include/editeng officecfg/registry

[László Németh (via logerrit)]

 cui/inc/strings.hrc|1 
 cui/source/inc/autocdlg.hxx|1 
 cui/source/tabpages/autocdlg.cxx   |   17 +-
 editeng/source/misc/acorrcfg.cxx   |   22 +
 editeng/source/misc/svxacorr.cxx   |5 ++
 editeng/source/misc/swafopt.cxx|1 
 include/editeng/svxacorr.hxx   |3 +
 include/editeng/swafopt.hxx|1 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 
 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8 
 10 files changed, 58 insertions(+), 9 deletions(-)

New commits:
commit 77b213890a96d144d9cfacdfd35ac0bba68b9f7a
Author: László Németh 
AuthorDate: Tue Jun 23 18:49:46 2020 +0200
Commit: László Németh 
CommitDate: Fri Jun 26 09:01:20 2020 +0200

tdf#133524 add option to angle quote AutoCorrect

in Localized Options page of AutoCorrect Options
dialog window:

[x] Replace << and >> with angle quotes

Note: this is optional part of Double Quotes replacement.
Change-Id: Ib0c7e8837a89c3772c5db76720811d440e62183a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97094
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 20ec52202bc0..d54a0f9cd370 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -333,6 +333,7 @@
 #define RID_SVXSTR_NON_BREAK_SPACE  
NC_("RID_SVXSTR_NON_BREAK_SPACE", "Add non-breaking space before specific 
punctuation marks in French text")
 #define RID_SVXSTR_ORDINAL  NC_("RID_SVXSTR_ORDINAL", 
"Format ordinal numbers suffixes (1st -> 1^st)")
 #define RID_SVXSTR_OLD_HUNGARIAN
NC_("RID_SVXSTR_OLD_HUNGARIAN", "Transliterate to Old Hungarian if the text 
direction is from right to left")
+#define RID_SVXSTR_ANGLE_QUOTES 
NC_("RID_SVXSTR_ANGLE_QUOTES", "Replace << and >> with angle quotes")
 #define RID_SVXSTR_DEL_EMPTY_PARA   
NC_("RID_SVXSTR_DEL_EMPTY_PARA", "Remove blank paragraphs")
 #define RID_SVXSTR_USER_STYLE   
NC_("RID_SVXSTR_USER_STYLE", "Replace Custom Styles")
 #define RID_SVXSTR_BULLET   NC_("RID_SVXSTR_BULLET", 
"Replace bullets with: %1")
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 11eb7b9de89b..e0c780fe831e 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -269,6 +269,7 @@ private:
 OUStringsNonBrkSpace;
 OUStringsOrdinal;
 OUStringsTransliterateRTL;
+OUStringsAngleQuotes;
 
 sal_UCS4cSglStartQuote;
 sal_UCS4cSglEndQuote;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 807f0cd2d284..ef413c52d54d 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1525,7 +1525,8 @@ enum OfaQuoteOptions
 {
 ADD_NONBRK_SPACE,
 REPLACE_1ST,
-TRANSLITERATE_RTL
+TRANSLITERATE_RTL,
+REPLACE_ANGLE_QUOTES
 };
 
 }
@@ -1546,6 +1547,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(weld::Container* pPage, 
weld::DialogController*
 , sNonBrkSpace(CuiResId(RID_SVXSTR_NON_BREAK_SPACE))
 , sOrdinal(CuiResId(RID_SVXSTR_ORDINAL))
 , sTransliterateRTL(CuiResId(RID_SVXSTR_OLD_HUNGARIAN))
+, sAngleQuotes(CuiResId(RID_SVXSTR_ANGLE_QUOTES))
 , cSglStartQuote(0)
 , cSglEndQuote(0)
 , cStartQuote(0)
@@ -1620,6 +1622,7 @@ bool OfaQuoteTabPage::FillItemSet( SfxItemSet*  )
 pAutoCorrect->SetAutoCorrFlag(ACFlags::AddNonBrkSpace, 
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
 pAutoCorrect->SetAutoCorrFlag(ACFlags::ChgOrdinalNumber, 
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
 pAutoCorrect->SetAutoCorrFlag(ACFlags::TransliterateRTL, 
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
+pAutoCorrect->SetAutoCorrFlag(ACFlags::ChgAngleQuotes, 
m_xCheckLB->get_toggle(nPos++) == TRISTATE_TRUE);
 }
 
 bool bModified = false;
@@ -1644,6 +1647,12 @@ bool OfaQuoteTabPage::FillItemSet( SfxItemSet*  )
 pOpt->bTransliterateRTL = bCheck;
 pAutoCorrect->SetAutoCorrFlag(ACFlags::TransliterateRTL,
 m_xSwCheckLB->get_toggle(TRANSLITERATE_RTL, 
CBCOL_SECOND) == TRISTATE_TRUE);
+
+bCheck = m_xSwCheckLB->get_toggle(REPLACE_ANGLE_QUOTES, CBCOL_FIRST) 
== TRISTATE_TRUE;
+bModified |= pOpt->bChgAngleQuotes != bCheck;
+pOpt->bChgAngleQuotes = bCheck;
+pAutoCorrect->SetAutoCorrFlag(ACFlags::ChgAngleQuotes,
+m_xSwCheckLB->get_toggle(REPLACE_ANGLE_QUOTES, 
CBCOL_SECOND) == TRISTATE_TRUE);
 }
 
 pAutoCorrect->SetAutoCorrFlag(ACFlags::ChgQuotes, 
m_xDoubleTypoCB->get_active());
@@ -1704,6 +1713,7 @@ void 

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig

[Caolán McNamara (via logerrit)]

 cui/inc/strings.hrc|1 
 cui/source/dialogs/passwdomdlg.cxx |   30 +
 cui/source/inc/passwdomdlg.hxx |7 +
 cui/uiconfig/ui/password.ui|  222 -
 4 files changed, 209 insertions(+), 51 deletions(-)

New commits:
commit a81d7c4e0379a021664f8f6c5e9032a47fcf61d6
Author: Caolán McNamara 
AuthorDate: Wed Jun 17 14:09:29 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jun 17 16:37:17 2020 +0200

tdf#43452 indicate when maximum password length has been reached

Change-Id: I58ba5887d41a80aa0ef2be547351f2faeccfa3cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96533
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 6312f38b6d53..dcfbcc0f4e9c 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -210,6 +210,7 @@
 #define RID_SVXSTR_TWO_PASSWORDS_MISMATCH   
NC_("RID_SVXSTR_TWO_PASSWORDS_MISMATCH", "The confirmation passwords did not 
match the original passwords. Set the passwords again.")
 #define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON  
NC_("RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON", "Please enter a password to open 
or to modify, or check the open read-only option to continue.")
 #define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2   
NC_("RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2", "Set the password by entering 
the same password in both boxes.")
+#define RID_SVXSTR_PASSWORD_LEN_INDICATOR   
NC_("RID_SVXSTR_PASSWORD_LEN_INDICATOR", "Password length limit of %1 reached")
 
 #define STR_AUTOLINKNC_("STR_AUTOLINK", 
"Automatic")
 #define STR_MANUALLINK  NC_("STR_MANUALLINK", 
"Manual")
diff --git a/cui/source/dialogs/passwdomdlg.cxx 
b/cui/source/dialogs/passwdomdlg.cxx
index f7b359bac237..250f9e728253 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -69,21 +69,43 @@ IMPL_LINK_NOARG(PasswordToOpenModifyDialog, OkBtnClickHdl, 
weld::Button&, void)
 }
 }
 
+IMPL_LINK(PasswordToOpenModifyDialog, ChangeHdl, weld::Entry&, rEntry, void)
+{
+weld::Label* pIndicator = nullptr;
+int nLength = rEntry.get_text().getLength();
+if ( == m_xPasswdToOpenED.get())
+pIndicator = m_xPasswdToOpenInd.get();
+else if ( == m_xReenterPasswdToOpenED.get())
+pIndicator = m_xReenterPasswdToOpenInd.get();
+else if ( == m_xPasswdToModifyED.get())
+pIndicator = m_xPasswdToModifyInd.get();
+else if ( == m_xReenterPasswdToModifyED.get())
+pIndicator = m_xReenterPasswdToModifyInd.get();
+assert(pIndicator);
+pIndicator->set_visible(nLength >= m_nMaxPasswdLen);
+}
+
 PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(weld::Window * pParent, 
sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify)
 : SfxDialogController(pParent, "cui/ui/password.ui", "PasswordDialog")
 , m_xPasswdToOpenED(m_xBuilder->weld_entry("newpassEntry"))
+, m_xPasswdToOpenInd(m_xBuilder->weld_label("newpassIndicator"))
 , m_xReenterPasswdToOpenED(m_xBuilder->weld_entry("confirmpassEntry"))
+, m_xReenterPasswdToOpenInd(m_xBuilder->weld_label("confirmpassIndicator"))
 , m_xOptionsExpander(m_xBuilder->weld_expander("expander"))
 , m_xOk(m_xBuilder->weld_button("ok"))
 , m_xOpenReadonlyCB(m_xBuilder->weld_check_button("readonly"))
 , m_xPasswdToModifyFT(m_xBuilder->weld_label("label7"))
 , m_xPasswdToModifyED(m_xBuilder->weld_entry("newpassroEntry"))
+, m_xPasswdToModifyInd(m_xBuilder->weld_label("newpassroIndicator"))
 , m_xReenterPasswdToModifyFT(m_xBuilder->weld_label("label8"))
 , m_xReenterPasswdToModifyED(m_xBuilder->weld_entry("confirmropassEntry"))
+, 
m_xReenterPasswdToModifyInd(m_xBuilder->weld_label("confirmropassIndicator"))
 , m_aOneMismatch( CuiResId( RID_SVXSTR_ONE_PASSWORD_MISMATCH ) )
 , m_aTwoMismatch( CuiResId( RID_SVXSTR_TWO_PASSWORDS_MISMATCH ) )
 , m_aInvalidStateForOkButton( CuiResId( 
RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON ) )
 , m_aInvalidStateForOkButton_v2( CuiResId( 
RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2 ) )
+, 
m_aIndicatorTemplate(CuiResId(RID_SVXSTR_PASSWORD_LEN_INDICATOR).replaceFirst("%1",
 OUString::number(nMaxPasswdLen)))
+, m_nMaxPasswdLen(nMaxPasswdLen)
 , m_bIsPasswordToModify( bIsPasswordToModify )
 {
 m_xOk->connect_clicked(LINK(this, PasswordToOpenModifyDialog, 
OkBtnClickHdl));
@@ -91,9 +113,17 @@ 
PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(weld::Window * pParent, s
 if (nMaxPasswdLen)
 {
 m_xPasswdToOpenED->set_max_length( nMaxPasswdLen );
+m_xPasswdToOpenED->connect_changed(LINK(this, 
PasswordToOpenModifyDialog, ChangeHdl));
+m_xPasswdToOpenInd->set_label(m_aIndicatorTemplate);
 m_xReenterPasswdToOpenED->set_max_length( nMaxPasswdLen );
+m_xReenterPasswdToOpenED->connect_changed(LINK(this, 
PasswordToOpenModifyDialog, 

[Libreoffice-commits] core.git: cui/inc cui/source

[Heiko Tietze (via logerrit)]

 cui/inc/strings.hrc |2 ++
 cui/source/tabpages/tpcolor.cxx |   15 +++
 2 files changed, 17 insertions(+)

New commits:
commit c895a6d8298a349784cd0aafff4bf518ac8d0a7d
Author: Heiko Tietze 
AuthorDate: Fri May 15 10:51:10 2020 +0200
Commit: Heiko Tietze 
CommitDate: Fri May 15 11:46:52 2020 +0200

Resolves tdf#132799 - Deleting of colors unclear

Tooltips added for disabled states

Change-Id: Iad8bdd1c22ce6619e233a4a20b4efcc2d4c5a27c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94264
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index fb5a67ef015d..c70c46d59a39 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -395,6 +395,8 @@
 #define RID_SVXSTR_COMMANDTIP   
NC_("RID_SVXSTR_COMMANDLABEL", "Tooltip")
 
 #define RID_SVXSTR_QRCODEDATALONG   
NC_("RID_SVXSTR_QRCODEDATALONG", "Text exceeds the maximum bits for Error 
Correction, Enter shorter text")
+#define RID_SVXSTR_DELETEUSERCOLOR1 
NC_("RID_SVXSTR_DELETEUSERCOLOR1", "You can only delete user-defined colors")
+#define RID_SVXSTR_DELETEUSERCOLOR2 
NC_("RID_SVXSTR_DELETEUSERCOLOR2", "Please select the color to delete")
 
 #endif
 
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 62d6d321fe1c..5933985a9b50 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -125,6 +125,7 @@ SvxColorTabPage::SvxColorTabPage(weld::Container* pPage, 
weld::DialogController*
 // disable modify buttons
 // Color palettes can't be modified
 m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR1) );
 
 // disable preset color values
 m_xRGBpreset->set_sensitive(false);
@@ -365,6 +366,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl, 
weld::Button&, void)
 m_xValSetColorList->InsertItem( nId + 1 , aCurrentColor, aName );
 m_xValSetColorList->SelectItem( nId + 1 );
 m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR2) 
);
 ImpColorCountChanged();
 }
 
@@ -421,7 +423,10 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl, 
weld::Button&, void)
 SelectValSetHdl_Impl(m_xValSetColorList.get());
 }
 else
+{
 m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR2) 
);
+}
 }
 
 IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, weld::ComboBox&, void)
@@ -454,7 +459,10 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, 
weld::ComboBox&, void)
 }
 }
 if (nPos != 0)
+{
 m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR1) 
);
+}
 
 m_xValSetColorList->Resize();
 }
@@ -476,14 +484,21 @@ IMPL_LINK(SvxColorTabPage, SelectValSetHdl_Impl, 
ValueSet*, pValSet, void)
 {
 m_xValSetRecentList->SetNoSelection();
 if (m_xSelectPalette->get_active() == 0 && 
m_xValSetColorList->GetSelectedItemId() != 0)
+{
 m_xBtnDelete->set_sensitive(true);
+m_xBtnDelete->set_tooltip_text("");
+}
 else
+{
 m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( 
SvxResId(RID_SVXSTR_DELETEUSERCOLOR1) );
+}
 }
 if (pValSet == m_xValSetRecentList.get())
 {
 m_xValSetColorList->SetNoSelection();
 m_xBtnDelete->set_sensitive(false);
+m_xBtnDelete->set_tooltip_text( SvxResId(RID_SVXSTR_DELETEUSERCOLOR2) 
);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig icon-themes/colibre setup_native/source

[Heiko Tietze (via logerrit)]

 cui/inc/strings.hrc   |2 
 cui/source/dialogs/about.cxx  |   11 -
 cui/uiconfig/ui/aboutdialog.ui|   20 +-
 icon-themes/colibre/brand/intro-highres.png   |binary
 icon-themes/colibre/brand/intro.png   |binary
 icon-themes/colibre/brand/shell/logo.svg  |  188 --
 icon-themes/colibre/brand/shell/logo_inverted.svg |  188 --
 icon-themes/colibre/brand_dev/intro-highres.png   |binary
 icon-themes/colibre/brand_dev/intro.png   |binary
 setup_native/source/packinfo/osxdndinstall.png|binary
 10 files changed, 21 insertions(+), 388 deletions(-)

New commits:
commit 1bc96e1d9c4d372761ac4b6a2891cbcc3768a60f
Author: Heiko Tietze 
AuthorDate: Mon May 4 21:48:17 2020 +0200
Commit: Heiko Tietze 
CommitDate: Tue May 5 07:52:28 2020 +0200

Some improvements to About box and branding

* Label left-aligned (tdf#132322)
* Long build string cut at 25 chars
* Extra text such as Tinderbox info wraps now at Misc
* UI-Language shortened to just UI
* More padding between about image and text

* Splash screen uses Vegur font
* Splash with small border
* Non-TDF logos have a "Community Edition" text

Change-Id: I1ec31e22052e365f28fe91de3e083252975911c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93444
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index df99edb217b2..fb5a67ef015d 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -386,7 +386,7 @@
 #define RID_SVXSTR_ABOUT_VENDOR NC_("aboutdialog|vendor", 
"This release was supplied by %OOOVENDOR.")
 #define RID_SVXSTR_ABOUT_BASED_ON   
NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
 #define RID_SVXSTR_ABOUT_DERIVEDNC_("aboutdialog|derived", 
"%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
-#define RID_SVXSTR_ABOUT_UILOCALE   
NC_("aboutdialog|uilocale", "UI-Language: $LOCALE")
+#define RID_SVXSTR_ABOUT_UILOCALE   
NC_("aboutdialog|uilocale", "UI: $LOCALE")
 
 #define RID_SVXSTR_EDIT_PATHS   
NC_("optpathspage|editpaths", "Edit Paths: %1")
 
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index c07a8c964586..953670ffa7ae 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -71,10 +71,13 @@ AboutDialog::AboutDialog(weld::Window *pParent)
   m_pVersionLabel->set_label(GetVersionString());
 
   OUString sbuildId = GetBuildString();
+  const long nMaxChar = 25;
   if (IsStringValidGitHash(sbuildId)) {
-m_pBuildLabel->set_label(sbuildId);
-m_pBuildLabel->set_uri(
-"https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=; + 
sbuildId);
+
m_pBuildLabel->set_uri("https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=;
+   + sbuildId);
+m_pBuildLabel->set_label(sbuildId.getLength() > nMaxChar ? 
sbuildId.replaceAt(
+ nMaxChar, sbuildId.getLength() - nMaxChar, 
"...")
+ : sbuildId);
   } else {
 m_pBuildCaption->hide();
 m_pBuildLabel->hide();
@@ -104,7 +107,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
 m_pBrandImage->set_image(m_pVirDev.get());
 m_pVirDev.disposeAndClear();
   }
-  if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth)) {
+  if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 
0.9)) {
 ScopedVclPtr m_pVirDev =
 m_pAboutImage->create_virtual_device();
 m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel());
diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index 5f3610856e34..9c4dee2e2d70 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -76,7 +76,7 @@
 center
 center
 12
-12
+24
 True
 True
   
@@ -116,8 +116,7 @@
 True
 Version:
 True
-50
-1
+0
   
   
 0
@@ -130,7 +129,7 @@
 False
 True
 Build:
-1
+0
   
   
 0
@@ -143,7 +142,7 @@
 False
 True
 Environment:
-1
+0
   
   
 0
@@ -196,7 +195,8 @@
 False
 True
 Misc:
-

[Libreoffice-commits] core.git: cui/inc cui/source

[Heiko Tietze (via logerrit)]

 cui/inc/strings.hrc  |3 ---
 cui/source/dialogs/about.cxx |   34 --
 2 files changed, 8 insertions(+), 29 deletions(-)

New commits:
commit 35f5520fc83a2c69a5d5eef283a37b1553c8ed65
Author: Heiko Tietze 
AuthorDate: Thu Apr 30 16:32:59 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu Apr 30 20:45:59 2020 +0200

Drop obsolete variable strings

Change-Id: I0cd96b3466f94681567663625aa662717630e92f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93220
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 1049f7e7ff4f..df99edb217b2 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -381,14 +381,11 @@
 
 #define RID_SVXSTR_CANNOTCONVERTURL_ERR 
NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a 
filesystem path.")
 
-#define RID_SVXSTR_ABOUT_VERSION
NC_("aboutdialog|textbuffer1", 
"%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")
 #define RID_SVXSTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2020 LibreOffice contributors.")
 #define RID_SVXSTR_ABOUT_CREDITS_URLNC_("aboutdialog|link", 
"https://www.libreoffice.org/about-us/credits/;)
-#define RID_SVXSTR_ABOUT_BUILDIDNC_("aboutdialog|buildid", 
"$BUILDID")
 #define RID_SVXSTR_ABOUT_VENDOR NC_("aboutdialog|vendor", 
"This release was supplied by %OOOVENDOR.")
 #define RID_SVXSTR_ABOUT_BASED_ON   
NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
 #define RID_SVXSTR_ABOUT_DERIVEDNC_("aboutdialog|derived", 
"%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
-#define RID_SVXSTR_ABOUT_LOCALE NC_("aboutdialog|locale", 
"$LOCALE")
 #define RID_SVXSTR_ABOUT_UILOCALE   
NC_("aboutdialog|uilocale", "UI-Language: $LOCALE")
 
 #define RID_SVXSTR_EDIT_PATHS   
NC_("optpathspage|editpaths", "Edit Paths: %1")
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 845ad5496a37..c07a8c964586 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -142,7 +142,7 @@ bool AboutDialog::IsStringValidGitHash(const OUString 
) {
 }
 
 OUString AboutDialog::GetVersionString() {
-  OUString sVersion = CuiResId(RID_SVXSTR_ABOUT_VERSION);
+  OUString sVersion = 
CuiResId("%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX");
 
 #ifdef _WIN64
   sVersion += " (x64)";
@@ -163,18 +163,7 @@ OUString AboutDialog::GetBuildString() {
   }
   OSL_ENSURE(!sBuildId.isEmpty(), "No BUILDID in bootstrap file");
 
-  OUString sBuildStr;
-
-  if (!sBuildId.trim().isEmpty()) {
-sBuildStr = CuiResId(RID_SVXSTR_ABOUT_BUILDID);
-if (sBuildStr.indexOf("$BUILDID") == -1) {
-  SAL_WARN("cui.dialogs", "translated Build Id string in translations "
-  "doesn't contain $BUILDID placeholder");
-  sBuildStr += " $BUILDID";
-}
-sBuildStr = sBuildStr.replaceAll("$BUILDID", sBuildId);
-  }
-  return sBuildStr;
+  return sBuildId;
 }
 
 OUString AboutDialog::GetEnvString() { return Application::GetHWOSConfInfo(1); 
}
@@ -182,29 +171,22 @@ OUString AboutDialog::GetUIString() { return 
Application::GetHWOSConfInfo(2); }
 
 OUString AboutDialog::GetLocaleString() {
 
-  OUString aLocaleStr;
+  OUString sLocaleStr;
 
   rtl_Locale *pLocale;
   osl_getProcessLocale();
   if (pLocale && pLocale->Language) {
 if (pLocale->Country && rtl_uString_getLength(pLocale->Country) > 0)
-  aLocaleStr = OUString::unacquired(>Language) + "_" +
+  sLocaleStr = OUString::unacquired(>Language) + "_" +
OUString::unacquired(>Country);
 else
-  aLocaleStr = OUString(pLocale->Language);
+  sLocaleStr = OUString(pLocale->Language);
 if (pLocale->Variant && rtl_uString_getLength(pLocale->Variant) > 0)
-  aLocaleStr += OUString(pLocale->Variant);
+  sLocaleStr += OUString(pLocale->Variant);
   }
 
-  aLocaleStr = Application::GetSettings().GetLanguageTag().getBcp47() + " (" +
-   aLocaleStr + ")";
-  OUString sLocaleStr(CuiResId(RID_SVXSTR_ABOUT_LOCALE));
-  if (sLocaleStr.indexOf("$LOCALE") == -1) {
-SAL_WARN("cui.dialogs", "translated locale string in translations doesn't "
-"contain $LOCALE placeholder");
-sLocaleStr += " $LOCALE";
-  }
-  sLocaleStr = sLocaleStr.replaceAll("$LOCALE", aLocaleStr);
+  sLocaleStr = Application::GetSettings().GetLanguageTag().getBcp47() + " (" +
+   sLocaleStr + ")";
 
   OUString aUILocaleStr =
   Application::GetSettings().GetUILanguageTag().getBcp47();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig include/vcl vcl/source

[Heiko Tietze (via logerrit)]

 cui/inc/strings.hrc|6 -
 cui/source/dialogs/about.cxx   |  179 +++--
 cui/source/inc/about.hxx   |   16 ++-
 cui/uiconfig/ui/aboutdialog.ui |  195 -
 include/vcl/svapp.hxx  |4 
 vcl/source/app/svapp.cxx   |   70 +++---
 6 files changed, 340 insertions(+), 130 deletions(-)

New commits:
commit ab846145bbd56f4308c8657df8b1354a403edd74
Author: Heiko Tietze 
AuthorDate: Wed Apr 29 11:39:57 2020 +0200
Commit: Heiko Tietze 
CommitDate: Wed Apr 29 19:09:39 2020 +0200

Resolves tdf#132322 - Link to Gerrit hash reintroduced

Mulit-line label split, Build realized as link_button

Required changes also solve tdf#132066 partially as many
localized strings are not anymore copied to clipboard

Change-Id: I346fdc65cd1734f17854eccd587fe0b7e216e720
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93119
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 9c81a8e104f9..1049f7e7ff4f 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -381,14 +381,14 @@
 
 #define RID_SVXSTR_CANNOTCONVERTURL_ERR 
NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a 
filesystem path.")
 
-#define RID_SVXSTR_ABOUT_VERSION
NC_("aboutdialog|textbuffer1", "Version: 
%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")
+#define RID_SVXSTR_ABOUT_VERSION
NC_("aboutdialog|textbuffer1", 
"%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")
 #define RID_SVXSTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2020 LibreOffice contributors.")
 #define RID_SVXSTR_ABOUT_CREDITS_URLNC_("aboutdialog|link", 
"https://www.libreoffice.org/about-us/credits/;)
-#define RID_SVXSTR_ABOUT_BUILDIDNC_("aboutdialog|buildid", 
"Build ID: $BUILDID")
+#define RID_SVXSTR_ABOUT_BUILDIDNC_("aboutdialog|buildid", 
"$BUILDID")
 #define RID_SVXSTR_ABOUT_VENDOR NC_("aboutdialog|vendor", 
"This release was supplied by %OOOVENDOR.")
 #define RID_SVXSTR_ABOUT_BASED_ON   
NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
 #define RID_SVXSTR_ABOUT_DERIVEDNC_("aboutdialog|derived", 
"%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
-#define RID_SVXSTR_ABOUT_LOCALE NC_("aboutdialog|locale", 
"Locale: $LOCALE")
+#define RID_SVXSTR_ABOUT_LOCALE NC_("aboutdialog|locale", 
"$LOCALE")
 #define RID_SVXSTR_ABOUT_UILOCALE   
NC_("aboutdialog|uilocale", "UI-Language: $LOCALE")
 
 #define RID_SVXSTR_EDIT_PATHS   
NC_("optpathspage|editpaths", "Edit Paths: %1")
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index ed58d06acc1c..845ad5496a37 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -19,23 +19,23 @@
 
 #include 
 
-#include  //OSL_ENSURE
-#include  //osl_getProcessLocale
+#include //OSL_ENSURE
+#include  //osl_getProcessLocale
 #include  //rtl::isAsciiHexDigit
-#include  //SAL_WARN
-#include  //GetSettings
+#include//SAL_WARN
+#include   //GetSettings
+#include  //Application::
+#include //VirtualDevice
 #include 
-#include  //Application::
-#include  //VirtualDevice
 
+#include  //EXTRA_BUILDID
+#include   //CuiResId
 #include 
+#include  //SfxApplication::loadBrandSvg
+#include 
 #include 
 #include  //utl::Bootstrap::getBuildVersion
 #include  //ConfigManager::
-#include  //EXTRA_BUILDID
-#include  //CuiResId
-#include  //SfxApplication::loadBrandSvg
-#include 
 
 #include 
 #include 
@@ -58,13 +58,36 @@ AboutDialog::AboutDialog(weld::Window *pParent)
   m_pCopyButton(m_xBuilder->weld_button("btnCopyVersion")),
   m_pBrandImage(m_xBuilder->weld_image("imBrand")),
   m_pAboutImage(m_xBuilder->weld_image("imAbout")),
-  m_pVersionLabel(m_xBuilder->weld_label("lbVersion")),
+  m_pVersionLabel(m_xBuilder->weld_label("lbVersionString")),
+  m_pBuildCaption(m_xBuilder->weld_label("lbBuild")),
+  m_pBuildLabel(m_xBuilder->weld_link_button("lbBuildString")),
+  m_pEnvLabel(m_xBuilder->weld_label("lbEnvString")),
+  m_pUILabel(m_xBuilder->weld_label("lbUIString")),
+  m_pLocaleLabel(m_xBuilder->weld_label("lbLocaleString")),
+  m_pMiscLabel(m_xBuilder->weld_label("lbMiscString")),
   m_pCopyrightLabel(m_xBuilder->weld_label("lbCopyright")) {
+
+  // Labels
   m_pVersionLabel->set_label(GetVersionString());
+
+  OUString sbuildId = GetBuildString();
+  if (IsStringValidGitHash(sbuildId)) {
+m_pBuildLabel->set_label(sbuildId);
+m_pBuildLabel->set_uri(
+"https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=; + 
sbuildId);
+  } else {
+m_pBuildCaption->hide();
+

[Libreoffice-commits] core.git: cui/inc cui/source

[22shubh22 (via logerrit)]

 cui/inc/strings.hrc|2 +
 cui/source/dialogs/QrCodeGenDialog.cxx |   35 ++---
 cui/source/inc/QrCodeGenDialog.hxx |1 
 3 files changed, 31 insertions(+), 7 deletions(-)

New commits:
commit 93fe47e113628925b3caf33502326c7b136263a1
Author: 22shubh22 <22shub...@gmail.com>
AuthorDate: Tue Feb 25 14:47:29 2020 +0530
Commit: Mike Kaganski 
CommitDate: Fri Feb 28 18:50:45 2020 +0100

tdf#130272 A warning is now shown and LO do not crash

Change-Id: Icd4ef637cb07c03c11aead53417bd48e47241203
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89415
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 099174d752cf..70b06199e700 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -400,6 +400,8 @@
 #define RID_SVXSTR_COMMANDNAME  
NC_("RID_SVXSTR_COMMANDLABEL", "Command")
 #define RID_SVXSTR_COMMANDTIP   
NC_("RID_SVXSTR_COMMANDLABEL", "Tooltip")
 
+#define RID_SVXSTR_QRCODEDATALONG   
NC_("RID_SVXSTR_QRCODEDATALONG", "Text exceeds the maximum bits for Error 
Correction, Enter shorter text")
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx 
b/cui/source/dialogs/QrCodeGenDialog.cxx
index 7daaee9afa04..3be6aafe0931 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -11,9 +11,11 @@
 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
-#include 
+#include 
 
 #if defined(SYSTEM_QRCODEGEN)
 #include 
@@ -66,6 +68,7 @@ QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent, 
Reference xModel
   m_xBuilder->weld_radio_button("button_quartile"),
   m_xBuilder->weld_radio_button("button_high") }
 , m_xSpinBorder(m_xBuilder->weld_spin_button("edit_border"))
+, mpParent(pParent)
 {
 if (!bEditExisting)
 {
@@ -101,9 +104,28 @@ QrCodeGenDialog::QrCodeGenDialog(weld::Widget* pParent, 
Reference xModel
 
 short QrCodeGenDialog::run()
 {
-short nRet = GenericDialogController::run();
-if (nRet == RET_OK)
-Apply();
+short nRet;
+while (true)
+{
+nRet = GenericDialogController::run();
+if (nRet == RET_OK)
+{
+try
+{
+Apply();
+break;
+}
+catch (qrcodegen::data_too_long)
+{
+std::unique_ptr 
xBox(Application::CreateMessageDialog(
+mpParent, VclMessageType::Warning, VclButtonsType::Ok,
+CuiResId(RID_SVXSTR_QRCODEDATALONG)));
+xBox->run();
+}
+}
+else
+break;
+}
 return nRet;
 }
 
@@ -266,12 +288,11 @@ OUString QrCodeGenDialog::GenerateQRCode(OUString 
aQRText, long aQRECC, int aQRB
 OString o = OUStringToOString(aQRText, RTL_TEXTENCODING_UTF8);
 const char* qrtext = o.pData->buffer;
 
-//From Qr Code library.
+// From QR Code library
 qrcodegen::QrCode qr0 = qrcodegen::QrCode::encodeText(qrtext, bqrEcc);
 std::string svg = qr0.toSvgString(aQRBorder);
 //cstring to OUString
-char* cstr = [0];
-return OUString::createFromAscii(cstr);
+return OUString::createFromAscii(svg.c_str());
 #endif
 }
 
diff --git a/cui/source/inc/QrCodeGenDialog.hxx 
b/cui/source/inc/QrCodeGenDialog.hxx
index a3ca38d48d4a..563182d7a043 100644
--- a/cui/source/inc/QrCodeGenDialog.hxx
+++ b/cui/source/inc/QrCodeGenDialog.hxx
@@ -32,6 +32,7 @@ private:
 std::unique_ptr m_xEdittext;
 std::unique_ptr m_xECC[4];
 std::unique_ptr m_xSpinBorder;
+weld::Widget* mpParent;
 
 css::uno::Reference m_xExistingShapeProperties;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig

[Jim Raykowski (via logerrit)]

 cui/inc/strings.hrc |4 
 cui/source/customize/CommandCategoryListBox.cxx |1 +
 cui/source/customize/cfgutil.cxx|   12 
 cui/source/inc/cfgutil.hxx  |3 +++
 cui/uiconfig/ui/menuassignpage.ui   |1 +
 5 files changed, 21 insertions(+)

New commits:
commit fdb5ce011cb043475869d0b607ea25b8f32b4314
Author: Jim Raykowski 
AuthorDate: Thu Dec 5 02:55:57 2019 -0900
Commit: Heiko Tietze 
CommitDate: Fri Dec 20 07:22:04 2019 +0100

tdf#108458 Show tooltips in CuiConfigFunctionListBox

Change-Id: I6644e939c644c827e2b3ad019b975a3845585063
Reviewed-on: https://gerrit.libreoffice.org/84555
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 1ade0c0d6b38..3169862f2e54 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -396,6 +396,10 @@
 
 #define RID_SVXSTR_EDIT_PATHS   
NC_("optpathspage|editpaths", "Edit Paths: %1")
 
+#define RID_SVXSTR_COMMANDLABEL 
NC_("RID_SVXSTR_COMMANDLABEL", "Label")
+#define RID_SVXSTR_COMMANDNAME  
NC_("RID_SVXSTR_COMMANDLABEL", "Command")
+#define RID_SVXSTR_COMMANDTIP   
NC_("RID_SVXSTR_COMMANDLABEL", "Tooltip")
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/CommandCategoryListBox.cxx 
b/cui/source/customize/CommandCategoryListBox.cxx
index 7576d0771edc..d9e3f57b1352 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -243,6 +243,7 @@ void CommandCategoryListBox::FillFunctionsList(
 SfxGroupInfo_Impl* pGrpInfo = m_aGroupInfo.back().get();
 pGrpInfo->sCommand = rInfo.Command;
 pGrpInfo->sLabel   = sUIName;
+pGrpInfo->sTooltip = sTooltipLabel;
 
pFunctionListBox->append(OUString::number(reinterpret_cast(m_aGroupInfo.back().get())),
 sUIName, xImage);
 }
 }
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index b464ff53f4e4..e52ed440d311 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -278,6 +278,7 @@ 
CuiConfigFunctionListBox::CuiConfigFunctionListBox(std::unique_ptrmake_sorted();
 m_xTreeView->set_size_request(m_xTreeView->get_approximate_digit_width() * 
35, m_xTreeView->get_height_rows(9));
+m_xTreeView->connect_query_tooltip(LINK(this, CuiConfigFunctionListBox, 
QueryTooltip));
 }
 
 CuiConfigFunctionListBox::~CuiConfigFunctionListBox()
@@ -285,6 +286,17 @@ CuiConfigFunctionListBox::~CuiConfigFunctionListBox()
 ClearAll();
 }
 
+IMPL_LINK(CuiConfigFunctionListBox, QueryTooltip, const weld::TreeIter&, 
rIter, OUString)
+{
+SfxGroupInfo_Impl *pData = 
reinterpret_cast(m_xTreeView->get_id(rIter).toInt64());
+if (!pData)
+return OUString();
+OUString aLabel = CuiResId(RID_SVXSTR_COMMANDLABEL) + ": ";
+OUString aName = CuiResId(RID_SVXSTR_COMMANDNAME) + ": ";
+OUString aTip = CuiResId(RID_SVXSTR_COMMANDTIP) + ": ";
+return  aLabel + pData->sLabel + "\n" + aName + pData->sCommand+ "\n" + 
aTip + pData->sTooltip;
+}
+
 void CuiConfigFunctionListBox::ClearAll()
 /*  Description
 Deletes all entries in the FunctionListBox, all UserData and all
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index e930c24ac3ec..bfce0d6b13f4 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -92,6 +92,7 @@ struct SfxGroupInfo_Impl
 OUStringsCommand;
 OUStringsLabel;
 OUStringsHelpText;
+OUStringsTooltip;
 
 SfxGroupInfo_Impl( SfxCfgKind n, sal_uInt16 nr, void* pObj = 
nullptr ) :
 nKind( n ), nUniqueID( nr ), pObject( pObj ) {}
@@ -175,6 +176,8 @@ public:
 OUString  GetHelpText( bool bConsiderParent = true );
 OUString  GetCurCommand() const;
 OUString  GetCurLabel() const;
+
+DECL_LINK(QueryTooltip, const weld::TreeIter& rIter, OUString);
 };
 
 struct SvxConfigGroupBoxResource_Impl;
diff --git a/cui/uiconfig/ui/menuassignpage.ui 
b/cui/uiconfig/ui/menuassignpage.ui
index 7f37aad311b0..44d06931ebe4 100644
--- a/cui/uiconfig/ui/menuassignpage.ui
+++ b/cui/uiconfig/ui/menuassignpage.ui
@@ -322,6 +322,7 @@
 True
 True
 True
+True
 True
 True
 liststore1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source

[Seth Chaiklin (via logerrit)]

 cui/inc/tipoftheday.hrc   |  315 +-
 cui/source/dialogs/tipofthedaydlg.cxx |   17 +
 2 files changed, 177 insertions(+), 155 deletions(-)

New commits:
commit 1bc50aca32a2c76017a552a06dca2c941ab38f7a
Author: Seth Chaiklin 
AuthorDate: Mon Dec 16 16:53:19 2019 +0100
Commit: Heiko Tietze 
CommitDate: Wed Dec 18 07:59:24 2019 +0100

tdf#127294 Remove spaces; follow design guidelines for tips-of-the-day

- converted to design guidelines
all quotes
all menus items
apostrophe (U+2019)
em-dash (U+2014)
minus (U+2212)
expanded contractions

- Corrected spelling and grammar mistakes.

- Simplified wording in some tips

- tried to clarify uri explanation in relation to help

Change-Id: Ic9984fdc09813d2b43324a104d5c30420671c6b9
Reviewed-on: https://gerrit.libreoffice.org/85228
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 5847985b714e..3c77cd73307d 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -29,247 +29,254 @@
  * std:tuple consists of 
  * text:
* escape backslash, ie. use \\ to show \
+   * Use %MOD1 for Ctrl/Cmd and %MOD2 for Alt/Option depending on OS 
(uppercase required)
  * uri:
-   * leave uri empty to not show any link
-   * if uri starts with "http" it opens directly in the browser
-   * all other strings are converted for the offline help
-   * find the right uri for e.g. 
https://help.libreoffice.org/6.2/en-US/text/shared/optionen/01030300.html by
-   * grepping help2file.js after building --with-help=html 
(cui/ui/optsecuritypage/OptSecurityPage for the example)
+   * if uri is empty, do not show any link
+   * if uri starts with "http", show the link directly in the browser
+   * all other strings are converted to a link for the offline help
+   * to find the right uri, look in instdir/help/hid2file.js after building 
--with-help=html
+   * structure of hid2file.js  'uri' : 'rest of URL' (that starts: 
https://help.libreoffice.org/latest/en-US/)
+   * For example 'cui/ui/optsecuritypage/OptSecurityPage' is the uri for 
https://help.libreoffice.org/latest/en-US/text/shared/optionen/01030300.html#bm_id9049654
  * image:
* leave the image string empty for the default tipoftheday.png
-   * place new images at extra/source/tipoftheday and don't forget to add the 
files to vcl/Package_tipoftheday.mk
-   * don't exceed 100x120px too much - images don't get scaled
+   * place new images at extra/source/tipoftheday and do not forget to add the 
files to vcl/Package_tipoftheday.mk
+   * do not exceed 100x120px too much - images do not get scaled
 */
 
 const std::tuple TIPOFTHEDAY_STRINGARRAY[] =
 {
  { NC_("RID_CUI_TIPOFTHEDAY", "Need to allow changes to parts of a 
read-only document in Writer? Insert frames or sections that can authorize 
changes."), 
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/section_edit.html;,
 "tipoftheday_w.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "To print the notes of your slides go to 
File > Print > Impress tab and select Notes under Document > Type."), "", 
"tipoftheday_i.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "To start temporarily with a fresh user 
profile, or to restore a non-working %PRODUCTNAME, use  Help > Restart in Safe 
Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/profile_safe_mode.html
+ { NC_("RID_CUI_TIPOFTHEDAY", "To print the notes of your slides go to 
File ▸ Print ▸ Impress tab and select Notes under Document ▸ Type."), "", 
"tipoftheday_i.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "To start temporarily with a fresh user 
profile, or to restore a non-working %PRODUCTNAME, use Help ▸ Restart in Safe 
Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/shared/01/profile_safe_mode.html
  { NC_("RID_CUI_TIPOFTHEDAY", "Writing a book? %PRODUCTNAME master 
document lets you manage large documents as a container for individual 
%PRODUCTNAME Writer files."), 
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/globaldoc.html;,
 "tipoftheday_w.png"}, //local help missing
  { NC_("RID_CUI_TIPOFTHEDAY", "Create editable Hybrid PDFs with 
%PRODUCTNAME."), 
"https://wiki.documentfoundation.org/Documentation/HowTo/CreateAHybridPDF;, ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Explore the ten different functions in the 
status bar (at the bottom of the document window). Place the cursor over each 
field for an explanation. If not visible, use View > Status Bar."), "", 
"tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Explore the ten different functions in the 
status bar (at the bottom of the document window). Place the cursor over each 
field for an explanation. If 

[Libreoffice-commits] core.git: cui/inc cui/source

[Heiko Tietze (via logerrit)]

 cui/inc/tipoftheday.hrc   |   80 +-
 cui/source/dialogs/tipofthedaydlg.cxx |   16 +-
 2 files changed, 54 insertions(+), 42 deletions(-)

New commits:
commit 78c6b79f2a05eb92f41037fd20c6579a0a644c47
Author: Heiko Tietze 
AuthorDate: Wed Sep 25 17:31:00 2019 +0200
Commit: Heiko Tietze 
CommitDate: Tue Oct 1 10:56:36 2019 +0200

Resolves tdf#127756 - Tip of the day not localized

Introduced %LANGUAGENAME token being replaced with
BCP47 for pt, en, zh or ISO otherwise

Change-Id: Iaa7168731e0f6a8e0dd1e906ff0ef646534d9f4b
Reviewed-on: https://gerrit.libreoffice.org/79564
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 8977f718f945..b0e8b11f23a2 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -43,48 +43,48 @@
 
 const std::tuple TIPOFTHEDAY_STRINGARRAY[] =
 {
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can open and save files stored 
on remote servers per CMIS."), "fps/ui/remotefilesdialog/RemoteFilesDialog", 
""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/guide/cmis-remote-files.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Tools > AutoCorrect > AutoCorrect Options… 
> Replace provides a list of common substitutions. Take a look and complete 
with your own replacements."), "cui/ui/acoroptionspage/AutocorrectOptionsPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/06040100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Writer can handle styles conditionally: 
paragraph styles that have different properties depending on the context."), 
"modules/swriter/ui/conditionpage/ConditionPage", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/01/05130100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "With File > Versions you can store multiple 
versions of the document in the same file. You can also open, delete, and 
compare previous versions."), "sfx/ui/versionsofdialog/VersionsOfDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/0119.html
- { NC_("RID_CUI_TIPOFTHEDAY", "You can create an illustration index from 
object names, not only from captions."), 
"cui/ui/objectnamedialog/ObjectNameDialog", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/0519.html
- { NC_("RID_CUI_TIPOFTHEDAY", "To temporarily start with a fresh user 
profile, or to restore a non-working %PRODUCTNAME instance, go to Help > 
Restart in Safe Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/01/profile_safe_mode.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Change the basic fonts for the predefined 
template or current document per Tools > Options > %PRODUCTNAME Writer > Basic 
Fonts."), "modules/swriter/ui/optfonttabpage/OptFontTabPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/optionen/01040300.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Define texts that you often use as 
AutoText. You will be able to insert them by their name, shortcut or toolbar in 
any Writer document."), "modules/swriter/ui/autotext/AutoTextDialog", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/guide/autotext.html
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can automatically add a 
numbered caption when you insert objects. See Tools > Options > %PRODUCTNAME 
Writer > AutoCaption."), "modules/swriter/ui/optcaptionpage/OptCaptionPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/shared/optionen/01041100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "You can sort paragraphs or table rows 
alphabetically or numerically per Tools > Sort."), 
"modules/swriter/ui/sortdialog/SortDialog", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/01/0610.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Sections in %PRODUCTNAME Writer to 
protect part of a text, show/hide text, reuse parts from other documents, use 
different column layout."), "modules/swriter/ui/sectionpage/SectionPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/swriter/01/04020100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Sheet > Fill Cells > Random Number to 
generate a random series based on various distributions."), 
"modules/scalc/ui/randomnumbergenerator/RandomNumberGeneratorDialog", 
"tipoftheday_c.png"}, 
//https://help.libreoffice.org/%PRODUCTVERSION/en-US/text/scalc/01/02140700.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Format > Conditional Formatting > 
Manage in Calc to find out which cells have been defined with conditional 
formatting."), 
"modules/scalc/ui/conditionalformatdialog/ConditionalFormatDialog", 
"tipoftheday_c.png"}, 

[Libreoffice-commits] core.git: cui/inc cui/source

[Stephan Bergmann (via logerrit)]

 cui/inc/strings.hrc|2 +
 cui/source/options/optjava.cxx |   69 +++--
 2 files changed, 49 insertions(+), 22 deletions(-)

New commits:
commit b742b4d7f1f3bb6e1fce45ccf5d885e587e01801
Author: Stephan Bergmann 
AuthorDate: Tue Aug 27 08:50:38 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 27 12:39:04 2019 +0200

Use osl::FileBase::getSystemPathFromFileURL

...instead of INetURLObject FSysStyle::Detect guesswork (with the hope of
eventually phasing out use of the latter).

(In each of the three places where a filesystem pathname would need to be
converted back to a URL with osl::FileBase::getFileURLFromSystemPath, 
failure is
rather harmless, so they don't check error returns and are marked as "best
effort".)

Change-Id: Ia312b49b20543cdd83aff5609bb054e0fc1dc194
Reviewed-on: https://gerrit.libreoffice.org/78165
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 9b70cbf55301..1ade0c0d6b38 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -379,6 +379,8 @@
 
 #define RID_SVXSTR_REGISTERED_DATABASES 
NC_("RID_SVXSTR_REGISTERED_DATABASES", "Registered Databases")
 
+#define RID_SVXSTR_CANNOTCONVERTURL_ERR 
NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a 
filesystem path.")
+
 #define RID_SVXSTR_ABOUT_VERSION
NC_("aboutdialog|textbuffer1", "Version: 
%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")
 #define RID_SVXSTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2019 LibreOffice contributors.")
 #define RID_SVXSTR_ABOUT_CREDITS_URLNC_("aboutdialog|link", 
"https://www.libreoffice.org/about-us/credits/;)
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 1f718a9b5122..ec0eeac4494e 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -31,6 +31,7 @@
 #include 
 
 #include 
+#include 
 #include 
 
 #include 
@@ -790,26 +791,37 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl, 
weld::Button&, void)
 OUString sFolder;
 if (m_xPathList->count_selected_rows() > 0)
 {
-INetURLObject aObj(m_xPathList->get_selected_text(), 
FSysStyle::Detect);
-sFolder = aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
+
osl::FileBase::getFileURLFromSystemPath(m_xPathList->get_selected_text(), 
sFolder);
+// best effort
 }
-else
+if (sFolder.isEmpty())
  sFolder = SvtPathOptions().GetWorkPath();
 aDlg.SetDisplayDirectory( sFolder );
 if ( aDlg.Execute() == ERRCODE_NONE )
 {
 OUString sURL = aDlg.GetPath();
-INetURLObject aURL( sURL );
-OUString sFile = aURL.getFSysPath( FSysStyle::Detect );
-if ( !IsPathDuplicate( sFile ) )
+OUString sFile;
+if (osl::FileBase::getSystemPathFromFileURL(sURL, sFile) == 
osl::FileBase::E_None)
 {
-m_xPathList->append("", sFile, 
SvFileInformationManager::GetImageId(aURL));
-m_xPathList->select(m_xPathList->n_children() - 1);
+INetURLObject aURL( sURL );
+if ( !IsPathDuplicate( sFile ) )
+{
+m_xPathList->append("", sFile, 
SvFileInformationManager::GetImageId(aURL));
+m_xPathList->select(m_xPathList->n_children() - 1);
+}
+else
+{
+OUString sMsg( CuiResId( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
+sMsg = sMsg.replaceFirst( "%1", sFile );
+std::unique_ptr 
xBox(Application::CreateMessageDialog(m_xDialog.get(),
+  
VclMessageType::Warning, VclButtonsType::Ok, sMsg));
+xBox->run();
+}
 }
 else
 {
-OUString sMsg( CuiResId( RID_SVXSTR_MULTIFILE_DBL_ERR ) );
-sMsg = sMsg.replaceFirst( "%1", sFile );
+OUString sMsg( CuiResId( RID_SVXSTR_CANNOTCONVERTURL_ERR ) );
+sMsg = sMsg.replaceFirst( "%1", sURL );
 std::unique_ptr 
xBox(Application::CreateMessageDialog(m_xDialog.get(),
   VclMessageType::Warning, 
VclButtonsType::Ok, sMsg));
 xBox->run();
@@ -826,26 +838,38 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl, 
weld::Button&, void)
 OUString sOldFolder;
 if (m_xPathList->count_selected_rows() > 0)
 {
-INetURLObject aObj(m_xPathList->get_selected_text(), 
FSysStyle::Detect);
-sOldFolder = aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
+
osl::FileBase::getFileURLFromSystemPath(m_xPathList->get_selected_text(), 
sOldFolder);
+// best effort
 }
-else
+if (sOldFolder.isEmpty())
 sOldFolder = 

[Libreoffice-commits] core.git: cui/inc cui/source

[Christophe JAILLET (via logerrit)]

 cui/inc/tipoftheday.hrc   |   82 +-
 cui/source/dialogs/tipofthedaydlg.cxx |2 
 2 files changed, 42 insertions(+), 42 deletions(-)

New commits:
commit 0ed7f9dab2ec03e168f2013e57c21637f7700736
Author: Christophe JAILLET 
AuthorDate: Fri Jul 19 19:33:26 2019 +0200
Commit: Julien Nabet 
CommitDate: Tue Aug 20 08:01:06 2019 +0200

Fix libreoffice version for links in tipoftheday

tipoftheday.hrc has some URL with fixed LibreOffice version (6.0 and 6.2)
Use %PRODUCTVERSION instead and perform the convertion to the correct
version at run-time.

Note, this can have the drawback to point to dead links if a newer
version of the online doc removes a page or changes its path.

'en-US' could also certainly be handled the same way.

Finaly the 'uiResId(aLink.toUtf8().getStr()' to get it converted is
certainly a hack that should be implemented in a better way.

So consider this patch as a PoC :)

Change-Id: Ibdcaedde631f1a243e0ec54cdec6c488c04b8f29
Signed-off-by: Christophe JAILLET 
Reviewed-on: https://gerrit.libreoffice.org/75971
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 903f7411bd3f..9ad4e3fcd88b 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -43,48 +43,48 @@
 
 const std::tuple TIPOFTHEDAY_STRINGARRAY[] =
 {
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can open and save files stored 
on remote servers per CMIS."), "fps/ui/remotefilesdialog/RemoteFilesDialog", 
""}, 
//https://help.libreoffice.org/6.2/en-US/text/shared/guide/cmis-remote-files.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Tools > AutoCorrect > AutoCorrect Options… 
> Replace provides a list of common substitutions. Take a look and complete 
with your own replacements."), "cui/ui/acoroptionspage/AutocorrectOptionsPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/6.2/en-US/text/shared/01/06040100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Writer can handle styles conditionally: 
paragraph styles that have different properties depending on the context."), 
"modules/swriter/ui/conditionpage/ConditionPage", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/6.2/en-US/text/swriter/01/05130100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "With File > Versions you can store multiple 
versions of the document in the same file. You can also open, delete, and 
compare previous versions."), "sfx/ui/versionsofdialog/VersionsOfDialog", ""}, 
//https://help.libreoffice.org/6.2/en-US/text/shared/01/0119.html
- { NC_("RID_CUI_TIPOFTHEDAY", "You can create an illustration index from 
object names, not only from captions."), 
"cui/ui/objectnamedialog/ObjectNameDialog", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/6.2/en-US/text/shared/01/0519.html
- { NC_("RID_CUI_TIPOFTHEDAY", "To temporarily starts with a fresh user 
profile or to restore a non-working %PRODUCTNAME instance start Help > Restart 
in Safe Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, 
//https://help.libreoffice.org/6.2/en-US/text/shared/01/profile_safe_mode.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Change the basic fonts for the predefined 
template or current document per Tools > Options > %PRODUCTNAME Writer > Basic 
Fonts."), "modules/swriter/ui/optfonttabpage/OptFontTabPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/6.2/en-US/text/shared/optionen/01040300.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Define texts that you often use as 
AutoText. You will be able to insert them by their name, shortcut or toolbar in 
any Writer document."), "modules/swriter/ui/autotext/AutoTextDialog", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/6.2/en-US/text/swriter/guide/autotext.html
- { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can automatically add a 
numbered caption when you insert objects. See Tools > Options > %PRODUCTNAME 
Writer > AutoCaption."), "modules/swriter/ui/optcaptionpage/OptCaptionPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/6.2/en-US/text/shared/optionen/01041100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "You can sort paragraphs or table rows 
alphabetically or numerically per Tools > Sort."), 
"modules/swriter/ui/sortdialog/SortDialog", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/6.2/en-US/text/swriter/01/0610.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Sections in %PRODUCTNAME Writer to 
protect part of a text, show/hide text, reuse parts from other documents, use 
different column layout."), "modules/swriter/ui/sectionpage/SectionPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/6.2/en-US/text/swriter/01/04020100.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Sheet > Fill Cells > Random Number to 
generate a random series based on various distributions."), 
"modules/scalc/ui/randomnumbergenerator/RandomNumberGeneratorDialog", 
"tipoftheday_c.png"}, 

[Libreoffice-commits] core.git: cui/inc cui/source embeddedobj/qa embeddedobj/source officecfg/registry

[Miklos Vajna (via logerrit)]

 cui/inc/strings.hrc|1 
 cui/source/options/optfltr.cxx |   26 +-
 cui/source/options/optfltr.hxx |3 -
 embeddedobj/qa/cppunit/data/insert-file-config.pdf |binary
 embeddedobj/qa/cppunit/general.cxx |   33 +
 embeddedobj/source/general/xcreator.cxx|7 ++
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   17 ++
 7 files changed, 85 insertions(+), 2 deletions(-)

New commits:
commit bdfa6b678bc0cc22f983a0c23187a8ba9d2e6730
Author: Miklos Vajna 
AuthorDate: Thu Aug 15 15:47:42 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Aug 15 16:45:23 2019 +0200

embeddedobj: allow controlling if PDF documents are converted to Draw or not

This is a bit custom, since it's not a Microsoft filter.  At the moment
this affects only Insert -> Object -> OLE Object -> from file.

Change-Id: If79602742a533db1b04e11a90890f8768186046d
Reviewed-on: https://gerrit.libreoffice.org/77520
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index e6edf6cca478..9b70cbf55301 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -257,6 +257,7 @@
 #define RID_SVXSTR_CHG_IMPRESS  
NC_("RID_SVXSTR_CHG_IMPRESS", "PowerPoint to %PRODUCTNAME Impress or reverse")
 #define RID_SVXSTR_CHG_SMARTART 
NC_("RID_SVXSTR_CHG_SMARTART", "SmartArt to %PRODUCTNAME shapes or reverse")
 #define RID_SVXSTR_CHG_VISIO
NC_("RID_SVXSTR_CHG_VISIO", "Visio to %PRODUCTNAME Draw or reverse")
+#define RID_SVXSTR_CHG_PDF  NC_("RID_SVXSTR_CHG_PDF", 
"PDF to %PRODUCTNAME Draw or reverse")
 
 #define RID_SVXSTR_OPT_DOUBLE_DICTS 
NC_("RID_SVXSTR_OPT_DOUBLE_DICTS", "The specified name already exists.\nPlease 
enter a new name.")
 #define RID_SVXSTR_OPT_INVALID_DICT_NAME
NC_("RID_SVXSTR_OPT_INVALID_DICT_NAME", "The specified name is invalid.\nPlease 
enter a new name.")
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 925c0c7981d4..85abc803b07e 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -35,6 +35,7 @@ enum class MSFltrPg2_CheckBoxEntries {
 Impress,
 SmartArt,
 Visio,
+PDF,
 InvalidCBEntry
 };
 
@@ -134,6 +135,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2(TabPageParent 
pParent, const SfxItemSet
 , sChgToFromImpress(CuiResId(RID_SVXSTR_CHG_IMPRESS))
 , sChgToFromSmartArt(CuiResId(RID_SVXSTR_CHG_SMARTART))
 , sChgToFromVisio(CuiResId(RID_SVXSTR_CHG_VISIO))
+, sChgToFromPDF(CuiResId(RID_SVXSTR_CHG_PDF))
 , m_xCheckLB(m_xBuilder->weld_tree_view("checklbcontainer"))
 , m_xHighlightingRB(m_xBuilder->weld_radio_button("highlighting"))
 , m_xShadingRB(m_xBuilder->weld_radio_button("shading"))
@@ -209,6 +211,15 @@ bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
 bFirstCol = !bFirstCol;
 }
 }
+int nPDFEntry = GetEntry4Type(MSFltrPg2_CheckBoxEntries::PDF);
+bool bPDFCheck = m_xCheckLB->get_toggle(nPDFEntry, 0);
+if (bPDFCheck != 
officecfg::Office::Common::Filter::Adobe::Import::PDFToDraw::get())
+{
+std::shared_ptr pBatch(
+comphelper::ConfigurationChanges::create());
+
officecfg::Office::Common::Filter::Adobe::Import::PDFToDraw::set(bPDFCheck, 
pBatch);
+pBatch->commit();
+}
 
 if( m_xHighlightingRB->get_state_changed_from_saved() )
 {
@@ -246,7 +257,10 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* )
 InsertEntry( sChgToFromImpress, MSFltrPg2_CheckBoxEntries::Impress );
 InsertEntry( sChgToFromSmartArt, MSFltrPg2_CheckBoxEntries::SmartArt, 
false );
 if (aModuleOpt.IsModuleInstalled(SvtModuleOptions::EModule::DRAW))
+{
 InsertEntry(sChgToFromVisio, MSFltrPg2_CheckBoxEntries::Visio, false);
+InsertEntry(sChgToFromPDF, MSFltrPg2_CheckBoxEntries::PDF, false);
+}
 
 static struct ChkCBoxEntries{
 MSFltrPg2_CheckBoxEntries eType;
@@ -262,6 +276,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* )
 { MSFltrPg2_CheckBoxEntries::Impress,  
::IsImpress2PowerPoint },
 { MSFltrPg2_CheckBoxEntries::SmartArt, 
::IsSmartArt2Shape },
 { MSFltrPg2_CheckBoxEntries::Visio,::IsVisio2Draw 
},
+{ MSFltrPg2_CheckBoxEntries::PDF,  nullptr },
 };
 
 bool bFirstCol = true;
@@ -275,7 +290,16 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* )
 int nEntry = GetEntry4Type( rArr.eType );
 if (nEntry != -1)
 {
-bool bCheck = (rOpt.*rArr.FnIs)();
+bool bCheck = false;
+if (rArr.eType != MSFltrPg2_CheckBoxEntries::PDF)
+{
+bCheck = (rOpt.*rArr.FnIs)();
+}
+else
+  

[Libreoffice-commits] core.git: cui/inc cui/source embeddedobj/qa embeddedobj/source include/unotools officecfg/registry unotools/source

[Miklos Vajna (via logerrit)]

 cui/inc/strings.hrc|1 
 cui/source/options/optfltr.cxx |   23 +++--
 cui/source/options/optfltr.hxx |3 -
 embeddedobj/qa/cppunit/data/insert-file-config.vsdx|binary
 embeddedobj/qa/cppunit/general.cxx |   33 +
 embeddedobj/source/general/xcreator.cxx|7 ++
 include/unotools/fltrcfg.hxx   |3 +
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 ++
 unotools/source/config/fltrcfg.cxx |   19 ++-
 9 files changed, 88 insertions(+), 8 deletions(-)

New commits:
commit 5827e30109b683cb74efa21d154e5219fe9e2a0c
Author: Miklos Vajna 
AuthorDate: Thu Aug 15 10:55:53 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Aug 15 11:42:55 2019 +0200

embeddedobj: allow controlling if Visio documents are converted to Draw or 
not

At the moment this affects only Insert -> Object -> OLE Object -> from
file.

Change-Id: I8d1c6456481610491916e3be3766b0bb04dfa296
Reviewed-on: https://gerrit.libreoffice.org/77489
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 3833d157adff..e6edf6cca478 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -256,6 +256,7 @@
 #define RID_SVXSTR_CHG_CALC NC_("RID_SVXSTR_CHG_CALC", 
"Excel to %PRODUCTNAME Calc or reverse")
 #define RID_SVXSTR_CHG_IMPRESS  
NC_("RID_SVXSTR_CHG_IMPRESS", "PowerPoint to %PRODUCTNAME Impress or reverse")
 #define RID_SVXSTR_CHG_SMARTART 
NC_("RID_SVXSTR_CHG_SMARTART", "SmartArt to %PRODUCTNAME shapes or reverse")
+#define RID_SVXSTR_CHG_VISIO
NC_("RID_SVXSTR_CHG_VISIO", "Visio to %PRODUCTNAME Draw or reverse")
 
 #define RID_SVXSTR_OPT_DOUBLE_DICTS 
NC_("RID_SVXSTR_OPT_DOUBLE_DICTS", "The specified name already exists.\nPlease 
enter a new name.")
 #define RID_SVXSTR_OPT_INVALID_DICT_NAME
NC_("RID_SVXSTR_OPT_INVALID_DICT_NAME", "The specified name is invalid.\nPlease 
enter a new name.")
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 731cab79d50e..925c0c7981d4 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -34,6 +34,7 @@ enum class MSFltrPg2_CheckBoxEntries {
 Calc,
 Impress,
 SmartArt,
+Visio,
 InvalidCBEntry
 };
 
@@ -132,6 +133,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2(TabPageParent 
pParent, const SfxItemSet
 , sChgToFromCalc(CuiResId(RID_SVXSTR_CHG_CALC))
 , sChgToFromImpress(CuiResId(RID_SVXSTR_CHG_IMPRESS))
 , sChgToFromSmartArt(CuiResId(RID_SVXSTR_CHG_SMARTART))
+, sChgToFromVisio(CuiResId(RID_SVXSTR_CHG_VISIO))
 , m_xCheckLB(m_xBuilder->weld_tree_view("checklbcontainer"))
 , m_xHighlightingRB(m_xBuilder->weld_radio_button("highlighting"))
 , m_xShadingRB(m_xBuilder->weld_radio_button("shading"))
@@ -183,14 +185,16 @@ bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
 ::SetImpress2PowerPoint },
 { MSFltrPg2_CheckBoxEntries::SmartArt,  
::IsSmartArt2Shape,
 ::SetSmartArt2Shape },
+{ MSFltrPg2_CheckBoxEntries::Visio, ::IsVisio2Draw,
+::SetVisio2Draw },
 };
 
 bool bFirstCol = true;
 for( const ChkCBoxEntries & rEntry : aChkArr )
 {
 // we loop through the list, alternating reading the first/second 
column,
-// each row appears twice in the list (except for smartart, which is 
import
-// only
+// each row appears twice in the list (except for smartart and later 
entries, which are
+// import only)
 sal_uInt16 nCol = bFirstCol ? 0 : 1;
 bFirstCol = !bFirstCol;
 int nEntry = GetEntry4Type(rEntry.eType);
@@ -200,6 +204,10 @@ bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
 if( bCheck != (rOpt.*rEntry.FnIs)() )
 (rOpt.*rEntry.FnSet)( bCheck );
 }
+if (rEntry.eType == MSFltrPg2_CheckBoxEntries::SmartArt)
+{
+bFirstCol = !bFirstCol;
+}
 }
 
 if( m_xHighlightingRB->get_state_changed_from_saved() )
@@ -237,6 +245,8 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* )
 if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::EModule::IMPRESS ) )
 InsertEntry( sChgToFromImpress, MSFltrPg2_CheckBoxEntries::Impress );
 InsertEntry( sChgToFromSmartArt, MSFltrPg2_CheckBoxEntries::SmartArt, 
false );
+if (aModuleOpt.IsModuleInstalled(SvtModuleOptions::EModule::DRAW))
+InsertEntry(sChgToFromVisio, MSFltrPg2_CheckBoxEntries::Visio, false);
 
 static struct ChkCBoxEntries{
 MSFltrPg2_CheckBoxEntries eType;
@@ -251,14 +261,15 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet* )
 { 

[Libreoffice-commits] core.git: cui/inc cui/source

[Rtch90 (via logerrit)]

 cui/inc/strings.hrc|1 +
 cui/source/options/optdict.cxx |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit c78306fb47011a3c050368b9696cb2d5ecf3d57d
Author: Rtch90 
AuthorDate: Mon Apr 22 01:53:09 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Wed Aug 7 08:06:20 2019 +0200

tdf#61076 string validation on creation of new dictionary.

Prevent having '/' or '\' within the dictionary name to prevent data
loss.

Change-Id: I392832c748effcdbbe58983a788ba6b38764628c
Reviewed-on: https://gerrit.libreoffice.org/71059
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Jenkins

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index d7e581fccb26..3833d157adff 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -258,6 +258,7 @@
 #define RID_SVXSTR_CHG_SMARTART 
NC_("RID_SVXSTR_CHG_SMARTART", "SmartArt to %PRODUCTNAME shapes or reverse")
 
 #define RID_SVXSTR_OPT_DOUBLE_DICTS 
NC_("RID_SVXSTR_OPT_DOUBLE_DICTS", "The specified name already exists.\nPlease 
enter a new name.")
+#define RID_SVXSTR_OPT_INVALID_DICT_NAME
NC_("RID_SVXSTR_OPT_INVALID_DICT_NAME", "The specified name is invalid.\nPlease 
enter a new name.")
 /* To translators:
Please, try to find a similar *short* translation to avoid
to get narrow "New" field in the "Edit custom dictionary" window,
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index adbb6489f551..40240d6fa550 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -132,6 +132,17 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl, 
weld::Button&, void)
 if ( sDict.equalsIgnoreAsciiCase( pDic[i]->getName()) )
 bFound = true;
 
+if ( sDict.indexOf("/") != -1 || sDict.indexOf("\\") != -1 )
+{
+// Detected an invalid character.
+std::unique_ptr 
xInfoBox(Application::CreateMessageDialog(m_xDialog.get(),
+  VclMessageType::Info, 
VclButtonsType::Ok,
+  
CuiResId(RID_SVXSTR_OPT_INVALID_DICT_NAME)));
+xInfoBox->run();
+m_xNameEdit->grab_focus();
+return;
+}
+
 if ( bFound )
 {
 // duplicate names?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig extras/source solenv/bin

[Caolán McNamara (via logerrit)]

 cui/inc/strings.hrc|3 
 cui/source/options/connpooloptions.cxx |  408 ++---
 cui/source/options/connpooloptions.hxx |   44 +-
 cui/source/options/connpoolsettings.hxx|4 
 cui/uiconfig/ui/connpooloptions.ui |  144 ++--
 extras/source/glade/libreoffice-catalog.xml.in |4 
 solenv/bin/native-code.py  |1 
 7 files changed, 230 insertions(+), 378 deletions(-)

New commits:
commit 56bde3321e36347faf57ccfc2bd7bb8715d5
Author: Caolán McNamara 
AuthorDate: Wed Jul 31 16:33:53 2019 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jul 31 21:03:55 2019 +0200

weld ConnectionPoolOptionsPage

Change-Id: I7a772fd441304eaa1f08c1474b28a471cf33af5a
Reviewed-on: https://gerrit.libreoffice.org/76756
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 482a9e44a34d..e1fdec1ef480 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -224,9 +224,6 @@
 // $(ROW) can be a number or the caption of the row in quotes
 #define RID_SVXSTR_DIAGRAM_ROW  
NC_("RID_SVXSTR_DIAGRAM_ROW", "Data Series $(ROW)")
 
-#define RID_SVXSTR_DRIVER_NAME  
NC_("RID_SVXSTR_DRIVER_NAME", "Driver name")
-#define RID_SVXSTR_POOLED_FLAG  
NC_("RID_SVXSTR_POOLED_FLAG", "Pool")
-#define RID_SVXSTR_POOL_TIMEOUT 
NC_("RID_SVXSTR_POOL_TIMEOUT", "Timeout")
 #define RID_SVXSTR_YES  NC_("RID_SVXSTR_YES", 
"Yes")
 #define RID_SVXSTR_NO   NC_("RID_SVXSTR_NO", "No")
 
diff --git a/cui/source/options/connpooloptions.cxx 
b/cui/source/options/connpooloptions.cxx
index 204abfb8f433..c26f7a56db85 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -33,81 +33,7 @@ using ::svt::EditBrowseBox;
 
 namespace offapp
 {
-/// Widget for the Connection Pool options page
-class DriverListControl : public EditBrowseBox
-{
-using Window::Update;
-protected:
-DriverPoolingSettings   m_aSavedSettings;
-DriverPoolingSettings   m_aSettings;
-DriverPoolingSettings::const_iterator   m_aSeekRow;
-
-OUStringm_sYes;
-OUStringm_sNo;
-
-Link   m_aRowChangeHandler;
-
-public:
-explicit DriverListControl(vcl::Window* _pParent);
-
-virtual void Init() override;
-void Update(const DriverPoolingSettings& _rSettings);
-virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const 
override;
-
-// the handler will be called with a 
DriverPoolingSettings::const_iterator as parameter,
-// or NULL if no valid current row exists
-void SetRowChangeHandler(const Link& _rHdl) 
{ m_aRowChangeHandler = _rHdl; }
-
-DriverPooling* getCurrentRow();
-voidupdateCurrentRow();
-
-const DriverPoolingSettings& getSettings() const { return m_aSettings; 
}
-
-voidsaveValue() { m_aSavedSettings = m_aSettings; }
-boolisModified() const;
-
-protected:
-virtual void InitController( ::svt::CellControllerRef& rController, 
long nRow, sal_uInt16 nCol ) override;
-virtual ::svt::CellController* GetController( long nRow, sal_uInt16 
nCol ) override;
-
-virtual void PaintCell( OutputDevice& rDev, const ::tools::Rectangle& 
rRect, sal_uInt16 nColId ) const override;
-
-virtual bool SeekRow( long nRow ) override;
-virtual bool SaveModified() override;
-
-virtual bool IsTabAllowed(bool _bForward) const override;
-
-virtual void StateChanged( StateChangedType nStateChange ) override;
-
-virtual void CursorMoved() override;
-
-protected:
-virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) 
override;
-
-
-private:
-OUString implGetCellText(const DriverPoolingSettings::const_iterator& 
_rPos, sal_uInt16 _nColId) const;
-};
-
-DriverListControl::DriverListControl(vcl::Window* _pParent)
-:EditBrowseBox(_pParent, EditBrowseBoxFlags::NO_HANDLE_COLUMN_CONTENT, 
WB_BORDER,
-   BrowserMode::AUTO_VSCROLL | BrowserMode::AUTO_HSCROLL | 
BrowserMode::HIDECURSOR | BrowserMode::AUTOSIZE_LASTCOL | 
BrowserMode::KEEPHIGHLIGHT)
-,m_aSeekRow(m_aSettings.end())
-,m_sYes(CuiResId(RID_SVXSTR_YES))
-,m_sNo(CuiResId(RID_SVXSTR_NO))
-{
-SetStyle((GetStyle() & ~WB_HSCROLL) | WB_AUTOHSCROLL);
-}
-
-VCL_BUILDER_FACTORY(DriverListControl)
-
-bool DriverListControl::IsTabAllowed(bool /*_bForward*/) const
-{
-// no travelling within the fields via RETURN and TAB
-return false;
-   

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig extras/source include/sfx2 include/svtools include/svx include/tools include/vcl solenv/bin svtools/source svx/source vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 cui/inc/bitmaps.hlst   |8 
 cui/inc/strings.hrc|8 
 cui/source/dialogs/cuihyperdlg.cxx |  249 ---
 cui/source/dialogs/hldocntp.cxx|  133 --
 cui/source/dialogs/hldoctp.cxx |  122 +++--
 cui/source/dialogs/hlinettp.cxx|  190 ++
 cui/source/dialogs/hlmailtp.cxx|   79 ++
 cui/source/dialogs/hltpbase.cxx|  159 +---
 cui/source/dialogs/iconcdlg.cxx|  268 +++-
 cui/source/factory/dlgfact.cxx |   17 -
 cui/source/factory/dlgfact.hxx |   19 -
 cui/source/inc/cuihyperdlg.hxx |   87 ++
 cui/source/inc/hldocntp.hxx|   19 -
 cui/source/inc/hldoctp.hxx |   34 +-
 cui/source/inc/hlinettp.hxx|   39 +-
 cui/source/inc/hlmailtp.hxx|   17 -
 cui/source/inc/hlmarkwn.hxx|2 
 cui/source/inc/hltpbase.hxx|   38 +-
 cui/source/inc/iconcdlg.hxx|   33 +-
 cui/source/tabpages/autocdlg.cxx   |1 
 cui/uiconfig/ui/hyperlinkdialog.ui |  327 ++---
 cui/uiconfig/ui/hyperlinkdocpage.ui|   59 ++--
 cui/uiconfig/ui/hyperlinkinternetpage.ui   |   37 +-
 cui/uiconfig/ui/hyperlinkmailpage.ui   |   60 ++--
 cui/uiconfig/ui/hyperlinknewdocpage.ui |   99 +--
 extras/source/glade/libreoffice-catalog.xml.in |8 
 include/sfx2/basedlgs.hxx  |2 
 include/svtools/inettbc.hxx|8 
 include/svx/svxdlg.hxx |4 
 include/tools/wintypes.hxx |3 
 include/vcl/ivctrl.hxx |   49 +++
 include/vcl/weld.hxx   |1 
 solenv/bin/native-code.py  |2 
 svtools/source/control/inettbc.cxx |2 
 svx/source/dialog/hyperdlg.cxx |   10 
 vcl/source/app/salvtables.cxx  |  105 +++-
 vcl/source/control/imivctl.hxx |1 
 vcl/source/control/imivctl1.cxx|7 
 vcl/source/control/ivctrl.cxx  |  187 ++
 vcl/source/window/builder.cxx  |  109 +---
 vcl/unx/gtk3/gtk3gtkinst.cxx   |9 
 41 files changed, 1431 insertions(+), 1180 deletions(-)

New commits:
commit 1942182a3d1817bc539229d7fda3af69f7e295b8
Author: Caolán McNamara 
AuthorDate: Sun Jun 23 19:51:15 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 25 13:36:53 2019 +0200

weld HyperLink Dialog

Change-Id: Ic861b0a593505828a900fe2163125d6f5584a956
Reviewed-on: https://gerrit.libreoffice.org/74634
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
index 8d506a6ae701..94d6227acb82 100644
--- a/cui/inc/bitmaps.hlst
+++ b/cui/inc/bitmaps.hlst
@@ -66,15 +66,7 @@
 #define RID_CUIBMP_COLLAPSED"res/plus.png"
 #define RID_CUIBMP_EXPANDED "res/minus.png"
 
-#define RID_SVXBMP_HLINETTP "res/hlinettp.png"
-#define RID_SVXBMP_HLMAILTP "res/hlmailtp.png"
-#define RID_SVXBMP_HLDOCTP  "res/hldoctp.png"
-#define RID_SVXBMP_HLDOCNTP "res/hldocntp.png"
 #define RID_SVXBMP_SCRIPT   "res/script.png"
-#define RID_SVXBMP_ADRESSBOOK   "res/adrbook.png"
-#define RID_SVXBMP_FILEOPEN "res/fileopen.png"
-#define RID_SVXBMP_TARGET   "res/target.png"
-#define RID_SVXBMP_NEWDOC   "res/newdoc.png"
 
 #define RID_SVXBMP_COLLAPSEDNODE"res/sx18002.png"
 #define RID_SVXBMP_EXPANDEDNODE "res/sx18003.png"
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 9b302e439453..d79397b138a2 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -74,14 +74,6 @@
 #define RID_SVXSTR_HYPDLG_MACROACT2 
NC_("RID_SVXSTR_HYPDLG_MACROACT2", "Trigger hyperlink")
 #define RID_SVXSTR_HYPDLG_MACROACT3 
NC_("RID_SVXSTR_HYPDLG_MACROACT3", "Mouse leaves object")
 #define RID_SVXSTR_HYPDLG_NOVALIDFILENAME   
NC_("RID_SVXSTR_HYPDLG_NOVALIDFILENAME", "Please type in a valid file name.")
-#define RID_SVXSTR_HYPERDLG_HLINETTP
NC_("RID_SVXSTR_HYPERDLG_HLINETTP", "Internet")
-#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP   
NC_("RID_SVXSTR_HYPERDLG_HLINETTP_HELP", "This is where you create a hyperlink 
to a Web page or FTP server connection.")
-#define RID_SVXSTR_HYPERDLG_HLMAILTP
NC_("RID_SVXSTR_HYPERDLG_HLMAILTP", "Mail")
-#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP   
NC_("RID_SVXSTR_HYPERDLG_HLMAILTP_HELP", "This is where you create a hyperlink 
to an email address.")
-#define 

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig include/sfx2 include/vcl sfx2/source solenv/sanitizers vcl/Library_vcl.mk vcl/source vcl/uiconfig vcl/UIConfig_vcl.mk vcl/unx

[Caolán McNamara (via logerrit)]

 cui/inc/strings.hrc   |   13 +
 cui/source/dialogs/about.cxx  |  215 +---
 cui/source/factory/dlgfact.cxx|   10 -
 cui/source/factory/dlgfact.hxx|2 
 cui/source/inc/about.hxx  |   59 ++
 cui/uiconfig/ui/aboutdialog.ui|  328 +-
 include/sfx2/sfxdlg.hxx   |1 
 include/vcl/aboutdialog.hxx   |   60 ++
 include/vcl/dialog.hxx|2 
 include/vcl/weld.hxx  |   17 +
 sfx2/source/appl/appserv.cxx  |2 
 solenv/sanitizers/ui/cui.suppr|   12 -
 solenv/sanitizers/ui/vcl.suppr|   12 +
 vcl/Library_vcl.mk|1 
 vcl/UIConfig_vcl.mk   |1 
 vcl/source/app/salvtables.cxx |   79 +
 vcl/source/window/aboutdialog.cxx |  159 ++
 vcl/source/window/builder.cxx |8 
 vcl/uiconfig/ui/aboutbox.ui   |  135 +++
 vcl/unx/gtk3/gtk3gtkinst.cxx  |  173 +++-
 20 files changed, 779 insertions(+), 510 deletions(-)

New commits:
commit a30a5d1b8af18d19526f1980df41857f455cc8ef
Author: Caolán McNamara 
AuthorDate: Tue Jun 4 11:34:28 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jun 6 09:57:53 2019 +0200

weld AboutDialog

use a native GtkAboutDialog on that platform and refactor the current cui 
about
dialog body to form the body of a vcl AboutDialog

use add_button to add the buttons to whichever is preferred of the headerbar
or action-area

Change-Id: I67e0b36dcb8d3fa08ec4f0397b0f6185b0778675
Reviewed-on: https://gerrit.libreoffice.org/73439
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 70aa6383149c..9b302e439453 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -391,6 +391,19 @@
 
 #define RID_SVXSTR_REGISTERED_DATABASES 
NC_("RID_SVXSTR_REGISTERED_DATABASES", "Registered Databases")
 
+#define RID_SVXSTR_ABOUT_VERSION
NC_("aboutdialog|textbuffer1", "Version: 
%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")
+#define RID_SVXSTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2019 LibreOffice contributors.")
+#define RID_SVXSTR_ABOUT_CREDITS_URLNC_("aboutdialog|link", 
"https://www.libreoffice.org/about-us/credits/;)
+#define RID_SVXSTR_ABOUT_BUILDIDNC_("aboutdialog|buildid", 
"Build ID: $BUILDID")
+#define RID_SVXSTR_ABOUT_VENDOR NC_("aboutdialog|vendor", 
"This release was supplied by %OOOVENDOR.")
+#define RID_SVXSTR_ABOUT_BASED_ON   
NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
+#define RID_SVXSTR_ABOUT_DERIVEDNC_("aboutdialog|derived", 
"%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
+#define RID_SVXSTR_ABOUT_LOCALE NC_("aboutdialog|locale", 
"Locale: $LOCALE")
+#define RID_SVXSTR_ABOUT_UILOCALE   
NC_("aboutdialog|uilocale", "UI-Language: $LOCALE")
+#define RID_SVXSTR_ABOUT_RELEASE_NOTES  
NC_("aboutdialog|releasenotes", "~Release Notes")
+#define RID_SVXSTR_ABOUT_WEBSITENC_("aboutdialog|website", 
"~Website")
+#define RID_SVXSTR_ABOUT_CREDITSNC_("aboutdialog|credits", 
"Cre~dits")
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index cdafad532c2c..776d89f9e88f 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -22,18 +22,19 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
-#include 
-#include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 
@@ -49,6 +50,8 @@
 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -64,80 +67,59 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star;
 
-AboutDialog::AboutDialog(vcl::Window* pParent)
-: SfxModalDialog(pParent, "AboutDialog", "cui/ui/aboutdialog.ui")
+AboutDialog::AboutDialog(weld::Window* pParent)
+: m_xBuilder(Application::CreateBuilder(pParent, "cui/ui/aboutdialog.ui"))
+, m_xDialog(m_xBuilder->weld_about_dialog("AboutDialog"))
+, m_xContentArea(m_xDialog->weld_content_area())
 {
-get(m_pLogoReplacement, "logoreplacement");
-get(m_pLogoImage, "logo");
-get(m_pVersion, "version");
-get(m_pDescriptionText, "description");
-get(m_pCopyrightText, "copyright");
-get(m_pBuildIdLink, "buildIdLink");
-m_aCopyrightTextStr = m_pCopyrightText->GetText();
-get(m_pWebsiteButton, "website");
-get(m_pCreditsButton, "credits");
-get(m_pReleaseNotesButton, "btnReleaseNotes");
-

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig editeng/source extras/source include/editeng include/vcl solenv/bin solenv/clang-format solenv/sanitizers sw/source vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 cui/inc/strings.hrc|1 
 cui/source/dialogs/thesdlg.cxx |  422 ++---
 cui/source/dialogs/thesdlg_impl.hxx|   57 ---
 cui/source/factory/dlgfact.cxx |   21 -
 cui/source/factory/dlgfact.hxx |   14 
 cui/source/inc/thesdlg.hxx |  136 +---
 cui/uiconfig/ui/accelconfigpage.ui |2 
 cui/uiconfig/ui/thesaurus.ui   |  128 ++-
 editeng/source/editeng/impedit4.cxx|3 
 extras/source/glade/libreoffice-catalog.xml.in |6 
 include/editeng/edtdlg.hxx |5 
 include/vcl/weld.hxx   |2 
 solenv/bin/native-code.py  |3 
 solenv/clang-format/blacklist  |1 
 solenv/sanitizers/ui/cui.suppr |1 
 sw/source/uibase/uiview/viewling.cxx   |3 
 vcl/source/app/salvtables.cxx  |   12 
 vcl/unx/gtk3/gtk3gtkinst.cxx   |   31 +
 18 files changed, 319 insertions(+), 529 deletions(-)

New commits:
commit a7862a61deb8e85d835f6a9c620747c3bb4d36f4
Author: Caolán McNamara 
AuthorDate: Fri May 31 16:50:35 2019 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 1 22:45:31 2019 +0200

weld SvxThesaurusDialog

Change-Id: I09a7b4dcd43af061d0e4be42a7b6a2ebf2331d0d
Reviewed-on: https://gerrit.libreoffice.org/73282
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 6627ad93bc44..70aa6383149c 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -86,7 +86,6 @@
 #define RID_SVXSTR_HYPERDLG_FROM_TEXT   
NC_("RID_SVXSTR_HYPERDLG_FROM_TEXT", "Text")
 #define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE  
NC_("RID_SVXSTR_HYPERDLG_QUERYOVERWRITE", "The file already exists. Overwrite?")
 
-#define RID_SVXSTR_ERR_TEXTNOTFOUND 
NC_("RID_SVXSTR_ERR_TEXTNOTFOUND", "No alternatives found.")
 #define RID_SVXSTR_SELECT_FILE_IFRAME   
NC_("RID_SVXSTR_SELECT_FILE_IFRAME", "Select File for Floating Frame")
 #define RID_SVXSTR_ALLFUNCTIONS 
NC_("RID_SVXSTR_ALLFUNCTIONS", "All commands")
 #define RID_SVXSTR_MACROS   NC_("RID_SVXSTR_MACROS", 
"Macros")
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index dd8d638dedaa..7d1cd2259d1c 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -18,7 +18,6 @@
  */
 
 #include 
-#include "thesdlg_impl.hxx"
 #include 
 #include 
 
@@ -52,222 +51,28 @@
 
 using namespace ::com::sun::star;
 
-// class LookUpComboBox --
-
-LookUpComboBox::LookUpComboBox(vcl::Window *pParent)
-: ComboBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP)
-, m_aModifyIdle("cui LookUpComboBox Modify")
-, m_pDialog(nullptr)
-{
-EnableAutoSize(true);
-
-m_aModifyIdle.SetInvokeHandler( LINK( this, LookUpComboBox, 
ModifyTimer_Hdl ) );
-m_aModifyIdle.SetPriority( TaskPriority::LOWEST );
-
-EnableAutocomplete( false );
-}
-
-LookUpComboBox::~LookUpComboBox()
-{
-disposeOnce();
-}
-
-void LookUpComboBox::dispose()
-{
-m_pDialog.clear();
-ComboBox::dispose();
-}
-
-VCL_BUILDER_FACTORY(LookUpComboBox)
-
-void LookUpComboBox::init(SvxThesaurusDialog *pDialog)
+IMPL_LINK_NOARG( SvxThesaurusDialog, ModifyTimer_Hdl, Timer *, void )
 {
-m_pDialog = pDialog;
-}
-
-void LookUpComboBox::Modify()
-{
-m_aModifyIdle.Start();
-}
-
-IMPL_LINK_NOARG( LookUpComboBox, ModifyTimer_Hdl, Timer *, void )
-{
-m_pDialog->LookUp( GetText() );
+LookUp(m_xWordCB->get_active_text());
 m_aModifyIdle.Stop();
 }
 
-// class ReplaceEdit --
-
-ReplaceEdit::ReplaceEdit(vcl::Window *pParent)
-: Edit(pParent, WB_BORDER | WB_TABSTOP)
-, m_pBtn(nullptr)
-{
-}
-
-ReplaceEdit::~ReplaceEdit()
-{
-disposeOnce();
-}
-
-void ReplaceEdit::dispose()
-{
-m_pBtn.clear();
-Edit::dispose();
-}
-
-VCL_BUILDER_FACTORY(ReplaceEdit)
-
-void ReplaceEdit::Modify()
-{
-if (m_pBtn)
-m_pBtn->Enable( !GetText().isEmpty() );
-}
-
-void ReplaceEdit::SetText( const OUString& rStr )
-{
-Edit::SetText( rStr );
-Modify();
-}
-
-void ReplaceEdit::SetText( const OUString& rStr, const Selection& 
rNewSelection )
-{
-Edit::SetText( rStr, rNewSelection );
-Modify();
-}
-
-// class ThesaurusAlternativesCtrl --
-
-AlternativesString::AlternativesString( ThesaurusAlternativesCtrl , 
const OUString& rStr ) :
-SvLBoxString( rStr ),
-m_rControlImpl( rControl )
-{
-}
-
-void AlternativesString::Paint(const Point& rPos, SvTreeListBox& /*rDev*/, 
vcl::RenderContext& rRenderContext,
-   const SvViewDataEntry* /*pView*/, const 
SvTreeListEntry& rEntry)
-{
-

[Libreoffice-commits] core.git: cui/inc cui/source

[heiko tietze (via logerrit)]

 cui/inc/tipoftheday.hrc   |  451 +-
 cui/source/dialogs/tipofthedaydlg.cxx |   52 ++-
 cui/source/inc/tipofthedaydlg.hxx |2 
 3 files changed, 269 insertions(+), 236 deletions(-)

New commits:
commit b2eae358eeaf5a3747a59e77eb07545253641197
Author: heiko tietze 
AuthorDate: Fri May 3 17:08:53 2019 +0200
Commit: Heiko Tietze 
CommitDate: Tue May 7 16:36:48 2019 +0200

Resolves tdf#124978 - Tip-of-the-day references

* LibreOffice changed into %PRODUCTNAME
* std::pair made into std::tuple and hyperlinks separated from strings
* tip about donation / getinvolved added
* "Use an array formula to repeat a calculation with different values..." 
removed
* "%PRODUCTNAME supports 110 languages"->"%PRODUCTNAME supports over 150 
languages"
* code added to open offline help
* online hyperlinks converted into offline links, if available
* Ctrl, Shift, Alt uppercased
* › replace by >
* ellipsis removed

Change-Id: Ic35257d0a6d6e77750716254fb9d1f6983a54af1
Reviewed-on: https://gerrit.libreoffice.org/71760
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 1a99e420db4a..a82e30b6386f 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -22,230 +22,247 @@
 
 #define NC_(Context, String) reinterpret_cast(Context "\004" 
u8##String)
 
+#include 
 
 /*
- * text beginning with "html" will be used until the end as hyperlink
- * use \\ to show \
- * place accompanying images at extra/source/tipoftheday and add the file name 
here as second parameter
- * don't forget to add the files to vcl/Package_tipoftheday.mk
+ * std:tuple consists of 
+ * text:
+   * escape backslash, ie. use \\ to show \
+ * uri:
+   * leave uri empty to not show any link
+   * if uri starts with "http" it opens directly in the browser
+   * all other strings are converted for the offline help
+   * find the right uri for e.g. 
https://help.libreoffice.org/6.2/en-US/text/shared/optionen/01030300.html by
+   * grepping help2file.js after building --with-help=html 
(cui/ui/optsecuritypage/OptSecurityPage for the example)
+ * image:
+   * leave the image string empty for the default tipoftheday.png
+   * place new images at extra/source/tipoftheday and don't forget to add the 
files to vcl/Package_tipoftheday.mk
+   * don't exceed 100x120px too much - images dont get scaled
 */
 
-const std::pair TIPOFTHEDAY_STRINGARRAY[] =
+const std::tuple TIPOFTHEDAY_STRINGARRAY[] =
 {
- { NC_("RID_CUI_TIPOFTHEDAY", "Get help from the community via the Ask 
portal. https://ask.libreoffice.org;), ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Easily convert your documents to PDF with 
one click by clicking on the PDF icon in the toolbar."), ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Create editable Hybrid PDFs with 
LibreOffice. 
https://wiki.documentfoundation.org/Documentation/HowTo/CreateAHybridPDF;), ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Select a different icon set from Tools › 
Options › LibreOffice › View › User Interface › Icon size and style."), ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Create fillable form documents (even PDF's) 
with LibreOffice. 
https://www.techrepublic.com/article/how-to-create-interactive-pdfs-with-libreoffice;),
 ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Use your Android or iPhone to remotely 
control your Impress presentation. 
https://help.libreoffice.org/6.0/he/text/simpress/guide/impress_remote.html;), 
"tipoftheday_i.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Run LibreOffice in any browser via rollApp. 
https://www.rollapp.com/app/lowriter;), ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "LibreOffice has great extensions to 
increase your productivity, check them out. 
https://extensions.libreoffice.org;), ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "LibreOffice has a template center to create 
good looking documents, check it out. 
http://templates.libreoffice.org/template-center;), ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Use font embedding for greater 
interoperability with other office suites at  File › Properties › Font."), ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Developing new XSLT and xml filters? 
http://fridrich.blogspot.com.tr/2013/08/extending-swiss-army-knife-overview.html
 "), ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Citation management ? Use a 3rd party 
extension. 
https://wiki.documentfoundation.org/Referencing_Systems_in_LibreOffice;), ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Get LibreOffice documentation and free user 
guide books at http://www.libreoffice.org/get-help/documentation "), ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "Embedded help is available by clicking on 
F1, if you've installed it. Otherwise check online at 
https://help.libreoffice.org;), ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "LibreOffice has a portable version which 
gives you mobility. Even without administrator rights on your computer you can 
install 

[Libreoffice-commits] core.git: cui/inc cui/source filter/source include/svx sd/source solenv/clang-format svx/inc svx/source

[Gabor Kelemen (via logerrit)]

 cui/inc/pch/precompiled_cui.hxx   |1 
 cui/source/tabpages/tparea.cxx|1 
 cui/source/tabpages/tpbitmap.cxx  |1 
 cui/source/tabpages/tpcolor.cxx   |1 
 cui/source/tabpages/tpgradnt.cxx  |1 
 cui/source/tabpages/tphatch.cxx   |1 
 cui/source/tabpages/tpline.cxx|3 +
 cui/source/tabpages/tplnedef.cxx  |1 
 cui/source/tabpages/tppattern.cxx |1 
 cui/source/tabpages/tpshadow.cxx  |1 
 cui/source/tabpages/tptrans.cxx   |1 
 filter/source/msfilter/msdffimp.cxx   |3 +
 filter/source/msfilter/svdfppt.cxx|1 
 include/svx/xattr.hxx |   34 --
 sd/source/ui/sidebar/SlideBackground.cxx  |1 
 solenv/clang-format/blacklist |1 
 svx/inc/pch/precompiled_svx.hxx   |1 
 svx/inc/pch/precompiled_svxcore.hxx   |1 
 svx/source/sidebar/shadow/ShadowPropertyPanel.cxx |1 
 svx/source/svdraw/svdcrtv.cxx |1 
 svx/source/svdraw/svddrgmt.cxx|1 
 svx/source/svdraw/svddrgv.cxx |1 
 svx/source/tbxctrls/colrctrl.cxx  |1 
 svx/source/tbxctrls/fillctrl.cxx  |2 -
 svx/source/tbxctrls/linectrl.cxx  |2 -
 svx/source/xoutdev/xattr.cxx  |4 +-
 svx/source/xoutdev/xattr2.cxx |3 +
 svx/source/xoutdev/xattrbmp.cxx   |1 
 svx/source/xoutdev/xpool.cxx  |6 +++
 29 files changed, 16 insertions(+), 62 deletions(-)

New commits:
commit f0c3fc59e1eefbec202e0a10553dd6581fc2cae5
Author: Gabor Kelemen 
AuthorDate: Tue Apr 30 21:59:34 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue May 7 10:41:10 2019 +0200

tdf#62699 Drop pass-through header file include/svx/xattr.hxx

Change-Id: I8db9a4de494fbd045a0f4da810c3887ce62dd350
Reviewed-on: https://gerrit.libreoffice.org/71595
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index d3e078be0c84..3baac2bbc12d 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -405,7 +405,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 43c078c87285..975279eede8d 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -25,7 +25,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index fcab3c124d03..6f894004b297 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -25,7 +25,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index a938bacbe6ff..4264f7cda73a 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -36,7 +36,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index abc476b14c86..bf437d9753f8 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -31,7 +31,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 8b59d3f2f353..d494d04d1674 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -33,7 +33,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 481dee2f39c2..8dd8dc36f527 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -26,7 +26,8 @@
 
 #include 
 #include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 3264719f4809..576b8b06a1b9 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -29,7 +29,6 @@
 
 #include 
 
-#include 
 #include 
 #include 
 #include 
diff --git a/cui/source/tabpages/tppattern.cxx 
b/cui/source/tabpages/tppattern.cxx
index 65c1a207d4d5..3e6b05df32a7 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -38,7 +38,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 6c629122aca7..a35b0cd04aae 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ 

[Libreoffice-commits] core.git: cui/inc cui/source

[Muhammet Kara (via logerrit)]

 cui/inc/strings.hrc|1 +
 cui/source/options/personalization.cxx |   10 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 0d28abe085293604eb3127626da9c5a520b25c21
Author: Muhammet Kara 
AuthorDate: Sat Feb 16 20:35:28 2019 +0300
Commit: Muhammet Kara 
CommitDate: Tue Apr 23 09:08:04 2019 +0200

tdf#123228: Disable Firefox theme search

We can't use the MOZ API anymore.
Let's disable it instead of showing a broken
search window. Then we can spend some time on
moving on instead of answering the
-This is not working!- bug reports.

Change-Id: Ice10bde804d1d9a7a13cd4781813fc794b1b0967
Reviewed-on: https://gerrit.libreoffice.org/67917
Tested-by: Muhammet Kara 
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 6627ad93bc44..7c32af629907 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -368,6 +368,7 @@
 #define RID_SVXSTR_NORESULTS
NC_("RID_SVXSTR_NORESULTS", "No results found.")
 #define RID_SVXSTR_APPLYPERSONA 
NC_("RID_SVXSTR_APPLYPERSONA", "Applying Theme...")
 #define RID_SVXSTR_INVALIDPERSONAURL
NC_("RID_SVXSTR_INVALIDPERSONAURL", "Please enter a valid theme address or a 
search term.")
+#define RID_SVXSTR_MOZAPIUNREACHABLE
NC_("RID_SVXSTR_MOZAPIUNREACHABLE", "The Mozilla Themes API is currently 
unavailable.")
 
 #define RID_SVXSTR_TABLE_PRESET_NONE
NC_("RID_SVXSTR_TABLE_PRESET_NONE", "Set No Borders")
 #define RID_SVXSTR_TABLE_PRESET_ONLYOUTER   
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Set Outer Border Only")
diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 7ba962d11eea..b1f9d3f38e4e 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -399,10 +399,14 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( 
vcl::Window *pParent, cons
 get( m_pAppliedThemeLabel, "applied_theme_link" );
 
 get( m_pOwnPersona, "own_persona" );
-m_pOwnPersona->SetClickHdl( LINK( this, SvxPersonalizationTabPage, 
ForceSelect ) );
-
 get( m_pSelectPersona, "select_persona" );
-m_pSelectPersona->SetClickHdl( LINK( this, SvxPersonalizationTabPage, 
SelectPersona ) );
+
+// Mozilla API and the Mozilla personas are no longer useful for us
+// We will probably remove this altogether before 6.3
+m_pSelectPersona->Disable();
+m_pOwnPersona->Disable();
+m_pSelectPersona->SetQuickHelpText( CuiResId( RID_SVXSTR_MOZAPIUNREACHABLE 
) );
+m_pOwnPersona->SetQuickHelpText( CuiResId( RID_SVXSTR_MOZAPIUNREACHABLE ) 
);
 
 for (sal_uInt32 i = 0; i < MAX_DEFAULT_PERSONAS; ++i)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source

[heiko tietze (via logerrit)]

 cui/inc/tipoftheday.hrc   |  615 +-
 cui/source/dialogs/tipofthedaydlg.cxx |7 
 2 files changed, 312 insertions(+), 310 deletions(-)

New commits:
commit 033e1130a65ec7f0fa9c46e5124adc9d8bf724ba
Author: heiko tietze 
AuthorDate: Mon Apr 15 14:46:16 2019 +0200
Commit: Heiko Tietze 
CommitDate: Tue Apr 16 10:03:12 2019 +0200

Resolves: tdf#124743 - Tip of the Day randomization

srand() added, image file name part of the hrc definition now

Change-Id: Ib697f64406ab6b11468eb837c71d57398a0533b5
Reviewed-on: https://gerrit.libreoffice.org/70767
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index f633bdc458a9..fbe7408a3bd9 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -22,319 +22,320 @@
 
 #define NC_(Context, String) reinterpret_cast(Context "\004" 
u8##String)
 
+
 /*
  * text beginning with "html" will be used until the end as hyperlink
  * use \\ to show \
- * place accompanying images at extra/source/tipoftheday and name 
tipoftheday_.png, e.g. tipoftheday_1.png
- * add the files to vcl/Package_tipoftheday.mk
+ * place accompanying images at extra/source/tipoftheday and add the file name 
here as second parameter
+ * don't forget to add the files to vcl/Package_tipoftheday.mk
 */
 
-const char* TIPOFTHEDAY_STRINGARRAY[] =
+const std::pair TIPOFTHEDAY_STRINGARRAY[] =
 {
-NC_("RID_CUI_TIPOFTHEDAY", "LibreOffice has the ask.libreoffice.org portal 
where you may get help from the community. https://ask.libreoffice.org/;),
-NC_("RID_CUI_TIPOFTHEDAY", "You can easily convert your documents to PDF 
with one click by clicking the PDF icon in the toolbar."),
-NC_("RID_CUI_TIPOFTHEDAY", "Editable PDFs? Yes, you can create Hybrid PDFs 
with LibreOffice. 
https://wiki.documentfoundation.org/Documentation/HowTo/CreateAHybridPDF;),
-NC_("RID_CUI_TIPOFTHEDAY", "You can select the new Sifr icon set from 
Tools > Options... > LibreOffice > View > User Interface > Icon size and 
style."),
-NC_("RID_CUI_TIPOFTHEDAY", "You can easily create fillable form documents 
(even PDF's) with LibreOffice"),
-NC_("RID_CUI_TIPOFTHEDAY", "You can use your Android or iPhone to remotely 
control your Impress presentation"),
-NC_("RID_CUI_TIPOFTHEDAY", "Something about rollAPP? You can use 
LibreOffice on your iPad or Chrome OS via rollApp"),
-NC_("RID_CUI_TIPOFTHEDAY", "LibreOffice has great extensions to increase 
your productivity on its Extension Center, check it out. 
https://extensions.libreoffice.org/;),
-NC_("RID_CUI_TIPOFTHEDAY", "LibreOffice has a template center to create 
good looking documents, check it out.  
http://templates.libreoffice.org/template-center;),
-NC_("RID_CUI_TIPOFTHEDAY", "You can use font embedding for greater 
interoperability with other office suites/oses "),
-NC_("RID_CUI_TIPOFTHEDAY", "Conditional formatting..."),
-NC_("RID_CUI_TIPOFTHEDAY", "XSLT and xml filters 
http://fridrich.blogspot.com.tr/2013/08/extending-swiss-army-knife-overview.html
 "),
-NC_("RID_CUI_TIPOFTHEDAY", "Zotero is an extensions for better 
bibliography citation management for Academic works and students 
https://www.zotero.org/download/;),
-NC_("RID_CUI_TIPOFTHEDAY", "Mendeley is an extensions for better 
bibliography citation management for Academic works and students 
http://www.mendeley.com/;),
-NC_("RID_CUI_TIPOFTHEDAY", "You can change the appearance of LibreOffice 
with Firefox Personas https://addons.mozilla.org/firefox/themes/;),
-NC_("RID_CUI_TIPOFTHEDAY", "You can change the splash screen of 
LibreOffice for your own taste"),
-NC_("RID_CUI_TIPOFTHEDAY", "You can disable the splash screen "),
-NC_("RID_CUI_TIPOFTHEDAY", "You can speed-up/fine tune LibreOffice's 
performance 
http://oldpapyrus.wordpress.com/2012/06/28/reduce-libreoffice-memory-usage/;),
-NC_("RID_CUI_TIPOFTHEDAY", "You can use Quickstart to open LibreOffice 
quicker"),
-NC_("RID_CUI_TIPOFTHEDAY", "Have you tried our new sidebar- Appearance- 
Sidebar"),
-NC_("RID_CUI_TIPOFTHEDAY", "Have you known that LibreOffice has great 
documentation and free user guide books 
http://www.libreoffice.org/get-help/documentation/ "),
-NC_("RID_CUI_TIPOFTHEDAY", "Embedded help can save lives. Just click F1 to 
reach the embedded help, if you've installed it. Otherwise you may benefit from 
this huge content online at http://help.libreoffice.org;),
-NC_("RID_CUI_TIPOFTHEDAY", "LibreOffice has a portable version which gives 
you mobility. If you don't have administrator rights on your computer you may 
install LibreOffice Portable to your hard drive too 
http://www.libreoffice.org/download/portable-versions/;),
-NC_("RID_CUI_TIPOFTHEDAY", "How to remove pagebreaks from a .docx document 
that someone sent you, where there are pagebreaks for each sentence in the 
document."),
-NC_("RID_CUI_TIPOFTHEDAY", "Open 1 

[Libreoffice-commits] core.git: cui/inc cui/source icon-themes/colibre icon-themes/colibre_svg

[Tomaž Vajngerl (via logerrit)]

 cui/inc/bitmaps.hlst   |   12 +
 cui/source/tabpages/border.cxx |  106 -
 icon-themes/colibre/svx/res/border_cell_all_32.png |binary
 icon-themes/colibre/svx/res/border_cell_diag_32.png|binary
 icon-themes/colibre/svx/res/border_cell_l_32.png   |binary
 icon-themes/colibre/svx/res/border_cell_lr_32.png  |binary
 icon-themes/colibre/svx/res/border_cell_none_32.png|binary
 icon-themes/colibre/svx/res/border_cell_tb_32.png  |binary
 icon-themes/colibre/svx/res/shadow_bottom_left_32.png  |binary
 icon-themes/colibre/svx/res/shadow_bottom_right_32.png |binary
 icon-themes/colibre/svx/res/shadow_none_32.png |binary
 icon-themes/colibre/svx/res/shadow_top_left_32.png |binary
 icon-themes/colibre/svx/res/shadow_top_right_32.png|binary
 icon-themes/colibre_svg/svx/res/border_cell_all_32.svg |4 
 icon-themes/colibre_svg/svx/res/border_cell_diag_32.svg|6 
 icon-themes/colibre_svg/svx/res/border_cell_l_32.svg   |7 
 icon-themes/colibre_svg/svx/res/border_cell_lr_32.svg  |8 
 icon-themes/colibre_svg/svx/res/border_cell_none_32.svg|4 
 icon-themes/colibre_svg/svx/res/border_cell_tb_32.svg  |7 
 icon-themes/colibre_svg/svx/res/shadow_bottom_left_32.svg  |8 
 icon-themes/colibre_svg/svx/res/shadow_bottom_right_32.svg |8 
 icon-themes/colibre_svg/svx/res/shadow_none_32.svg |7 
 icon-themes/colibre_svg/svx/res/shadow_top_left_32.svg |8 
 icon-themes/colibre_svg/svx/res/shadow_top_right_32.svg|8 
 24 files changed, 159 insertions(+), 34 deletions(-)

New commits:
commit 92990b12f900ac0a12ce006f63b8c3d0f09b6b2f
Author: Tomaž Vajngerl 
AuthorDate: Fri Mar 29 22:08:34 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Fri Mar 29 15:30:26 2019 +0100

tdf#124149 add bigger 32px icons for border line and shadow

Change-Id: I7ea382f3ba648657d2a6d009bf90dcc3be879c63
Reviewed-on: https://gerrit.libreoffice.org/69925
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
index c6c2d19b3407..8d506a6ae701 100644
--- a/cui/inc/bitmaps.hlst
+++ b/cui/inc/bitmaps.hlst
@@ -11,11 +11,17 @@
 #define INCLUDED_CUI_INC_BITMAPS_HRC
 
 #define RID_SVXBMP_CELL_NONE"svx/res/pr01.png"
+#define RID_SVXBMP_CELL_NONE_32 "svx/res/border_cell_none_32.png"
 #define RID_SVXBMP_CELL_ALL "svx/res/pr02.png"
+#define RID_SVXBMP_CELL_ALL_32  "svx/res/border_cell_all_32.png"
 #define RID_SVXBMP_CELL_LR  "svx/res/pr03.png"
+#define RID_SVXBMP_CELL_LR_32   "svx/res/border_cell_lr_32.png"
 #define RID_SVXBMP_CELL_TB  "svx/res/pr04.png"
+#define RID_SVXBMP_CELL_TB_32   "svx/res/border_cell_tb_32.png"
 #define RID_SVXBMP_CELL_L   "svx/res/pr05.png"
+#define RID_SVXBMP_CELL_L_32"svx/res/border_cell_l_32.png"
 #define RID_SVXBMP_CELL_DIAG"svx/res/pr06.png"
+#define RID_SVXBMP_CELL_DIAG_32 "svx/res/border_cell_diag_32.png"
 #define RID_SVXBMP_HOR_NONE "svx/res/pr07.png"
 #define RID_SVXBMP_HOR_OUTER"svx/res/pr08.png"
 #define RID_SVXBMP_HOR_HOR  "svx/res/pr09.png"
@@ -31,11 +37,17 @@
 #define RID_SVXBMP_TABLE_OUTERH "svx/res/pr019.png"
 #define RID_SVXBMP_TABLE_ALL"svx/res/pr020.png"
 #define RID_SVXBMP_TABLE_OUTER2 "svx/res/pr021.png"
+
 #define RID_SVXBMP_SHADOWNONE   "svx/res/sh01.png"
+#define RID_SVXBMP_SHADOWNONE_32"svx/res/shadow_none_32.png"
 #define RID_SVXBMP_SHADOW_BOT_RIGHT "svx/res/sh02.png"
+#define RID_SVXBMP_SHADOW_BOT_RIGHT_32  "svx/res/shadow_bottom_right_32.png"
 #define RID_SVXBMP_SHADOW_BOT_LEFT  "svx/res/sh03.png"
+#define RID_SVXBMP_SHADOW_BOT_LEFT_32   "svx/res/shadow_bottom_left_32.png"
 #define RID_SVXBMP_SHADOW_TOP_RIGHT "svx/res/sh04.png"
+#define RID_SVXBMP_SHADOW_TOP_RIGHT_32  "svx/res/shadow_top_right_32.png"
 #define RID_SVXBMP_SHADOW_TOP_LEFT  "svx/res/sh05.png"
+#define RID_SVXBMP_SHADOW_TOP_LEFT_32   "svx/res/shadow_top_left_32.png"
 
 #define RID_SVXBMP_BOTTOMLOCK   "svx/res/lo01.png"
 #define RID_SVXBMP_TOPLOCK  "svx/res/lo02.png"
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index eefb6a6a50d0..b6c177f04e75 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::editeng;
 using ::com::sun::star::uno::Reference;
@@ -269,45 +270,82 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, 
const SfxItemSet& rCor
 , 
m_xRemoveAdjcentCellBordersCB(m_xBuilder->weld_check_button("rmadjcellborders"))
 , 
m_xRemoveAdjcentCellBordersFT(m_xBuilder->weld_label("rmadjcellbordersft"))
 {
-static const OUStringLiteral pnBorderImgIds[] =
+

[Libreoffice-commits] core.git: cui/inc cui/source dbaccess/source include/svx sc/source sd/source svx/source sw/source

[Libreoffice Gerrit user]

 cui/inc/strings.hrc  |2 ++
 cui/source/factory/dlgfact.cxx   |   25 +++--
 cui/source/factory/dlgfact.hxx   |2 +-
 cui/source/inc/dbregister.hxx|9 +++--
 cui/source/options/dbregister.cxx|   16 
 dbaccess/source/ui/browser/unodatbr.cxx  |2 +-
 include/svx/databaseregistrationui.hxx   |4 ++--
 include/svx/svxdlg.hxx   |2 +-
 sc/source/ui/drawfunc/drawsh.cxx |2 +-
 sd/source/ui/func/fuconnct.cxx   |2 +-
 sd/source/ui/func/fumeasur.cxx   |2 +-
 svx/source/dialog/databaseregistrationui.cxx |4 ++--
 sw/source/uibase/shells/drawdlg.cxx  |2 +-
 13 files changed, 31 insertions(+), 43 deletions(-)

New commits:
commit 0faf4e5c2e98219b17e042594710f6872bf6a615
Author: Caolán McNamara 
AuthorDate: Tue Mar 12 18:37:26 2019 +
Commit: Caolán McNamara 
CommitDate: Wed Mar 13 09:53:32 2019 +0100

weld DatabaseRegistrationDialog

Change-Id: I739785daef892ac16d2a41a98268f18670daeedb
Reviewed-on: https://gerrit.libreoffice.org/69136
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 37dc1f719c9f..6627ad93bc44 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -390,6 +390,8 @@
 
 #define RID_SVXSTR_FILTER_ALL   
NC_("RID_SVXSTR_FILTER_ALL", "All files")
 
+#define RID_SVXSTR_REGISTERED_DATABASES 
NC_("RID_SVXSTR_REGISTERED_DATABASES", "Registered Databases")
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index b155a8685b9a..91b3e943621b 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1304,35 +1304,24 @@ VclPtr 
AbstractDialogFactory_Impl::CreateEventConfigDialog(we
 return 
VclPtr::Create(std::make_unique(pParent,
 _rxDocumentFrame, rAttr));
 }
 
-VclPtr 
AbstractDialogFactory_Impl::CreateSfxDialog(vcl::Window* pParent,
+VclPtr 
AbstractDialogFactory_Impl::CreateSfxDialog(weld::Window* pParent,
   const 
SfxItemSet& rAttr,
   const 
SdrView* pView,
   
sal_uInt32 nResId)
 {
-SfxSingleTabDialog* pDlg=nullptr;
 switch ( nResId )
 {
-case RID_SVXPAGE_MEASURE :
-{
-return 
VclPtr::Create(std::make_unique(pParent
 ? pParent->GetFrameWeld() : nullptr, rAttr, pView));
-}
-case RID_SVXPAGE_CONNECTION :
-return 
VclPtr::Create(std::make_unique(pParent
 ? pParent->GetFrameWeld() : nullptr, rAttr, pView));
-
-case RID_SFXPAGE_DBREGISTER :
-pDlg = VclPtr::Create( pParent, rAttr 
);
-break;
-default:
-break;
+case RID_SVXPAGE_MEASURE:
+return 
VclPtr::Create(std::make_unique(pParent,
 rAttr, pView));
+case RID_SVXPAGE_CONNECTION:
+return 
VclPtr::Create(std::make_unique(pParent,
 rAttr, pView));
+case RID_SFXPAGE_DBREGISTER:
+return 
VclPtr::Create(std::make_unique(pParent,
 rAttr));
 }
 
-if ( pDlg )
-return VclPtr::Create( pDlg );
-
 return nullptr;
 }
 
-
 VclPtr 
AbstractDialogFactory_Impl::CreateSvxPostItDialog( weld::Window* pParent,
 const 
SfxItemSet& rCoreSet,
 bool 
bPrevNext )
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 44ad834a3b50..83e156abbf97 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -667,7 +667,7 @@ class AbstractDialogFactory_Impl : public 
SvxAbstractDialogFactory
 public:
 virtual VclPtrCreateVclDialog( vcl::Window* 
pParent, sal_uInt32 nResId ) override;
 
-virtual VclPtrCreateSfxDialog( vcl::Window* pParent,
+virtual VclPtrCreateSfxDialog( weld::Window* 
pParent,
 const SfxItemSet& rAttr,
 const SdrView* pView,
 sal_uInt32 nResId ) override;
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 4e77f06f2e13..167090f40d0c 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -106,18 +106,15 @@ namespace svx
 };
 
 class DatabaseRegistrationDialog:public RegistrationItemSetHolder
-,public SfxSingleTabDialog
+,public SfxSingleTabDialogController
 {
 public:
-

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig vcl/source

[Libreoffice Gerrit user]

 cui/inc/strings.hrc   |3 
 cui/source/inc/dbregister.hxx |   37 ++--
 cui/source/options/dbregister.cxx |  292 +++---
 cui/uiconfig/ui/dbregisterpage.ui |   67 +++-
 vcl/source/app/salvtables.cxx |3 
 5 files changed, 166 insertions(+), 236 deletions(-)

New commits:
commit fdc44bd929f038182dda4ea951f3b70dfc67f8d1
Author: Caolán McNamara 
AuthorDate: Tue Mar 12 16:46:56 2019 +
Commit: Caolán McNamara 
CommitDate: Wed Mar 13 09:53:14 2019 +0100

weld DbRegistrationOptionsPage

Change-Id: I88c1129f50d9f9cbef9970f1a9453641fc87e8fd
Reviewed-on: https://gerrit.libreoffice.org/69135
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 9278d9e818b4..37dc1f719c9f 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -263,9 +263,6 @@
 #define RID_SVXSTR_ERROR_TYPE_LABEL 
NC_("RID_SVXSTR_ERROR_TYPE_LABEL", "Type:")
 #define RID_SVXSTR_ERROR_MESSAGE_LABEL  
NC_("RID_SVXSTR_ERROR_MESSAGE_LABEL", "Message:")
 
-#define RID_SVXSTR_TYPE NC_("RID_SVXSTR_TYPE", 
"Registered name")
-#define RID_SVXSTR_PATH NC_("RID_SVXSTR_PATH", 
"Database file")
-
 //abbreviation for "[Load]"
 #define RID_SVXSTR_HEADER1  NC_("RID_SVXSTR_HEADER1", 
"[L]")
 //abbreviation for "[Save]"
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index b880f38e332d..4e77f06f2e13 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -38,27 +38,24 @@ namespace svx
 class DbRegistrationOptionsPage : public SfxTabPage
 {
 private:
-VclPtr m_pPathCtrl;
-VclPtr m_pNew;
-VclPtr m_pEdit;
-VclPtr m_pDelete;
-
-VclPtr m_pPathBox;
-SvTreeListEntry*m_pCurEntry;
 sal_uLong   m_nOldCount;
 boolm_bModified;
 
-DECL_LINK( NewHdl, Button*, void );
-DECL_LINK( EditHdl, Button*, void );
-DECL_LINK( DeleteHdl, Button*, void );
-DECL_LINK( PathBoxDoubleClickHdl, SvTreeListBox*, bool);
+std::unique_ptr m_xNew;
+std::unique_ptr m_xEdit;
+std::unique_ptr m_xDelete;
+std::unique_ptr m_xPathBox;
+std::unique_ptr m_xIter;
 
-DECL_LINK( PathSelect_Impl, SvTreeListBox*, void);
+DECL_LINK( NewHdl, weld::Button&, void );
+DECL_LINK( EditHdl, weld::Button&, void );
+DECL_LINK( DeleteHdl, weld::Button&, void );
+DECL_LINK( PathBoxDoubleClickHdl, weld::TreeView&, void);
 
-DECL_LINK( HeaderSelect_Impl, HeaderBar *, void );
-DECL_LINK( HeaderEndDrag_Impl, HeaderBar *, void );
-DECL_LINK( NameValidator, const OUString&, bool);
+DECL_LINK( PathSelect_Impl, weld::TreeView&, void);
 
+DECL_LINK( HeaderSelect_Impl, int, void );
+DECL_LINK( NameValidator, const OUString&, bool);
 
 /** inserts a new entry in the tablistbox
 @param  _sName
@@ -69,17 +66,17 @@ namespace svx
 void insertNewEntry( const OUString& _sName,const OUString& 
_sLocation, const bool bReadOnly );
 
 /** opens the LinkDialog to create a register pair
-@param  _sOldName
+@param  sOldName
 The old name of the entry may be empty.
-@param  _sOldLocation
+@param  sOldLocation
 The old location of the entry may be empty.
-@param  _pEntry
+@param  nEntry
 The entry to remove if the entry will be changed
 */
-void openLinkDialog(const OUString& _sOldName,const OUString& 
_sOldLocation,SvTreeListEntry const * _pEntry = nullptr);
+void openLinkDialog(const OUString& sOldName, const OUString& 
sOldLocation, int nEntry = -1);
 
 public:
-DbRegistrationOptionsPage( vcl::Window* pParent, const SfxItemSet& 
rSet );
+DbRegistrationOptionsPage(TabPageParent pParent, const SfxItemSet& 
rSet);
 virtual ~DbRegistrationOptionsPage() override;
 virtual void dispose() override;
 
diff --git a/cui/source/options/dbregister.cxx 
b/cui/source/options/dbregister.cxx
index e71fac5ccd80..557d2e04e6c0 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -45,10 +45,8 @@
 #include 
 
 #define TAB_WIDTH1  80
-#define TAB_WIDTH_MIN   10
-#define TAB_WIDTH2  1000
-#define ITEMID_TYPE   1
-#define ITEMID_PATH   2
+
+#define COL_TYPE   0
 
 namespace svx
 {
@@ -96,66 +94,36 @@ short DatabaseRegistrationDialog::Execute()
 
 // class DbRegistrationOptionsPage 
--
 
-DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, 
const SfxItemSet& rSet ) :
-
-SfxTabPage( pParent, 

[Libreoffice-commits] core.git: cui/inc cui/source include/svtools svtools/source svtools/uiconfig

[Libreoffice Gerrit user]

 cui/inc/strings.hrc  |2 --
 cui/source/options/optopencl.cxx |   19 ---
 include/svtools/restartdialog.hxx|   25 +++--
 svtools/source/dialogs/restartdialog.cxx |3 +++
 svtools/uiconfig/ui/restartdialog.ui |   17 -
 5 files changed, 38 insertions(+), 28 deletions(-)

New commits:
commit 2b6bd096f5bd9d250e4590d7150190086ad282b2
Author: Mike Kaganski 
AuthorDate: Wed Dec 12 15:24:47 2018 +0300
Commit: Mike Kaganski 
CommitDate: Wed Dec 12 16:20:47 2018 +0100

tdf#104277 follow-up: use svtools::executeRestartDialog

This harmonizes this setting's prompt with other places asking for restart.
Related obsolete strings are removed.

Change-Id: I2da63585747056714eb688681194acd35550e1c7
Reviewed-on: https://gerrit.libreoffice.org/65022
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 7b4d692108c4..0359680e678d 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -317,7 +317,6 @@
 
 #define RID_SVXSTR_JRE_NOT_RECOGNIZED   
NC_("RID_SVXSTR_JRE_NOT_RECOGNIZED", "The folder you selected does not contain 
a Java runtime environment.\nPlease select a different folder.")
 #define RID_SVXSTR_JRE_FAILED_VERSION   
NC_("RID_SVXSTR_JRE_FAILED_VERSION", "The Java runtime environment you selected 
is not the required version.\nPlease select a different folder.")
-#define RID_SVXSTR_OPTIONS_RESTART  
NC_("RID_SVXSTR_OPTIONS_RESTART", "Please restart %PRODUCTNAME now so the new 
or modified values can take effect.")
 #define RID_SVXSTR_JAVA_START_PARAM 
NC_("RID_SVXSTR_JAVA_START_PARAM", "Edit Parameter")
 
 #define RID_SVXSTR_OPT_PROXYPORTS   
NC_("RID_SVXSTR_OPT_PROXYPORTS", "Invalid value!\n\nThe maximum value for a 
port number is 65535.")
@@ -391,7 +390,6 @@
 #define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT  
NC_("RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT", "Cast Shadow to Bottom Left")
 #define RID_SVXSTR_SHADOW_STYLE_TOPLEFT 
NC_("RID_SVXSTR_SHADOW_STYLE_TOPLEFT", "Cast Shadow to Top Left")
 #define RID_SVXSTR_SIGNATURELINE_SIGNED_BY  
NC_("RID_SVXSTR_SIGNATURELINE_SIGNED_BY", "Signed by: %1")
-#define RID_SVXSTR_OPENCL_RESTART   
NC_("RID_SVXSTR_OPENCL_RESTART", "For the OpenCL changes to take effect, 
%PRODUCTNAME must be restarted.")
 
 #define RID_SVXSTR_FILTER_ALL   
NC_("RID_SVXSTR_FILTER_ALL", "All files")
 
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 816d09ccfcde..3535711e6f38 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include "optHeaderTabListbox.hxx"
 
@@ -34,9 +35,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
 
 #include 
 #include 
@@ -94,19 +92,10 @@ bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* )
 
 if (bModified)
 {
-std::unique_ptr 
xWarnBox(Application::CreateMessageDialog(GetFrameWeld(),
-  
VclMessageType::Question, VclButtonsType::NONE,
-  
CuiResId(RID_SVXSTR_OPENCL_RESTART)));
-xWarnBox->add_button("Restart Now",RET_YES);
-xWarnBox->add_button("Restart Later",RET_NO);
-sal_uInt16 nRet = xWarnBox->run();
 batch->commit();
-if (nRet == RET_YES)
-{
-
css::task::OfficeRestartManager::get(comphelper::getProcessComponentContext())->requestRestart(
-css::uno::Reference< css::task::XInteractionHandler >());
-}
-
+SolarMutexGuard aGuard;
+
svtools::executeRestartDialog(comphelper::getProcessComponentContext(), nullptr,
+  svtools::RESTART_REASON_OPENCL);
 }
 
 return bModified;
diff --git a/include/svtools/restartdialog.hxx 
b/include/svtools/restartdialog.hxx
index 750542a37459..29a7673d8dcd 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -23,37 +23,42 @@ namespace com { namespace sun { namespace star { namespace 
uno {
 namespace svtools {
 
 enum RestartReason {
-RESTART_REASON_JAVA,
 // "For the selected Java runtime environment to work properly,
 // %PRODUCTNAME must be restarted."
-RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT,
+RESTART_REASON_JAVA,
 // For the modified default print job format to take effect,
 // %PRODUCTNAME must be restarted.
-RESTART_REASON_BIBLIOGRAPHY_INSTALL,
+RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT,
 // "For the bibliography to work properly,
 // %PRODUCTNAME must be restarted."
-RESTART_REASON_MAILMERGE_INSTALL,
+RESTART_REASON_BIBLIOGRAPHY_INSTALL,
 // "For the mail merge to work 

[Libreoffice-commits] core.git: cui/inc cui/source

[Libreoffice Gerrit user]

 cui/inc/strings.hrc|1 -
 cui/source/inc/treeopt.hxx |1 -
 cui/source/options/treeopt.cxx |1 -
 3 files changed, 3 deletions(-)

New commits:
commit 5d43a4d941b34cb076a6a2463dccd327ff83e7b9
Author: Stephan Bergmann 
AuthorDate: Mon Nov 12 13:20:42 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Nov 12 13:20:42 2018 +0100

-Werror,-Wunused-private-field

...since 9eb81304989acb16c61c15b211dd124548ffb85f "tdf#120703 PVS: drop the
unused code".  And which now removes the sole use of RID_SVXSTR_LOAD_ERROR.

Change-Id: If8afa7595a449cb8677b03a159a452b73fed110e

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index f8cc42be3fcb..db0c46269e29 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -362,7 +362,6 @@
 #define RID_SVXSTR_DEL_SPACES_BETWEEN_LINES 
NC_("RID_SVXSTR_DEL_SPACES_BETWEEN_LINES", "Delete spaces and tabs at end and 
start of line")
 #define RID_SVXSTR_CONNECTOR
NC_("RID_SVXSTR_CONNECTOR", "Connector")
 #define RID_SVXSTR_DIMENSION_LINE   
NC_("RID_SVXSTR_DIMENSION_LINE", "Dimension line")
-#define RID_SVXSTR_LOAD_ERROR   
NC_("RID_SVXSTR_LOAD_ERROR", "The selected module could not be loaded.")
 #define RID_SVXSTR_STARTQUOTE   
NC_("RID_SVXSTR_STARTQUOTE", "Start Quote")
 #define RID_SVXSTR_ENDQUOTE NC_("RID_SVXSTR_ENDQUOTE", 
"End Quote")
 
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 1def2d942eb4..96267575333a 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -133,7 +133,6 @@ private:
 SvTreeListEntry*   pCurrentPageEntry;
 
 OUString   sTitle;
-OUString   sNotLoadedError;
 
 bool   bForgetSelection;
 bool   bIsFromExtensionManager;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 62179f315de4..a0ced4fccd16 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -482,7 +482,6 @@ struct OptionsGroupInfo
 m_pParent   ( pParent ),\
 pCurrentPageEntry   ( nullptr ),\
 sTitle  ( GetText() ),\
-sNotLoadedError (   CuiResId( RID_SVXSTR_LOAD_ERROR ) ),\
 bForgetSelection( false ),\
 bIsFromExtensionManager( false ), \
 bIsForSetDocumentLanguage( false ), \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source cui/uiconfig

[Libreoffice Gerrit user]

 cui/inc/bitmaps.hlst   |4 +++
 cui/source/tabpages/labdlg.cxx |   10 -
 cui/uiconfig/ui/calloutpage.ui |   45 -
 3 files changed, 9 insertions(+), 50 deletions(-)

New commits:
commit aa641600fcb81865217fe5db0a6ed79a71e45cd0
Author: Caolán McNamara 
AuthorDate: Fri Nov 9 11:31:49 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 9 17:14:13 2018 +0100

Resolves: tdf#121290 Crash, if press F4 for a selected callout

Change-Id: Idf73b21ae2f27f4966705c8faf9fd38abc502ae4
Reviewed-on: https://gerrit.libreoffice.org/63178
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
index 2cefabd14611..ae3516fe1f60 100644
--- a/cui/inc/bitmaps.hlst
+++ b/cui/inc/bitmaps.hlst
@@ -67,6 +67,10 @@
 #define RID_SVXBMP_COLLAPSEDNODE"res/sx18002.png"
 #define RID_SVXBMP_EXPANDEDNODE "res/sx18003.png"
 
+#define RID_SVXBMP_LEGTYP1  "svx/res/legtyp1.png"
+#define RID_SVXBMP_LEGTYP2  "svx/res/legtyp2.png"
+#define RID_SVXBMP_LEGTYP3  "svx/res/legtyp3.png"
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 778d4b869e5b..4d8331e05c0e 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 // define 
 
@@ -110,11 +111,10 @@ SvxCaptionTabPage::SvxCaptionTabPage(TabPageParent 
pParent, const SfxItemSet& rI
 for (int i = 0; i < 3; ++i)
 aLineTypes.push_back(m_xLineTypes->get_text(i));
 
-for(sal_uInt16 nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; ++nBitmap)
-{
-FixedImage *pImage = get(OString("legtyp") + 
OString::number(nBitmap+1));
-m_aBmpCapTypes[nBitmap] = pImage->GetImage();
-}
+static_assert(CAPTYPE_BITMAPS_COUNT == 3, "unexpected");
+m_aBmpCapTypes[0] = Image(BitmapEx(RID_SVXBMP_LEGTYP1));
+m_aBmpCapTypes[1] = Image(BitmapEx(RID_SVXBMP_LEGTYP2));
+m_aBmpCapTypes[2] = Image(BitmapEx(RID_SVXBMP_LEGTYP3));
 
 //install ValueSet--
 m_xCT_CAPTTYPE->SetStyle( m_xCT_CAPTTYPE->GetStyle() | WB_ITEMBORDER | 
WB_DOUBLEBORDER | WB_NAMEFIELD );
diff --git a/cui/uiconfig/ui/calloutpage.ui b/cui/uiconfig/ui/calloutpage.ui
index 766d5e5db164..518afbe7a91a 100644
--- a/cui/uiconfig/ui/calloutpage.ui
+++ b/cui/uiconfig/ui/calloutpage.ui
@@ -255,51 +255,6 @@
   
 
 
-  
-False
-True
-center
-
-  
-True
-False
-svx/res/legtyp1.png
-  
-  
-0
-0
-  
-
-
-  
-True
-False
-svx/res/legtyp2.png
-  
-  
-1
-0
-  
-
-
-  
-True
-False
-svx/res/legtyp3.png
-  
-  
-2
-0
-  
-
-  
-  
-0
-3
-2
-  
-
-
   
 False
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source

[Libreoffice Gerrit user]

 cui/inc/strings.hrc   |2 +-
 cui/source/dialogs/cuicharmap.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cf2825d9f8af86a73aae5ac4216966504b320184
Author: Adolfo Jayme Barrientos 
AuthorDate: Wed Sep 12 16:14:28 2018 -0500
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Oct 15 01:46:59 2018 +0200

The code doesn’t check for glyphs, but for code points (i.e., characters)

This string was a little misleading. A typical pair of OS-provided fonts
can encode glyphs at different code points (e.g., the f+i ligature is
encoded at U+F001 (legacy position) in Arial Black but at U+FB01 in
Comic Sans MS.

Change-Id: I6ca93e9ad247f62e1674a03d6ab1bc0800df3612
Reviewed-on: https://gerrit.libreoffice.org/60419
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 71ff45488568..f8cc42be3fcb 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -100,7 +100,7 @@
 #define RID_SVXSTR_INSERTROW_BEFORE 
NC_("RID_SVXSTR_INSERTROW_BEFORE", "Above selection")
 #define RID_SVXSTR_INSERTROW_AFTER  
NC_("RID_SVXSTR_INSERTROW_AFTER", "Below selection")
 #define RID_SVXSTR_REMOVE_FAVORITES 
NC_("RID_SVXSTR_REMOVE_FAVORITES", "Remove from Favorites")
-#define RID_SVXSTR_MISSING_GLYPH
NC_("RID_SVXSTR_MISSING_GLYPH", "Missing Glyph")
+#define RID_SVXSTR_MISSING_CHAR 
NC_("RID_SVXSTR_MISSING_CHAR", "Missing character")
 #define RID_SVXSTR_ADD_FAVORITES
NC_("RID_SVXSTR_ADD_FAVORITES", "Add to Favorites")
 // PPI is pixel per inch, %1 is a number
 #define RID_SVXSTR_PPI  NC_("RID_SVXSTR_PPI", "(%1 
PPI)")
diff --git a/cui/source/dialogs/cuicharmap.cxx 
b/cui/source/dialogs/cuicharmap.cxx
index 4ffc213003ca..64581f5f5165 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -1049,7 +1049,7 @@ void SvxCharacterMap::selectCharByCode(Radix radix)
 // Select the corresponding character
 SetChar(cChar);
 else {
-m_xCharName->set_label(CuiResId(RID_SVXSTR_MISSING_GLYPH));
+m_xCharName->set_label(CuiResId(RID_SVXSTR_MISSING_CHAR));
 m_aShowChar.SetText(" ");
 switch(radix)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source

[Libreoffice Gerrit user]

 cui/inc/strings.hrc|1 +
 cui/source/options/personalization.cxx |   21 +
 2 files changed, 22 insertions(+)

New commits:
commit e59ea346d31d416e61b963648e78c5c7f13d8551
Author: Muhammet Kara 
AuthorDate: Mon Oct 8 14:43:12 2018 +0300
Commit: Muhammet Kara 
CommitDate: Tue Oct 9 19:41:09 2018 +0200

tdf#101629: Handle invalid urls and search strings for Personas

Change-Id: I9666aa9f323e53ef394121acdef146866d2cc696
Reviewed-on: https://gerrit.libreoffice.org/61529
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 06347dea6bcc..71ff45488568 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -371,6 +371,7 @@
 #define RID_SVXSTR_SEARCHERROR  
NC_("RID_SVXSTR_SEARCHERROR", "Cannot open %1, please try again later.")
 #define RID_SVXSTR_NORESULTS
NC_("RID_SVXSTR_NORESULTS", "No results found.")
 #define RID_SVXSTR_APPLYPERSONA 
NC_("RID_SVXSTR_APPLYPERSONA", "Applying Theme...")
+#define RID_SVXSTR_INVALIDPERSONAURL
NC_("RID_SVXSTR_INVALIDPERSONAURL", "Please enter a valid theme address or a 
search term.")
 
 #define RID_SVXSTR_TABLE_PRESET_NONE
NC_("RID_SVXSTR_TABLE_PRESET_NONE", "Set No Borders")
 #define RID_SVXSTR_TABLE_PRESET_ONLYOUTER   
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Set Outer Border Only")
diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 0c88f9adf325..ae314e1019c8 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -284,14 +284,35 @@ IMPL_LINK( SelectPersonaDialog, SearchPersonas, Button*, 
pButton, void )
 if( searchTerm.isEmpty( ) )
 return;
 
+// Direct url of a persona given
 if ( searchTerm.startsWith( "https://addons.mozilla.org/; ) )
 {
 OUString sSlug = searchTerm.getToken( 6, '/' );
 
+// Check if we got the slug
+if ( sSlug.isEmpty() )
+{
+SolarMutexGuard aGuard;
+OUString sError = CuiResId( RID_SVXSTR_INVALIDPERSONAURL );
+std::unique_ptr 
xBox(Application::CreateMessageDialog(nullptr,
+   
VclMessageType::Error, VclButtonsType::Ok,
+   
sError));
+xBox->run();
+return;
+}
+
+// Remove invalid characters
+searchTerm = searchTerm.replaceAll("?", "");
+
 m_pSearchThread = new SearchAndParseThread( this, sSlug, true );
 }
+// Search term given
 else
 {
+// Remove invalid characters
+searchTerm = searchTerm.replaceAll("/", "");
+searchTerm = searchTerm.replaceAll("?", "");
+
 // 15 results so that invalid and duplicate search results whose 
names, textcolors etc. are null can be skipped
 OUString rSearchURL = 
"https://addons.mozilla.org/api/v3/addons/search/?q=; + searchTerm + 
"=persona_size=15";
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source officecfg/registry

[Libreoffice Gerrit user]

 cui/inc/strings.hrc |6 
++
 cui/source/dialogs/insrc.cxx|   10 
++
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 

 3 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 77a9df09adfcb04a3d49a621d568694657969fd7
Author: heiko tietze 
AuthorDate: Thu Sep 6 11:32:36 2018 +0200
Commit: Heiko Tietze 
CommitDate: Thu Sep 6 15:31:45 2018 +0200

tdf#119293 - UI Consistency for inserting rows in Writer table"

Labels are set now depending on row/col as before/after and above/below
.uno:InsertColumnsBefore and .uno:InsertColumnsAfter are captioned 
Before/After

Change-Id: Ifb4f791b62e3c96f50d457c785b6f793deb4fce9
Reviewed-on: https://gerrit.libreoffice.org/60080
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 99e0b1b69030..06347dea6bcc 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -96,12 +96,18 @@
 #define RID_SVXSTR_SELECTOR_ADD_COMMANDS
NC_("RID_SVXSTR_SELECTOR_ADD_COMMANDS", "Add Commands")
 #define RID_SVXSTR_SELECTOR_RUN 
NC_("RID_SVXSTR_SELECTOR_RUN", "Run")
 #define RID_SVXSTR_ROW  NC_("RID_SVXSTR_ROW", 
"Insert Rows")
+// tdf#119293 Labels depending on row/col
+#define RID_SVXSTR_INSERTROW_BEFORE 
NC_("RID_SVXSTR_INSERTROW_BEFORE", "Above selection")
+#define RID_SVXSTR_INSERTROW_AFTER  
NC_("RID_SVXSTR_INSERTROW_AFTER", "Below selection")
 #define RID_SVXSTR_REMOVE_FAVORITES 
NC_("RID_SVXSTR_REMOVE_FAVORITES", "Remove from Favorites")
 #define RID_SVXSTR_MISSING_GLYPH
NC_("RID_SVXSTR_MISSING_GLYPH", "Missing Glyph")
 #define RID_SVXSTR_ADD_FAVORITES
NC_("RID_SVXSTR_ADD_FAVORITES", "Add to Favorites")
 // PPI is pixel per inch, %1 is a number
 #define RID_SVXSTR_PPI  NC_("RID_SVXSTR_PPI", "(%1 
PPI)")
 #define RID_SVXSTR_COL  NC_("RID_SVXSTR_COL", 
"Insert Columns")
+// tdf#119293 Labels depending on row/col
+#define RID_SVXSTR_INSERTCOL_BEFORE 
NC_("RID_SVXSTR_INSERTCOL_BEFORE", "Before selection")
+#define RID_SVXSTR_INSERTCOL_AFTER  
NC_("RID_SVXSTR_INSERTCOL_AFTER", "After selection")
 #define RID_SVXSTR_AUTO_ENTRY   
NC_("RID_SVXSTR_AUTO_ENTRY", "Automatic")
 #define RID_SVXSTR_EDIT_GRAPHIC 
NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link")
 #define RID_SVXSTR_LOADACCELCONFIG  
NC_("RID_SVXSTR_LOADACCELCONFIG", "Load Keyboard Configuration")
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 5cecafd62c82..3da4c32eab5d 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -40,6 +40,16 @@ SvxInsRowColDlg::SvxInsRowColDlg(weld::Window* pParent, bool 
bColumn, const OStr
 , m_xAfterBtn(m_xBuilder->weld_radio_button("insert_after"))
 {
 m_xDialog->set_title(bColumn ? CuiResId(RID_SVXSTR_COL) : 
CuiResId(RID_SVXSTR_ROW));
+
+// tdf#119293
+if (bColumn) {
+m_xBeforeBtn->set_label(CuiResId(RID_SVXSTR_INSERTCOL_BEFORE));
+m_xAfterBtn->set_label(CuiResId(RID_SVXSTR_INSERTCOL_AFTER));
+} else {
+m_xBeforeBtn->set_label(CuiResId(RID_SVXSTR_INSERTROW_BEFORE));
+m_xAfterBtn->set_label(CuiResId(RID_SVXSTR_INSERTROW_AFTER));
+}
+
 m_xDialog->set_help_id(rHelpId);
 }
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 8b3db77534c8..aa69deff81de 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1441,10 +1441,10 @@
   
   
 
-  Insert Columns Left
+  Insert Columns Before
 
 
-  Columns ~Left
+  Columns ~Before
 
 
   1
@@ -1461,10 +1461,10 @@
   
   
 
-  Insert Columns Right
+  Insert Columns After
 
 
-  Columns R~ight
+  Columns ~After
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source

[Libreoffice Gerrit user]

 cui/inc/strings.hrc  |7 ---
 cui/source/dialogs/insrc.cxx |7 ---
 2 files changed, 14 deletions(-)

New commits:
commit 48d7a087b43b523d9d3f2bb296904c5a4ef43759
Author: Heiko Tietze 
AuthorDate: Thu Sep 6 10:26:27 2018 +0200
Commit: Heiko Tietze 
CommitDate: Thu Sep 6 10:43:57 2018 +0200

Revert "tdf#119293 - UI Consistency for inserting rows in Writer table"

This reverts commit a3c8250c5b56a2cb40aa01b9a6a59e4daa1fd2f8.
"Left/Right" is inappropriate for RTL documents. So we better use 
Before/After in accordance with tdf#119036.

Change-Id: Id9cb721902d246f837c7440c2f0c049c7c1dc4ca
Reviewed-on: https://gerrit.libreoffice.org/60073
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 9581676fed37..99e0b1b69030 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -96,19 +96,12 @@
 #define RID_SVXSTR_SELECTOR_ADD_COMMANDS
NC_("RID_SVXSTR_SELECTOR_ADD_COMMANDS", "Add Commands")
 #define RID_SVXSTR_SELECTOR_RUN 
NC_("RID_SVXSTR_SELECTOR_RUN", "Run")
 #define RID_SVXSTR_ROW  NC_("RID_SVXSTR_ROW", 
"Insert Rows")
-// tdf#119293 Labels depending on row/col
-#define RID_SVXSTR_INSERTROW_BEFORE 
NC_("RID_SVXSTR_INSERTROW_BEFORE", "Above the selection")
-#define RID_SVXSTR_INSERTROW_AFTER  
NC_("RID_SVXSTR_INSERTROW_AFTER", "Below the selection")
 #define RID_SVXSTR_REMOVE_FAVORITES 
NC_("RID_SVXSTR_REMOVE_FAVORITES", "Remove from Favorites")
 #define RID_SVXSTR_MISSING_GLYPH
NC_("RID_SVXSTR_MISSING_GLYPH", "Missing Glyph")
 #define RID_SVXSTR_ADD_FAVORITES
NC_("RID_SVXSTR_ADD_FAVORITES", "Add to Favorites")
 // PPI is pixel per inch, %1 is a number
 #define RID_SVXSTR_PPI  NC_("RID_SVXSTR_PPI", "(%1 
PPI)")
 #define RID_SVXSTR_COL  NC_("RID_SVXSTR_COL", 
"Insert Columns")
-// tdf#119293 Labels depending on row/col
-#define RID_SVXSTR_INSERTCOL_BEFORE 
NC_("RID_SVXSTR_INSERTCOL_BEFORE", "Left of the selection")
-#define RID_SVXSTR_INSERTCOL_AFTER  
NC_("RID_SVXSTR_INSERTCOL_AFTER", "Right of the selection")
-
 #define RID_SVXSTR_AUTO_ENTRY   
NC_("RID_SVXSTR_AUTO_ENTRY", "Automatic")
 #define RID_SVXSTR_EDIT_GRAPHIC 
NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link")
 #define RID_SVXSTR_LOADACCELCONFIG  
NC_("RID_SVXSTR_LOADACCELCONFIG", "Load Keyboard Configuration")
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index eab54d16d6f7..5cecafd62c82 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -40,13 +40,6 @@ SvxInsRowColDlg::SvxInsRowColDlg(weld::Window* pParent, bool 
bColumn, const OStr
 , m_xAfterBtn(m_xBuilder->weld_radio_button("insert_after"))
 {
 m_xDialog->set_title(bColumn ? CuiResId(RID_SVXSTR_COL) : 
CuiResId(RID_SVXSTR_ROW));
-if (bColumn) {
-m_xBeforeBtn->set_label(CuiResId(RID_SVXSTR_INSERTCOL_BEFORE));
-m_xAfterBtn->set_label(CuiResId(RID_SVXSTR_INSERTCOL_AFTER));
-} else {
-m_xBeforeBtn->set_label(CuiResId(RID_SVXSTR_INSERTROW_BEFORE));
-m_xAfterBtn->set_label(CuiResId(RID_SVXSTR_INSERTROW_AFTER));
-}
 m_xDialog->set_help_id(rHelpId);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source

[Libreoffice Gerrit user]

 cui/inc/strings.hrc  |7 +++
 cui/source/dialogs/insrc.cxx |7 +++
 2 files changed, 14 insertions(+)

New commits:
commit a3c8250c5b56a2cb40aa01b9a6a59e4daa1fd2f8
Author: heiko tietze 
AuthorDate: Fri Aug 31 14:24:54 2018 +0200
Commit: Heiko Tietze 
CommitDate: Mon Sep 3 09:05:11 2018 +0200

tdf#119293 - UI Consistency for inserting rows in Writer table

Labels are set now depending on row/col as left/right and above/below

Change-Id: I73b81660db1e4e8c3d0146f59e193744a3883583
Reviewed-on: https://gerrit.libreoffice.org/59867
Reviewed-by: Olivier Hallot 
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 99e0b1b69030..9581676fed37 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -96,12 +96,19 @@
 #define RID_SVXSTR_SELECTOR_ADD_COMMANDS
NC_("RID_SVXSTR_SELECTOR_ADD_COMMANDS", "Add Commands")
 #define RID_SVXSTR_SELECTOR_RUN 
NC_("RID_SVXSTR_SELECTOR_RUN", "Run")
 #define RID_SVXSTR_ROW  NC_("RID_SVXSTR_ROW", 
"Insert Rows")
+// tdf#119293 Labels depending on row/col
+#define RID_SVXSTR_INSERTROW_BEFORE 
NC_("RID_SVXSTR_INSERTROW_BEFORE", "Above the selection")
+#define RID_SVXSTR_INSERTROW_AFTER  
NC_("RID_SVXSTR_INSERTROW_AFTER", "Below the selection")
 #define RID_SVXSTR_REMOVE_FAVORITES 
NC_("RID_SVXSTR_REMOVE_FAVORITES", "Remove from Favorites")
 #define RID_SVXSTR_MISSING_GLYPH
NC_("RID_SVXSTR_MISSING_GLYPH", "Missing Glyph")
 #define RID_SVXSTR_ADD_FAVORITES
NC_("RID_SVXSTR_ADD_FAVORITES", "Add to Favorites")
 // PPI is pixel per inch, %1 is a number
 #define RID_SVXSTR_PPI  NC_("RID_SVXSTR_PPI", "(%1 
PPI)")
 #define RID_SVXSTR_COL  NC_("RID_SVXSTR_COL", 
"Insert Columns")
+// tdf#119293 Labels depending on row/col
+#define RID_SVXSTR_INSERTCOL_BEFORE 
NC_("RID_SVXSTR_INSERTCOL_BEFORE", "Left of the selection")
+#define RID_SVXSTR_INSERTCOL_AFTER  
NC_("RID_SVXSTR_INSERTCOL_AFTER", "Right of the selection")
+
 #define RID_SVXSTR_AUTO_ENTRY   
NC_("RID_SVXSTR_AUTO_ENTRY", "Automatic")
 #define RID_SVXSTR_EDIT_GRAPHIC 
NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link")
 #define RID_SVXSTR_LOADACCELCONFIG  
NC_("RID_SVXSTR_LOADACCELCONFIG", "Load Keyboard Configuration")
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 5cecafd62c82..eab54d16d6f7 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -40,6 +40,13 @@ SvxInsRowColDlg::SvxInsRowColDlg(weld::Window* pParent, bool 
bColumn, const OStr
 , m_xAfterBtn(m_xBuilder->weld_radio_button("insert_after"))
 {
 m_xDialog->set_title(bColumn ? CuiResId(RID_SVXSTR_COL) : 
CuiResId(RID_SVXSTR_ROW));
+if (bColumn) {
+m_xBeforeBtn->set_label(CuiResId(RID_SVXSTR_INSERTCOL_BEFORE));
+m_xAfterBtn->set_label(CuiResId(RID_SVXSTR_INSERTCOL_AFTER));
+} else {
+m_xBeforeBtn->set_label(CuiResId(RID_SVXSTR_INSERTROW_BEFORE));
+m_xAfterBtn->set_label(CuiResId(RID_SVXSTR_INSERTROW_AFTER));
+}
 m_xDialog->set_help_id(rHelpId);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source

[Libreoffice Gerrit user]

 cui/inc/strings.hrc  |2 +-
 cui/source/options/optopencl.cxx |   17 ++---
 2 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 84ee78fce5e980d3593fbbbe49005f35c5b3e2d0
Author: Nickson Thanda 
AuthorDate: Tue Jul 17 05:12:57 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Jul 18 17:15:42 2018 +0200

tdf#104277 - Added restart buttons to OpenCL restart dialog

Change-Id: Icf31d0516deb7844c8be1003219cbacae1cdc5ec
Reviewed-on: https://gerrit.libreoffice.org/57537
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 66da2d39506d..99e0b1b69030 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -384,7 +384,7 @@
 #define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT  
NC_("RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT", "Cast Shadow to Bottom Left")
 #define RID_SVXSTR_SHADOW_STYLE_TOPLEFT 
NC_("RID_SVXSTR_SHADOW_STYLE_TOPLEFT", "Cast Shadow to Top Left")
 #define RID_SVXSTR_SIGNATURELINE_SIGNED_BY  
NC_("RID_SVXSTR_SIGNATURELINE_SIGNED_BY", "Signed by: %1")
-
+#define RID_SVXSTR_OPENCL_RESTART   
NC_("RID_SVXSTR_OPENCL_RESTART", "For the OpenCL changes to take effect, 
%PRODUCTNAME must be restarted.")
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index cefd3b2cd71c..4448ed99405c 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -34,6 +34,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -103,10 +106,18 @@ bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* )
 if (bModified)
 {
 std::unique_ptr 
xWarnBox(Application::CreateMessageDialog(GetFrameWeld(),
-  VclMessageType::Info, 
VclButtonsType::Ok,
-  
CuiResId(RID_SVXSTR_OPTIONS_RESTART)));
-xWarnBox->run();
+  
VclMessageType::Question, VclButtonsType::NONE,
+  
CuiResId(RID_SVXSTR_OPENCL_RESTART)));
+xWarnBox->add_button("Restart Now",RET_YES);
+xWarnBox->add_button("Restart Later",RET_NO);
+sal_uInt16 nRet = xWarnBox->run();
 batch->commit();
+if (nRet == RET_YES)
+{
+
css::task::OfficeRestartManager::get(comphelper::getProcessComponentContext())->requestRestart(
+css::uno::Reference< css::task::XInteractionHandler >());
+}
+
 }
 
 return bModified;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source

[himajin100000]

 cui/inc/strings.hrc   |1 
 cui/source/dialogs/cuicharmap.cxx |   42 ++
 2 files changed, 26 insertions(+), 17 deletions(-)

New commits:
commit fa17a6021f79374ba0e4e010587fa01774805da5
Author: himajin10 
Date:   Tue Mar 20 05:41:35 2018 +0900

tdf#114549:entering hex/dec code should change char sample

by checking has_focus() for m_xHexCodeText and m_xDecimalCodeText.
Also,CharHighlightHdl and SearchCharHighlightHdl now look alike.
Also add case for missing glyph for entered hex/dec code.

Change-Id: I32c782ac09756462f11b209afa12183d5ae7ac1f
Reviewed-on: https://gerrit.libreoffice.org/51616
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 5ee718467f54..66da2d39506d 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -97,6 +97,7 @@
 #define RID_SVXSTR_SELECTOR_RUN 
NC_("RID_SVXSTR_SELECTOR_RUN", "Run")
 #define RID_SVXSTR_ROW  NC_("RID_SVXSTR_ROW", 
"Insert Rows")
 #define RID_SVXSTR_REMOVE_FAVORITES 
NC_("RID_SVXSTR_REMOVE_FAVORITES", "Remove from Favorites")
+#define RID_SVXSTR_MISSING_GLYPH
NC_("RID_SVXSTR_MISSING_GLYPH", "Missing Glyph")
 #define RID_SVXSTR_ADD_FAVORITES
NC_("RID_SVXSTR_ADD_FAVORITES", "Add to Favorites")
 // PPI is pixel per inch, %1 is a number
 #define RID_SVXSTR_PPI  NC_("RID_SVXSTR_PPI", "(%1 
PPI)")
diff --git a/cui/source/dialogs/cuicharmap.cxx 
b/cui/source/dialogs/cuicharmap.cxx
old mode 100644
new mode 100755
index ae4eedfb84ba..4727baca0fc2
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -935,6 +935,17 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl, 
SvxShowCharSet*, void)
 {
 // using the new UCS4 constructor
 aText = OUString( , 1 );
+// Get the hexadecimal code
+aHexText = OUString::number(cChar, 16).toAsciiUpperCase();
+// Get the decimal code
+aDecimalText = OUString::number(cChar);
+setCharName(cChar);
+
+// Update the hex and decimal codes only if necessary
+if (m_xHexCodeText->get_text() != aHexText)
+m_xHexCodeText->set_text( aHexText );
+if (m_xDecimalCodeText->get_text() != aDecimalText)
+m_xDecimalCodeText->set_text( aDecimalText );
 
 const Subset* pSubset = nullptr;
 if( pSubsetMap )
@@ -945,7 +956,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl, 
SvxShowCharSet*, void)
 m_xSubsetLB->set_active(-1);
 }
 
-if (m_xShowSet->HasFocus())
+if(m_xShowSet->HasFocus() || m_xHexCodeText->has_focus() || 
m_xDecimalCodeText->has_focus() )
 {
 m_xShowChar->SetText( aText );
 m_xShowChar->SetFont( aFont );
@@ -953,22 +964,6 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl, 
SvxShowCharSet*, void)
 
 setFavButtonState(aText, aFont.GetFamilyName());
 }
-
-// show char codes
-if ( bSelect )
-{
-// Get the hexadecimal code
-aHexText = OUString::number(cChar, 16).toAsciiUpperCase();
-// Get the decimal code
-aDecimalText = OUString::number(cChar);
-setCharName(cChar);
-}
-
-// Update the hex and decimal codes only if necessary
-if (m_xHexCodeText->get_text() != aHexText)
-m_xHexCodeText->set_text( aHexText );
-if (m_xDecimalCodeText->get_text() != aDecimalText)
-m_xDecimalCodeText->set_text( aDecimalText );
 }
 
 IMPL_LINK_NOARG(SvxCharacterMap, SearchCharHighlightHdl, SvxShowCharSet*, void)
@@ -1034,6 +1029,19 @@ void SvxCharacterMap::selectCharByCode(Radix radix)
 if (xFontCharMap->HasChar(cChar))
 // Select the corresponding character
 SetChar(cChar);
+else {
+m_xCharName->set_label(CuiResId(RID_SVXSTR_MISSING_GLYPH));
+m_xShowChar->SetText(" ");
+switch(radix)
+{
+case Radix::decimal:
+m_xHexCodeText->set_text(OUString::number(cChar, 16));
+break;
+case Radix::hexadecimal:
+m_xDecimalCodeText->set_text(OUString::number(cChar));
+break;
+}
+}
 }
 
 IMPL_LINK_NOARG(SvxCharacterMap, DecimalCodeChangeHdl, weld::Entry&, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source include/svx sw/source sw/uiconfig

[Gabor Kelemen]

 cui/inc/strings.hrc  |9 -
 cui/source/tabpages/page.cxx |   11 ++-
 include/svx/strings.hrc  |   11 ---
 sw/source/ui/frmdlg/frmpage.cxx  |8 
 sw/source/uibase/inc/frmpage.hxx |3 ++-
 sw/uiconfig/swriter/ui/frmaddpage.ui |   35 ++-
 6 files changed, 26 insertions(+), 51 deletions(-)

New commits:
commit 9807290ccb87c0901a53f885a81a6aab93181f1d
Author: Gabor Kelemen 
Date:   Sun Dec 10 15:31:02 2017 +0100

tdf#113959 Use svxlo-FrameDirectionListBox instead of ListBox

Final part. Here frmaddpage.ui is migrated, but to reuse the 2
other strings we need to shake up their original place in page.cxx

Now all the stings are moved to svx and occur only once in the code base.

Change-Id: I8b3942f96d43bf8d6f054c8410c3781bcefc3ccc
Reviewed-on: https://gerrit.libreoffice.org/46189
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index af4fbb388b57..330931871a47 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -315,15 +315,6 @@
 
 #define RID_SVXSTR_OPT_PROXYPORTS   
NC_("RID_SVXSTR_OPT_PROXYPORTS", "Invalid value!\n\nThe maximum value for a 
port number is 65535.")
 
-#define RID_SVXSTR_FRAMEDIR_LTR 
NC_("RID_SVXSTR_FRAMEDIR_LTR", "Left-to-right (LTR)")
-#define RID_SVXSTR_FRAMEDIR_RTL 
NC_("RID_SVXSTR_FRAMEDIR_RTL", "Right-to-left (RTL)")
-#define RID_SVXSTR_FRAMEDIR_SUPER   
NC_("RID_SVXSTR_FRAMEDIR_SUPER", "Use superordinate object settings")
-// page direction
-#define RID_SVXSTR_PAGEDIR_LTR_HORI 
NC_("RID_SVXSTR_PAGEDIR_LTR_HORI", "Left-to-right (horizontal)")
-#define RID_SVXSTR_PAGEDIR_RTL_HORI 
NC_("RID_SVXSTR_PAGEDIR_RTL_HORI", "Right-to-left (horizontal)")
-#define RID_SVXSTR_PAGEDIR_RTL_VERT 
NC_("RID_SVXSTR_PAGEDIR_RTL_VERT", "Right-to-left (vertical)")
-#define RID_SVXSTR_PAGEDIR_LTR_VERT 
NC_("RID_SVXSTR_PAGEDIR_LTR_VERT", "Left-to-right (vertical)")
-
 #define RID_SVXSTR_DESC_GRADIENT
NC_("RID_SVXSTR_DESC_GRADIENT", "Please enter a name for the gradient:")
 #define RID_SVXSTR_DESC_NEW_BITMAP  
NC_("RID_SVXSTR_DESC_NEW_BITMAP", "Please enter a name for the bitmap:")
 #define RID_SVXSTR_DESC_EXT_BITMAP  
NC_("RID_SVXSTR_DESC_EXT_BITMAP", "Please enter a name for the external 
bitmap:")
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index f1de9a5e2185..4f2303c28a40 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -30,7 +30,8 @@
 #include 
 #include 
 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -216,11 +217,11 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, 
const SfxItemSet& rAttr
 
 //  fill text flow listbox with valid entries
 
-m_pTextFlowBox->InsertEntryValue( CuiResId( RID_SVXSTR_PAGEDIR_LTR_HORI ), 
SvxFrameDirection::Horizontal_LR_TB );
+m_pTextFlowBox->InsertEntryValue( SvxResId( RID_SVXSTR_PAGEDIR_LTR_HORI ), 
SvxFrameDirection::Horizontal_LR_TB );
 
 
 if( bCTL )
-m_pTextFlowBox->InsertEntryValue( CuiResId( 
RID_SVXSTR_PAGEDIR_RTL_HORI ), SvxFrameDirection::Horizontal_RL_TB );
+m_pTextFlowBox->InsertEntryValue( SvxResId( 
RID_SVXSTR_PAGEDIR_RTL_HORI ), SvxFrameDirection::Horizontal_RL_TB );
 
 
 // #109989# do not show vertical directions in Writer/Web
@@ -228,8 +229,8 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, 
const SfxItemSet& rAttr
 {
 if( bCJK )
 {
-m_pTextFlowBox->InsertEntryValue( CuiResId( 
RID_SVXSTR_PAGEDIR_RTL_VERT ), SvxFrameDirection::Vertical_RL_TB );
-m_pTextFlowBox->InsertEntryValue( CuiResId( 
RID_SVXSTR_PAGEDIR_LTR_VERT ), SvxFrameDirection::Vertical_LR_TB );
+m_pTextFlowBox->InsertEntryValue( SvxResId( 
RID_SVXSTR_PAGEDIR_RTL_VERT ), SvxFrameDirection::Vertical_RL_TB );
+m_pTextFlowBox->InsertEntryValue( SvxResId( 
RID_SVXSTR_PAGEDIR_LTR_VERT ), SvxFrameDirection::Vertical_LR_TB );
 }
 }
 
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index cd670874e1e6..1fbcfc2066b2 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1628,9 +1628,14 @@
 #define RID_SUBSETSTR_SYRIAC_SUPPLEMENT 
NC_("RID_SUBSETMAP", "Syriac Supplement")
 #define RID_SUBSETSTR_ZANABAZAR_SQUARE  
NC_("RID_SUBSETMAP", "Zanabazar Square")
 
-#define RID_SVXSTR_FRAMEDIR_LTR 
NC_("RID_SVXSTR_FRAMEDIR_LTR", "Left-to-right (LTR)")
-#define RID_SVXSTR_FRAMEDIR_RTL 
NC_("RID_SVXSTR_FRAMEDIR_RTL", "Right-to-left (RTL)")
-#define RID_SVXSTR_FRAMEDIR_SUPER   

[Libreoffice-commits] core.git: cui/inc cui/source

[Muhammet Kara]

 cui/inc/strings.hrc |2 +-
 cui/source/customize/CommandCategoryListBox.cxx |6 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit cdb9e338f1e410fe968df3193369a1b516c50c35
Author: Muhammet Kara 
Date:   Tue Dec 5 10:36:05 2017 +0300

tdf#114091: Customize dialog: Rename 'All categories' to 'All commands'

And put a separator before the 'Macros' category.

Change-Id: Ibcff6b6c6d3a4f72d5e06b519fe8245d9602ad3c
Reviewed-on: https://gerrit.libreoffice.org/45843
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 16db3c213f71..af4fbb388b57 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -88,7 +88,7 @@
 
 #define RID_SVXSTR_ERR_TEXTNOTFOUND 
NC_("RID_SVXSTR_ERR_TEXTNOTFOUND", "No alternatives found.")
 #define RID_SVXSTR_SELECT_FILE_IFRAME   
NC_("RID_SVXSTR_SELECT_FILE_IFRAME", "Select File for Floating Frame")
-#define RID_SVXSTR_ALLFUNCTIONS 
NC_("RID_SVXSTR_ALLFUNCTIONS", "All categories")
+#define RID_SVXSTR_ALLFUNCTIONS 
NC_("RID_SVXSTR_ALLFUNCTIONS", "All commands")
 #define RID_SVXSTR_MACROS   NC_("RID_SVXSTR_MACROS", 
"Macros")
 #define RID_SVXSTR_MYMACROS NC_("RID_SVXSTR_MYMACROS", 
"My Macros")
 #define RID_SVXSTR_PRODMACROS   
NC_("RID_SVXSTR_PRODMACROS", "%PRODUCTNAME Macros")
diff --git a/cui/source/customize/CommandCategoryListBox.cxx 
b/cui/source/customize/CommandCategoryListBox.cxx
index ae100bf0bc03..1c93de9bd7cf 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -132,7 +132,7 @@ void CommandCategoryListBox::Init(
 css::uno::Sequence< sal_Int16 > lGroups = 
xProvider->getSupportedCommandGroups();
 
 sal_Int32 nGroupsLength = lGroups.getLength();
-sal_Int32 nEntryPos;
+sal_Int32 nEntryPos = 0;
 
 if ( nGroupsLength > 0 )
 {
@@ -166,6 +166,10 @@ void CommandCategoryListBox::Init(
 SetEntryData( nEntryPos, m_aGroupInfo.back().get() );
 }
 
+// Separate regular commands from styles and macros
+if (nEntryPos)
+SetSeparatorPos(nEntryPos);
+
 // Add macros category
 OUString sMacros( CuiResId(RID_SVXSTR_MACROS) );
 nEntryPos = InsertEntry( sMacros );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source

[Muhammet Kara]

 cui/inc/strings.hrc |2 
 cui/source/customize/CommandCategoryListBox.cxx |  215 ++--
 cui/source/inc/CommandCategoryListBox.hxx   |5 
 3 files changed, 211 insertions(+), 11 deletions(-)

New commits:
commit 3f2915c40fcc42ac91f2019fd506bfbdd1e5933f
Author: Muhammet Kara 
Date:   Mon Nov 27 21:10:21 2017 +0300

tdf#112207: Allow assigning macros to ui elements

* Adds "Macros" category to the categories list

* Search/filter feature now works also on the macros category

* Since macros category has multiple trees and subtrees, and many leaf
  elements (macros). I chose to implement the behavior like this:

  If there is no filter/search term, the trees will be presented as in the 
old
  macro selector dialog (collapsed), but if user types a search term, then
  filtering happens: non-matching elements and empty containers/(sub)trees
  are removed and everything is expanded so that user easily sees what
  (s)he is looking for.

Change-Id: I1a93f156a7293c7e61baac882a10ff631961e2af
Reviewed-on: https://gerrit.libreoffice.org/44938
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 
Reviewed-by: Katarina Behrens 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 18ea70bd6f4e..16db3c213f71 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -89,8 +89,10 @@
 #define RID_SVXSTR_ERR_TEXTNOTFOUND 
NC_("RID_SVXSTR_ERR_TEXTNOTFOUND", "No alternatives found.")
 #define RID_SVXSTR_SELECT_FILE_IFRAME   
NC_("RID_SVXSTR_SELECT_FILE_IFRAME", "Select File for Floating Frame")
 #define RID_SVXSTR_ALLFUNCTIONS 
NC_("RID_SVXSTR_ALLFUNCTIONS", "All categories")
+#define RID_SVXSTR_MACROS   NC_("RID_SVXSTR_MACROS", 
"Macros")
 #define RID_SVXSTR_MYMACROS NC_("RID_SVXSTR_MYMACROS", 
"My Macros")
 #define RID_SVXSTR_PRODMACROS   
NC_("RID_SVXSTR_PRODMACROS", "%PRODUCTNAME Macros")
+#define RID_SVXSTR_NOMACRODESC  
NC_("RID_SVXSTR_NOMACRODESC", "There is no description available for this 
macro.")
 #define RID_SVXSTR_SELECTOR_ADD_COMMANDS
NC_("RID_SVXSTR_SELECTOR_ADD_COMMANDS", "Add Commands")
 #define RID_SVXSTR_SELECTOR_RUN 
NC_("RID_SVXSTR_SELECTOR_RUN", "Run")
 #define RID_SVXSTR_ROW  NC_("RID_SVXSTR_ROW", 
"Insert Rows")
diff --git a/cui/source/customize/CommandCategoryListBox.cxx 
b/cui/source/customize/CommandCategoryListBox.cxx
index 1763196db5ab..ae100bf0bc03 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -20,9 +20,15 @@
 #include 
 #include 
 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 
 // include search util
@@ -65,8 +71,7 @@ void CommandCategoryListBox::dispose()
 
 void CommandCategoryListBox::ClearAll()
 {
-//TODO: Handle SfxCfgKind::GROUP_SCRIPTCONTAINER when it gets added to Init
-// Clear style info objects from m_aGroupInfo vector to avoid memory leak
+// Clear objects from m_aGroupInfo vector to avoid memory leak
 for (const auto & It : m_aGroupInfo)
 {
 if ( It->nKind == SfxCfgKind::GROUP_STYLES && It->pObject )
@@ -74,6 +79,19 @@ void CommandCategoryListBox::ClearAll()
 SfxStyleInfo_Impl* pStyle = 
static_cast(It->pObject);
 delete pStyle;
 }
+else if ( It->nKind == SfxCfgKind::FUNCTION_SCRIPT && It->pObject )
+{
+OUString* pScriptURI = static_cast(It->pObject);
+delete pScriptURI;
+}
+else if ( It->nKind == SfxCfgKind::GROUP_SCRIPTCONTAINER && 
It->pObject)
+{
+css::uno::XInterface* xi = static_cast(It->pObject);
+if (xi != nullptr)
+{
+xi->release();
+}
+}
 }
 
 m_aGroupInfo.clear();
@@ -85,6 +103,7 @@ void CommandCategoryListBox::Init(
 const css::uno::Reference< css::frame::XFrame >& xFrame,
 const OUString& sModuleLongName)
 {
+// User will not see incomplete UI
 SetUpdateMode(false);
 ClearAll();
 
@@ -107,7 +126,6 @@ void CommandCategoryListBox::Init(
 m_aStylesInfo.init(sModuleLongName, xModel);
 SetStylesInfo(_aStylesInfo);
 
-/ InitModule Start /
 try
 {
 css::uno::Reference< css::frame::XDispatchInformationProvider > 
xProvider(m_xFrame, css::uno::UNO_QUERY_THROW);
@@ -143,23 +161,32 @@ void CommandCategoryListBox::Init(
 }
 
 nEntryPos = InsertEntry( sGroupName );
-m_aGroupInfo.push_back( o3tl::make_unique( 
SfxCfgKind::GROUP_FUNCTION, rGroupID ) );
+m_aGroupInfo.push_back(
+ 

[Libreoffice-commits] core.git: cui/inc cui/source linguistic/source

[László Németh]

 cui/inc/strings.hrc|1 +
 cui/source/inc/optdict.hxx |1 +
 cui/source/options/optdict.cxx |   29 ++---
 linguistic/source/dicimp.cxx   |   36 +++-
 4 files changed, 59 insertions(+), 8 deletions(-)

New commits:
commit 95d9f596336ebf19dc367f618b3788a4ce0ba542
Author: László Németh 
Date:   Thu Nov 9 16:03:21 2017 +0100

tdf#113739 add "Grammar By" feature to user dictionaries

Language-specific user dictionaries (en-US, de-DE, etc.)
have got a new "Grammar By" field to specify
optional automatic affixation and compounding of the
new words by adding an example dictionary word.

Test example:

Create an en-US user dictionary. Add the new word
"crowdfund" to it, also an example, the Hunspell
en-US dictionary word "fund" in the optional
"Grammar By" field.

This way, the word "crowdfund" will be recognized
by the spell checker with suffixes of the word "fund",
too: crowdfund’s, crowdfunds, crowdfunder, crowdfunders
and crowdfunding.

Hunspell dictionaries with compound flag usage (German,
Hungarian, etc.) can support automatic compounding of
the new words, too.

Change-Id: Id70dbee4544643967153f730ae64938e5cee0c82
Reviewed-on: https://gerrit.libreoffice.org/44562
Tested-by: Jenkins 
Reviewed-by: László Németh 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 40270de92037..5909ef647c74 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -268,6 +268,7 @@
 #define RID_SVXSTR_CHG_SMARTART 
NC_("RID_SVXSTR_CHG_SMARTART", "SmartArt to %PRODUCTNAME shapes or reverse")
 
 #define RID_SVXSTR_OPT_DOUBLE_DICTS 
NC_("RID_SVXSTR_OPT_DOUBLE_DICTS", "The specified name already exists.\nPlease 
enter a new name.")
+#define RID_SVXSTR_OPT_GRAMMAR_BY   
NC_("RID_SVXSTR_OPT_GRAMMAR_BY", "~Grammar By")
 #define STR_MODIFY  NC_("STR_MODIFY", 
"~Replace")
 #define RID_SVXSTR_CONFIRM_SET_LANGUAGE 
NC_("RID_SVXSTR_CONFIRM_SET_LANGUAGE", "Do you want to change the '%1' 
dictionary language?")
 
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index fb8cd6deb364..e2dc53bf9e6e 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -109,6 +109,7 @@ private:
 
 OUStringsModify;
 OUStringsNew;
+OUStringsReplaceFT_Text;
 
 css::uno::Sequence<
 css::uno::Reference<
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index c04584f08bb4..8b23f40c5445 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -227,6 +227,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
 
 get(pWordED,"word");
 get(pReplaceFT,"replace_label");
+sReplaceFT_Text = pReplaceFT->GetText();
 get(pReplaceED,"replace");
 get(pWordsLB,"words");
 pWordsLB->set_height_request(pWordsLB->GetTextHeight() * 8);
@@ -484,7 +485,22 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 
nId )
 pWordED->SetText(aStr);
 pReplaceED->SetText(aStr);
 
-if(xDic->getDictionaryType() != DictionaryType_POSITIVE)
+bool bIsNegative = xDic->getDictionaryType() != DictionaryType_POSITIVE;
+bool bLangNone = LanguageTag(
+xDic->getLocale() ).getLanguageType() == LANGUAGE_NONE;
+
+// The label is "Replace By" only in negative dictionaries (forbidden
+// words), otherwise "Grammar By" in language-specific dictionaries
+// (where the optional second word is the sample word for
+// the Hunspell based affixation/compounding of the new dictionary word)
+if (bIsNegative)
+{
+pReplaceFT->SetText(sReplaceFT_Text);
+} else if (!bLangNone) {
+pReplaceFT->SetText(CuiResId(RID_SVXSTR_OPT_GRAMMAR_BY));
+}
+
+if(bIsNegative || !bLangNone)
 {
 nStaticTabs[0]=2;
 
@@ -525,7 +541,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 
nId )
 {
 aStr = pEntry[i]->getDictionaryWord();
 sal_uLong nPos = GetLBInsertPos( aStr );
-if(pEntry[i]->isNegative())
+if(!pEntry[i]->getReplacementText().isEmpty())
 {
 aStr += "\t" + pEntry[i]->getReplacementText();
 }
@@ -608,11 +624,10 @@ bool SvxEditDictionaryDialog::NewDelHdl(void const * pBtn)
 {
 // make changes in dic
 
-//! ...IsVisible should reflect whether the dictionary is a 
negativ
-//! or not (hopefully...)
-bool bIsNegEntry = pReplaceFT->IsVisible();
+bool bIsNegEntry = xDic->getDictionaryType() == 
DictionaryType_NEGATIVE;
+
 OUString aRplcText;
-if(bIsNegEntry)
+if(!aReplaceStr.isEmpty())

[Libreoffice-commits] core.git: cui/inc cui/source

[Maxim Monastirsky]

 cui/inc/bitmaps.hlst   |1 +
 cui/source/dialogs/colorpicker.cxx |3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 48e64ea4a8201a43457e46422a07f14f697eb91e
Author: Maxim Monastirsky 
Date:   Wed Oct 25 01:34:13 2017 +0300

tdf#107569 Fix missing res/colorslider.png

Change-Id: I83c719594a29cde8385a22793f17812e7d5c12bb
Reviewed-on: https://gerrit.libreoffice.org/43796
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
index 2cefabd14611..dc1ce4a6a9e4 100644
--- a/cui/inc/bitmaps.hlst
+++ b/cui/inc/bitmaps.hlst
@@ -63,6 +63,7 @@
 #define RID_SVXBMP_FILEOPEN "res/fileopen.png"
 #define RID_SVXBMP_TARGET   "res/target.png"
 #define RID_SVXBMP_NEWDOC   "res/newdoc.png"
+#define RID_SVXBMP_COLORSLIDER  "res/colorslider.png"
 
 #define RID_SVXBMP_COLLAPSEDNODE"res/sx18002.png"
 #define RID_SVXBMP_EXPANDEDNODE "res/sx18003.png"
diff --git a/cui/source/dialogs/colorpicker.cxx 
b/cui/source/dialogs/colorpicker.cxx
index 504a65ddd7a8..5546573e0645 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -906,7 +907,7 @@ ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, 
sal_Int32 nColor, sa
 : ModalDialog( pParent, "ColorPicker", "cui/ui/colorpickerdialog.ui" )
 , mnDialogMode( nMode )
 , meMode( DefaultMode )
-, maSliderImage( FixedImage::loadThemeImage("res/colorslider.png") )
+, maSliderImage( BitmapEx( RID_SVXBMP_COLORSLIDER ) )
 {
 get(mpColorField, "colorField");
 get(mpColorSlider, "colorSlider");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/inc cui/source svl/source svx/source

[Philipp Riemer]

 cui/inc/pch/precompiled_cui.hxx|1 -
 cui/source/dialogs/cuifmsearch.cxx |1 -
 svl/source/items/style.cxx |1 -
 svx/source/form/fmsrccfg.cxx   |1 -
 4 files changed, 4 deletions(-)

New commits:
commit 387666fbd751561b53b5c7072e85551d22fced74
Author: Philipp Riemer ruderphil...@gmail.com
Date:   Tue Sep 3 19:19:41 2013 +0200

remove filerec.hxx inclusion where not needed

Change-Id: Ia5a65cb53580ed1ed7535a787f4f762da5a43d43
Reviewed-on: https://gerrit.libreoffice.org/5792
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index 965a275..74a9e8c 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -407,7 +407,6 @@
 #include svl/ctloptions.hxx
 #include svl/eitem.hxx
 #include svl/filenotation.hxx
-#include svl/filerec.hxx
 #include svl/flagitem.hxx
 #include svl/intitem.hxx
 #include svl/itemiter.hxx
diff --git a/cui/source/dialogs/cuifmsearch.cxx 
b/cui/source/dialogs/cuifmsearch.cxx
index 96faf47..ad3304c 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -26,7 +26,6 @@
 #include osl/mutex.hxx
 #include sfx2/app.hxx
 #include cuires.hrc
-#include svl/filerec.hxx
 #include svx/fmsrccfg.hxx
 #include svx/fmsrcimp.hxx
 #include fmsearch.hrc
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 1c04655..2695577 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -27,7 +27,6 @@
 #include svl/itemset.hxx
 #include svl/itempool.hxx
 #include poolio.hxx
-#include svl/filerec.hxx
 #include svl/itemiter.hxx
 #include svl/style.hxx
 #include unotools/syslocale.hxx
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index e2c78a2..c74e4df 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -18,7 +18,6 @@
  */
 
 #include svx/fmsrccfg.hxx
-#include svl/filerec.hxx
 #include com/sun/star/i18n/TransliterationModules.hpp
 #include comphelper/processfactory.hxx
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits