date:20230701

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

2023-07-01 Thread Caolán McNamara (via logerrit)

 svx/source/table/tablecontroller.cxx |   19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

New commits:
commit c7d202a61f9ce81b76b29e61252c23aa66daff07
Author: Caolán McNamara 
AuthorDate: Sat Jul 1 20:28:54 2023 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jul 1 22:59:05 2023 +0200

cid#1532376 Big parameter passed by value

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

diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index a5469e949ba5..af11e5c875f7 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -935,14 +935,13 @@ void SvxTableController::onFormatTable(const SfxRequest& 
rReq)
 SfxItemSet aNewAttr(rModel.GetItemPool());
 
 // merge drawing layer text distance items into SvxBoxItem used by the 
dialog
-SvxBoxItem aBoxItem(TextDistancesToSvxBoxItem(aNewAttr));
-
-SvxBoxInfoItem aBoxInfoItem( aNewAttr.Get( SDRATTR_TABLE_BORDER_INNER ) );
+auto 
xBoxItem(std::make_shared(TextDistancesToSvxBoxItem(aNewAttr)));
+auto 
xBoxInfoItem(std::make_shared(aNewAttr.Get(SDRATTR_TABLE_BORDER_INNER)));
 
 MergeAttrFromSelectedCells(aNewAttr, false);
-FillCommonBorderAttrFromSelectedCells( aBoxItem, aBoxInfoItem );
-aNewAttr.Put( aBoxItem );
-aNewAttr.Put( aBoxInfoItem );
+FillCommonBorderAttrFromSelectedCells(*xBoxItem, *xBoxInfoItem);
+aNewAttr.Put(*xBoxItem);
+aNewAttr.Put(*xBoxInfoItem);
 
 // Fill in shadow properties.
 const SfxItemSet& rTableItemSet = rTableObj.GetMergedItemSet();
@@ -963,7 +962,7 @@ void SvxTableController::onFormatTable(const SfxRequest& 
rReq)
 rModel, false) );
 
 // Even Cancel Button is returning positive(101) value,
