diff options
author | Noel Grandin <noel@peralex.com> | 2013-05-08 08:27:27 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-05-16 13:42:57 +0000 |
commit | 0fd4d12c6233da2ac1936cd89838b006ffec5192 (patch) | |
tree | 483027e44646a4f798de27626d974a4264263ace /sw | |
parent | 859f28865c9761a3ea8608ef919fce1ff4037ac4 (diff) |
Remove code associated with psprint::CompatMetricOverride service
We don't actually have any implementations of this service.
This service was introduced by
commit 01cf481111436df2cc3f01d1c57cc4348fc037ef
Author: Kurt Zenker <kz@openoffice.org>
Date: Wed Jun 20 09:07:44 2007 +0000
INTEGRATION: CWS compmetric (1.77.2); FILE MERGED
2007/05/09 16:27:46 pl 1.77.2.2: #146890# algorithm is needed
2007/05/09 12:13:59 pl 1.77.2.1: #146890# backwards compatibility service for metrics
Michael Stahl seems to think it was a Sun-internal hack introduced
for a specific customer.
Change-Id: I1b27778f827504c2adb0e27e8d7c0f0dedcaf940
Reviewed-on: https://gerrit.libreoffice.org/3824
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/IDocumentSettingAccess.hxx | 1 | ||||
-rw-r--r-- | sw/source/core/doc/doc.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/uno/SwXDocumentSettings.cxx | 11 |
4 files changed, 1 insertions, 23 deletions
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx index 8214f1abf282..12039152a9af 100644 --- a/sw/inc/IDocumentSettingAccess.hxx +++ b/sw/inc/IDocumentSettingAccess.hxx @@ -65,7 +65,6 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME, UNIX_FORCE_ZERO_EXT_LEADING, - USE_OLD_PRINTER_METRICS, TABS_RELATIVE_TO_INDENT, PROTECT_FORM, // #i89181# diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index c8e6c90f3413..db23e354d5d6 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -181,7 +181,6 @@ bool SwDoc::get(/*[in]*/ DocumentSettingId id) const // #i68949# case CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME: return mbClipAsCharacterAnchoredWriterFlyFrames; case UNIX_FORCE_ZERO_EXT_LEADING: return mbUnixForceZeroExtLeading; - case USE_OLD_PRINTER_METRICS: return mbOldPrinterMetrics; case TABS_RELATIVE_TO_INDENT : return mbTabRelativeToIndent; case PROTECT_FORM: return mbProtectForm; // #i89181# @@ -310,9 +309,6 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value) mbProtectForm = value; break; - case USE_OLD_PRINTER_METRICS: - mbOldPrinterMetrics = value; - break; case TABS_RELATIVE_TO_INDENT: mbTabRelativeToIndent = value; break; diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 34e16489c1b6..2be3074a4004 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -1455,14 +1455,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC // The flag might be set from setting the printer, so it // it is required to clear it. pDoc->SetOLEPrtNotifyPending( !pPrinter->IsKnown() ); - - // old printer metrics compatibility - if ( pDoc->get(IDocumentSettingAccess::USE_OLD_PRINTER_METRICS ) && - !pDoc->get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE ) ) - { - pPrinter->Compat_OldPrinterMetrics( true ); - pDoc->GetDocShell()->UpdateFontList(); - } } } diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index a2f3e07c5e1f..8944837d9ba1 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -662,10 +662,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf } break; case HANDLE_USE_OLD_PRINTER_METRICS: - { - sal_Bool bTmp = *(sal_Bool*)rValue.getValue(); - mpDoc->set(IDocumentSettingAccess::USE_OLD_PRINTER_METRICS, bTmp); - } + // ignore - this is a dead property break; case HANDLE_TABS_RELATIVE_TO_INDENT: { @@ -1088,12 +1085,6 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf rValue.setValue( &bTmp, ::getBooleanCppuType() ); } break; - case HANDLE_USE_OLD_PRINTER_METRICS: - { - sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::USE_OLD_PRINTER_METRICS); - rValue.setValue( &bTmp, ::getBooleanCppuType() ); - } - break; case HANDLE_TABS_RELATIVE_TO_INDENT: { sal_Bool bTmp = mpDoc->get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT); |