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

2023-07-11 Thread TokieSan (via logerrit) 
 cui/source/options/optinet2.cxx|   58 +
 cui/source/options/optinet2.hxx|4 
 cui/uiconfig/ui/optsecuritypage.ui |  391 +++--
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 
 xmlsecurity/Module_xmlsecurity.mk  |4 
 xmlsecurity/inc/digitalsignaturesdialog.hxx|2 
 xmlsecurity/inc/strings.hrc|1 
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |  160 ++---
 8 files changed, 401 insertions(+), 225 deletions(-)

New commits:
commit 92b6ffcd9f687cc54a0fc3801ca85c7e4d77512f
Author: TokieSan 
AuthorDate: Fri Jun 30 11:22:01 2023 +0300
Commit: Thorsten Behrens 
CommitDate: Tue Jul 11 16:30:59 2023 +0200

Allow selecting a custom certificate manager

Added a new option in Tools>Options>Security that allows choosing the
path of a different certificate manager.

Made Certificate Manager Button be disabled instead of hidden in case no
certificate manager is detected. Added a box notifying that the
certificate manager is opened (or not working in case it failed for some
reason).

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

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 95d0ec18346b..cf879d056824 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -493,6 +493,8 @@ SvxSecurityTabPage::SvxSecurityTabPage(weld::Container* 
pPage, weld::DialogContr
 , m_xTSAURLsFrame(m_xBuilder->weld_container("tsaurls"))
 , m_xTSAURLsPB(m_xBuilder->weld_button("tsas"))
 , m_xNoPasswordSaveFT(m_xBuilder->weld_label("nopasswordsave"))
+, m_xCertMgrPathLB(m_xBuilder->weld_button("browse"))
+, m_xParameterEdit(m_xBuilder->weld_entry("parameterfield"))
 {
 //fdo#65595, we need height-for-width support here, but for now we can
 //bodge it
@@ -516,10 +518,46 @@ SvxSecurityTabPage::SvxSecurityTabPage(weld::Container* 
pPage, weld::DialogContr
 m_xMacroSecPB->connect_clicked( LINK( this, SvxSecurityTabPage, 
MacroSecPBHdl ) );
 m_xCertPathPB->connect_clicked( LINK( this, SvxSecurityTabPage, 
CertPathPBHdl ) );
 m_xTSAURLsPB->connect_clicked( LINK( this, SvxSecurityTabPage, 
TSAURLsPBHdl ) );
+m_xCertMgrPathLB->connect_clicked( LINK( this, SvxSecurityTabPage, 
CertMgrPBHdl ) );
 
 ActivatePage( rSet );
 }
 
+IMPL_LINK_NOARG(SvxSecurityTabPage, CertMgrPBHdl, weld::Button&, void)
+{
+try
+{
+FileDialogHelper 
aHelper(css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
+ FileDialogFlags::NONE, nullptr);
+OUString sPath = m_xParameterEdit->get_text();
+if (sPath.isEmpty())
+sPath = "/usr/bin";
+
+OUString sUrl;
+osl::FileBase::getFileURLFromSystemPath(sPath, sUrl);
+aHelper.SetDisplayDirectory(sUrl);
+
+if (ERRCODE_NONE == aHelper.Execute())
+{
+sUrl = aHelper.GetPath();
+if (osl::FileBase::getSystemPathFromFileURL(sUrl, sPath) != 
osl::FileBase::E_None)
+{
+sPath.clear();
+}
+m_xParameterEdit->set_text(sPath);
+}
+std::shared_ptr pBatch(
+comphelper::ConfigurationChanges::create());
+OUString sCurCertMgr = m_xParameterEdit->get_text();
+
officecfg::Office::Common::Security::Scripting::CertMgrPath::set(sCurCertMgr, 
pBatch);
+pBatch->commit();
+}
+catch (const uno::Exception&)
+{
+TOOLS_WARN_EXCEPTION("cui.options", "CertMgrPBHdl");
+}
+}
+
 SvxSecurityTabPage::~SvxSecurityTabPage()
 {
 }
@@ -750,6 +788,17 @@ void SvxSecurityTabPage::InitControls()
 {
 m_xSavePasswordsCB->set_sensitive( false );
 }
+
+try
+{
+OUString sCurCertMgr = 
officecfg::Office::Common::Security::Scripting::CertMgrPath::get();
+
+if (!sCurCertMgr.isEmpty())
+m_xParameterEdit->set_text(sCurCertMgr);
+}
+catch (const uno::Exception&)
+{
+}
 }
 
 std::unique_ptr SvxSecurityTabPage::Create(weld::Container* pPage, 
weld::DialogController* pController, const SfxItemSet* rAttrSet )
@@ -803,6 +852,15 @@ bool SvxSecurityTabPage::FillItemSet( SfxItemSet* )
 CheckAndSave( SvtSecurityOptions::EOption::BlockUntrustedRefererLinks, 
m_xSecOptDlg->IsBlockUntrustedRefererLinksChecked(), bModified );
 }
 
+std::shared_ptr pBatch(
+comphelper::ConfigurationChanges::create());
+if (m_xParameterEdit->get_value_changed_from_saved())
+{
+OUString sCurCertMgr = m_xParameterEdit->get_text();
+
officecfg::Office::Common::Security::Scripting::CertMgrPath::set(sCurCertMgr, 
pBatch);
+pBatch->commit();
+}
+

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

2023-05-27 Thread Baole Fang (via logerrit) 
 cui/source/inc/treeopt.hxx   |2 
 cui/source/options/optsave.cxx   |   40 +++
 cui/source/options/treeopt.cxx   |4 +
 cui/uiconfig/ui/optsavepage.ui   |9 
 officecfg/registry/data/org/openoffice/Office/UI.xcu |   16 +++
 5 files changed, 45 insertions(+), 26 deletions(-)

New commits:
commit 9e92437cbb2180d51fdabc0d5efff24b530ba27a
Author: Baole Fang 
AuthorDate: Sat May 6 22:35:17 2023 -0400
Commit: Mike Kaganski 
CommitDate: Sat May 27 09:00:08 2023 +0200

tdf#148756: Fix document type in option dialog

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

diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 69278a1b5349..74ca73944b66 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -142,6 +142,7 @@ private:
 
 css::uno::Reference < css::awt::XContainerWindowProvider >
 m_xContainerWinProvider;
+css::uno::Reference m_xFrame;
 
 static LastPageSaver*   pLastPageSaver;
 
@@ -193,6 +194,7 @@ public:
 
 // helper functions to call the language settings TabPage from the 
SpellDialog
 static void ApplyLanguageOptions(const SfxItemSet& rSet);