-xDlg->StartExecuteAsync([xDlg, this, aBoxItem, aBoxInfoItem](int nResult){
+xDlg->StartExecuteAsync([xDlg, this, xBoxItem, xBoxInfoItem](int nResult){
 if (nResult == RET_OK)
 {
 SfxItemSet aNewSet(*(xDlg->GetOutputItemSet()));
@@ -975,14 +974,14 @@ void SvxTableController::onFormatTable(const SfxRequest& 
rReq)
 //unchanged state back to their input properties
 if (aNewSet.GetItemState(SDRATTR_TABLE_BORDER, false) != 
SfxItemState::SET)
 {
-aNewSet.Put(aBoxItem);
+aNewSet.Put(*xBoxItem);
 }
 if (aNewSet.GetItemState(SDRATTR_TABLE_BORDER_INNER, false) != 
SfxItemState::SET)
 {
-aNewSet.Put(aBoxInfoItem);
+aNewSet.Put(*xBoxInfoItem);
 }
 
-SvxBoxItemToTextDistances(aBoxItem, aNewSet);
+SvxBoxItemToTextDistances(*xBoxItem, aNewSet);
 
 if (checkTableObject() && mxTable.is())
 {

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - solenv/flatpak-manifest.in

2023-07-01 Thread Stephan Bergmann (via logerrit)

 solenv/flatpak-manifest.in |   53 -
 1 file changed, 43 insertions(+), 10 deletions(-)

New commits:
commit faa0795fd82abc2763da97a466ce510515425ac9
Author: Stephan Bergmann 
AuthorDate: Fri Jun 30 08:54:03 2023 +0200
Commit: Caolán McNamara 
CommitDate: Sat Jul 1 21:59:33 2023 +0200

Sync flatpak-manifest.in with Flathub

...including


"Change gvfs source back to download.gnome.org",


"Add metadata for flatpak-external-data-checker",


"Update bundled krb5",


"Reformat the JSON source (#240)", and


"Update gvfs-1.50.4.tar.xz to 1.50.5 (#244)".

Change-Id: I970276ebe815b9dd2f61000abcb1a726cfd258ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153787
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit c788fddc4392ad014d94032ec967a37f2db89db5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153840
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index bdc7bf63cce4..10b4001b5de6 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -18,17 +18,44 @@
 {
 "name": "gvfs",
 "buildsystem": "meson",
-"config-opts": [ "-Dsystemduserunitdir=no", "-Dtmpfilesdir=no", 
"-Dinstalled_tests=true",
-"-Dadmin=false", "-Dafc=false", "-Dafp=false",
-"-Darchive=false", "-Dcdda=false", "-Ddnssd=false", "-Dgoa=false", 
"-Dgoogle=false",
-"-Dgphoto2=false", "-Dhttp=false", "-Dmtp=false", "-Dnfs=false", 
"-Dsftp=false", "-Dsmb=false",
-"-Dudisks2=false", "-Dbluray=false", "-Dfuse=false", 
"-Dgcr=false", "-Dgcrypt=false",
-"-Dgudev=false", "-Dkeyring=false", "-Dlogind=false", 
"-Dlibusb=false" ],
+"config-opts": [
+"-Dsystemduserunitdir=no",
+"-Dtmpfilesdir=no",
+"-Dinstalled_tests=true",
+"-Dadmin=false",
+"-Dafc=false",
+"-Dafp=false",
+"-Darchive=false",
+"-Dcdda=false",
+"-Ddnssd=false",
+"-Dgoa=false",
+"-Dgoogle=false",
+"-Dgphoto2=false",
+"-Dhttp=false",
+"-Dmtp=false",
+"-Dnfs=false",
+"-Dsftp=false",
+"-Dsmb=false",
+"-Dudisks2=false",
+"-Dbluray=false",
+"-Dfuse=false",
+"-Dgcr=false",
+"-Dgcrypt=false",
+"-Dgudev=false",
+"-Dkeyring=false",
+"-Dlogind=false",
+"-Dlibusb=false"
+],
 "sources": [
 {
 "type": "archive",
-"url": 
"https://gitlab.gnome.org/GNOME/gvfs/-/archive/1.50.4/gvfs-1.50.4.tar.gz";,
-"sha256": 
"c67bba49c5b1dbe0b8b8f53b45eab545f6a6ce36fcdf3c11ac92464732b60ea5"
+"url": 
"https://download.gnome.org/sources/gvfs/1.50/gvfs-1.50.5.tar.xz";,
+"sha256": 
"b86f09b7331c8642ecebf46a3cda0692f5eb26086f132326a5483c2ebf86a4cb",
+"x-checker-data": {
+"type": "gnome",
+"name": "gvfs",
+"stable-only": true
+}
 }
 ]
 },
@@ -48,8 +75,14 @@
 "sources": [
 {
 "type": "archive",
-"url": 
"https://kerberos.org/dist/krb5/1.20/krb5-1.20.1.tar.gz";,
-"sha256": 
"704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851"
+"url": 
"https://kerberos.org/dist/krb5/1.21/krb5-1.21.tar.gz";,
+"sha256": 
"69f8aaff85484832df67a4bbacd99b9259bd95aab8c651fbbe65cdc9620ea93b",
+"x-checker-data": {
+"type": "html",
+"url": "https://kerberos.org/dist/";,
+"version-pattern": "Kerberos V5 Release ([\\d\\.]+) - 
current release",
+"url-template": 
"https://kerberos.org/dist/krb5/$major.$minor/krb5-$version.tar.gz";
+}
 }
 ]
 },

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - solenv/flatpak-manifest.in

2023-07-01 Thread Stephan Bergmann (via logerrit)

 solenv/flatpak-manifest.in |   53 -
 1 file changed, 43 insertions(+), 10 deletions(-)

New commits:
commit c8e2978c430e27f437ec9d1c49d24e6cdc369348
Author: Stephan Bergmann 
AuthorDate: Fri Jun 30 08:54:03 2023 +0200
Commit: Caolán McNamara 
CommitDate: Sat Jul 1 21:59:23 2023 +0200

Sync flatpak-manifest.in with Flathub

...including


"Change gvfs source back to download.gnome.org",


"Add metadata for flatpak-external-data-checker",


"Update bundled krb5",


"Reformat the JSON source (#240)", and


"Update gvfs-1.50.4.tar.xz to 1.50.5 (#244)".

Change-Id: I970276ebe815b9dd2f61000abcb1a726cfd258ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153787
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 5135348ca36ba35dac9b40bc7ad78009b881f9f4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153841
Reviewed-by: Caolán McNamara 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index f9d05c84fa7b..a1d597586cb6 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -18,17 +18,44 @@
 {
 "name": "gvfs",
 "buildsystem": "meson",
-"config-opts": [ "-Dsystemduserunitdir=no", "-Dtmpfilesdir=no", 
"-Dinstalled_tests=true",
-"-Dadmin=false", "-Dafc=false", "-Dafp=false",
-"-Darchive=false", "-Dcdda=false", "-Ddnssd=false", "-Dgoa=false", 
"-Dgoogle=false",
-"-Dgphoto2=false", "-Dhttp=false", "-Dmtp=false", "-Dnfs=false", 
"-Dsftp=false", "-Dsmb=false",
-"-Dudisks2=false", "-Dbluray=false", "-Dfuse=false", 
"-Dgcr=false", "-Dgcrypt=false",
-"-Dgudev=false", "-Dkeyring=false", "-Dlogind=false", 
"-Dlibusb=false" ],
+"config-opts": [
+"-Dsystemduserunitdir=no",
+"-Dtmpfilesdir=no",
+"-Dinstalled_tests=true",
+"-Dadmin=false",
+"-Dafc=false",
+"-Dafp=false",
+"-Darchive=false",
+"-Dcdda=false",
+"-Ddnssd=false",
+"-Dgoa=false",
+"-Dgoogle=false",
+"-Dgphoto2=false",
+"-Dhttp=false",
+"-Dmtp=false",
+"-Dnfs=false",
+"-Dsftp=false",
+"-Dsmb=false",
+"-Dudisks2=false",
+"-Dbluray=false",
+"-Dfuse=false",
+"-Dgcr=false",
+"-Dgcrypt=false",
+"-Dgudev=false",
+"-Dkeyring=false",
+"-Dlogind=false",
+"-Dlibusb=false"
+],
 "sources": [
 {
 "type": "archive",
-"url": 
"https://gitlab.gnome.org/GNOME/gvfs/-/archive/1.50.4/gvfs-1.50.4.tar.gz";,
-"sha256": 
"c67bba49c5b1dbe0b8b8f53b45eab545f6a6ce36fcdf3c11ac92464732b60ea5"
+"url": 
"https://download.gnome.org/sources/gvfs/1.50/gvfs-1.50.5.tar.xz";,
+"sha256": 
"b86f09b7331c8642ecebf46a3cda0692f5eb26086f132326a5483c2ebf86a4cb",
+"x-checker-data": {
+"type": "gnome",
+"name": "gvfs",
+"stable-only": true
+}
 }
 ]
 },
@@ -48,8 +75,14 @@
 "sources": [
 {
 "type": "archive",
-"url": 
"https://kerberos.org/dist/krb5/1.20/krb5-1.20.1.tar.gz";,
-"sha256": 
"704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851"
+"url": 
"https://kerberos.org/dist/krb5/1.21/krb5-1.21.tar.gz";,
+"sha256": 
"69f8aaff85484832df67a4bbacd99b9259bd95aab8c651fbbe65cdc9620ea93b",
+"x-checker-data": {
+"type": "html",
+"url": "https://kerberos.org/dist/";,
+"version-pattern": "Kerberos V5 Release ([\\d\\.]+) - 
current release",
+"url-template": 
"https://kerberos.org/dist/krb5/$major.$minor/krb5-$version.tar.gz";
+}
 }
 ]
 },

[Libreoffice-commits] core.git: vcl/uiconfig vcl/unx

2023-07-01 Thread Khaled Hosny (via logerrit)

 vcl/uiconfig/ui/printerdevicepage.ui |   41 ++-
 vcl/unx/generic/print/prtsetup.cxx   |   52 ---
 vcl/unx/generic/print/prtsetup.hxx   |3 --
 3 files changed, 4 insertions(+), 92 deletions(-)

New commits:
commit c3a4f689f44d83e3e9520bc280c566c83c4f2b5e
Author: Khaled Hosny 
AuthorDate: Fri Jun 30 09:37:45 2023 +
Commit: Caolán McNamara 
CommitDate: Sat Jul 1 21:09:25 2023 +0200

Remove option to set printer language type

Drop support for changing printer language type from printer properties
dialog, in preparation for dropping support for PostScript printing.

This is a follow up to:

commit 2a40505d00fcd79bfa433c301ddc05a35287bfb1
Date:   Thu Jan 26 11:49:43 2023 +

remove option to toggle IsPDFAsStandardPrintJobFormat from UI

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

diff --git a/vcl/uiconfig/ui/printerdevicepage.ui 
b/vcl/uiconfig/ui/printerdevicepage.ui
index 7b6d6f28213e..249562950ef9 100644
--- a/vcl/uiconfig/ui/printerdevicepage.ui
+++ b/vcl/uiconfig/ui/printerdevicepage.ui
@@ -161,7 +161,7 @@
   
 
 
-  
+  
   
 True
 False
@@ -178,7 +178,7 @@
   
   
 0
-2
+1
   
 
 
@@ -190,44 +190,11 @@
 colorspace
 1
   
-  
-0
-1
-  
-
-
-  
-True
-False
-Printer language _type:
-True
-level
-1
-  
   
 0
 0
   
 
-
-  
-True
-False
-True
-
-  Automatic : %s
-  PostScript (Level from driver)
-  PostScript Level 1
-  PostScript Level 2
-  PostScript Level 3
-  PDF
-
-  
-  
-1
-0
-  
-
 
   
 True
@@ -240,7 +207,7 @@
   
   
 1
-1
+0
   
 
 
@@ -254,7 +221,7 @@
   
   
 1
-2
+1
   
 
   
diff --git a/vcl/unx/generic/print/prtsetup.cxx 
b/vcl/unx/generic/print/prtsetup.cxx
index 90ae49ec5179..4b0a63c1b3e8 100644
--- a/vcl/unx/generic/print/prtsetup.cxx
+++ b/vcl/unx/generic/print/prtsetup.cxx
@@ -115,8 +115,6 @@ IMPL_LINK( RTSDialog, ClickButton, weld::Button&, rButton, 
void )
 {
 m_aJobData.m_nColorDepth= m_xDevicePage->getDepth();
 m_aJobData.m_nColorDevice   = m_xDevicePage->getColorDevice();
-m_aJobData.m_nPSLevel   = m_xDevicePage->getLevel();
-m_aJobData.m_nPDFDevice = m_xDevicePage->getPDFDevice();
 }
 m_xDialog->response(RET_OK);
 }
@@ -271,7 +269,6 @@ RTSDevicePage::RTSDevicePage(weld::Widget* pPage, 
RTSDialog* pParent)
 , m_xPPDKeyBox(m_xBuilder->weld_tree_view("options"))
 , m_xPPDValueBox(m_xBuilder->weld_tree_view("values"))
 , m_xCustomEdit(m_xBuilder->weld_entry("custom"))
-, m_xLevelBox(m_xBuilder->weld_combo_box("level"))
 , m_xSpaceBox(m_xBuilder->weld_combo_box("colorspace"))
 , m_xDepthBox(m_xBuilder->weld_combo_box("colordepth"))
 , m_aReselectCustomIdle("RTSDevicePage m_aReselectCustomIdle")
@@ -286,7 +283,6 @@ RTSDevicePage::RTSDevicePage(weld::Widget* pPage, 
RTSDialog* pParent)
 m_xPPDKeyBox->connect_changed( LINK( this, RTSDevicePage, SelectHdl ) );
 m_xPPDValueBox->connect_changed( LINK( this, RTSDevicePage, SelectHdl ) );
 
-m_xLevelBox->connect_changed(LINK(this, RTSDevicePage, ComboChangedHdl));
 m_xSpaceBox->connect_changed(LINK(this, RTSDevicePage, ComboChangedHdl));
 m_xDepthBox->connect_changed(LINK(this, RTSDevicePage, ComboChangedHdl));
 
@@ -303,36 +299,6 @@ RTSDevicePage::RTSDevicePage(weld::Widget* pPage, 
RTSDialog* pParent)
 break;
 }
 
-sal_Int32 nLevelEntryData = 0; //automatic
-if( m_pParent->m_aJobData.m_nPDFDevice == 2 ) //explicit PDF
-nLevelEntryData = 10;
-else if (m_pParent->m_aJobData.m_nPSLevel > 0) //explicit PS Level
-nLevelEntryData = m_pParent->m_aJobData.m_nPSLevel+1;
-else if (m_pParent->m_aJobData.m_nPDFDevice == 1) //automatically PDF
-nLevelEntryData = 0;
-else if (m_pParent->m_aJobData.m_nPDFDevice == -1) //explicitly PS from 
driver
-nLevelEntryData = 1;
-
-bool bAutoIsPDF = 
officecfg::Office::Common::Print::Option::Printer::PDFAsStandardPrintJobFormat::get();
-
-assert(nLevelEntryData != 0
-|| "Generic Printer" == m_pParent->m_aJobData.m_aPrinterName
-

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

2023-07-01 Thread Khaled Hosny (via logerrit)

 vcl/uiconfig/ui/printerdevicepage.ui |  150 +--
 1 file changed, 75 insertions(+), 75 deletions(-)

New commits:
commit b1c97304f135702e53e6aa48483ede31eaa54fec
Author: Khaled Hosny 
AuthorDate: Fri Jun 30 09:14:49 2023 +
Commit: Caolán McNamara 
CommitDate: Sat Jul 1 21:08:17 2023 +0200

Resave with glade

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

diff --git a/vcl/uiconfig/ui/printerdevicepage.ui 
b/vcl/uiconfig/ui/printerdevicepage.ui
index 4bdee960d64a..7b6d6f28213e 100644
--- a/vcl/uiconfig/ui/printerdevicepage.ui
+++ b/vcl/uiconfig/ui/printerdevicepage.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -18,62 +18,62 @@
   
 
   
-  
+  
   
 True
-False
+False
 True
 True
-6
-6
-12
-True
+6
+6
+12
+True
 
   
 True
-False
+False
 _Option:
-True
-options
+True
+options
 0
   
   
-0
-0
+0
+0
   
 
 
   
 True
-False
+False
 Current _value:
-True
-values
+True
+values
 0
   
   
-1
-0
+1
+0
   
 
 
   
 True
-True
+True
 True
 True
-in
+in
 
   
 True
-True
+True
 True
 True
 liststore1
-False
-False
-0
-False
+False
+False
+0
+False
 
   
 
@@ -91,48 +91,48 @@
 
   
   
-0
-1
+0
+1
   
 
 
-  
+  
   
 True
-False
+False
 True
 True
-6
+6
 
   
-True
-True
+True
+True
+True
 True
-True
   
   
-0
-0
+0
+0
   
 
 
   
 True
-True
+True
 True
 True
-in
+in
 
   
 True
-True
+True
 True
 True
 liststore2
-False
-False
-0
-False
+False
+False
+0
+False
 
   
 
@@ -150,69 +150,69 @@
 
   
   
-0
-1
+0
+1
   
 
   
   
-1
-1
+1
+1
   
 
 
-  
+  
   
 True
-False
-6
-12
+False
+6
+12
 
   
 True
-False
+False
 Color _depth:
-True
-colordepth
+True
+colordepth
 1
   
   
-0
-2
+0
+2
   
 
 
   
 True
-False
+False
 Co_lor:
-True
-colorspace
+True
+colorspace
 1
   
   
-0
-1
+0
+1
   
 
 
   
 True
-False
+False
 Printer language _type:
-True
-level
+True
+level
 1
   
   
-0
-0
+0
+0
   
 
 
   
 True
-False
+False
 True
 
   Automatic : %s
@@ -224,14 +224,14 @@
 
   
   
-1
-0
+1
+0
   
 
 
   
 True
-False
+False
 
   From driver
   Color
@@ -239,28 +239,28 @@
 
   
   
-1
-1
+1
+1
   
 
 
   
 True
-False
+False
 
   8 Bit
   24 Bit
 
   
   
-1
-2
+1
+2
   
 
   
   
-0
-2
+0
+

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

2023-07-01 Thread Stephan Bergmann (via logerrit)

 solenv/flatpak-manifest.in |   53 -
 1 file changed, 43 insertions(+), 10 deletions(-)

New commits:
commit 5135348ca36ba35dac9b40bc7ad78009b881f9f4
Author: Stephan Bergmann 
AuthorDate: Fri Jun 30 08:54:03 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Jul 1 20:57:16 2023 +0200

Sync flatpak-manifest.in with Flathub

...including


"Change gvfs source back to download.gnome.org",


"Add metadata for flatpak-external-data-checker",


"Update bundled krb5",


"Reformat the JSON source (#240)", and


"Update gvfs-1.50.4.tar.xz to 1.50.5 (#244)".

Change-Id: I970276ebe815b9dd2f61000abcb1a726cfd258ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153787
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index bdc7bf63cce4..10b4001b5de6 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -18,17 +18,44 @@
 {
 "name": "gvfs",
 "buildsystem": "meson",
-"config-opts": [ "-Dsystemduserunitdir=no", "-Dtmpfilesdir=no", 
"-Dinstalled_tests=true",
-"-Dadmin=false", "-Dafc=false", "-Dafp=false",
-"-Darchive=false", "-Dcdda=false", "-Ddnssd=false", "-Dgoa=false", 
"-Dgoogle=false",
-"-Dgphoto2=false", "-Dhttp=false", "-Dmtp=false", "-Dnfs=false", 
"-Dsftp=false", "-Dsmb=false",
-"-Dudisks2=false", "-Dbluray=false", "-Dfuse=false", 
"-Dgcr=false", "-Dgcrypt=false",
-"-Dgudev=false", "-Dkeyring=false", "-Dlogind=false", 
"-Dlibusb=false" ],
+"config-opts": [
+"-Dsystemduserunitdir=no",
+"-Dtmpfilesdir=no",
+"-Dinstalled_tests=true",
+"-Dadmin=false",
+"-Dafc=false",
+"-Dafp=false",
+"-Darchive=false",
+"-Dcdda=false",
+"-Ddnssd=false",
+"-Dgoa=false",
+"-Dgoogle=false",
+"-Dgphoto2=false",
+"-Dhttp=false",
+"-Dmtp=false",
+"-Dnfs=false",
+"-Dsftp=false",
+"-Dsmb=false",
+"-Dudisks2=false",
+"-Dbluray=false",
+"-Dfuse=false",
+"-Dgcr=false",
+"-Dgcrypt=false",
+"-Dgudev=false",
+"-Dkeyring=false",
+"-Dlogind=false",
+"-Dlibusb=false"
+],
 "sources": [
 {
 "type": "archive",
-"url": 
"https://gitlab.gnome.org/GNOME/gvfs/-/archive/1.50.4/gvfs-1.50.4.tar.gz";,
-"sha256": 
"c67bba49c5b1dbe0b8b8f53b45eab545f6a6ce36fcdf3c11ac92464732b60ea5"
+"url": 
"https://download.gnome.org/sources/gvfs/1.50/gvfs-1.50.5.tar.xz";,
+"sha256": 
"b86f09b7331c8642ecebf46a3cda0692f5eb26086f132326a5483c2ebf86a4cb",
+"x-checker-data": {
+"type": "gnome",
+"name": "gvfs",
+"stable-only": true
+}
 }
 ]
 },
@@ -48,8 +75,14 @@
 "sources": [
 {
 "type": "archive",
-"url": 
"https://kerberos.org/dist/krb5/1.20/krb5-1.20.1.tar.gz";,
-"sha256": 
"704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851"
+"url": 
"https://kerberos.org/dist/krb5/1.21/krb5-1.21.tar.gz";,
+"sha256": 
"69f8aaff85484832df67a4bbacd99b9259bd95aab8c651fbbe65cdc9620ea93b",
+"x-checker-data": {
+"type": "html",
+"url": "https://kerberos.org/dist/";,
+"version-pattern": "Kerberos V5 Release ([\\d\\.]+) - 
current release",
+"url-template": 
"https://kerberos.org/dist/krb5/$major.$minor/krb5-$version.tar.gz";
+}
 }
 ]
 },

[Libreoffice-commits] core.git: sfx2/source

2023-07-01 Thread Justin Luth (via logerrit)

 sfx2/source/view/viewfrm.cxx |   18 ++
 1 file changed, 2 insertions(+), 16 deletions(-)

New commits:
commit d0bbc16b1715a3711d872a36c7e525e8d3811669
Author: Justin Luth 
AuthorDate: Sat Jul 1 11:30:46 2023 -0400
Commit: Justin Luth 
CommitDate: Sat Jul 1 18:59:58 2023 +0200

Revert "tdf#126006 sc SID_RELOAD: restart notebookbar"

This reverts 24.2 commit 0211c88f884065aa179725bd2eb846edd4c5bb6b.

Although it passed on Jenkins, my own computer seems to hang
on UITests - both Writer and Calc.

Change-Id: I57e8a176cce55a514490db81f211582c0ad86675
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153829
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 0766eec86088..196a18d3d335 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -838,18 +838,8 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 
 UpdateDocument_Impl();
 
-auto sModule = 
vcl::CommandInfoProvider::GetModuleIdentifier(GetFrame().GetFrameInterface());
-OUString sReloadNotebookBar;
-if (sModule == "com.sun.star.text.TextDocument")
-sReloadNotebookBar = u"modules/swriter/ui/";
-else if (sModule == 
"com.sun.star.sheet.SpreadsheetDocument")
-sReloadNotebookBar = u"modules/scalc/ui/";
-else if (sfx2::SfxNotebookBar::IsActive()
- && sModule != "presentation.PresentationDocument"
- && sModule != 
"com.sun.star.drawing.DrawingDocument")
-{
-assert(false && "SID_RELOAD Notebookbar active, but 
not refreshed here");
-}
+if 
(vcl::CommandInfoProvider::GetModuleIdentifier(GetFrame().GetFrameInterface()) 
== "com.sun.star.text.TextDocument")
+
sfx2::SfxNotebookBar::ReloadNotebookBar(u"modules/swriter/ui/");
 
 try
 {
@@ -888,10 +878,6 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 
 // Propagate document closure.
 SfxGetpApp()->NotifyEvent( SfxEventHint( 
SfxEventHintId::CloseDoc, GlobalEventConfig::GetEventName( 
GlobalEventId::CLOSEDOC ), xOldObj ) );
-
-// tdf#126006 Calc needs to reload the notebookbar after 
closing the document
-if (!sReloadNotebookBar.isEmpty())
-
sfx2::SfxNotebookBar::ReloadNotebookBar(sReloadNotebookBar);
 }
 
 // Record as done

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - translations

2023-07-01 Thread Martin Srebotnjak (via logerrit)

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7da76df0191f1683fbc5b7af9c6772f6221e0763
Author: Martin Srebotnjak 
AuthorDate: Sat Jul 1 18:18:44 2023 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Jul 1 18:18:44 2023 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-6'
  to 6019c3e7cefef1b37af5966b95e930278d54d755
  - Updated Slovenian translation

Change-Id: I6a612b5c9329db26d9368dda230a0db21f18ff6b

diff --git a/translations b/translations
index 9baf6fe8f472..6019c3e7cefe 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 9baf6fe8f472c82da8663d0857389562f300bfb0
+Subproject commit 6019c3e7cefef1b37af5966b95e930278d54d755

[Libreoffice-commits] translations.git: Branch 'libreoffice-7-6' - source/sl

2023-07-01 Thread Martin Srebotnjak (via logerrit)

 source/sl/cui/messages.po |   11 
 source/sl/extensions/messages.po  |8 
 source/sl/helpcontent2/source/text/sbasic/shared.po   |   42 
 source/sl/helpcontent2/source/text/scalc/00.po|   10 
 source/sl/helpcontent2/source/text/scalc/01.po|4 
 source/sl/helpcontent2/source/text/scalc/guide.po |4 
 source/sl/helpcontent2/source/text/sdraw.po   |   18 
 source/sl/helpcontent2/source/text/shared.po  |   28 
 source/sl/helpcontent2/source/text/shared/00.po   |  974 +-
 source/sl/helpcontent2/source/text/shared/01.po   |  828 -
 source/sl/helpcontent2/source/text/shared/02.po   |  176 -
 source/sl/helpcontent2/source/text/shared/guide.po|  184 -
 source/sl/helpcontent2/source/text/shared/menu.po |  236 +
 source/sl/helpcontent2/source/text/simpress.po|   18 
 source/sl/helpcontent2/source/text/swriter.po |  138 
 source/sl/helpcontent2/source/text/swriter/00.po  |  370 ++
 source/sl/helpcontent2/source/text/swriter/01.po  |  554 ++-
 source/sl/helpcontent2/source/text/swriter/02.po  |   32 
 source/sl/helpcontent2/source/text/swriter/04.po  |6 
 source/sl/helpcontent2/source/text/swriter/guide.po   |   22 
 source/sl/helpcontent2/source/text/swriter/menu.po|   60 
 source/sl/officecfg/registry/data/org/openoffice/Office.po|4 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |   35 
 source/sl/sc/messages.po  |   12 
 source/sl/scp2/source/calc.po |   14 
 source/sl/sfx2/messages.po|6 
 source/sl/svtools/messages.po |8 
 source/sl/svx/messages.po | 1420 --
 source/sl/sw/messages.po  |  186 -
 source/sl/vcl/messages.po |  108 
 30 files changed, 3514 insertions(+), 2002 deletions(-)

New commits:
commit 6019c3e7cefef1b37af5966b95e930278d54d755
Author: Martin Srebotnjak 
AuthorDate: Sat Jul 1 18:18:40 2023 +0200
Commit: Andras Timar 
CommitDate: Sat Jul 1 18:18:40 2023 +0200

Updated Slovenian translation

Change-Id: I6a612b5c9329db26d9368dda230a0db21f18ff6b

diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po
index 011e594dd09..1695831822f 100644
--- a/source/sl/cui/messages.po
+++ b/source/sl/cui/messages.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 7.6\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2023-05-30 13:22+0200\n"
-"PO-Revision-Date: 2023-05-25 23:42+0200\n"
+"POT-Creation-Date: 2023-06-30 21:11+0200\n"
+"PO-Revision-Date: 2023-06-22 14:18+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "MIME-Version: 1.0\n"
@@ -1837,8 +1837,13 @@ msgctxt "RID_LANGUAGETOOL_LEAVE_EMPTY"
 msgid "Leave this field empty to use the free version"
 msgstr "Pustite to polje prazno, če želite uporabljati brezplačno različico"
 
+#: cui/inc/strings.hrc:410
+msgctxt "RID_LANGUAGETOOL_REST_LEAVE_EMPTY"
+msgid "Leave this field empty to use LanguageTool protocol"
+msgstr "Pustite to polje prazno, če želite uporabljati protokol LanguageTool"
+
 #. Translatable names of color schemes
-#: cui/inc/strings.hrc:412
+#: cui/inc/strings.hrc:413
 msgctxt "RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC"
 msgid "Automatic"
 msgstr "samodejna"
diff --git a/source/sl/extensions/messages.po b/source/sl/extensions/messages.po
index be4e19adc97..f8af2ce7073 100644
--- a/source/sl/extensions/messages.po
+++ b/source/sl/extensions/messages.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: LibreOffice 7.6\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
 "POT-Creation-Date: 2023-04-24 15:45+0200\n"
-"PO-Revision-Date: 2023-04-11 15:38+0200\n"
+"PO-Revision-Date: 2023-07-01 17:48+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -1612,7 +1612,7 @@ msgstr "Presledki"
 #: extensions/inc/strings.hrc:213
 msgctxt "RID_STR_SHOW_SCROLLBARS"
 msgid "Scrollbars"
-msgstr "Drsniki"
+msgstr "Drsni trakovi"
 
 #: extensions/inc/strings.hrc:214
 msgctxt "RID_STR_XSD_PATTERN"
@@ -1744,7 +1744,7 @@ msgstr "Navadno"
 #: extensions/inc/strings.hrc:

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/inc sw/source vcl/jsdialog vcl/source

2023-07-01 Thread Attila Szűcs (via logerrit)

 sw/inc/view.hxx|1 +
 sw/source/uibase/inc/conttree.hxx  |2 ++
 sw/source/uibase/utlui/content.cxx |   21 +
 sw/source/uibase/utlui/navipi.cxx  |9 -
 vcl/jsdialog/executor.cxx  |   10 ++
 vcl/source/treelist/svtabbx.cxx|4 
 6 files changed, 42 insertions(+), 5 deletions(-)

New commits:
commit b95750af717e0693a13c3ef3529e1394e0ae
Author: Attila Szűcs 
AuthorDate: Thu Jun 29 18:32:27 2023 +0200
Commit: Andras Timar 
CommitDate: Sat Jul 1 16:51:44 2023 +0200

LOK: Navigator: fix expand problems

Save/load content types' expanded status to view, and make sure it
is synchronized with client.
Treeviews now receive/send collapse event/status from/to client.
I've rewritten the way how headings are opened by default
(because synch of collapsed status broke that, as sub-headings
were not expanded at core side).

Change-Id: I80f5b4d99fe5224391a92c4609f94ddbcf37b8ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153771
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index b556c2c53f39..9e31e337206b 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -350,6 +350,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
 
 public: // #i123922# Needs to be called from a 2nd place now as a helper method
 SAL_DLLPRIVATE bool  InsertGraphicDlg( SfxRequest& );
+sal_Int32 m_nNaviExpandedStatus = -1;
 
 protected:
 
diff --git a/sw/source/uibase/inc/conttree.hxx 
b/sw/source/uibase/inc/conttree.hxx
index e2cf31028171..c397a15bb20b 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -266,6 +266,8 @@ public:
 // return true if it has any children
 bool RequestingChildren(const weld::TreeIter& rParent);
 
+void ExpandAllHeadings();
+
 virtual void Notify(SfxBroadcaster& rBC, SfxHint const& rHint) override;
 
 sal_Int8 AcceptDrop(const AcceptDropEvent& rEvt);
diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 5367627cad03..c837124b723c 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1130,6 +1130,12 @@ 
SwContentTree::SwContentTree(std::unique_ptr xTreeView, SwNaviga
 OUString sDocTitle = pView->GetDocShell()->GetTitle();
 if (lcl_DocOutLineExpandStateMap.find(sDocTitle) != 
lcl_DocOutLineExpandStateMap.end())
 mOutLineNodeMap = lcl_DocOutLineExpandStateMap[sDocTitle];
+if (comphelper::LibreOfficeKit::isActive()) {
+if (pView->m_nNaviExpandedStatus < 0)
+m_nActiveBlock = 1;
+else
+m_nActiveBlock = pView->m_nNaviExpandedStatus;
+}
 }
 
 m_aUpdTimer.SetInvokeHandler(LINK(this, SwContentTree, TimerUpdate));
@@ -1144,6 +1150,8 @@ SwContentTree::~SwContentTree()
 {
 OUString sDocTitle = pView->GetDocShell()->GetTitle();
 lcl_DocOutLineExpandStateMap[sDocTitle] = mOutLineNodeMap;
+if (comphelper::LibreOfficeKit::isActive())
+pView->m_nNaviExpandedStatus = m_nActiveBlock;
 }
 clear(); // If applicable erase content types previously.
 m_aUpdTimer.Stop();
@@ -2177,6 +2185,19 @@ bool SwContentTree::RequestingChildren(const 
weld::TreeIter& rParent)
 return bChild;
 }
 
+void SwContentTree::ExpandAllHeadings()
+{
+if (HasHeadings())
+{
+std::unique_ptr xEntry = GetEntryAtAbsPos(0);
+if (xEntry)
+{
+if (!IsAllExpanded(*m_xTreeView, *xEntry))
+ExpandOrCollapseAll(*m_xTreeView, *xEntry);
+}
+}
+}
+
 SdrObject* SwContentTree::GetDrawingObjectsByContent(const SwContent *pCnt)
 {
 SdrObject *pRetObj = nullptr;
diff --git a/sw/source/uibase/utlui/navipi.cxx 
b/sw/source/uibase/utlui/navipi.cxx
index fb3f461f8f64..0f6d2ac78923 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -694,12 +694,11 @@ SwNavigationPI::SwNavigationPI(weld::Widget* pParent,
 m_xGlobalTree->HideTree();
 
 //Open Headings by default
-if (m_xContentTree->HasHeadings())
+SwView *pView = GetCreateView();
+if (pView->m_nNaviExpandedStatus < 0)
 {
-auto& pTreeView = m_xContentTree->get_widget();
-std::unique_ptr itEntry(pTreeView.make_iterator());
-pTreeView.get_iter_first(*itEntry);
-pTreeView.expand_row(*itEntry);
+pView->m_nNaviExpandedStatus = 1;
+m_xContentTree->ExpandAllHeadings();
 }
 }
 }
diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 1accb3bc1de0..750b10c0b606 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -474,6 +474,16 @@ bool ExecuteAction(const std::string& nWindowId, const 
OString& rWidget, StringM
 pTreeView->expand_row(*

[Libreoffice-commits] core.git: 2 commits - chart2/source libreofficekit/qa

2023-07-01 Thread Caolán McNamara (via logerrit)

 chart2/source/controller/main/ControllerCommandDispatch.cxx |6 +++---
 libreofficekit/qa/tilebench/tilebench.cxx   |3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit d31f61f47293b1ea9b9d86def4a412c3c45797b5
Author: Caolán McNamara 
AuthorDate: Sat Jul 1 13:18:22 2023 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jul 1 15:32:37 2023 +0200

cid#1533667 silence Uninitialized scalar variable

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

diff --git a/libreofficekit/qa/tilebench/tilebench.cxx 
b/libreofficekit/qa/tilebench/tilebench.cxx
index 3464c589f542..ffcdcefa009f 100644
--- a/libreofficekit/qa/tilebench/tilebench.cxx
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
@@ -133,6 +133,9 @@ static void dumpTile(const char *pNameStem,
 buf[1] = (*(pixel + 1) * 255 + alpha / 2) / alpha;
 buf[2] = (*(pixel + 0) * 255 + alpha / 2) / alpha;
 break;
+default:
+assert(false && "unhandled LibreOfficeKitTileMode");
+break;
 }
 }
 
commit 92ec5c70691778ccff8a37be361e638379ee6b4d
Author: Caolán McNamara 
AuthorDate: Sat Jul 1 12:50:03 2023 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jul 1 15:32:30 2023 +0200

cid#1500458 help coverity see that Dereference after null check is false

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

diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx 
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 98468a138c3f..5317c1c47c06 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -678,9 +678,9 @@ void ControllerCommandDispatch::updateCommandAvailability()
 m_aCommandAvailability[ ".uno:InsertDataLabel" ] = bIsWritable;
 m_aCommandAvailability[ ".uno:InsertMeanValue" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddMeanValue;
 m_aCommandAvailability[ ".uno:InsertTrendline" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddTrendline;
-m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddTrendlineEquation;
-m_aCommandAvailability[ ".uno:InsertTrendlineEquationAndR2" ] =
-m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ] && 
m_apControllerState->bMayAddR2Value;
+const bool bInsertTrendlineEquation = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddTrendlineEquation;
+m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ] = 
bInsertTrendlineEquation;
+m_aCommandAvailability[ ".uno:InsertTrendlineEquationAndR2" ] = 
bInsertTrendlineEquation && m_apControllerState->bMayAddR2Value;
 m_aCommandAvailability[ ".uno:InsertR2Value" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayAddR2Value
 && !m_apControllerState->bMayAddTrendlineEquation;
 m_aCommandAvailability[ ".uno:DeleteR2Value" ] = bIsWritable && 
bControllerStateIsValid && m_apControllerState->bMayDeleteR2Value;

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - chart2/source

2023-07-01 Thread Laurent Balland (via logerrit)

 chart2/source/controller/dialogs/ObjectNameProvider.cxx|   13 
+-
 chart2/source/controller/dialogs/res_Trendline.cxx |4 ---
 chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx |   10 ++-
 3 files changed, 11 insertions(+), 16 deletions(-)

New commits:
commit 6916aef75602b598c096fba00567e884dd010a7b
Author: Laurent Balland 
AuthorDate: Mon Jun 12 21:48:13 2023 +0200
Commit: Laurent Balland 
CommitDate: Sat Jul 1 15:26:04 2023 +0200

tdf#155526 Add Period to trend line equation

Insert Period value earlier to have it ready for representation
Allow Moving average equation in dialog UI

Change-Id: I1d20572c39462e60b60ab7eec1f174a3cf934d4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153094
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit dc03f59374d4fc74dd44ddedc903bb9c00a74bb7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153755
Reviewed-by: Laurent Balland 

diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx 
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index c60ff1ca364a..ab002761bde6 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -601,18 +601,9 @@ OUString ObjectNameProvider::getHelpText( 
std::u16string_view rObjectCID, const
 xCalculator->setXYNames ( aXName, aYName );
 RegressionCurveHelper::initializeCurveCalculator( 
xCalculator, xSeries, xChartModel );
 
-// change text for Moving Average
-OUString aWildcard( "%PERIOD" );
-sal_Int32 nIndex = 
xCalculator->getRepresentation().indexOf( aWildcard );
-if( nIndex != -1 )
-{  // replace period
-aRet = xCalculator->getRepresentation();
-aRet = aRet.replaceAt( nIndex, 
aWildcard.getLength(), OUString::number(aPeriod) );
-}
-
 // replace formula
-aWildcard = "%FORMULA";
-nIndex = aRet.indexOf( aWildcard );
+OUString aWildcard = "%FORMULA";
+sal_Int32 nIndex = aRet.indexOf( aWildcard );
 if( nIndex != -1 )
 {
 OUString aFormula ( 
xCalculator->getRepresentation() );
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx 
b/chart2/source/controller/dialogs/res_Trendline.cxx
index 647c071b1040..58ef6497a538 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -372,10 +372,8 @@ void TrendlineResources::UpdateControlStates()
 m_xFmtFld_InterceptValue->set_sensitive( bInterceptAvailable );
 if( bMovingAverage )
 {
-m_xCB_ShowEquation->set_state(TRISTATE_FALSE);
 m_xCB_ShowCorrelationCoeff->set_state(TRISTATE_FALSE);
 }
-m_xCB_ShowEquation->set_sensitive( !bMovingAverage );
 m_xCB_ShowCorrelationCoeff->set_sensitive( !bMovingAverage );
 m_xCB_RegressionMovingType->set_sensitive(bMovingAverage);
 m_xNF_Period->set_sensitive(bMovingAverage);
@@ -428,8 +426,6 @@ void TrendlineResources::SetNbPoints( sal_Int32 nNbPoints )
 
 IMPL_LINK_NOARG(TrendlineResources, ShowEquation, weld::Toggleable&, void)
 {
-m_xEE_XName->set_sensitive(m_xCB_ShowEquation->get_active());
-m_xEE_YName->set_sensitive(m_xCB_ShowEquation->get_active());
 UpdateControlStates();
 }
 
diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx 
b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
index 6726d9d78b36..f71262f738b9 100644
--- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
@@ -157,7 +157,15 @@ OUString 
MovingAverageRegressionCurveCalculator::ImplGetRepresentation(
 const uno::Reference< util::XNumberFormatter >& /*xNumFormatter*/,
 sal_Int32 /*nNumberFormatKey*/, sal_Int32* /*pFormulaLength = nullptr */ ) 
const
 {
-return SchResId( STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS );
+OUString aRet = SchResId( STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS );
+// change text for Moving Average
+OUString aWildcard( "%PERIOD" );
+sal_Int32 nIndex = aRet.indexOf( aWildcard );
+if( nIndex != -1 )
+{  // replace period
+aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), 
OUString::number(mPeriod) );
+}
+return aRet;
 }
 
 } //  namespace chart

[Libreoffice-commits] core.git: sfx2/source

2023-07-01 Thread Justin Luth (via logerrit)

 sfx2/source/view/viewfrm.cxx |   18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 0211c88f884065aa179725bd2eb846edd4c5bb6b
Author: Justin Luth 
AuthorDate: Fri Jun 30 21:44:01 2023 -0400
Commit: Justin Luth 
CommitDate: Sat Jul 1 12:36:35 2023 +0200

tdf#126006 sc SID_RELOAD: restart notebookbar

Change-Id: Icca41461d203615be58f9cf1214b82d70ee55ccb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153818
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 196a18d3d335..0766eec86088 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -838,8 +838,18 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 
 UpdateDocument_Impl();
 
-if 
(vcl::CommandInfoProvider::GetModuleIdentifier(GetFrame().GetFrameInterface()) 
== "com.sun.star.text.TextDocument")
-
sfx2::SfxNotebookBar::ReloadNotebookBar(u"modules/swriter/ui/");
+auto sModule = 
vcl::CommandInfoProvider::GetModuleIdentifier(GetFrame().GetFrameInterface());
+OUString sReloadNotebookBar;
+if (sModule == "com.sun.star.text.TextDocument")
+sReloadNotebookBar = u"modules/swriter/ui/";
+else if (sModule == 
"com.sun.star.sheet.SpreadsheetDocument")
+sReloadNotebookBar = u"modules/scalc/ui/";
+else if (sfx2::SfxNotebookBar::IsActive()
+ && sModule != "presentation.PresentationDocument"
+ && sModule != 
"com.sun.star.drawing.DrawingDocument")
+{
+assert(false && "SID_RELOAD Notebookbar active, but 
not refreshed here");
+}
 
 try
 {
@@ -878,6 +888,10 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
 
 // Propagate document closure.
 SfxGetpApp()->NotifyEvent( SfxEventHint( 
SfxEventHintId::CloseDoc, GlobalEventConfig::GetEventName( 
GlobalEventId::CLOSEDOC ), xOldObj ) );
+
+// tdf#126006 Calc needs to reload the notebookbar after 
closing the document
+if (!sReloadNotebookBar.isEmpty())
+
sfx2::SfxNotebookBar::ReloadNotebookBar(sReloadNotebookBar);
 }
 
 // Record as done

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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - solenv/flatpak-manifest.in

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - solenv/flatpak-manifest.in

[Libreoffice-commits] core.git: vcl/uiconfig vcl/unx

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

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

[Libreoffice-commits] core.git: sfx2/source

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - translations

[Libreoffice-commits] translations.git: Branch 'libreoffice-7-6' - source/sl

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/inc sw/source vcl/jsdialog vcl/source

[Libreoffice-commits] core.git: 2 commits - chart2/source libreofficekit/qa

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - chart2/source

[Libreoffice-commits] core.git: sfx2/source

13 matches

Site Navigation

Mail list logo

Footer information