diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc index 171ae5290a96..94160925617f 100644 --- a/cui/inc/tipoftheday.hrc +++ b/cui/inc/tipoftheday.hrc @@ -221,7 +221,6 @@ const std::tuple 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"}, diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx index c5dc3fb14746..73e77a598ec9 100644 --- a/include/unotools/compatibility.hxx +++ b/include/unotools/compatibility.hxx @@ -46,7 +46,6 @@ class SvtCompatibilityEntry Module, /* Editable list of compatibility options. */ - UsePrtMetrics, AddSpacing, AddSpacingAtPages, UseOurTabStops, diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 39a7ec03a703..dce8685a0a05 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -666,14 +666,6 @@ false - - - - Specifies whether text metrics from the printer will be used to format text on the screen. - - - false - diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs index db5c7b474ff8..68b369ba09fc 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs @@ -38,12 +38,6 @@ - - - Use printer metrics for document formatting - - false - Add spacing between paragraphs and tables diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx index 7fde948f5ee4..13781040ee22 100644 --- a/sc/source/core/tool/inputopt.cxx +++ b/sc/source/core/tool/inputopt.cxx @@ -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 ScInputCfg::GetPropertyNames() { @@ -75,7 +74,6 @@ Sequence 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(); diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index ee35ce6f6f77..e1aa9ea07400 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -92,7 +92,6 @@ class ScTpLayoutOptions : public SfxTabPage std::unique_ptr m_xExpRefCB; std::unique_ptr m_xSortRefUpdateCB; std::unique_ptr m_xMarkHdrCB; - std::unique_ptr m_xTextFmtCB; std::unique_ptr m_xReplWarnCB; std::unique_ptr m_xLegacyCellSelectionCB; std::unique_ptr m_xEnterPasteModeCB; diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index d7cd46303a26..90b99f4a34b0 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -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(); diff --git a/sc/uiconfig/scalc/ui/scgeneralpage.ui b/sc/uiconfig/scalc/ui/scgeneralpage.ui index c078b2240197..902652333dab 100644 --- a/sc/uiconfig/scalc/ui/scgeneralpage.ui +++ b/sc/uiconfig/scalc/ui/scgeneralpage.ui @@ -1,5 +1,5 @@ - + @@ -212,7 +212,7 @@ True True - + True False @@ -334,7 +334,7 @@ 0 - 9 + 8 2 @@ -354,7 +354,7 @@ 0 - 8 + 7 2 @@ -373,25 +373,6 @@ 2 - - - Use printer metrics for text formatting - True - True - False - True - - - Specifies that printer metrics are applied for printing and also for formatting the display on the screen. - - - - - 0 - 7 - 2 - - Highlight sele_ction in column/row headers diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 0c534682de13..8c1408de0b57 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -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) diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 8657db27a243..d0f010a26332 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -88,7 +88,6 @@ private: std::unique_ptr m_xCbxEnableSdremote; std::unique_ptr m_xCbxEnablePresenterScreen; - std::unique_ptr m_xCbxUsePrinterMetrics; std::unique_ptr m_xCbxCompatibility; //Scale diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui index 2a944eac2fbe..449248536fb9 100644 --- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui +++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui @@ -1,5 +1,5 @@ - + @@ -169,7 +169,7 @@ 0 none - + True False @@ -177,25 +177,6 @@ 6 6 12 - - - Us_e printer metrics for document formatting - True - True - False - True - True - - - 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. - - - - - 0 - 0 - - Add _spacing between paragraphs and tables @@ -212,7 +193,7 @@ 0 - 1 + 0 diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx index cb2ea3288d35..9dbea91ac4a0 100644 --- a/sw/source/core/doc/DocumentSettingManager.cxx +++ b/sw/source/core/doc/DocumentSettingManager.cxx @@ -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 ); diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 663faf7be2c6..0ba1b147614c 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -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( SvtCompatibilityEntry::Index::UsePrtMetrics ), rEntry.getValue( SvtCompatibilityEntry::Index::AddSpacing ), rEntry.getValue( SvtCompatibilityEntry::Index::AddSpacingAtPages ), rEntry.getValue( 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; diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui b/sw/uiconfig/swriter/ui/optcompatpage.ui index eb69c1f678ba..bf325fa1c097 100644 --- a/sw/uiconfig/swriter/ui/optcompatpage.ui +++ b/sw/uiconfig/swriter/ui/optcompatpage.ui @@ -1,5 +1,5 @@ - + @@ -32,48 +32,48 @@ True - False + False True True - 6 + 6 vertical 12 True - False + False True False - 0 - none + 0 + none - + True - False - 5 - True - False + False 12 6 + True + False + 5 True - True + True True True - in + in True - True - True + True + True True True liststore2 - False - 0 - False + False + 0 + False @@ -107,21 +107,21 @@ - 0 - 0 + 0 + 0 - False - True + False + True Reorganize Form menu for Microsoft compatibility - 0 - 1 + 0 + 1 @@ -129,7 +129,7 @@ True - False + False Global Compatibility Options @@ -146,39 +146,39 @@ True - False + False True True - 0 - none + 0 + none - + True - False - 5 - True - True + False 12 6 + True + True + 5 True - True + True True True - in + in True - True - True + True + True True True liststore1 - False - 0 - False + False + 0 + False @@ -213,16 +213,15 @@ - 0 - 0 + 0 + 0 - False - True + False + True - Use printer metrics for document formatting Add spacing between paragraphs and tables Add paragraph and table spacing at tops of pages Use OpenOffice.org 1.1 tabstop formatting @@ -241,18 +240,18 @@ - 0 - 1 + 0 + 1 Use as _Default True - True - True + True + True end - True + True Click to use the current settings on this tab page as the default for further sessions with Writer. @@ -260,8 +259,8 @@ - 0 - 2 + 0 + 2 @@ -269,7 +268,7 @@ True - False + False Compatibility options for “%DOCNAME” diff --git a/test/source/sheet/globalsheetsettings.cxx b/test/source/sheet/globalsheetsettings.cxx index 3e796fc58efe..40d01fe45d42 100644 --- a/test/source/sheet/globalsheetsettings.cxx +++ b/test/source/sheet/globalsheetsettings.cxx @@ -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"; diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index affcaf5a38e0..a5ac6ea895b4 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -50,7 +50,6 @@ SvtCompatibilityEntry::SvtCompatibilityEntry() setValue( Index::Module, OUString() ); /* Editable list of default values. Sync it with the SvtCompatibilityEntry::Index enum class. */ - setValue( Index::UsePrtMetrics, false ); setValue( Index::AddSpacing, false ); setValue( Index::AddSpacingAtPages, false ); setValue( 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",