+static OUString getCurrentFactory_Impl( const css::uno::Reference< 
css::frame::XFrame >& _xFrame );
 
 voidSetNeedsRestart( svtools::RestartReason eReason );
 };
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 9b2aee019476..7799da84c8b6 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -106,13 +107,20 @@ SvxSaveTabPage::SvxSaveTabPage(weld::Container* pPage, 
weld::DialogController* p
 m_xODFVersionLB->set_id(4, OUString::number(SvtSaveOptions::ODFVER_013)); 
// 1.3
 m_xODFVersionLB->set_id(5, 
OUString::number(SvtSaveOptions::ODFVER_LATEST)); // 1.3 Extended (recommended)
 
-m_xDocTypeLB->set_id(0, OUString::number(APP_WRITER)   );
-m_xDocTypeLB->set_id(1, OUString::number(APP_WRITER_WEB)   );
-m_xDocTypeLB->set_id(2, OUString::number(APP_WRITER_GLOBAL));
-m_xDocTypeLB->set_id(3, OUString::number(APP_CALC) );
-m_xDocTypeLB->set_id(4, OUString::number(APP_IMPRESS)  );
-m_xDocTypeLB->set_id(5, OUString::number(APP_DRAW) );
-m_xDocTypeLB->set_id(6, OUString::number(APP_MATH) );
+auto aFilterClassesNode = 
utl::OConfigurationTreeRoot::createWithComponentContext(
+comphelper::getProcessComponentContext(),
+
"org.openoffice.Office.UI/FilterClassification/GlobalFilters/Classes",
+-1,
+utl::OConfigurationTreeRoot::CM_READONLY
+);
+
+m_xDocTypeLB->append(OUString::number(APP_WRITER), 
aFilterClassesNode.getNodeValue("com.sun.star.text.TextDocument/DisplayName").get());
+m_xDocTypeLB->append(OUString::number(APP_WRITER_WEB), 
aFilterClassesNode.getNodeValue("com.sun.star.text.WebDocument/DisplayName").get());
+m_xDocTypeLB->append(OUString::number(APP_WRITER_GLOBAL), 
aFilterClassesNode.getNodeValue("com.sun.star.text.GlobalDocument/DisplayName").get());
+m_xDocTypeLB->append(OUString::number(APP_CALC), 
aFilterClassesNode.getNodeValue("com.sun.star.sheet.SpreadsheetDocument/DisplayName").get());
+m_xDocTypeLB->append(OUString::number(APP_IMPRESS), 
aFilterClassesNode.getNodeValue("com.sun.star.presentation.PresentationDocument/DisplayName").get());
+m_xDocTypeLB->append(OUString::number(APP_DRAW), 
aFilterClassesNode.getNodeValue("com.sun.star.drawing.DrawingDocument/DisplayName").get());
+m_xDocTypeLB->append(OUString::number(APP_MATH), 
aFilterClassesNode.getNodeValue("com.sun.star.formula.FormulaProperties/DisplayName").get());
 
 m_xAutoSaveCB->connect_toggled( LINK( this, SvxSaveTabPage, 
AutoClickHdl_Impl ) );
 
@@ -434,7 +442,23 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
 pImpl->aODFArr[nData] = lODFList;
 }
 }
-m_xDocTypeLB->set_active(0);
+OUString sModule = 
OfaTreeOptionsDialog::getCurrentFactory_Impl(GetFrame());
+sal_Int32 docId = 0;
+if (sModule == "com.sun.star.text.TextDocument")
+docId = APP_WRITER;
+else if (sModule == "com.sun.star.text.WebDocument")
+docId = APP_WRITER_WEB;
+else if (sModule == "com.sun.star.text.GlobalDocument")
+docId = APP_WRITER_GLOBAL;
+else if (sModule == "com.sun.star.sheet.SpreadsheetDocument")
+docId = APP_CALC;
+else if (sModule == 
"com.sun.star.presentation.PresentationDocument")
+docId = APP_IMPRESS;
+else if

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

2023-04-11 Thread Michael Stahl (via logerrit) 
 cui/source/options/optsave.cxx |9 ++
 cui/source/options/optsave.hxx |1 
 cui/uiconfig/ui/optsavepage.ui |   19 +
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 +
 sw/source/uibase/uiview/view.cxx   |4 ++
 5 files changed, 41 insertions(+)

New commits:
commit d57abff54db6860c3e263c8874c6b606e1ba1088
Author: Michael Stahl 
AuthorDate: Thu Apr 6 20:56:00 2023 +0200
Commit: Michael Stahl 
CommitDate: Tue Apr 11 20:16:28 2023 +0200

officecfg,cui,sw: add Common::Load::ViewPositionForAnyUser

Add setting Office::Common::Load::ViewPositionForAnyUser which if
enabled skips the user name matching against meta.xml that sw does
before restoring a view position stored as ViewTop/ViewLeft/etc. in
settings.xml in an ODF file.

This is particularly useful if the user disables the "ApplyUserData"
in Document->Properties->General, which made restoring view position
impossible.

Change-Id: Ie3ced3c4ad20a35eb8453ad1521c787b0b0c8458
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150113
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 0abadfd03e92..3fbeebf4543d 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -78,6 +79,7 @@ SvxSaveTabPage_Impl::SvxSaveTabPage_Impl() : bInitialized( 
false )
 SvxSaveTabPage::SvxSaveTabPage(weld::Container* pPage, weld::DialogController* 
pController, const SfxItemSet& rCoreSet)
 : SfxTabPage( pPage, pController, "cui/ui/optsavepage.ui", "OptSavePage", 
 )
 , pImpl(new SvxSaveTabPage_Impl)
+, m_xLoadViewPosAnyUserCB(m_xBuilder->weld_check_button("load_anyuser"))
 , m_xLoadUserSettingsCB(m_xBuilder->weld_check_button("load_settings"))
 , m_xLoadDocPrinterCB(m_xBuilder->weld_check_button("load_docprinter"))
 , m_xDocInfoCB(m_xBuilder->weld_check_button("docinfo"))
