Kaydet (Commit) bf1183b9 authored tarafından jp's avatar jp

must change: processfactory moved

üst ed94ad6b
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: swxml.cxx,v $ * $RCSfile: swxml.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: mib $ $Date: 2000-10-26 09:38:52 $ * last change: $Author: jp $ $Date: 2000-11-20 09:18:37 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -70,8 +70,8 @@ ...@@ -70,8 +70,8 @@
#include <rsc/rscsfx.hxx> #include <rsc/rscsfx.hxx>
#endif #endif
#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_ #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include <unotools/processfactory.hxx> #include <comphelper/processfactory.hxx>
#endif #endif
#ifndef _COM_SUN_STAR_XML_SAX_INPUTSOURCE_HPP_ #ifndef _COM_SUN_STAR_XML_SAX_INPUTSOURCE_HPP_
#include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/xml/sax/InputSource.hpp>
...@@ -118,7 +118,7 @@ XMLReader::XMLReader() ...@@ -118,7 +118,7 @@ XMLReader::XMLReader()
sal_uInt32 XMLReader::Read( SwDoc &rDoc, SwPaM &rPaM, const String & rName ) sal_uInt32 XMLReader::Read( SwDoc &rDoc, SwPaM &rPaM, const String & rName )
{ {
Reference< lang::XMultiServiceFactory > xServiceFactory = Reference< lang::XMultiServiceFactory > xServiceFactory =
utl::getProcessServiceFactory(); comphelper::getProcessServiceFactory();
ASSERT( xServiceFactory.is(), ASSERT( xServiceFactory.is(),
"XMLReader::Read: got no service manager" ); "XMLReader::Read: got no service manager" );
if( !xServiceFactory.is() ) if( !xServiceFactory.is() )
...@@ -271,6 +271,9 @@ sal_uInt32 XMLReader::Read( SwDoc &rDoc, SwPaM &rPaM, const String & rName ) ...@@ -271,6 +271,9 @@ sal_uInt32 XMLReader::Read( SwDoc &rDoc, SwPaM &rPaM, const String & rName )
/************************************************************************* /*************************************************************************
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.3 2000/10/26 09:38:52 mib
tables within headers and footers
Revision 1.2 2000/10/06 06:37:01 mib Revision 1.2 2000/10/06 06:37:01 mib
Added missing include XActiveDataControl Added missing include XActiveDataControl
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: wrtxml.cxx,v $ * $RCSfile: wrtxml.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: mib $ $Date: 2000-11-14 08:03:32 $ * last change: $Author: jp $ $Date: 2000-11-20 09:18:37 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -65,10 +65,9 @@ ...@@ -65,10 +65,9 @@
#pragma hdrstop #pragma hdrstop
#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_ #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include <unotools/processfactory.hxx> #include <comphelper/processfactory.hxx>
#endif #endif
#ifndef _XMLOFF_XMLKYWD_HXX #ifndef _XMLOFF_XMLKYWD_HXX
#include <xmloff/xmlkywd.hxx> #include <xmloff/xmlkywd.hxx>
#endif #endif
...@@ -123,7 +122,7 @@ sal_uInt32 SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed, ...@@ -123,7 +122,7 @@ sal_uInt32 SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed,
const String* pFileName ) const String* pFileName )
{ {
Reference< lang::XMultiServiceFactory > xServiceFactory = Reference< lang::XMultiServiceFactory > xServiceFactory =
utl::getProcessServiceFactory(); comphelper::getProcessServiceFactory();
ASSERT( xServiceFactory.is(), ASSERT( xServiceFactory.is(),
"SwXMLWriter::Write: got no service manager" ); "SwXMLWriter::Write: got no service manager" );
if( !xServiceFactory.is() ) if( !xServiceFactory.is() )
...@@ -178,11 +177,14 @@ void GetXMLWriter( const String&, WriterRef& xRet ) ...@@ -178,11 +177,14 @@ void GetXMLWriter( const String&, WriterRef& xRet )
Source Code Control System - Header Source Code Control System - Header
$Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/xml/wrtxml.cxx,v 1.3 2000-11-14 08:03:32 mib Exp $ $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/xml/wrtxml.cxx,v 1.4 2000-11-20 09:18:37 jp Exp $
Source Code Control System - Update Source Code Control System - Update
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.3 2000/11/14 08:03:32 mib
Adding of EditEngine- and Bullet-Font-Items temporarily removed
Revision 1.2 2000/11/13 08:44:24 mib Revision 1.2 2000/11/13 08:44:24 mib
font declarations and asian/complex font properties font declarations and asian/complex font properties
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: idxmrk.cxx,v $ * $RCSfile: idxmrk.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: jp $ $Date: 2000-10-25 12:07:02 $ * last change: $Author: jp $ $Date: 2000-11-20 09:18:54 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -447,7 +447,7 @@ void SwIndexMarkDlg::InsertUpdate() ...@@ -447,7 +447,7 @@ void SwIndexMarkDlg::InsertUpdate()
void lcl_SelectSameStrings(SwWrtShell& rSh, BOOL bWordOnly, BOOL bCaseSensitive) void lcl_SelectSameStrings(SwWrtShell& rSh, BOOL bWordOnly, BOOL bCaseSensitive)
{ {
rSh.Push(); rSh.Push();
SearchParam aParam( rSh.GetSelTxt(), SearchParam::SRCH_NORMAL, utl::SearchParam aParam( rSh.GetSelTxt(), utl::SearchParam::SRCH_NORMAL,
TRUE, FALSE, FALSE ); TRUE, FALSE, FALSE );
aParam.SetCaseSensitive( bCaseSensitive ); aParam.SetCaseSensitive( bCaseSensitive );
...@@ -1754,6 +1754,9 @@ void SwAuthMarkModalDlg::Apply() ...@@ -1754,6 +1754,9 @@ void SwAuthMarkModalDlg::Apply()
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.3 2000/10/25 12:07:02 jp
Spellchecker/Hyphenator are not longer member of the shells
Revision 1.2 2000/10/20 14:18:04 os Revision 1.2 2000/10/20 14:18:04 os
use comphelper methods use comphelper methods
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: dlelstnr.cxx,v $ * $RCSfile: dlelstnr.cxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: tl $ $Date: 2000-11-02 13:35:27 $ * last change: $Author: jp $ $Date: 2000-11-20 09:19:15 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -75,8 +75,8 @@ ...@@ -75,8 +75,8 @@
#include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.h>
#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_ #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include <unotools/processfactory.hxx> #include <comphelper/processfactory.hxx>
#endif #endif
#ifndef _VOS_MUTEX_HXX_ #ifndef _VOS_MUTEX_HXX_
...@@ -115,7 +115,7 @@ SwDicListEvtListener::SwDicListEvtListener( ...@@ -115,7 +115,7 @@ SwDicListEvtListener::SwDicListEvtListener(
xDicList->addDictionaryListEventListener( this, sal_False ); xDicList->addDictionaryListEventListener( this, sal_False );
} }
Reference< XMultiServiceFactory > xMgr( utl::getProcessServiceFactory() ); Reference< XMultiServiceFactory > xMgr( comphelper::getProcessServiceFactory() );
if (xMgr.is()) if (xMgr.is())
{ {
OUString aSvcName( OUString::createFromAscii( OUString aSvcName( OUString::createFromAscii(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment