using comphelper for process factory
This commit is contained in:
parent
ec0f599dd0
commit
5fe13fe720
6 changed files with 35 additions and 34 deletions
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: sdxmlwrp.cxx,v $
|
||||
*
|
||||
* $Revision: 1.4 $
|
||||
* $Revision: 1.5 $
|
||||
*
|
||||
* last change: $Author: cl $ $Date: 2000-11-13 09:18:29 $
|
||||
* last change: $Author: cl $ $Date: 2000-11-17 11:13:31 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -97,10 +97,9 @@
|
|||
#include <com/sun/star/lang/XServiceInfo.hpp>
|
||||
#endif
|
||||
|
||||
#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
|
||||
#include <unotools/processfactory.hxx>
|
||||
#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
|
||||
#include <comphelper/processfactory.hxx>
|
||||
#endif
|
||||
|
||||
#include "pkgurl.hxx"
|
||||
|
||||
using namespace com::sun::star;
|
||||
|
@ -139,7 +138,7 @@ BOOL SdXMLWrapper::Import()
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
uno::Reference<lang::XMultiServiceFactory> xServiceFactory(utl::getProcessServiceFactory());
|
||||
uno::Reference<lang::XMultiServiceFactory> xServiceFactory(::comphelper::getProcessServiceFactory());
|
||||
if(!xServiceFactory.is())
|
||||
{
|
||||
DBG_ERROR("XMLReader::Read: got no service manager");
|
||||
|
@ -292,7 +291,7 @@ BOOL SdXMLWrapper::Export()
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
uno::Reference<lang::XMultiServiceFactory> xServiceFactory(utl::getProcessServiceFactory());
|
||||
uno::Reference<lang::XMultiServiceFactory> xServiceFactory(::comphelper::getProcessServiceFactory());
|
||||
if(!xServiceFactory.is())
|
||||
{
|
||||
DBG_ERROR("got no service manager");
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: futext.cxx,v $
|
||||
*
|
||||
* $Revision: 1.6 $
|
||||
* $Revision: 1.7 $
|
||||
*
|
||||
* last change: $Author: tbe $ $Date: 2000-11-10 16:31:20 $
|
||||
* last change: $Author: cl $ $Date: 2000-11-17 11:04:38 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -132,8 +132,9 @@
|
|||
#ifndef _COM_SUN_STAR_LINGUISTIC2_XSPELLCHECKER1_HPP_
|
||||
#include <com/sun/star/linguistic2/XSpellChecker1.hpp>
|
||||
#endif
|
||||
#include <unotools/processfactory.hxx>
|
||||
|
||||
#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
|
||||
#include <comphelper/processfactory.hxx>
|
||||
#endif
|
||||
#include "sdresid.hxx"
|
||||
#include "app.hrc"
|
||||
#include "res_bmp.hrc"
|
||||
|
@ -971,7 +972,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag)
|
|||
|
||||
pOutl->SetControlWord(nCntrl);
|
||||
|
||||
Reference< XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
|
||||
Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
|
||||
Reference< XLinguServiceManager > xLinguServiceManager( xMgr->createInstance(
|
||||
OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.LinguServiceManager" ))),
|
||||
uno::UNO_QUERY );
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: futhes.cxx,v $
|
||||
*
|
||||
* $Revision: 1.3 $
|
||||
* $Revision: 1.4 $
|
||||
*
|
||||
* last change: $Author: obo $ $Date: 2000-10-31 15:42:38 $
|
||||
* last change: $Author: cl $ $Date: 2000-11-17 11:04:38 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -88,8 +88,9 @@
|
|||
#ifndef _UNO_LINGU_HXX
|
||||
#include <svx/unolingu.hxx>
|
||||
#endif
|
||||
#include <unotools/processfactory.hxx>
|
||||
|
||||
#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
|
||||
#include <comphelper/processfactory.hxx>
|
||||
#endif
|
||||
#include "app.hrc"
|
||||
#include "strings.hrc"
|
||||
#include "drawdoc.hxx"
|
||||
|
@ -152,7 +153,7 @@ FuThesaurus::FuThesaurus( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
|
|||
{
|
||||
if ( !pOutliner->GetSpeller().is() )
|
||||
{
|
||||
Reference< XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
|
||||
Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
|
||||
Reference< XLinguServiceManager > xLinguServiceManager( xMgr->createInstance(
|
||||
OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.LinguServiceManager" ))),
|
||||
uno::UNO_QUERY );
|
||||
|
@ -189,7 +190,7 @@ FuThesaurus::FuThesaurus( SdViewShell* pViewSh, SdWindow* pWin, SdView* pView,
|
|||
|
||||
if ( !pOutliner->GetSpeller().is() )
|
||||
{
|
||||
Reference< XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
|
||||
Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
|
||||
Reference< XLinguServiceManager > xLinguServiceManager( xMgr->createInstance(
|
||||
OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.LinguServiceManager" ))),
|
||||
uno::UNO_QUERY );
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: drviews7.cxx,v $
|
||||
*
|
||||
* $Revision: 1.2 $
|
||||
* $Revision: 1.3 $
|
||||
*
|
||||
* last change: $Author: dl $ $Date: 2000-10-25 10:27:01 $
|
||||
* last change: $Author: cl $ $Date: 2000-11-17 11:08:34 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -127,8 +127,9 @@
|
|||
#include <svx/unolingu.hxx>
|
||||
#endif
|
||||
|
||||
#include <unotools/processfactory.hxx>
|
||||
|
||||
#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
|
||||
#include <comphelper/processfactory.hxx>
|
||||
#endif
|
||||
#pragma hdrstop
|
||||
|
||||
#include <svx/pfiledlg.hxx>
|
||||
|
@ -474,7 +475,7 @@ void __EXPORT SdDrawViewShell::GetMenuState( SfxItemSet &rSet )
|
|||
else
|
||||
{
|
||||
LanguageType eLang = pDoc->GetLanguage();
|
||||
Reference< XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
|
||||
Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
|
||||
Reference< XLinguServiceManager > xLinguServiceManager( xMgr->createInstance(
|
||||
OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.LinguServiceManager" ))),
|
||||
uno::UNO_QUERY );
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: drviewsa.cxx,v $
|
||||
*
|
||||
* $Revision: 1.2 $
|
||||
* $Revision: 1.3 $
|
||||
*
|
||||
* last change: $Author: ka $ $Date: 2000-09-21 16:12:20 $
|
||||
* last change: $Author: cl $ $Date: 2000-11-17 11:08:34 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -64,8 +64,8 @@
|
|||
#ifndef _CPPUHELPER_IMPLBASE1_HXX_
|
||||
#include <cppuhelper/implbase1.hxx>
|
||||
#endif
|
||||
#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
|
||||
#include <unotools/processfactory.hxx>
|
||||
#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
|
||||
#include <comphelper/processfactory.hxx>
|
||||
#endif
|
||||
#ifndef _SVX_SIZEITEM
|
||||
#include <svx/sizeitem.hxx>
|
||||
|
@ -493,7 +493,7 @@ void SdDrawViewShell::Construct(SdDrawDocShell* pDocSh)
|
|||
|
||||
nLockCount = 0UL;
|
||||
|
||||
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
|
||||
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
|
||||
|
||||
if( xMgr.is() )
|
||||
{
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: outlnvsh.cxx,v $
|
||||
*
|
||||
* $Revision: 1.7 $
|
||||
* $Revision: 1.8 $
|
||||
*
|
||||
* last change: $Author: aw $ $Date: 2000-10-30 11:50:43 $
|
||||
* last change: $Author: cl $ $Date: 2000-11-17 11:08:34 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -144,10 +144,9 @@
|
|||
#ifndef _UNO_LINGU_HXX
|
||||
#include <svx/unolingu.hxx>
|
||||
#endif
|
||||
#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
|
||||
#include <unotools/processfactory.hxx>
|
||||
#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
|
||||
#include <comphelper/processfactory.hxx>
|
||||
#endif
|
||||
|
||||
#ifndef _OUTLOBJ_HXX
|
||||
#include <svx/outlobj.hxx>
|
||||
#endif
|
||||
|
@ -1211,7 +1210,7 @@ void SdOutlineViewShell::GetMenuState( SfxItemSet &rSet )
|
|||
else
|
||||
{
|
||||
LanguageType eLang = pDoc->GetLanguage();
|
||||
Reference< XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
|
||||
Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
|
||||
Reference< XLinguServiceManager > xLinguServiceManager( xMgr->createInstance(
|
||||
OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.LinguServiceManager" ))),
|
||||
uno::UNO_QUERY );
|
||||
|
|
Loading…
Reference in a new issue