@@ -228,6 +230,10 @@ bool SvxSaveTabPage::FillItemSet( SfxItemSet* rSet )
 {
 auto xChanges = comphelper::ConfigurationChanges::create();
 bool bModified = false, bRequestRestart = false;
+if (m_xLoadViewPosAnyUserCB->get_state_changed_from_saved())
+{
+
officecfg::Office::Common::Load::ViewPositionForAnyUser::set(m_xLoadViewPosAnyUserCB->get_active(),
 xChanges);
+}
 if(m_xLoadUserSettingsCB->get_state_changed_from_saved())
 
officecfg::Office::Common::Load::UserDefinedSettings::set(m_xLoadUserSettingsCB->get_active(),
 xChanges);
 
@@ -371,6 +377,9 @@ static bool isODFFormat( std::u16string_view sFilter )
 
 void SvxSaveTabPage::Reset( const SfxItemSet* )
 {
+
m_xLoadViewPosAnyUserCB->set_active(officecfg::Office::Common::Load::ViewPositionForAnyUser::get());
+m_xLoadViewPosAnyUserCB->save_state();
+
m_xLoadViewPosAnyUserCB->set_sensitive(!officecfg::Office::Common::Load::ViewPositionForAnyUser::isReadOnly());
 
m_xLoadUserSettingsCB->set_active(officecfg::Office::Common::Load::UserDefinedSettings::get());
 m_xLoadUserSettingsCB->save_state();
 
m_xLoadUserSettingsCB->set_sensitive(!officecfg::Office::Common::Load::UserDefinedSettings::isReadOnly());
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 4ec3b1ddada5..1bc047985330 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -41,6 +41,7 @@ class SvxSaveTabPage : public SfxTabPage
 private:
 std::unique_ptrpImpl;
 
+std::unique_ptr m_xLoadViewPosAnyUserCB;
 std::unique_ptr m_xLoadUserSettingsCB;
 std::unique_ptr m_xLoadDocPrinterCB;
 std::unique_ptr m_xDocInfoCB;
diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui
index d9c1ce1235a2..be612ec3b775 100644
--- a/cui/uiconfig/ui/optsavepage.ui
+++ b/cui/uiconfig/ui/optsavepage.ui
@@ -67,6 +67,25 @@
 0
   
 
+
+  
+Load view position with the document even if 
it was saved by a different user
+True
+True
+False
+True
+True
+
+  
+Loads the view position settings 
saved in a document with the document even if it was saved by a different 
user.
+  
+
+  
+  
+0
+2
+  
+
   
 
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 6702c8499315..9beda4a62c81 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++

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

2022-10-15 Thread Caolán McNamara (via logerrit) 
 cui/source/options/optaccessibility.cxx|7 +
 cui/source/options/optaccessibility.hxx|1 
 cui/uiconfig/ui/optaccessibilitypage.ui|   54 -
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   25 ++
 vcl/source/window/settings.cxx |   19 +++-
 5 files changed, 98 insertions(+), 8 deletions(-)

New commits:
commit 5bf38da0910f590159e8fa4fe359f98c7bd395a4
Author: Caolán McNamara 
AuthorDate: Sat Oct 15 20:10:04 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 15 22:38:13 2022 +0200

tdf#151522 add Accessibility::HighContrast

0 Automatic, do what the system says
1 Disable
2 Enable

Forcing Disable/Enable won't have (much of) an effect on the widgetry, but 
will
affect how document content is rendered where typically content color
is mapped to fore/back ground color.

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

diff --git a/cui/source/options/optaccessibility.cxx 
b/cui/source/options/optaccessibility.cxx
index 1f85254dae22..d0a3694a3c73 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -29,6 +29,7 @@ 
SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(weld::Container*
 , 
m_xTextSelectionInReadonly(m_xBuilder->weld_check_button("textselinreadonly"))
 , m_xAnimatedGraphics(m_xBuilder->weld_check_button("animatedgraphics"))
 , m_xAnimatedTexts(m_xBuilder->weld_check_button("animatedtext"))
+, m_xHighContrast(m_xBuilder->weld_combo_box("highcontrast"))
 , m_xAutomaticFontColor(m_xBuilder->weld_check_button("autofontcolor"))
 , m_xPagePreviews(m_xBuilder->weld_check_button("systempagepreviewcolor"))
 {
@@ -60,6 +61,8 @@ bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* 
)
 
officecfg::Office::Common::Accessibility::IsAutomaticFontColor::set(m_xAutomaticFontColor->get_active(),
 batch);
 if ( 
!officecfg::Office::Common::Accessibility::IsSelectionInReadonly::isReadOnly() )
 
officecfg::Office::Common::Accessibility::IsSelectionInReadonly::set(m_xTextSelectionInReadonly->get_active(),
 batch);
+if ( !officecfg::Office::Common::Accessibility::HighContrast::isReadOnly() 
)
+
officecfg::Office::Common::Accessibility::HighContrast::set(m_xHighContrast->get_active(),
 batch);
 batch->commit();
 
 AllSettings aAllSettings = Application::GetSettings();
@@ -96,6 +99,10 @@ void SvxAccessibilityOptionsTabPage::Reset( const 
SfxItemSet* )
 if( 
officecfg::Office::Common::Accessibility::IsSelectionInReadonly::isReadOnly() )
 m_xTextSelectionInReadonly->set_sensitive(false);
 
+m_xHighContrast->set_active( 
officecfg::Office::Common::Accessibility::HighContrast::get() );
+if( officecfg::Office::Common::Accessibility::HighContrast::isReadOnly() )
+m_xHighContrast->set_sensitive(false);
+
 AllSettings aAllSettings = Application::GetSettings();
 const MiscSettings& aMiscSettings = aAllSettings.GetMiscSettings();
 m_xAccessibilityTool->set_active(aMiscSettings.GetEnableATToolSupport());
diff --git a/cui/source/options/optaccessibility.hxx 
b/cui/source/options/optaccessibility.hxx
index c53c17be1158..504e18327c7f 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -26,6 +26,7 @@ class SvxAccessibilityOptionsTabPage : public SfxTabPage
 std::unique_ptr m_xTextSelectionInReadonly;
 std::unique_ptr m_xAnimatedGraphics;
 std::unique_ptr m_xAnimatedTexts;
+std::unique_ptr m_xHighContrast;
 std::unique_ptr m_xAutomaticFontColor;
 std::unique_ptr m_xPagePreviews;
 
diff --git a/cui/uiconfig/ui/optaccessibilitypage.ui 
b/cui/uiconfig/ui/optaccessibilitypage.ui
index 2643000fd246..07d89dcac65e 100644
--- a/cui/uiconfig/ui/optaccessibilitypage.ui
+++ b/cui/uiconfig/ui/optaccessibilitypage.ui
@@ -135,6 +135,56 @@
 6
 vertical
 6
+
+  
+  
+True
+False
+True
+6
+
+  
+True
+False
+High Contrast:
+True
+highcontrast
+0
+  
+  
+0
+0
+  
+
+
+  
+True
+False
+start
+0
+
+  Automatic
+  Disable
+  Enable
+
+
+  
+Controls if high

[Libreoffice-commits] core.git: cui/source cui/uiconfig officecfg/registry svtools/source vcl/source vcl/win

2022-10-15 Thread Caolán McNamara (via logerrit) 
 cui/source/options/optaccessibility.cxx|7 ---
 cui/source/options/optaccessibility.hxx|1 
 cui/uiconfig/ui/optaccessibilitypage.ui|   24 --
 officecfg/registry/data/org/openoffice/Setup.xcu   |1 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   10 
 svtools/source/config/colorcfg.cxx |   18 +---
 vcl/source/window/settings.cxx |   29 -
 vcl/win/window/salframe.cxx|5 --
 8 files changed, 6 insertions(+), 89 deletions(-)

New commits:
commit 75fd3093ea748e35beca1f903e7828ad82f2372f
Author: Caolán McNamara 
AuthorDate: Fri Oct 14 20:17:05 2022 +0100
Commit: Caolán McNamara 
CommitDate: Sat Oct 15 21:09:34 2022 +0200

tdf#151522 drop Accessibility::AutoDetectSystemHC

which doesn't preclude having a different option to force it
on/off against the system HighContrast mode setting.

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

diff --git a/cui/source/options/optaccessibility.cxx 
b/cui/source/options/optaccessibility.cxx
index a394ff955a4a..1f85254dae22 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -29,7 +29,6 @@ 
SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(weld::Container*
 , 
m_xTextSelectionInReadonly(m_xBuilder->weld_check_button("textselinreadonly"))
 , m_xAnimatedGraphics(m_xBuilder->weld_check_button("animatedgraphics"))
 , m_xAnimatedTexts(m_xBuilder->weld_check_button("animatedtext"))
-, m_xAutoDetectHC(m_xBuilder->weld_check_button("autodetecthc"))
 , m_xAutomaticFontColor(m_xBuilder->weld_check_button("autofontcolor"))
 , m_xPagePreviews(m_xBuilder->weld_check_button("systempagepreviewcolor"))
 {
@@ -61,8 +60,6 @@ bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* 
)
 
officecfg::Office::Common::Accessibility::IsAutomaticFontColor::set(m_xAutomaticFontColor->get_active(),
 batch);
 if ( 
!officecfg::Office::Common::Accessibility::IsSelectionInReadonly::isReadOnly() )
 
officecfg::Office::Common::Accessibility::IsSelectionInReadonly::set(m_xTextSelectionInReadonly->get_active(),
 batch);
-if ( 
!officecfg::Office::Common::Accessibility::AutoDetectSystemHC::isReadOnly() )
-
officecfg::Office::Common::Accessibility::AutoDetectSystemHC::set(m_xAutoDetectHC->get_active(),
 batch);
 batch->commit();
 
 AllSettings aAllSettings = Application::GetSettings();
@@ -99,10 +96,6 @@ void SvxAccessibilityOptionsTabPage::Reset( const 
SfxItemSet* )
 if( 
officecfg::Office::Common::Accessibility::IsSelectionInReadonly::isReadOnly() )
 m_xTextSelectionInReadonly->set_sensitive(false);
 
-m_xAutoDetectHC->set_active( 
officecfg::Office::Common::Accessibility::AutoDetectSystemHC::get() );
-if( 
officecfg::Office::Common::Accessibility::AutoDetectSystemHC::isReadOnly() )
-m_xAutoDetectHC->set_sensitive(false);
-
 AllSettings aAllSettings = Application::GetSettings();
 const MiscSettings& aMiscSettings = aAllSettings.GetMiscSettings();
 m_xAccessibilityTool->set_active(aMiscSettings.GetEnableATToolSupport());
diff --git a/cui/source/options/optaccessibility.hxx 
b/cui/source/options/optaccessibility.hxx
index 35d5fdefde03..c53c17be1158 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -26,7 +26,6 @@ class SvxAccessibilityOptionsTabPage : public SfxTabPage
 std::unique_ptr m_xTextSelectionInReadonly;
 std::unique_ptr m_xAnimatedGraphics;
 std::unique_ptr m_xAnimatedTexts;
-std::unique_ptr m_xAutoDetectHC;
 std::unique_ptr m_xAutomaticFontColor;
 std::unique_ptr m_xPagePreviews;
 
diff --git a/cui/uiconfig/ui/optaccessibilitypage.ui 
b/cui/uiconfig/ui/optaccessibilitypage.ui
index 43be59802974..2643000fd246 100644
--- a/cui/uiconfig/ui/optaccessibilitypage.ui
+++ b/cui/uiconfig/ui/optaccessibilitypage.ui
@@ -135,26 +135,6 @@
 6
 vertical
 6
-
-  
-Automatically _detect high contrast 
mode of operating system
-True
-True
-False
-True
-True
-
-  
-Switches the office 
suite into high contrast mode when the system background color is very 
dark.
-  
-
-  
-  
-False
-True
-0
-  
-
 
   
 Use automatic font _color for 
screen display
@@ -172,7 +152,7 @@
   
 False
 True
-1

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

2021-07-23 Thread Jeff Huang (via logerrit) 
 cui/source/options/optgdlg.cxx |   14 -
 cui/source/options/optgdlg.hxx |2 
 cui/uiconfig/ui/optgeneralpage.ui  |   20 -
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 
 sfx2/source/control/unoctitm.cxx   |  142 -
 5 files changed, 4 insertions(+), 182 deletions(-)

New commits:
commit 2c0b84dc65739bfc47dca684e819717eb9cce387
Author: Jeff Huang 
AuthorDate: Mon Jul 19 17:00:17 2021 +0800
Commit: Heiko Tietze 
CommitDate: Fri Jul 23 13:29:22 2021 +0200

tdf#140107 Remove all collect usage data code.

Remove all collect usage data code because we
don't really use them.

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

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 3870a3df3ca8..83fd85d8a074 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -161,9 +161,9 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage, 
weld::DialogController* p
 , m_xYearFrame(m_xBuilder->weld_widget("yearframe"))
 , m_xYearValueField(m_xBuilder->weld_spin_button("year"))
 , m_xToYearFT(m_xBuilder->weld_label("toyear"))
-, m_xCollectUsageInfo(m_xBuilder->weld_check_button("collectusageinfo"))
 , m_xCrashReport(m_xBuilder->weld_check_button("crashreport"))
 , m_xQuickStarterFrame(m_xBuilder->weld_widget("quickstarter"))
+, m_xHelpImproveLabel(m_xBuilder->weld_label("label7")) //"Help Improve"
 #if defined(UNX)
 , m_xQuickLaunchCB(m_xBuilder->weld_check_button("systray"))
 #else
@@ -188,6 +188,8 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage, 
weld::DialogController* p
 //Only available in Win or if building the gtk systray
 #if !defined(_WIN32)
 m_xQuickStarterFrame->hide();
+//Hide frame label in case of no content
+m_xHelpImproveLabel->hide();
 #endif
 
 #if defined(_WIN32)
@@ -251,12 +253,6 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
 rSet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) );
 }
 
-if (m_xCollectUsageInfo->get_state_changed_from_saved())
-{
-
officecfg::Office::Common::Misc::CollectUsageInformation::set(m_xCollectUsageInfo->get_active(),
 batch);
-bModified = true;
-}
-
 #if HAVE_FEATURE_BREAKPAD
 if (m_xCrashReport->get_state_changed_from_saved())
 {
@@ -309,10 +305,6 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
 else
 m_xYearFrame->set_sensitive(false);
 
-
m_xCollectUsageInfo->set_active(officecfg::Office::Common::Misc::CollectUsageInformation::get());
-
m_xCollectUsageInfo->set_sensitive(!officecfg::Office::Common::Misc::CollectUsageInformation::isReadOnly());
-m_xCollectUsageInfo->save_state();
-
 #if HAVE_FEATURE_BREAKPAD
 
m_xCrashReport->set_active(officecfg::Office::Common::Misc::CrashReport::get() 
&& CrashReporter::IsDumpEnable());
 
m_xCrashReport->set_sensitive(!officecfg::Office::Common::Misc::CrashReport::isReadOnly()
 && CrashReporter::IsDumpEnable());
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 38731cefd043..3d4c342a73a6 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -44,9 +44,9 @@ private:
 std::unique_ptr m_xYearFrame;
 std::unique_ptr m_xYearValueField;
 std::unique_ptr m_xToYearFT;
-std::unique_ptr m_xCollectUsageInfo;
 std::unique_ptr m_xCrashReport;
 std::unique_ptr m_xQuickStarterFrame;
+std::unique_ptr m_xHelpImproveLabel;
 std::unique_ptr m_xQuickLaunchCB;
 #if defined(_WIN32)
 std::unique_ptr m_xFileAssocFrame;
diff --git a/cui/uiconfig/ui/optgeneralpage.ui 
b/cui/uiconfig/ui/optgeneralpage.ui
index 6d9512d72cab..363ed4633a76 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -279,26 +279,6 @@
 False
 12
 6
-
-  
-Collect usage data and send it to The 
Document Foundation
-True
-True
-False
-1
-True
-True
-
-  
-Send usage data to 
help The Document Foundation improve the software usability.
-  
-
-  
-  
-0
-0
-  
-
 
   
 Sen_d crash reports to The Document 
Foundation
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index d74a9411ca3c..c9940001b573 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++

[Libreoffice-commits] core.git: cui/source cui/uiconfig officecfg/registry solenv/sanitizers

2019-07-01 Thread Samuel Mehrbrodt (via logerrit) 
 cui/source/options/optpath.cxx|   25 --
 cui/uiconfig/ui/optpathspage.ui   |   32 --
 officecfg/registry/schema/org/openoffice/Office/Paths.xcs |2 
 solenv/sanitizers/ui/cui.suppr|3 -
 4 files changed, 42 insertions(+), 20 deletions(-)

New commits:
commit ed7e547e1241cf913e138436fa3d7bca8319ec1d
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jul 1 12:35:43 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Jul 1 14:59:39 2019 +0200

tdf#126088 Display InternalPaths in UI

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

diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 1543e1c964b9..5a53d1fe5267 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -65,7 +65,8 @@ using namespace svx;
 
 #define TAB_WIDTH_MIN   10
 #define ITEMID_TYPE   1
-#define ITEMID_PATH   2
+#define ITEMID_USER_PATHS 2
+#define ITEMID_INTERNAL_PATHS 3
 
 #define POSTFIX_INTERNAL"_internal"
 #define POSTFIX_USER"_user"
@@ -96,6 +97,7 @@ struct PathUserData_Impl
 sal_uInt16  nRealId;
 SfxItemStateeState;
 OUStringsUserPath;
+OUStringsInternalPath;
 OUStringsWritablePath;
 
 explicit PathUserData_Impl( sal_uInt16 nId ) :
@@ -217,16 +219,21 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, 
const SfxItemSet& rSet)
 rBar.InsertItem( ITEMID_TYPE, get("type")->GetText(),
 0,
 HeaderBarItemBits::LEFT | 
HeaderBarItemBits::CLICKABLE | HeaderBarItemBits::UPARROW );
-rBar.InsertItem( ITEMID_PATH, get("path")->GetText(),
+rBar.InsertItem( ITEMID_USER_PATHS, 
get("user_paths")->GetText(),
+0,
+HeaderBarItemBits::LEFT );
+rBar.InsertItem( ITEMID_INTERNAL_PATHS, 
get("internal_paths")->GetText(),
 0,
 HeaderBarItemBits::LEFT );
 
 long nWidth1 = rBar.GetTextWidth(rBar.GetItemText(ITEMID_TYPE));
-long nWidth2 = rBar.GetTextWidth(rBar.GetItemText(ITEMID_PATH));
+long nWidth2 = rBar.GetTextWidth(rBar.GetItemText(ITEMID_USER_PATHS));
+long nWidth3 = rBar.GetTextWidth(rBar.GetItemText(ITEMID_INTERNAL_PATHS));
 
-long aTabs[] = {0, 0, 0};
+long aTabs[] = {0, 0, 0, 0};
 aTabs[1] = nWidth1 + 12;
 aTabs[2] = aTabs[1] + nWidth2 + 12;
+aTabs[3] = aTabs[2] + nWidth3 + 12;
 pPathBox->SetTabs(SAL_N_ELEMENTS(aTabs), aTabs, MapUnit::MapPixel);
 
 pPathBox->SetDoubleClickHdl( LINK( this, SvxPathTabPage, 
DoubleClickPathHdl_Impl ) );
@@ -283,6 +290,7 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
 HeaderBar  = pPathBox->GetTheHeaderBar();
 long nWidth1 = rBar.GetTextWidth(rBar.GetItemText(1));
 long nWidth2 = rBar.GetTextWidth(rBar.GetItemText(2));
+long nWidth3 = rBar.GetTextWidth(rBar.GetItemText(3));
 
 for( sal_uInt16 i = 0; i <= 
sal_uInt16(SvtPathOptions::PATH_CLASSIFICATION); ++i )
 {
@@ -348,6 +356,10 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
 const OUString aValue = Convert_Impl( sTmpPath );
 nWidth2 = std::max(nWidth2, pPathBox->GetTextWidth(aValue));
 aStr += aValue;
+aStr += "\t";
+const OUString aValueInternal = Convert_Impl( sInternal );
+nWidth3 = std::max(nWidth3, 
pPathBox->GetTextWidth(aValueInternal));
+aStr += aValueInternal;
 SvTreeListEntry* pEntry = pPathBox->InsertEntry( aStr );
 if ( bReadOnly )
 {
@@ -355,15 +367,16 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
 }
 PathUserData_Impl* pPathImpl = new PathUserData_Impl(i);
 pPathImpl->sUserPath = sUser;
+pPathImpl->sInternalPath = sInternal;
 pPathImpl->sWritablePath = sWritable;
 pEntry->SetUserData( pPathImpl );
 }
-
 }
 
-long aTabs[] = {0, 0, 0};
+long aTabs[] = {0, 0, 0, 0};
 aTabs[1] = nWidth1 + 12;
 aTabs[2] = aTabs[1] + nWidth2 + 12;
+aTabs[3] = aTabs[2] + nWidth3 + 12;
 pPathBox->SetTabs(SAL_N_ELEMENTS(aTabs), aTabs, MapUnit::MapPixel);
 
 PathSelect_Impl( nullptr );
diff --git a/cui/uiconfig/ui/optpathspage.ui b/cui/uiconfig/ui/optpathspage.ui
index 9b42e041f74a..383cdf4c6ab3 100644
--- a/cui/uiconfig/ui/optpathspage.ui
+++ b/cui/uiconfig/ui/optpathspage.ui
@@ -1,6 +1,8 @@
 
+
 
   
+  
   
 True
 False
@@ -42,21 +44,17 @@
   
 0
 0
-1
-1
   
 
 
-  
+  
 True

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

2017-04-28 Thread Tor Lillqvist 
 cui/source/inc/cuioptgenrl.hxx   |1 
 cui/source/options/optgenrl.cxx  |  102 +++
 cui/uiconfig/ui/optuserpage.ui   |  204 ++-
 officecfg/registry/schema/org/openoffice/UserProfile.xcs |8 
 4 files changed, 248 insertions(+), 67 deletions(-)

New commits:
commit 9416611763a6c6e5bc04a938e909727579716db0
Author: Tor Lillqvist 
Date:   Fri Apr 28 12:16:13 2017 +0300

tdf#105841: Avoid REGRESSION!!!

Let's reinstate the name charade instead. Pitäkää tunkkinne.

This reverts commit 5941496601600269296dde3e4ff8b615a8bb45ca.

This reverts commit db231633af4667e24281e0be69ab63ad3081fdc3.

Change-Id: I7d9890f3bd478bac195c1a7a59ff9822c2c83653

diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 5f1065ada287..0c56b6cdcde6 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -47,6 +47,7 @@ private:
 struct Field;
 std::vector vFields;
 // "name" fields
+unsigned nNameRow;
 unsigned nShortNameField;
 
 DECL_LINK( ModifyHdl_Impl, Edit&, void );
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 0dd5e7f0e05a..fc220de51598 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -41,6 +41,8 @@ enum RowType
 {
 Row_Company,
 Row_Name,
+Row_Name_Russian,
+Row_Name_Eastern,
 Row_Street,
 Row_Street_Russian,
 Row_City,
@@ -58,6 +60,7 @@ namespace Lang
 {
 unsigned const Others = 1;
 unsigned const Russian = 2;
+unsigned const Eastern = 4;
 unsigned const US = 8;
 unsigned const All = static_cast(-1);
 }
@@ -77,7 +80,9 @@ struct
 const vRowInfo[] =
 {
 { "companyft",   Lang::All },
-{ "nameft",  Lang::All },
+{ "nameft",  Lang::All & ~Lang::Russian & ~Lang::Eastern },
+{ "rusnameft",   Lang::Russian },
+{ "eastnameft",  Lang::Eastern },
 { "streetft",Lang::All & ~Lang::Russian },
 { "russtreetft", Lang::Russian },
 { "icityft", Lang::All & ~Lang::US },
@@ -108,8 +113,18 @@ const vFieldInfo[] =
 // Company
 { Row_Company, "company", UserOptToken::Company, EditPosition::COMPANY },
 // Name
+{ Row_Name, "firstname", UserOptToken::FirstName, EditPosition::FIRSTNAME 
},
 { Row_Name, "lastname", UserOptToken::LastName, EditPosition::LASTNAME  },
 { Row_Name, "shortname", UserOptToken::ID, EditPosition::SHORTNAME },
+// Name (russian)
+{ Row_Name_Russian, "ruslastname", UserOptToken::LastName, 
EditPosition::LASTNAME  },
+{ Row_Name_Russian, "rusfirstname", UserOptToken::FirstName, 
EditPosition::FIRSTNAME },
+{ Row_Name_Russian, "rusfathersname", UserOptToken::FathersName, 
EditPosition::UNKNOWN },
+{ Row_Name_Russian, "russhortname", UserOptToken::ID, 
EditPosition::SHORTNAME },
+// Name (eastern: reversed name ord
+{ Row_Name_Eastern, "eastlastname", UserOptToken::LastName, 
EditPosition::LASTNAME  },
+{ Row_Name_Eastern, "eastfirstname", UserOptToken::FirstName, 
EditPosition::FIRSTNAME },
+{ Row_Name_Eastern, "eastshortname", UserOptToken::ID, 
EditPosition::SHORTNAME },
 // Street
 { Row_Street, "street", UserOptToken::Street, EditPosition::STREET },
 // Street (russian)
@@ -218,7 +233,10 @@ void SvxGeneralTabPage::InitControls ()
 LangBit = Lang::Russian;
 else
 {
-LangBit = Lang::Others;
+if (MsLangId::isFamilyNameFirst(l))
+LangBit = Lang::Eastern;
+else
+LangBit = Lang::Others;
 }
 
 // creating rows
@@ -248,6 +266,7 @@ void SvxGeneralTabPage::InitControls ()
 // "short name" field?
 if (vFieldInfo[iField].nUserOptionsId == UserOptToken::ID)
 {
+nNameRow = vRows.size() - 1;
 nShortNameField = vFields.size() - 1;
 }
 }
@@ -260,7 +279,7 @@ void SvxGeneralTabPage::SetLinks ()
 {
 // link for updating the initials
 Link aLink = LINK( this, SvxGeneralTabPage, ModifyHdl_Impl );
-Row& rNameRow = *vRows[Row_Name];
+Row& rNameRow = *vRows[nNameRow];
 for (unsigned i = rNameRow.nFirstField; i != rNameRow.nLastField - 1; ++i)
 vFields[i]->pEdit->SetModifyHdl(aLink);
 }
@@ -313,22 +332,36 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet )
 
 // ModifyHdl_Impl()
 // This handler updates the initials (short name)
-// when the name field was updated.
+// when one of the name fields was updated.
 IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit&, rEdit, void )
 {
 // short name field and row
 Field& rShortName = *vFields[nShortNameField];
-if (rShortName.pEdit->IsEnabled())
+Row& rNameRow = *vRows[nNameRow];
+// number of initials
+unsigned const nInits = rNameRow.nLastField - rNameRow.nFirstField - 1;
+//

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

2016-10-10 Thread Federico Bassini 
 cui/source/dialogs/hyperdlg.src  |6 
++---
 cui/uiconfig/ui/hyperlinkdialog.ui   |2 -
 cui/uiconfig/ui/hyperlinkinternetpage.ui |2 -
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |6 
++---
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |   12 
+-
 5 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 06dec56d96603026921311c6ddfa41ed6b5879d5
Author: Federico Bassini 
Date:   Thu Oct 6 11:08:11 2016 +0200

tdf#101442 Change "hyperlink" to "link" for a modern vocabulary

Change-Id: Ib1c067b6d45e959d6cd0fbf00cab167939554203
Reviewed-on: https://gerrit.libreoffice.org/29572
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 0ebc1e0..941d8b2 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -49,7 +49,7 @@ String RID_SVXSTR_HYPERDLG_HLINETTP
 };
 String RID_SVXSTR_HYPERDLG_HLINETTP_HELP
 {
-Text [ en-US ] = "This is where you create a hyperlink to a Web page or 
FTP server connection." ;
+Text [ en-US ] = "This is where you create a link to a Web page or FTP 
server connection." ;
 };
 
 String RID_SVXSTR_HYPERDLG_HLMAILTP
