ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

[API CHANGE] Resolves tdf#131136 - Remove option "Use printer metrics"

Browse Source 
Option is out-dated and access via UI confusing
* UI access removed from Tools > Options > General (Impress, Calc)
resp. > Compatibility (Writer)
* Unit tests updated
* Tip-Of-The-Day cleaned-up
* remove UsePrtMetrics value

Change-Id: Ib645f6e1f648455e0536a437be14c2c6a7b25a49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139863
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
This commit is contained in:
Heiko Tietze
2022-10-06 18:55:20 +02:00
committed by Heiko Tietze
parent d6a5214c70
commit 27f98935f9
16 changed files with 63 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cui/inc/tipoftheday.hrc
-1
View File
@@ -221,7 +221,6 @@ const std::tuple<TranslateId, OUString, OUString> TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Use font embedding for greater interoperability with other office suites at File ▸ Properties ▸ Font."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "To convert a formula into static values you do not need to copy/paste; use Data ▸ Calculate ▸ Formula to Value."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "You can reformat all comments in a document by clicking the down arrow in a comment and choose “Format all Comments”."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want the same layout for the screen display and printing? Check Tools ▸ Options ▸ %PRODUCTNAME Calc ▸ General ▸ Use printer metrics for text formatting."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer helps you to make backups: with File ▸ Save a Copy you create a new document continuing to work on the original."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "When you have created a Style based on another, you can enter a percentage value or a point value (e.g. 110% or −2pt or +5pt)."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To copy a comment without losing the content of the target cell you should use Paste Special and uncheck everything except “Comments” in dialog. Use Operations “Add” to not override existing content."), "", "tipoftheday_c.png"},
include/unotools/compatibility.hxx
-1
View File
@@ -46,7 +46,6 @@ class SvtCompatibilityEntry
Module,
/* Editable list of compatibility options. */
UsePrtMetrics,
AddSpacing,
AddSpacingAtPages,
UseOurTabStops,
officecfg/registry/schema/org/openoffice/Office/Calc.xcs
-8
View File
@@ -666,14 +666,6 @@
</info>
<value>false</value>
</prop>
<prop oor:name="UsePrinterMetrics" oor:type="xs:boolean" oor:nillable="false">
<!-- UIHints: Tools - Options - Spreadsheet - General - [Section] Input settings -->
<info>
<desc>Specifies whether text metrics from the printer will be used to format text on the screen.</desc>
<label>Use printer metrics for text formatting</label>
</info>
<value>false</value>
</prop>
<prop oor:name="ReplaceCellsWarning" oor:type="xs:boolean" oor:nillable="false">
<!-- UIHints: Tools - Options - Spreadsheet - General - [Section] Input settings -->
<info>
officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
-6
View File
@@ -38,12 +38,6 @@
</enumeration>
</constraints>
</prop>
<prop oor:name="UsePrinterMetrics" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Use printer metrics for document formatting</desc>
</info>
<value>false</value>
</prop>
<prop oor:name="AddSpacing" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Add spacing between paragraphs and tables</desc>
sc/source/core/tool/inputopt.cxx
+3 -8
View File
@@ -59,10 +59,9 @@ constexpr OUStringLiteral CFGPATH_INPUT = u"Office.Calc/Input";
#define SCINPUTOPT_SORT_REF_UPDATE 6
#define SCINPUTOPT_MARKHEADER 7
#define SCINPUTOPT_USETABCOL 8
#define SCINPUTOPT_TEXTWYSIWYG 9
#define SCINPUTOPT_REPLCELLSWARN 10
#define SCINPUTOPT_LEGACY_CELL_SELECTION 11
#define SCINPUTOPT_ENTER_PASTE_MODE 12
#define SCINPUTOPT_REPLCELLSWARN 9
#define SCINPUTOPT_LEGACY_CELL_SELECTION 10
#define SCINPUTOPT_ENTER_PASTE_MODE 11
Sequence<OUString> ScInputCfg::GetPropertyNames()
{
@@ -75,7 +74,6 @@ Sequence<OUString> ScInputCfg::GetPropertyNames()
"UpdateReferenceOnSort", // SCINPUTOPT_SORT_REF_UPDATE
"HighlightSelection", // SCINPUTOPT_MARKHEADER
"UseTabCol", // SCINPUTOPT_USETABCOL
"UsePrinterMetrics", // SCINPUTOPT_TEXTWYSIWYG
"ReplaceCellsWarning", // SCINPUTOPT_REPLCELLSWARN
"LegacyCellSelection", // SCINPUTOPT_LEGACY_CELL_SELECTION
"EnterPasteMode"}; // SCINPUTOPT_ENTER_PASTE_MODE
@@ -115,8 +113,6 @@ void ScInputCfg::ReadCfg()
SetMarkHeader(bVal);
if (bool bVal; aValues[SCINPUTOPT_USETABCOL] >>= bVal)
SetUseTabCol(bVal);
if (bool bVal; aValues[SCINPUTOPT_TEXTWYSIWYG] >>= bVal)
SetTextWysiwyg(bVal);
if (bool bVal; aValues[SCINPUTOPT_REPLCELLSWARN] >>= bVal)
SetReplaceCellsWarn(bVal);
if (bool bVal; aValues[SCINPUTOPT_LEGACY_CELL_SELECTION] >>= bVal)
@@ -140,7 +136,6 @@ void ScInputCfg::ImplCommit()
pValues[SCINPUTOPT_SORT_REF_UPDATE] <<= GetSortRefUpdate();
pValues[SCINPUTOPT_MARKHEADER] <<= GetMarkHeader();
pValues[SCINPUTOPT_USETABCOL] <<= GetUseTabCol();
pValues[SCINPUTOPT_TEXTWYSIWYG] <<= GetTextWysiwyg();
pValues[SCINPUTOPT_REPLCELLSWARN] <<= GetReplaceCellsWarn();
pValues[SCINPUTOPT_LEGACY_CELL_SELECTION] <<= GetLegacyCellSelection();
pValues[SCINPUTOPT_ENTER_PASTE_MODE] <<= GetEnterPasteMode();
sc/source/ui/inc/tpview.hxx
-1
View File
@@ -92,7 +92,6 @@ class ScTpLayoutOptions : public SfxTabPage
std::unique_ptr<weld::CheckButton> m_xExpRefCB;
std::unique_ptr<weld::CheckButton> m_xSortRefUpdateCB;
std::unique_ptr<weld::CheckButton> m_xMarkHdrCB;
std::unique_ptr<weld::CheckButton> m_xTextFmtCB;
std::unique_ptr<weld::CheckButton> m_xReplWarnCB;
std::unique_ptr<weld::CheckButton> m_xLegacyCellSelectionCB;
std::unique_ptr<weld::CheckButton> m_xEnterPasteModeCB;
sc/source/ui/optdlg/tpview.cxx
-11
View File
@@ -325,7 +325,6 @@ ScTpLayoutOptions::ScTpLayoutOptions(weld::Container* pPage, weld::DialogControl
, m_xExpRefCB(m_xBuilder->weld_check_button("exprefcb"))
, m_xSortRefUpdateCB(m_xBuilder->weld_check_button("sortrefupdatecb"))
, m_xMarkHdrCB(m_xBuilder->weld_check_button("markhdrcb"))
, m_xTextFmtCB(m_xBuilder->weld_check_button("textfmtcb"))
, m_xReplWarnCB(m_xBuilder->weld_check_button("replwarncb"))
, m_xLegacyCellSelectionCB(m_xBuilder->weld_check_button("legacy_cell_selection_cb"))
, m_xEnterPasteModeCB(m_xBuilder->weld_check_button("enter_paste_mode_cb"))
@@ -456,12 +455,6 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet* rCoreSet )
bRet = true;
}
if (m_xTextFmtCB->get_state_changed_from_saved())
{
rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_TEXTWYSIWYG, m_xTextFmtCB->get_active()));
bRet = true;
}
if (m_xReplWarnCB->get_state_changed_from_saved())
{
rCoreSet->Put( SfxBoolItem( SID_SC_INPUT_REPLCELLSWARN, m_xReplWarnCB->get_active() ) );
@@ -554,9 +547,6 @@ void ScTpLayoutOptions::Reset( const SfxItemSet* rCoreSet )
if(const SfxBoolItem* pHeaderItem = rCoreSet->GetItemIfSet(SID_SC_INPUT_MARK_HEADER, false))
m_xMarkHdrCB->set_active(pHeaderItem->GetValue());
if(const SfxBoolItem* pWysiItem = rCoreSet->GetItemIfSet(SID_SC_INPUT_TEXTWYSIWYG, false))
m_xTextFmtCB->set_active(pWysiItem->GetValue());
if( const SfxBoolItem* pWarnItem = rCoreSet->GetItemIfSet( SID_SC_INPUT_REPLCELLSWARN, false ) )
m_xReplWarnCB->set_active( pWarnItem->GetValue() );
@@ -574,7 +564,6 @@ void ScTpLayoutOptions::Reset( const SfxItemSet* rCoreSet )
m_xExpRefCB->save_state();
m_xSortRefUpdateCB->save_state();
m_xMarkHdrCB->save_state();
m_xTextFmtCB->save_state();
m_xReplWarnCB->save_state();
m_xLegacyCellSelectionCB->save_state();
sc/uiconfig/scalc/ui/scgeneralpage.ui
+4 -23
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 -->
<!-- Generated with glade 3.40.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -212,7 +212,7 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
<!-- n-columns=2 n-rows=10 -->
<!-- n-columns=2 n-rows=9 -->
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -334,7 +334,7 @@
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">9</property>
<property name="top-attach">8</property>
<property name="width">2</property>
</packing>
</child>
@@ -354,7 +354,7 @@
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">8</property>
<property name="top-attach">7</property>
<property name="width">2</property>
</packing>
</child>
@@ -373,25 +373,6 @@
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="textfmtcb">
<property name="label" translatable="yes" context="scgeneralpage|textfmtcb">Use printer metrics for text formatting</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="textfmtcb-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|textfmtcb">Specifies that printer metrics are applied for printing and also for formatting the display on the screen.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">7</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="markhdrcb">
<property name="label" translatable="yes" context="scgeneralpage|markhdrcb">Highlight sele_ction in column/row headers</property>
sd/source/ui/dlg/tpoption.cxx
-9
View File
@@ -186,7 +186,6 @@ SdTpOptionsMisc::SdTpOptionsMisc(weld::Container* pPage, weld::DialogController*
, m_xMtrFldTabstop(m_xBuilder->weld_metric_spin_button("metricFields", FieldUnit::MM))
, m_xCbxEnableSdremote(m_xBuilder->weld_check_button("enremotcont"))
, m_xCbxEnablePresenterScreen(m_xBuilder->weld_check_button("enprsntcons"))
, m_xCbxUsePrinterMetrics(m_xBuilder->weld_check_button("printermetrics"))
, m_xCbxCompatibility(m_xBuilder->weld_check_button("cbCompatibility"))
, m_xScaleFrame(m_xBuilder->weld_frame("scaleframe"))
, m_xCbScale(m_xBuilder->weld_combo_box("scaleBox"))
@@ -339,7 +338,6 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs )
m_xCbxEnableSdremote->get_state_changed_from_saved() ||
m_xCbxEnablePresenterScreen->get_state_changed_from_saved() ||
m_xCbxCompatibility->get_state_changed_from_saved() ||
m_xCbxUsePrinterMetrics->get_state_changed_from_saved() ||
m_xCbxDistort->get_state_changed_from_saved())
{
SdOptionsMiscItem aOptsItem;
@@ -353,10 +351,6 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs )
aOptsItem.GetOptionsMisc().SetEnableSdremote( m_xCbxEnableSdremote->get_active() );
aOptsItem.GetOptionsMisc().SetEnablePresenterScreen( m_xCbxEnablePresenterScreen->get_active() );
aOptsItem.GetOptionsMisc().SetSummationOfParagraphs( m_xCbxCompatibility->get_active() );
aOptsItem.GetOptionsMisc().SetPrinterIndependentLayout (
m_xCbxUsePrinterMetrics->get_active()
? css::document::PrinterIndependentLayout::DISABLED
: css::document::PrinterIndependentLayout::ENABLED);
aOptsItem.GetOptionsMisc().SetCrookNoContortion( m_xCbxDistort->get_active() );
rAttrs->Put( aOptsItem );
@@ -406,7 +400,6 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs )
m_xCbxEnableSdremote->set_active( aOptsItem.GetOptionsMisc().IsEnableSdremote() );
m_xCbxEnablePresenterScreen->set_active( aOptsItem.GetOptionsMisc().IsEnablePresenterScreen() );
m_xCbxCompatibility->set_active( aOptsItem.GetOptionsMisc().IsSummationOfParagraphs() );
m_xCbxUsePrinterMetrics->set_active( aOptsItem.GetOptionsMisc().GetPrinterIndependentLayout()==1 );
m_xCbxDistort->set_active( aOptsItem.GetOptionsMisc().IsCrookNoContortion() );
m_xCbxStartWithTemplate->save_state();
m_xCbxMarkedHitMovesAlways->save_state();
@@ -418,7 +411,6 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs )
m_xCbxEnableSdremote->save_state();
m_xCbxEnablePresenterScreen->save_state();
m_xCbxCompatibility->save_state();
m_xCbxUsePrinterMetrics->save_state();
m_xCbxDistort->save_state();
// metric
@@ -599,7 +591,6 @@ void SdTpOptionsMisc::UpdateCompatibilityControls()
}
m_xCbxCompatibility->set_sensitive(bIsEnabled);
m_xCbxUsePrinterMetrics->set_sensitive(bIsEnabled);
}
void SdTpOptionsMisc::PageCreated(const SfxAllItemSet& aSet)
sd/source/ui/inc/tpoption.hxx
-1
View File
@@ -88,7 +88,6 @@ private:
std::unique_ptr<weld::CheckButton> m_xCbxEnableSdremote;
std::unique_ptr<weld::CheckButton> m_xCbxEnablePresenterScreen;
std::unique_ptr<weld::CheckButton> m_xCbxUsePrinterMetrics;
std::unique_ptr<weld::CheckButton> m_xCbxCompatibility;
//Scale
sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
+3 -22
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 -->
<!-- Generated with glade 3.40.0 -->
<interface domain="sd">
<requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -169,7 +169,7 @@
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
<!-- n-columns=1 n-rows=2 -->
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="grid6">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -177,25 +177,6 @@
<property name="margin-top">6</property>
<property name="row-spacing">6</property>
<property name="column-spacing">12</property>
<child>
<object class="GtkCheckButton" id="printermetrics">
<property name="label" translatable="yes" context="optimpressgeneralpage|printermetrics">Us_e printer metrics for document formatting</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="printermetrics-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|printermetrics">Specifies that printer metrics are applied for printing and also for formatting the display on the screen. If this box is not checked, a printer independent layout will be used for screen display and printing.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="cbCompatibility">
<property name="label" translatable="yes" context="optimpressgeneralpage|cbCompatibility">Add _spacing between paragraphs and tables</property>
@@ -212,7 +193,7 @@
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
</object>
sw/source/core/doc/DocumentSettingManager.cxx
+1 -1
View File
@@ -123,7 +123,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc &rDoc)
mbParaSpaceMax = aOptions.GetDefault( SvtCompatibilityEntry::Index::AddSpacing );
mbParaSpaceMaxAtPages = aOptions.GetDefault( SvtCompatibilityEntry::Index::AddSpacingAtPages );
mbTabCompat = !aOptions.GetDefault( SvtCompatibilityEntry::Index::UseOurTabStops );
mbUseVirtualDevice = !aOptions.GetDefault( SvtCompatibilityEntry::Index::UsePrtMetrics );
mbUseVirtualDevice = true;
mbAddExternalLeading = !aOptions.GetDefault( SvtCompatibilityEntry::Index::NoExtLeading );
mbOldLineSpacing = aOptions.GetDefault( SvtCompatibilityEntry::Index::UseLineSpacing );
mbAddParaSpacingToTableCells = aOptions.GetDefault( SvtCompatibilityEntry::Index::AddTableSpacing );
sw/source/ui/config/optcomp.cxx
-10
View File
@@ -109,7 +109,6 @@ SwCompatibilityOptPage::~SwCompatibilityOptPage()
static sal_uInt32 convertBools2Ulong_Impl
(
bool _bUsePrtMetrics,
bool _bAddSpacing,
bool _bAddSpacingAtPages,
bool _bUseOurTabStops,
@@ -130,9 +129,6 @@ static sal_uInt32 convertBools2Ulong_Impl
sal_uInt32 nRet = 0;
sal_uInt32 nSetBit = 1;
if ( _bUsePrtMetrics )
nRet |= nSetBit;
nSetBit = nSetBit << 1;
if ( _bAddSpacing )
nRet |= nSetBit;
nSetBit = nSetBit << 1;
@@ -231,7 +227,6 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet )
sNewEntry = sEntryName;
sal_uInt32 nOptions = convertBools2Ulong_Impl(
rEntry.getValue<bool>( SvtCompatibilityEntry::Index::UsePrtMetrics ),
rEntry.getValue<bool>( SvtCompatibilityEntry::Index::AddSpacing ),
rEntry.getValue<bool>( SvtCompatibilityEntry::Index::AddSpacingAtPages ),
rEntry.getValue<bool>( SvtCompatibilityEntry::Index::UseOurTabStops ),
@@ -319,7 +314,6 @@ sal_uInt32 SwCompatibilityOptPage::GetDocumentOptions() const
{
const IDocumentSettingAccess& rIDocumentSettingAccess = m_pWrtShell->getIDocumentSettingAccess();
nRet = convertBools2Ulong_Impl(
!rIDocumentSettingAccess.get( DocumentSettingId::USE_VIRTUAL_DEVICE ),
rIDocumentSettingAccess.get( DocumentSettingId::PARA_SPACE_MAX ),
rIDocumentSettingAccess.get( DocumentSettingId::PARA_SPACE_MAX_AT_PAGES ),
!rIDocumentSettingAccess.get( DocumentSettingId::TAB_COMPAT ),
@@ -380,10 +374,6 @@ bool SwCompatibilityOptPage::FillItemSet( SfxItemSet* )
int nCoptIdx = i + 2; /* Consider "Name" & "Module" indexes */
switch ( SvtCompatibilityEntry::Index(nCoptIdx) )
{
case SvtCompatibilityEntry::Index::UsePrtMetrics:
m_pWrtShell->SetUseVirDev( !bChecked );
break;
case SvtCompatibilityEntry::Index::AddSpacing:
m_pWrtShell->SetParaSpaceMax( bChecked );
break;
sw/uiconfig/swriter/ui/optcompatpage.ui
+52 -53
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.36.0 -->
<!-- Generated with glade 3.40.0 -->
<interface domain="sw">
<requires lib="gtk+" version="3.20"/>
<object class="GtkTreeStore" id="liststore1">
@@ -32,48 +32,48 @@
</object>
<object class="GtkBox" id="OptCompatPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="border-width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="globalcompatframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
<!-- n-columns=1 n-rows=1 -->
<!-- n-columns=1 n-rows=2 -->
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">5</property>
<property name="hexpand">True</property>
<property name="vexpand">False</property>
<property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
<property name="hexpand">True</property>
<property name="vexpand">False</property>
<property name="row-spacing">5</property>
<child>
<object class="GtkScrolledWindow" id="globaloptioncheckboxscroll">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="shadow_type">in</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="globaloptioncheckbox">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore2</property>
<property name="headers_visible">False</property>
<property name="search_column">0</property>
<property name="show_expanders">False</property>
<property name="headers-visible">False</property>
<property name="search-column">0</property>
<property name="show-expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library List-selection1"/>
</child>
@@ -107,21 +107,21 @@
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="globaloptions">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="can-focus">False</property>
<property name="no-show-all">True</property>
<items>
<item translatable="yes" context="optcompatpage|globalcompatoptions">Reorganize Form menu for Microsoft compatibility</item>
</items>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
</object>
@@ -129,7 +129,7 @@
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="optcompatpage|label2">Global Compatibility Options</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -146,39 +146,39 @@
<child>
<object class="GtkFrame" id="compatframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
<!-- n-columns=1 n-rows=1 -->
<!-- n-columns=1 n-rows=3 -->
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">5</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row-spacing">5</property>
<child>
<object class="GtkScrolledWindow" id="optionsscroll">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="shadow_type">in</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="options">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore1</property>
<property name="headers_visible">False</property>
<property name="search_column">0</property>
<property name="show_expanders">False</property>
<property name="headers-visible">False</property>
<property name="search-column">0</property>
<property name="show-expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library List-selection2"/>
</child>
@@ -213,16 +213,15 @@
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="format">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="can-focus">False</property>
<property name="no-show-all">True</property>
<items>
<item translatable="yes" context="optcompatpage|format">Use printer metrics for document formatting</item>
<item translatable="yes" context="optcompatpage|format">Add spacing between paragraphs and tables</item>
<item translatable="yes" context="optcompatpage|format">Add paragraph and table spacing at tops of pages</item>
<item translatable="yes" context="optcompatpage|format">Use OpenOffice.org 1.1 tabstop formatting</item>
@@ -241,18 +240,18 @@
</items>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="default">
<property name="label" translatable="yes" context="optcompatpage|default">Use as _Default</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="halign">end</property>
<property name="use_underline">True</property>
<property name="use-underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="default-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|default">Click to use the current settings on this tab page as the default for further sessions with Writer.</property>
@@ -260,8 +259,8 @@
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="left-attach">0</property>
<property name="top-attach">2</property>
</packing>
</child>
</object>
@@ -269,7 +268,7 @@
<child type="label">
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="optcompatpage|label11">Compatibility options for “%DOCNAME”</property>
<attributes>
<attribute name="weight" value="bold"/>
test/source/sheet/globalsheetsettings.cxx
-1
View File
@@ -80,7 +80,6 @@ void GlobalSheetSettings::testGlobalSheetSettingsProperties()
DoCheck("ExpandReferences", false, true, node, "ExpandReference");
DoCheck("MarkHeader", true, false, node, "HighlightSelection");
DoCheck("UseTabCol", false, true, node, "UseTabCol");
DoCheck("UsePrinterMetrics", false, true, node, "UsePrinterMetrics");
DoCheck("ReplaceCellsWarning", true, false, node, "ReplaceCellsWarning");
node = "/org.openoffice.Office.Calc/Layout/Other/MeasureUnit";
unotools/source/config/compatibility.cxx
-2
View File
@@ -50,7 +50,6 @@ SvtCompatibilityEntry::SvtCompatibilityEntry()
setValue<OUString>( Index::Module, OUString() );
/* Editable list of default values. Sync it with the SvtCompatibilityEntry::Index enum class. */
setValue<bool>( Index::UsePrtMetrics, false );
setValue<bool>( Index::AddSpacing, false );
setValue<bool>( Index::AddSpacingAtPages, false );
setValue<bool>( Index::UseOurTabStops, false );
@@ -79,7 +78,6 @@ OUString SvtCompatibilityEntry::getName( const Index rIdx )
"Module",
/* Editable list of compatibility option names. Sync it with the SvtCompatibilityEntry::Index enum class. */
"UsePrinterMetrics",
"AddSpacing",
"AddSpacingAtPages",
"UseOurTabStopFormat",