diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-01-31 17:25:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-01-31 17:26:57 +0100 |
| commit | 6fca59d9c2d3ee3833da6a71d390a2a5b6b73299 (patch) | |
| tree | 4a367bb7c33626eb753d1d3b7b6fd0743ee94f50 /vcl | |
| parent | 03e17a141fbb4e1242de9d9979b5b699e6840454 (diff) | |
Simplify code by making getProcessComponentContext() implicit.
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/aqua/source/gdi/salprn.cxx | 10 | ||||
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk/gdi/salprn-gtk.cxx | 5 |
3 files changed, 9 insertions, 10 deletions
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index 0b659f8c33f8..1a2743375433 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -29,8 +29,6 @@ #include <boost/bind.hpp> -#include "comphelper/processfactory.hxx" - #include "officecfg/Office/Common.hxx" #include "vcl/print.hxx" @@ -325,7 +323,8 @@ sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, sal_uInt16 i case PRINTER_CAPABILITIES_SETPAPER: return 1; case PRINTER_CAPABILITIES_EXTERNALDIALOG: - return officecfg::Office::Common::Misc::UseSystemPrintDialog::get(comphelper::getProcessComponentContext()) ? 1 : 0; + return officecfg::Office::Common::Misc::UseSystemPrintDialog::get() + ? 1 : 0; case PRINTER_CAPABILITIES_PDF: return 1; case PRINTER_CAPABILITIES_USEPULLMODEL: @@ -520,7 +519,10 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName, if( pPrintOperation ) { NSObject* pReleaseAfterUse = nil; - bool bShowPanel = (! i_rController.isDirectPrint() && officecfg::Office::Common::Misc::UseSystemPrintDialog::get(comphelper::getProcessComponentContext()) && i_rController.isShowDialogs() ); + bool bShowPanel = !i_rController.isDirectPrint() + && (officecfg::Office::Common::Misc::UseSystemPrintDialog:: + get()) + && i_rController.isShowDialogs(); [pPrintOperation setShowsPrintPanel: bShowPanel ? YES : NO ]; [pPrintOperation setShowsProgressPanel: bShowProgressPanel ? YES : NO]; diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index 44499142fbe7..801788d4e56f 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -26,8 +26,6 @@ * ************************************************************************/ -#include "comphelper/processfactory.hxx" - #include "officecfg/Office/Common.hxx" #include "osl/module.h" @@ -58,7 +56,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase ) #ifndef ANDROID // Disable gtk3 plugin load except in experimental mode for now. if( rModuleBase.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "gtk3" ) ) && - !officecfg::Office::Common::Misc::ExperimentalMode::get( comphelper::getProcessComponentContext() ) ) + !officecfg::Office::Common::Misc::ExperimentalMode::get() ) return NULL; #endif OUStringBuffer aModName( 128 ); diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index 587a75492fb3..ffa584cd2c43 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -183,9 +183,8 @@ lcl_getGtkSalInstance() bool lcl_useSystemPrintDialog() { - uno::Reference<uno::XComponentContext> const xCtxt(comphelper::getProcessComponentContext()); - return officecfg::Office::Common::Misc::UseSystemPrintDialog::get(xCtxt) - && officecfg::Office::Common::Misc::ExperimentalMode::get(xCtxt) + return officecfg::Office::Common::Misc::UseSystemPrintDialog::get() + && officecfg::Office::Common::Misc::ExperimentalMode::get() && lcl_getGtkSalInstance().getPrintWrapper()->supportsPrinting(); } |