@@ -58,7 +58,7 @@ String RID_SVXSTR_HYPERDLG_HLMAILTP
 };
 String RID_SVXSTR_HYPERDLG_HLMAILTP_HELP
 {
-Text [ en-US ] = "This is where you create a hyperlink to an e-mail 
address." ;
+Text [ en-US ] = "This is where you create a link to an e-mail address." ;
 };
 
 String RID_SVXSTR_HYPERDLG_HLDOCTP
@@ -67,7 +67,7 @@ String RID_SVXSTR_HYPERDLG_HLDOCTP
 };
 String RID_SVXSTR_HYPERDLG_HLDOCTP_HELP
 {
-Text [ en-US ] = "This is where you create a hyperlink to an existing 
document or a target within a document." ;
+Text [ en-US ] = "This is where you create a link to an existing document 
or a target within a document." ;
 };
 
 String RID_SVXSTR_HYPERDLG_HLDOCNTP
diff --git a/cui/uiconfig/ui/hyperlinkdialog.ui 
b/cui/uiconfig/ui/hyperlinkdialog.ui
index 4ebf47e..0152824 100644
--- a/cui/uiconfig/ui/hyperlinkdialog.ui
+++ b/cui/uiconfig/ui/hyperlinkdialog.ui
@@ -8,7 +8,7 @@
 True
 True
 6
