[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - cui/source
cui/source/options/optjava.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 59be25c3dc69076a433f077f551ec7019a4d861e
Author: Michael Weghorn
AuthorDate: Thu Oct 22 14:01:07 2020 +0200
Commit: Michael Weghorn
CommitDate: Fri Oct 23 18:02:29 2020 +0200
Don't make list of JREs active when parent frame is inactive
When the Java framework's direct mode is used,
there is no use in allowing the user to change the Java
options in the "Advanced" options page, so the corresponding
frame is grayed out, s. commit
2976590ed9f727c24064c97d80a51e9891253119
("Gray out Java options when framework's direct mode is used",
2020-10-21).
For the native gtk3 implementation, this also means that the
child widget holding the list of JREs ('m_xJavaList')
automatically remains grayed out as long as the parent widget
('m_xJavaFrame') is.
However, it turns out that this is not true for the
plain VCL implementation (used e.g. by the gen or kf5 VCL
plugins) where the child widget can be
made sensitive while the parent widget is insensitive.
Therefore, commit 3935a0bd3bcf747aa9bede59b045d23ab598f2d4
("Properly (un)tick Java checkbox in Java options in direct
mode", 2020-10-21) resulted in the widget holding the
list of JREs becoming active again when the
'EnableHdl_Impl' handler was called in the non-gtk3 case
(while the parent widget and the buttons to add JREs, edit
Java parameters and classpath would remained grayed out).
Make sure the widget holding the list of JREs remains
grayed out along with the whole frame holding the Java
options.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104657
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
(cherry picked from commit cb44cf2f36e4da74ea7dcc3d06f51a85e825a497)
Conflicts:
cui/source/options/optjava.cxx
Change-Id: Ic46bf317afec9bc566493ec56ab5319a78050da0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104667
Tested-by: Michael Weghorn
Reviewed-by: Michael Weghorn
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 210903fb3c85..3609ee89ec81 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -206,7 +206,7 @@ void SvxJavaOptionsPage::dispose()
IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void)
{
-bool bEnable = m_pJavaEnableCB->IsChecked();
+bool bEnable = get("javaframe")->IsEnabled() &&
m_pJavaEnableCB->IsChecked();
m_pJavaBox->Enable(bEnable);
bEnable ? m_pJavaList->EnableTable() : m_pJavaList->DisableTable();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - cui/source
cui/source/options/optjava.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 6180c80560605826757b35d37c1e651468f817b0
Author: Michael Weghorn
AuthorDate: Wed Oct 21 10:23:30 2020 +0200
Commit: Michael Weghorn
CommitDate: Fri Oct 23 17:09:07 2020 +0200
Properly (un)tick Java checkbox in Java options in direct mode
While the Java settings cannot be changed when the direct mode
of the Java framework is used
(s. Change-ID Ife017f9b5c6c6488f84201dd78b23305c67bec1b,
"Gray out Java options when framework's direct mode is used"),
it still makes sense to (un)tick the (grayed out) checkbox which
indicates whether a JRE is used or not, which depends on whether
the JRE that is set (e.g. via env variable
'UNO_JAVA_JFW_JREHOME') is usable or not.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104064
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
(cherry picked from commit 3935a0bd3bcf747aa9bede59b045d23ab598f2d4)
Conflicts:
cui/source/options/optjava.cxx
Change-Id: I13822bb7535e3f05cbc6ef83b3c82e2739c45ad6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104666
Tested-by: Michael Weghorn
Reviewed-by: Michael Weghorn
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index f6eb32bb01af..210903fb3c85 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -675,6 +675,10 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/
)
{
// direct mode disregards Java settings made here, so gray them out
get("javaframe")->Disable();
+// check whether a usable JRE was set
+std::unique_ptr pSelectedJava;
+eErr = jfw_getSelectedJRE( );
+bEnabled = (eErr == JFW_E_NONE);
}
else if ( eErr != JFW_E_NONE )
bEnabled = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - cui/source
cui/source/options/optjava.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit fefe7b687049694dce6183fba4384dd050d65ba3
Author: Michael Weghorn
AuthorDate: Wed Oct 21 10:23:30 2020 +0200
Commit: Michael Weghorn
CommitDate: Fri Oct 23 09:29:25 2020 +0200
Gray out Java options when framework's direct mode is used
The 'javasettings_${_OS}_${_ARCH}.xml' files are only
meant to be used when the application mode of the
Java framework is used, not in direct mode.
From ure/source/README:
> You can also use the
> UNO_JAVA_JFW_JREHOME deployment variable to specify the location of a
JDK/JRE
> installation. For more information on this variable, see
> http://udk.openoffice.org/common/man/spec/javavendorextension.sxw.
From that http://udk.openoffice.org/common/man/spec/javavendorextension.sxw
:
> The direct mode of the framework is used within the build environment.
> Java is needed there in order to register Java UNO components with the
> regcomp tool. Direct mode means that no settings are written or read.
> That is the parameters UNO_JAVA_JFW_USER_DATA and
> UNO_JAVA_JFW_SHARED_DATA are not used.
> [...]
> Another example for using the direct mode is the SDK. The SDK uses the
> libraries from the office installation. When an SDK is configured then
> one specifies what Java is to be used. This Java shall then be used for
> all task which require Java including registration of UNO components. In
> order to override the java settings of the office the script which
> prepares the SDK environment sets these environment variables:
> UNO_JAVA_JFW_JREHOME=
> UNO_JAVA_JFW_ENV_CLASSPATH=true
> UNO_JAVA_JFW_VENDOR_SETTINGS=
> By setting UNO_JAVA_JFW_JREHOME the framework is switched into direct mode
> and the office settings are disregarded.
Therefore, gray out the Java options in the "Advanced" page in "Tools"
-> "Options" to not give the user the wrong impression that settings
made there actually have any effect when using direct mode, e.g. by
starting LibreOffice like this
UNO_JAVA_JFW_JREHOME=file:///usr/lib/jvm/java-11-openjdk-amd64/
./instdir/program/soffice --writer
and then realizing on restart that all manually made settings
were discarded (e.g. newly added Java installation does not
show up,...).
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104002
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
(cherry picked from commit 2976590ed9f727c24064c97d80a51e9891253119)
Change-Id: Ife017f9b5c6c6488f84201dd78b23305c67bec1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104665
Tested-by: Michael Weghorn
Reviewed-by: Michael Weghorn
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index fb401745c52e..f6eb32bb01af 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -671,7 +671,12 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/
)
#if HAVE_FEATURE_JAVA
bool bEnabled = false;
javaFrameworkError eErr = jfw_getEnabled( );
-if ( eErr != JFW_E_NONE )
+if (eErr == JFW_E_DIRECT_MODE)
+{
+// direct mode disregards Java settings made here, so gray them out
+get("javaframe")->Disable();
+}
+else if ( eErr != JFW_E_NONE )
bEnabled = false;
m_pJavaEnableCB->Check( bEnabled );
EnableHdl_Impl(m_pJavaEnableCB);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - cui/source fpicker/source officecfg/registry
cui/source/options/optpath.cxx |8 --
fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx |2
fpicker/source/win32/filepicker/VistaFilePicker.cxx| 13
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx|1
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx| 28
+-
fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx|4 -
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 12
7 files changed, 20 insertions(+), 48 deletions(-)
New commits:
commit b5ad13a606f93955d983beef5baacac6a694b7cb
Author: Jan-Marek Glogowski
AuthorDate: Thu Nov 21 17:16:28 2019 +0100
Commit: Thorsten Behrens
CommitDate: Thu Dec 5 15:30:57 2019 +0100
tdf#43021 WIN opt-out of OS recent folder usage
The Microsoft documentation for SetFolder explicitly mentiones
"In general, we do not recommended the use of this method. [...]
SetDefaultFolder is the better method." If SetDefaultFolder is
used the recently-used folder overwrites the value passed to
SetDefaultFolder, which is shared between all file pickers.
With this patch we rely on the LO internal mechanism to show the
last used directory in the file picker.
Regina's workaround basically does the same, as it just sets
oRegistryKeyContent.WorkPathChanged, which triggers the internal
path to use SetFolder instead of SetDefaultFolder.
If you're wondering about the GetFolder() handling, the MS API
docs have this: "Gets either the folder currently selected in the
dialog, or, if the dialog is not currently displayed, the folder
that is to be selected when the dialog is opened."
So the call to GetFolder(), after the dialog is closed, returns
the folder set by the SetFolder call, not the folder selected by
the user, in case of the save dialog at least.
Reviewed-on: https://gerrit.libreoffice.org/83409
Reviewed-by: Mike Kaganski
Reviewed-by: Jan-Marek Glogowski
Tested-by: Jan-Marek Glogowski
(cherry picked from commit ffa636ba74b04b3258ec9a696bc4eac33581fa24)
Reviewed-on: https://gerrit.libreoffice.org/83839
Tested-by: Jenkins
(cherry picked from commit a20e061d0a54e027a9cf3702fdc88b94e9ec8c18)
Change-Id: Ia24f47848501df82727bfb2a99db723468bfe5b1
Reviewed-on: https://gerrit.libreoffice.org/84304
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 59c93cf9d216..1118a2094eb7 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -514,14 +514,6 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString&
_rFolder )
// Reset also last used dir in the sfx application instance
SfxApplication *pSfxApp = SfxGetpApp();
pSfxApp->ResetLastDir();
-
-// Set configuration flag to notify file picker that it's necessary
-// to take over the path provided.
-std::shared_ptr< comphelper::ConfigurationChanges > batch(
-comphelper::ConfigurationChanges::create());
-officecfg::Office::Common::Path::Info::WorkPathChanged::set(
-true, batch);
-batch->commit();
}
}
}
diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
index 3501a37c94f9..57f995715719 100644
--- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
+++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
@@ -46,6 +46,8 @@ class IVistaFilePickerInternalNotify
virtual bool onFileTypeChanged( UINT nTypeIndex ) = 0;
+virtual void onDirectoryChanged() = 0;
+
protected:
~IVistaFilePickerInternalNotify() {}
};
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 17b6a566d8ce..f1018d90e0c6 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -170,22 +170,9 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const
OUString& sDirectory)
{
ensureInit();
-bool bChanged =
officecfg::Office::Common::Path::Info::WorkPathChanged::get(
-comphelper::getComponentContext(m_xSMGR));
-if (bChanged )
-{
-std::shared_ptr< comphelper::ConfigurationChanges > batch(
-comphelper::ConfigurationChanges::create(
-comphelper::getComponentContext(m_xSMGR)));
-officecfg::Office::Common::Path::Info::WorkPathChanged::set(
-false, batch);
-batch->commit();
-}
-
RequestRef rRequest(new Request());
rRequest->setRequest (VistaFilePickerImpl::E_SET_DIRECTORY);
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - cui/source
cui/source/options/optgdlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e4501cbf6ee93b140cad9ba2d5d1abda5d421764 Author: Juergen Funk AuthorDate: Mon Nov 4 10:42:06 2019 +0100 Commit: Juergen Funk (CIB) CommitDate: Mon Nov 4 13:13:56 2019 +0100 Backport mismatch for tdf#107471 Add checkbox to enable/disable sending crash reports to TDF the hide it when compiled with --disable-breakpad was not hide it was inactive commit: 42af34720f5fb5be34e0b5b757e7b7a69595f91c Change-Id: Id4731265ad444bc6b16443e98e531f186be5b11c Reviewed-on: https://gerrit.libreoffice.org/81989 Reviewed-by: Juergen Funk (CIB) Tested-by: Juergen Funk (CIB) diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 05c48787f6b1..7949342e40d1 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -431,7 +431,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet ) m_xCrashReport->Enable(!officecfg::Office::Common::Misc::CrashReport::isReadOnly()); m_xCrashReport->SaveValue(); #else -m_xCrashReport->Disable(); +m_xCrashReport->Hide(); #endif SfxItemState eState = rSet->GetItemState( SID_ATTR_QUICKLAUNCHER, false, ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - cui/source cui/uiconfig desktop/source officecfg/registry
cui/source/options/optgdlg.cxx | 18 +
cui/source/options/optgdlg.hxx |1
cui/uiconfig/ui/optgeneralpage.ui | 41 ++---
desktop/source/app/app.cxx |2
officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 ++
5 files changed, 61 insertions(+), 8 deletions(-)
New commits:
commit 42af34720f5fb5be34e0b5b757e7b7a69595f91c
Author: Gabor Kelemen
AuthorDate: Wed Jul 31 23:54:29 2019 +0200
Commit: Juergen Funk (CIB)
CommitDate: Wed Sep 18 12:31:51 2019 +0200
tdf#107471 Add checkbox to enable/disable sending crash reports to TDF
Also hide it when compiled with --disable-breakpad i.e. most Linux
distributions
Reviewed-on: https://gerrit.libreoffice.org/76771
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 5841be069cf9891669b385f62f2e7f8d8e877981)
Change-Id: I5d392e22410614550aa9602d0c30b0b81ec22ea0
Reviewed-on: https://gerrit.libreoffice.org/79057
Reviewed-by: Juergen Funk (CIB)
Tested-by: Juergen Funk (CIB)
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 3d0e7ee81be7..05c48787f6b1 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -279,6 +279,8 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const
SfxItemSet& rSet)
get(m_pToYearFT, "toyear");
get(m_pCollectUsageInfo, "collectusageinfo");
get(m_pQuickStarterFrame, "quickstarter");
+get(m_xCrashReport, "crashreport");
+
#if defined(UNX)
get(m_pQuickLaunchCB, "systray");
@@ -376,6 +378,14 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
bModified = true;
}
+#if HAVE_FEATURE_BREAKPAD
+if (m_xCrashReport->IsValueChangedFromSaved())
+{
+
officecfg::Office::Common::Misc::CrashReport::set(m_xCrashReport->IsChecked(),
batch);
+bModified = true;
+}
+#endif
+
batch->commit();
if( m_pQuickLaunchCB->IsValueChangedFromSaved())
@@ -416,6 +426,14 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
m_pCollectUsageInfo->Enable(!officecfg::Office::Common::Misc::CollectUsageInformation::isReadOnly());
m_pCollectUsageInfo->SaveValue();
+#if HAVE_FEATURE_BREAKPAD
+m_xCrashReport->Check(officecfg::Office::Common::Misc::CrashReport::get());
+
m_xCrashReport->Enable(!officecfg::Office::Common::Misc::CrashReport::isReadOnly());
+m_xCrashReport->SaveValue();
+#else
+m_xCrashReport->Disable();
+#endif
+
SfxItemState eState = rSet->GetItemState( SID_ATTR_QUICKLAUNCHER, false,
);
if ( SfxItemState::SET == eState )
m_pQuickLaunchCB->Check( static_cast(pItem)->GetValue() );
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index f6296ff87679..d4b568c2479b 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -60,6 +60,7 @@ private:
VclPtr m_pQuickStarterFrame;
VclPtr m_pQuickLaunchCB;
+VclPtr m_xCrashReport;
DECL_LINK( TwoFigureHdl, Edit&, void );
protected:
diff --git a/cui/uiconfig/ui/optgeneralpage.ui
b/cui/uiconfig/ui/optgeneralpage.ui
index 022fb620bcdd..1b807b495051 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -287,14 +287,41 @@
6
12
-
-Collect usage data and send it to The
Document Foundation
+
True
-True
-False
-True
-0
-True
+False
+
+
+Collect usage data and send it to The
Document Foundation
+True
+True
+False
+1
+True
+0
+True
+
+
+0
+0
+
+
+
+
+Sen_d crash reports to The Document
Foundation
+True
+True
+False
+start
+True
+True
+True
+
+
+0
+1
+
+
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c83d424f8a30..8c41c01a09ae 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2025,7 +2025,7 @@ void Desktop::OpenClients()
#endif
#if HAVE_FEATURE_BREAKPAD
-if (crashReportInfoExists())
+if (officecfg::Office::Common::Misc::CrashReport::get() &&
crashReportInfoExists())
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - cui/source
cui/source/options/certpath.cxx | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
New commits:
commit e3b95b4a2efc3641236f3cfb3a1f5aaf5843045e
Author: Ilhan Yesil
AuthorDate: Wed May 29 12:02:47 2019 +0200
Commit: Michael Weghorn
CommitDate: Thu Jul 4 16:54:39 2019 +0200
tdf#125552 Don't show deleted certificate folder in Certificate Path dialog
Added a check to ensure that certificate folder exists.
Change-Id: I351a58bbc606ac48eb9bdc85aaf0dbf8533a3d10
Reviewed-on: https://gerrit.libreoffice.org/73149
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
(cherry picked from commit 6be961a7b6b5594b65f651522ef19f38bb9579aa)
Reviewed-on: https://gerrit.libreoffice.org/75087
Reviewed-by: Michael Weghorn
Tested-by: Michael Weghorn
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 59d0d8834b0c..57f34df44a15 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -94,7 +94,23 @@ CertPathDialog::CertPathDialog(vcl::Window* pParent)
officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(OUString());
if (!sUserSetCertPath.isEmpty())
-AddCertPath(m_sManual, sUserSetCertPath);
+{
+// check existence
+::osl::DirectoryItem aUserPathItem;
+OUString sUserSetCertURLPath;
+osl::FileBase::getFileURLFromSystemPath(sUserSetCertPath,
sUserSetCertURLPath);
+::osl::FileBase::RC result = ::osl::DirectoryItem::get(
sUserSetCertURLPath, aUserPathItem );
+if ( result == ::osl::FileBase::E_None )
+{
+::osl::FileStatus aStatus( osl_FileStatus_Mask_Validate );
+result = aUserPathItem.getFileStatus( aStatus );
+if ( result == ::osl::FileBase::E_None )
+{
+// the cert path exists
+AddCertPath(m_sManual, sUserSetCertPath);
+}
+}
+}
}
catch (const uno::Exception )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
