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 /sw | |
parent | 03e17a141fbb4e1242de9d9979b5b699e6840454 (diff) |
Simplify code by making getProcessComponentContext() implicit.
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/docvw/srcedtw.cxx | 11 | ||||
-rw-r--r-- | sw/source/ui/ribbar/inputwin.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/uiview/view.cxx | 4 |
3 files changed, 5 insertions, 14 deletions
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index 91dbf073919a..9bd534ca484b 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XPropertiesChangeListener.hpp> -#include <comphelper/processfactory.hxx> #include <cppuhelper/implbase1.hxx> #include <officecfg/Office/Common.hxx> #include <rtl/oustringostreaminserter.hxx> @@ -273,8 +272,7 @@ SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) : // long as there are no derivations: listener_ = new ChangesListener(*this); css::uno::Reference< css::beans::XMultiPropertySet > n( - officecfg::Office::Common::Font::SourceViewFont::get( - comphelper::getProcessComponentContext()), + officecfg::Office::Common::Font::SourceViewFont::get(), css::uno::UNO_QUERY_THROW); { osl::MutexGuard g(mutex_); @@ -978,8 +976,7 @@ sal_Bool lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType aLangu void SwSrcEditWindow::SetFont() { rtl::OUString sFontName( - officecfg::Office::Common::Font::SourceViewFont::FontName::get( - comphelper::getProcessComponentContext()). + officecfg::Office::Common::Font::SourceViewFont::FontName::get(). get_value_or(rtl::OUString())); if(sFontName.isEmpty()) { @@ -1008,9 +1005,7 @@ void SwSrcEditWindow::SetFont() Size aSize(rFont.GetSize()); //font height is stored in point and set in twip aSize.Height() = - officecfg::Office::Common::Font::SourceViewFont::FontHeight::get( - comphelper::getProcessComponentContext()) - * 20; + officecfg::Office::Common::Font::SourceViewFont::FontHeight::get() * 20; aFont.SetSize(pOutWin->LogicToPixel(aSize, MAP_TWIP)); GetTextEngine()->SetFont( aFont ); pOutWin->SetFont(aFont); diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx index 34497e82f274..fe643d940e90 100644 --- a/sw/source/ui/ribbar/inputwin.cxx +++ b/sw/source/ui/ribbar/inputwin.cxx @@ -28,7 +28,6 @@ #include "sal/config.h" -#include <comphelper/processfactory.hxx> #include <officecfg/Office/Common.hxx> #include <tools/gen.hxx> #include <sfx2/imgmgr.hxx> @@ -243,8 +242,7 @@ void SwInputWindow::ShowWin() { m_bResetUndo = true; SAL_WARN_IF( - officecfg::Office::Common::Undo::Steps::get( - comphelper::getProcessComponentContext()) <= 0, + officecfg::Office::Common::Undo::Steps::get() <= 0, "sw", "/org.openoffice.Office.Common/Undo/Steps <= 0"); m_bDoesUndo = pWrtShell->DoesUndo(); diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 0b10a46f44bf..c2ee944424a8 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -31,7 +31,6 @@ #include <stdlib.h> #include <hintids.hxx> #include <comphelper/string.hxx> -#include <comphelper/processfactory.hxx> #include <officecfg/Office/Common.hxx> #include <rtl/logfile.hxx> #include <vcl/graph.hxx> @@ -948,8 +947,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) SetVisArea( pDocSh->GetVisArea(ASPECT_CONTENT),sal_False); SAL_WARN_IF( - officecfg::Office::Common::Undo::Steps::get( - comphelper::getProcessComponentContext()) <= 0, + officecfg::Office::Common::Undo::Steps::get() <= 0, "sw", "/org.openoffice.Office.Common/Undo/Steps <= 0"); pWrtShell->DoUndo( true ); |