-Hyperlink
+Link
 dialog
 
   
diff --git a/cui/uiconfig/ui/hyperlinkinternetpage.ui 
b/cui/uiconfig/ui/hyperlinkinternetpage.ui
index 047799f..a185e0b 100644
--- a/cui/uiconfig/ui/hyperlinkinternetpage.ui
+++ b/cui/uiconfig/ui/hyperlinkinternetpage.ui
@@ -189,7 +189,7 @@
   
 True
 False
-Hyperlink Type
+Link Type
 
   
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index ecf8c93..470daaa 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3158,7 +3158,7 @@
   
   
 
-  Open Hyperlink
+  Open Link
 
   
   
@@ -3821,10 +3821,10 @@
   
   
 
-  ~Hyperlink...
+  ~Link...
 
 
-  Insert Hyperlink
+  Insert Link
 
 
   9
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 8df4e92..177ab9b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -375,20 +375,20 @@
   
   
 
-  ~Hyperlink
+  ~Link
 
 
-  Edit Hyperlink...
+  Edit Link...
 
   
   
 
-  Remove Hyperlink
+  Remove Link
 
   
   
 
-  Copy Hyperlink Location
+  Copy Link Location
 
   
   
@@ -476,7 +476,7 @@
   
   
 
-  Insert Hyperlink
+  Insert Link
 
   
   
