diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-04-28 18:04:14 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-05-18 18:19:03 +0200 |
| commit | a541cd91951eca15e40764244b34c72b347f9f26 (patch) | |
| tree | 4bc8d4dae54b42a65bd65239dc5283bcb667b23b /cui | |
| parent | 101594c272a53727566b3533fd083178769a4b49 (diff) | |
officecfg,unotools,cui: add ODF 1.2 Extended / ODF 1.3 versions
... to configuration and UI.
The new default is ODF 1.3 Extended, which is now ODFVER_LATEST and
stored as value "3" in configuration.
Adapt a few places related to DocumentDigitalSignatures etc. to new
default.
Change-Id: I420da4f7787cc864c6bd88470d61b146b9399aa1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93177
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optsave.cxx | 10 | ||||
| -rw-r--r-- | cui/uiconfig/ui/optsavepage.ui | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index c165a3f9478b..564fabb730f6 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -87,10 +87,12 @@ SvxSaveTabPage::SvxSaveTabPage(weld::Container* pPage, weld::DialogController* p , m_xODFWarningFI(m_xBuilder->weld_widget("odfwarning_image")) , m_xODFWarningFT(m_xBuilder->weld_label("odfwarning_label")) { - m_xODFVersionLB->set_id(0, OUString::number(2 )); // 1.0/1.1 - m_xODFVersionLB->set_id(1, OUString::number(4 )); // 1.2 - m_xODFVersionLB->set_id(2, OUString::number(8 )); // 1.2 Extended (compatibility mode) - m_xODFVersionLB->set_id(3, OUString::number(0x7fffffff)); // 1.2 Extended (recommended) + m_xODFVersionLB->set_id(0, OUString::number(SvtSaveOptions::ODFVER_011)); // 1.0/1.1 + m_xODFVersionLB->set_id(1, OUString::number(SvtSaveOptions::ODFVER_012)); // 1.2 + m_xODFVersionLB->set_id(2, OUString::number(SvtSaveOptions::ODFVER_012_EXT_COMPAT)); // 1.2 Extended (compatibility mode) + m_xODFVersionLB->set_id(3, OUString::number(SvtSaveOptions::ODFVER_012_EXTENDED)); // 1.2 Extended + 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) ); diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui index e9a090d45091..dccf9d948eba 100644 --- a/cui/uiconfig/ui/optsavepage.ui +++ b/cui/uiconfig/ui/optsavepage.ui @@ -288,7 +288,7 @@ <object class="GtkLabel" id="odfwarning_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="optsavepage|odfwarning_label" comments="EN-US, the term 'extended' must not be translated.">Not using ODF 1.2 Extended may cause information to be lost.</property> + <property name="label" translatable="yes" context="optsavepage|odfwarning_label" comments="EN-US, the term 'extended' must not be translated.">Not using ODF 1.3 Extended may cause information to be lost.</property> </object> <packing> <property name="left_attach">1</property> @@ -321,7 +321,9 @@ <item translatable="yes" context="optsavepage|odfversion">1.0/1.1</item> <item translatable="yes" context="optsavepage|odfversion">1.2</item> <item translatable="yes" context="optsavepage|odfversion">1.2 Extended (compatibility mode)</item> - <item translatable="yes" context="optsavepage|odfversion">1.2 Extended (recommended)</item> + <item translatable="yes" context="optsavepage|odfversion">1.2 Extended</item> + <item translatable="yes" context="optsavepage|odfversion">1.3</item> + <item translatable="yes" context="optsavepage|odfversion">1.3 Extended (recommended)</item> </items> </object> <packing> |