diff options
-rw-r--r-- | sw/source/filter/xml/swxml.cxx | 13 | ||||
-rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 16 | ||||
-rw-r--r-- | sw/source/ui/index/idxmrk.cxx | 9 | ||||
-rw-r--r-- | sw/source/ui/uno/dlelstnr.cxx | 10 |
4 files changed, 28 insertions, 20 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 5b2465e54d4a..65f647d05fab 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -2,9 +2,9 @@ * * $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 * either of the following licenses @@ -70,8 +70,8 @@ #include <rsc/rscsfx.hxx> #endif -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_ -#include <unotools/processfactory.hxx> +#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ +#include <comphelper/processfactory.hxx> #endif #ifndef _COM_SUN_STAR_XML_SAX_INPUTSOURCE_HPP_ #include <com/sun/star/xml/sax/InputSource.hpp> @@ -118,7 +118,7 @@ XMLReader::XMLReader() sal_uInt32 XMLReader::Read( SwDoc &rDoc, SwPaM &rPaM, const String & rName ) { Reference< lang::XMultiServiceFactory > xServiceFactory = - utl::getProcessServiceFactory(); + comphelper::getProcessServiceFactory(); ASSERT( xServiceFactory.is(), "XMLReader::Read: got no service manager" ); if( !xServiceFactory.is() ) @@ -271,6 +271,9 @@ sal_uInt32 XMLReader::Read( SwDoc &rDoc, SwPaM &rPaM, const String & rName ) /************************************************************************* $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 Added missing include XActiveDataControl diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index d76e5b30bda5..5141c060e3d9 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -2,9 +2,9 @@ * * $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 * either of the following licenses @@ -65,10 +65,9 @@ #pragma hdrstop -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_ -#include <unotools/processfactory.hxx> +#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ +#include <comphelper/processfactory.hxx> #endif - #ifndef _XMLOFF_XMLKYWD_HXX #include <xmloff/xmlkywd.hxx> #endif @@ -123,7 +122,7 @@ sal_uInt32 SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed, const String* pFileName ) { Reference< lang::XMultiServiceFactory > xServiceFactory = - utl::getProcessServiceFactory(); + comphelper::getProcessServiceFactory(); ASSERT( xServiceFactory.is(), "SwXMLWriter::Write: got no service manager" ); if( !xServiceFactory.is() ) @@ -178,11 +177,14 @@ void GetXMLWriter( const String&, WriterRef& xRet ) 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 $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 font declarations and asian/complex font properties diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx index b337e2910936..406a38c30d75 100644 --- a/sw/source/ui/index/idxmrk.cxx +++ b/sw/source/ui/index/idxmrk.cxx @@ -2,9 +2,9 @@ * * $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 * either of the following licenses @@ -447,7 +447,7 @@ void SwIndexMarkDlg::InsertUpdate() void lcl_SelectSameStrings(SwWrtShell& rSh, BOOL bWordOnly, BOOL bCaseSensitive) { rSh.Push(); - SearchParam aParam( rSh.GetSelTxt(), SearchParam::SRCH_NORMAL, + utl::SearchParam aParam( rSh.GetSelTxt(), utl::SearchParam::SRCH_NORMAL, TRUE, FALSE, FALSE ); aParam.SetCaseSensitive( bCaseSensitive ); @@ -1754,6 +1754,9 @@ void SwAuthMarkModalDlg::Apply() /*------------------------------------------------------------------------ $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 use comphelper methods diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx index 5c3ed8737710..fe3f582a22a0 100644 --- a/sw/source/ui/uno/dlelstnr.cxx +++ b/sw/source/ui/uno/dlelstnr.cxx @@ -2,9 +2,9 @@ * * $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 * either of the following licenses @@ -75,8 +75,8 @@ #include <com/sun/star/uno/Reference.h> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_ -#include <unotools/processfactory.hxx> +#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ +#include <comphelper/processfactory.hxx> #endif #ifndef _VOS_MUTEX_HXX_ @@ -115,7 +115,7 @@ SwDicListEvtListener::SwDicListEvtListener( xDicList->addDictionaryListEventListener( this, sal_False ); } - Reference< XMultiServiceFactory > xMgr( utl::getProcessServiceFactory() ); + Reference< XMultiServiceFactory > xMgr( comphelper::getProcessServiceFactory() ); if (xMgr.is()) { OUString aSvcName( OUString::createFromAscii( |