@@ -865,7 +865,7 @@
   
   
 
-  Hyperlinks Active
+  Links Active
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-24 Thread Tor Lillqvist 
 cui/source/options/optgdlg.cxx |   10 ++
 cui/source/options/optgdlg.hxx |2 
 cui/uiconfig/ui/optgeneralpage.ui  |   41 ++
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs   |7 -
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 +
 sc/inc/calcconfig.hxx  |1 
 sc/source/core/data/formulacell.cxx|7 +
 sc/source/core/tool/calcconfig.cxx |3 
 sc/source/core/tool/formulagroup.cxx   |   14 ++-
 sc/source/core/tool/formulaopt.cxx |   37 ++---
 sc/source/core/tool/interpr5.cxx   |3 
 sc/source/ui/optdlg/calcoptionsdlg.cxx |   28 ---
 sc/source/ui/optdlg/calcoptionsdlg.hxx |3 
 sc/source/ui/unoobj/docuno.cxx |8 +-
 sc/uiconfig/scalc/ui/formulacalculationoptions.ui  |   49 ++---
 15 files changed, 98 insertions(+), 122 deletions(-)

New commits:
commit 3a58704459a8e60ecca337a247331ac55b7672d3
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Nov 24 18:08:55 2014 +0200

Make whether to use OpenCL or not a global option

