diff options
| author | Malte Timmermann <mt@openoffice.org> | 2001-05-11 06:28:20 +0000 |
|---|---|---|
| committer | Malte Timmermann <mt@openoffice.org> | 2001-05-11 06:28:20 +0000 |
| commit | 48803e7b538786a3d85bea63da0bfd0ab9735eec (patch) | |
| tree | c1e74c56cb2bfe01de2a7436f2fa7ee932d356bc | |
| parent | 2a0bcf920a6576409b00038b3b4a39f4de366dd9 (diff) | |
Get MultiServiceFactory from vcl::unohelper, not from comphelper
| -rw-r--r-- | vcl/source/gdi/print.cxx | 9 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 71e2f2983044..a6cd31f0d924 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -2,9 +2,9 @@ * * $RCSfile: print.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: ka $ $Date: 2001-05-07 10:35:52 $ + * last change: $Author: mt $ $Date: 2001-05-11 07:28:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,6 +82,9 @@ #include <salprn.hxx> #endif +#include <unohelp.hxx> + + #else #include "rmoutdev.hxx" @@ -1827,7 +1830,7 @@ BOOL Printer::EndJob() if ( mpPrinter ) { CHECK_FOR_RVPSYNC_NORMAL() - mpPrinter->mxPrintSpooler->EndJob( ::comphelper::getProcessServiceFactory() ); + mpPrinter->mxPrintSpooler->EndJob( vcl::unohelper::GetMultiServiceFactory() ); mbPrinting = FALSE; mnCurPage = 0; mnCurPrintPage = 0; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 26896bfec7b5..c5d280d3949e 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2,9 +2,9 @@ * * $RCSfile: window.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: obr $ $Date: 2001-05-07 11:07:24 $ + * last change: $Author: mt $ $Date: 2001-05-11 07:23:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,6 +82,8 @@ #endif #endif +#include <unohelp.hxx> + #ifndef _DEBUG_HXX #include <tools/debug.hxx> #endif @@ -563,7 +565,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::star:: // FIXME: drag and drop for remote case #else - Reference< XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory(); + Reference< XMultiServiceFactory > xFactory = vcl::unohelper::GetMultiServiceFactory(); if ( xFactory.is() ) { /* |