diff options
| author | Frank Schönheit <fs@openoffice.org> | 2000-11-02 10:12:12 +0000 |
|---|---|---|
| committer | Frank Schönheit <fs@openoffice.org> | 2000-11-02 10:12:12 +0000 |
| commit | 43a9fca66d68088d30a7bbbd1dd98ab0ef505f89 (patch) | |
| tree | 8b194894a9279f3063bccd0ec1a59357b9171ca1 /svx/workben | |
| parent | 30e740d7ec28fa22f3928a0a5f248255caface55 (diff) | |
unotools -> comphelper
Diffstat (limited to 'svx/workben')
| -rw-r--r-- | svx/workben/edittest.cxx | 22 | ||||
| -rw-r--r-- | svx/workben/makefile.mk | 6 |
2 files changed, 16 insertions, 12 deletions
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx index a7d52c90270a..984a5964c9a2 100644 --- a/svx/workben/edittest.cxx +++ b/svx/workben/edittest.cxx @@ -2,9 +2,9 @@ * * $RCSfile: edittest.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:01:29 $ + * last change: $Author: fs $ $Date: 2000-11-02 11:12:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -115,8 +115,12 @@ #define SERVICE_SIMPLEREGISTRY "com.sun.star.registry.SimpleRegistry" -#include <unotools/processfactory.hxx> -#include <unotools/regpathhelper.hxx> +#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ +#include <comphelper/processfactory.hxx> +#endif +#ifndef _COMPHELPER_REGPATHHELPER_HXX_ +#include <comphelper/regpathhelper.hxx> +#endif #include <cppuhelper/servicefactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -230,8 +234,8 @@ BOOL bURLClicked = FALSE; if ( xInit.is() ) { sal_Bool bLocalCreate = sal_True; - ::rtl::OUString localRegistry = ::utl::getPathToUserRegistry(); - ::rtl::OUString systemRegistry = ::utl::getPathToSystemRegistry(); + ::rtl::OUString localRegistry = ::comphelper::getPathToUserRegistry(); + ::rtl::OUString systemRegistry = ::comphelper::getPathToSystemRegistry(); // if ( localRegistry.getLength() == 0) // { @@ -766,7 +770,7 @@ EditMainWindow::EditMainWindow() : aToolBox.InsertItem( TB_HYPH, String( RTL_CONSTASCII_USTRINGPARAM( "Hyph" ) ) ); aToolBox.InsertItem( TB_STDSEL, String( RTL_CONSTASCII_USTRINGPARAM( "StdSel" ) ) ); aToolBox.InsertItem( TB_FLAT, String( RTL_CONSTASCII_USTRINGPARAM( "FlatMode" ) ) ); - aToolBox.InsertItem( TB_OUTL, String( RTL_CONSTASCII_USTRINGPARAM( "Outl" ) ) ); + aToolBox.InsertItem( TB_OUTL, String( RTL_CONSTASCII_USTRINGPARAM( "Ocomphelper" ) ) ); aToolBox.InsertItem( TB_POLY, String( RTL_CONSTASCII_USTRINGPARAM( "Poly" ) ) ); aToolBox.InsertItem( TB_COLORS, String( RTL_CONSTASCII_USTRINGPARAM( "Colors" ) )); aToolBox.InsertItem( TB_IDLE, String( RTL_CONSTASCII_USTRINGPARAM( "Idle!" ) ) ); @@ -1522,7 +1526,7 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p ) aDebStr += (USHORT)((SvxPostureItem&)rItem).GetPosture(); break; case EE_CHAR_OUTLINE: - aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontOutline=" ) ); + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontOcomphelperine=" ) ); aDebStr += (USHORT)((SvxContourItem&)rItem).GetValue(); break; case EE_CHAR_SHADOW: @@ -2158,7 +2162,7 @@ void __EXPORT EditApp::Main() #endif ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr = createApplicationServiceManager(); - ::utl::setProcessServiceFactory( xSMgr ); + ::comphelper::setProcessServiceFactory( xSMgr ); EditDLL aEditDll; SvxGlobalItemData aItemData; diff --git a/svx/workben/makefile.mk b/svx/workben/makefile.mk index 823639e470bd..b453b83bf660 100644 --- a/svx/workben/makefile.mk +++ b/svx/workben/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-18 17:01:29 $ +# last change: $Author: fs $ $Date: 2000-11-02 11:12:12 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -91,7 +91,7 @@ APP1STDLIBS=$(TOOLSLIB) \ $(SO2LIB) \ $(SVTOOLLIB) \ $(SVLLIB) \ - $(UNOTOOLSLIB) \ + $(COMPHELPERLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(SALLIB) \ |