Add a toggle to the General page.

Change-Id: If35b1472032706b09a3bc3499c55cbd3ac2e13ac

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e68743d..c449eb0 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -209,6 +209,7 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const 
SfxItemSet rSet)
 get(m_pYearValueField, year);
 get(m_pToYearFT, toyear);
 get(m_pCollectUsageInfo, collectusageinfo);
+get(m_pUseOpenCL, useopencl);
 
 if (m_pFileDlgCB-IsVisible()  
SvtMiscOptions().IsUseSystemFileDialogReadOnly())
 {
@@ -301,6 +302,12 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
 bModified = true;
 }
 
+if (m_pUseOpenCL-IsValueChangedFromSaved())
+{
+
officecfg::Office::Common::Misc::UseOpenCL::set(m_pUseOpenCL-IsChecked(), 
batch);
+bModified = true;
+}
+
 batch-commit();
 
 return bModified;
@@ -342,6 +349,9 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
 
 
m_pCollectUsageInfo-Check(officecfg::Office::Common::Misc::CollectUsageInformation::get());
 m_pCollectUsageInfo-SaveValue();
+
+m_pUseOpenCL-Check(officecfg::Office::Common::Misc::UseOpenCL::get());
+m_pUseOpenCL-SaveValue();
 }
 
 
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 3353457..a6a7dac 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -57,6 +57,8 @@ private:
 
 CheckBox* m_pCollectUsageInfo;
 
+CheckBox* m_pUseOpenCL;
+
 DECL_LINK( TwoFigureHdl, NumericField* );
 DECL_LINK( TwoFigureConfigHdl, NumericField* );
 DECL_LINK(HelpCheckHdl_Impl, void *);
diff --git a/cui/uiconfig/ui/optgeneralpage.ui 
b/cui/uiconfig/ui/optgeneralpage.ui
index b1447c5..d3e8015 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -370,5 +370,46 @@
 property name=top_attach5/property
   /packing
 /child
+child
+  object class=GtkFrame id=openclframe
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
+child
+  object class=GtkAlignment id=alignment7
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=top_padding6/property
+property name=left_padding12/property
+child
+  object class=GtkCheckButton id=useopencl
+property name=label translatable=yesAllow use of 
OpenCL/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultFalse/property
+property name=use_underlineTrue/property
+property name=xalign0/property
+property name=draw_indicatorTrue/property
+  /object
+/child
+  /object
+/child
+child type=label
+  object class=GtkLabel id=label8
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesOpenCL/property
+attributes
+  attribute name=weight value=bold/
+/attributes
+  /object
+/child
+  /object
+  packing
+property name=left_attach0/property
+property name=top_attach6/property
+  /packing
+/child
   /object
 /interface
diff --git

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

2014-10-16 Thread Jan Holesovsky 
 cui/source/options/optgdlg.cxx |   14 +++
 cui/source/options/optgdlg.hxx |2 
 cui/uiconfig/ui/optgeneralpage.ui  |   57 +++--
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 +
 sfx2/source/control/unoctitm.cxx   |6 +
 5 files changed, 79 insertions(+), 8 deletions(-)

New commits:
commit 9c9831f79cf0413c0cd947449bf8253fe09a224f
Author: Jan Holesovsky ke...@collabora.com
Date:   Thu Oct 16 10:53:52 2014 +0200

usage info: Checkbox to turn it on and off (Tools - Options... - General).

Change-Id: I67143e604314f5553026c369bbed3fdd683c39a6

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 79688cc..ef1ae96 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -67,6 +67,7 @@
 #include unotools/saveopt.hxx
 #include unotools/searchopt.hxx
 #include sal/macros.h
+#include officecfg/Office/Common.hxx
 
 #include com/sun/star/configuration/theDefaultProvider.hpp
 #include com/sun/star/container/XNameAccess.hpp
@@ -206,6 +207,7 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const 
SfxItemSet rSet)
 get(m_pYearFrame, yearframe);
 get(m_pYearValueField, year);
 get(m_pToYearFT, toyear);
+get(m_pCollectUsageInfo, collectusageinfo);
 
 if (m_pFileDlgCB-IsVisible()  
SvtMiscOptions().IsUseSystemFileDialogReadOnly())
 {
@@ -246,6 +248,7 @@ SfxTabPage* OfaMiscTabPage::Create( vcl::Window* pParent, 
const SfxItemSet* rAtt
 bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
 {
 bool bModified = false;
+boost::shared_ptrcomphelper::ConfigurationChanges 
batch(comphelper::ConfigurationChanges::create());
 
 SvtHelpOptions aHelpOptions;
 if ( m_pToolTipsCB-IsValueChangedFromSaved() )
@@ -291,6 +294,14 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
 rSet-Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) );
 }
 
+if (m_pCollectUsageInfo-IsValueChangedFromSaved())
+{
+
officecfg::Office::Common::Misc::CollectUsageInformation::set(m_pCollectUsageInfo-IsChecked(),
 batch);
+bModified = true;
+}
+
+batch-commit();
+
 return bModified;
 }
 
@@ -327,6 +338,9 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
 {
 m_pYearFrame-Enable(false);
 }
+
+
m_pCollectUsageInfo-Check(officecfg::Office::Common::Misc::CollectUsageInformation::get());
+m_pCollectUsageInfo-SaveValue();
 }
 
 
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index f559a0c..3353457 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -55,6 +55,8 @@ private:
 
 OUString  m_aStrDateInfo;
 
+CheckBox* m_pCollectUsageInfo;
+
 DECL_LINK( TwoFigureHdl, NumericField* );
 DECL_LINK( TwoFigureConfigHdl, NumericField* );
 DECL_LINK(HelpCheckHdl_Impl, void *);
diff --git a/cui/uiconfig/ui/optgeneralpage.ui 
b/cui/uiconfig/ui/optgeneralpage.ui
index 83bc114..943c366 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -1,6 +1,13 @@
 ?xml version=1.0 encoding=UTF-8?
 interface
   !-- interface-requires gtk+ 3.0 --
+  object class=GtkAdjustment id=adjustment1
+property name=lower1583/property
+property name=upper9857/property
+property name=value1930/property
+property name=step_increment1/property
+property name=page_increment10/property
+  /object
   object class=GtkGrid id=OptGeneralPage
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -351,12 +358,48 @@
 property name=height1/property
   /packing
 /child
-  /object
-  object class=GtkAdjustment id=adjustment1
-property name=lower1583/property
-property name=upper9857/property
-property name=value1930/property
-property name=step_increment1/property
-property name=page_increment10/property
+child
+  object class=GtkFrame id=privacyframe
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
+child
+  object class=GtkAlignment id=alignment6
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=top_padding6/property
+property name=left_padding12/property
+child
+  object class=GtkCheckButton id=collectusageinfo
+property name=label translatable=yesAllow collecting 
usage information, and sending it to TDF servers/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultFalse/property
+property name=use_underlineTrue/property
+property name=xalign0/property
+

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

2013-05-10 Thread Jan Holesovsky 
 cui/source/options/personalization.cxx |   76 
 cui/source/options/personalization.hxx |   11 -
 cui/uiconfig/ui/personalization_tab.ui |  118 -
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   34 ---
 4 files changed, 13 insertions(+), 226 deletions(-)

New commits:
commit 67bbbfe91da47e5a58befca54c361db5846d59e1
Author: Jan Holesovsky ke...@suse.cz
Date:   Fri May 10 10:47:53 2013 +0200

Personas: Kill the non-finished Background Image feature.

It seems not to be a too good idea anyway - the image has to have some
specifics, so the value of setting any random image as the background of
Writer / Calc / Impress is questionable.

Either way, if anybody wants to finish that, easy to recover from the
history ;-) - better than keeping the unused code around.

Change-Id: I5079210bd91b5e70ce20681e5477b860bb28ff07

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 1f88044..453fc30 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -83,19 +83,8 @@ IMPL_LINK( SelectPersonaDialog, VisitPersonas, PushButton*, 
/*pButton*/ )
 }
 
 SvxPersonalizationTabPage::SvxPersonalizationTabPage( Window *pParent, const 
SfxItemSet rSet )
-: SfxTabPage( pParent, PersonalizationTabPage, 
cui/ui/personalization_tab.ui, rSet ),
-  m_aBackgroundURL()
+: SfxTabPage( pParent, PersonalizationTabPage, 
cui/ui/personalization_tab.ui, rSet )
 {
-// background image
-get( m_pNoBackground, no_background );
-get( m_pDefaultBackground, default_background );
-
-get( m_pOwnBackground, own_background );
-m_pOwnBackground-SetClickHdl( LINK( this, SvxPersonalizationTabPage, 
ForceSelect ) );
-
-get( m_pSelectBackground, select_background );
-m_pSelectBackground-SetClickHdl( LINK( this, SvxPersonalizationTabPage, 
SelectBackground ) );
-
 // persona
 get( m_pNoPersona, no_persona );
 get( m_pDefaultPersona, default_persona );
@@ -118,13 +107,6 @@ SfxTabPage* SvxPersonalizationTabPage::Create( Window 
*pParent, const SfxItemSet
 
 sal_Bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet  )
 {
-// background image
-OUString aBackground( default );
-if ( m_pNoBackground-IsChecked() )
-aBackground = no;
-else if ( m_pOwnBackground-IsChecked() )
-aBackground = own;
-
 // persona
 OUString aPersona( default );
 if ( m_pNoPersona-IsChecked() )
@@ -135,9 +117,7 @@ sal_Bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet 
 )
 bool bModified = false;
 uno::Reference uno::XComponentContext  xContext( 
comphelper::getProcessComponentContext() );
 if ( xContext.is() 
-( aBackground != 
officecfg::Office::Common::Misc::BackgroundImage::get( xContext ) ||
-  m_aBackgroundURL != 
officecfg::Office::Common::Misc::BackgroundImageURL::get( xContext ) ||
-  aPersona != officecfg::Office::Common::Misc::Persona::get( 
xContext ) ||
+( aPersona != officecfg::Office::Common::Misc::Persona::get( 
xContext ) ||
   m_aPersonaSettings != 
officecfg::Office::Common::Misc::PersonaSettings::get( xContext ) ) )
 {
 bModified = true;
@@ -146,8 +126,6 @@ sal_Bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet 
 )
 // write
 boost::shared_ptr comphelper::ConfigurationChanges  batch( 
comphelper::ConfigurationChanges::create() );
 
-officecfg::Office::Common::Misc::BackgroundImage::set( aBackground, batch 
);
-officecfg::Office::Common::Misc::BackgroundImageURL::set( 
m_aBackgroundURL, batch );
 officecfg::Office::Common::Misc::Persona::set( aPersona, batch );
 officecfg::Office::Common::Misc::PersonaSettings::set( m_aPersonaSettings, 
batch );
 
@@ -167,21 +145,6 @@ void SvxPersonalizationTabPage::Reset( const SfxItemSet  )
 {
 uno::Reference uno::XComponentContext  xContext( 
comphelper::getProcessComponentContext() );
 
-// background image
-OUString aBackground( default );
-if ( xContext.is() )
-{
-aBackground = officecfg::Office::Common::Misc::BackgroundImage::get( 
xContext );
-m_aBackgroundURL = 
officecfg::Office::Common::Misc::BackgroundImageURL::get( xContext );
-}
-
-if ( aBackground == no )
-m_pNoBackground-Check();
-else if ( aBackground == own )
-m_pOwnBackground-Check();
-else
-m_pDefaultBackground-Check();
-
 // persona
 OUString aPersona( default );
 if ( xContext.is() )
@@ -198,37 +161,6 @@ void SvxPersonalizationTabPage::Reset( const SfxItemSet  )
 m_pDefaultPersona-Check();
 }
 
-IMPL_LINK( SvxPersonalizationTabPage, SelectBackground, PushButton*, 
/*pButton*/ )
-{
-uno::Reference uno::XComponentContext  xContext( 
::comphelper::getProcessComponentContext() );
-
-uno::Reference ui::dialogs::XFilePicker3  xFilePicker =