summaryrefslogtreecommitdiff
path: root/cpputools
diff options
context:
space:
mode:
Diffstat (limited to 'cpputools')
-rw-r--r--cpputools/source/registercomponent/registercomponent.cxx18
-rw-r--r--cpputools/source/regsingleton/regsingleton.cxx3
-rw-r--r--cpputools/source/sp2bv/sp2bv.cxx6
-rwxr-xr-x[-rw-r--r--]cpputools/source/unoexe/makefile.mk3
-rw-r--r--cpputools/source/unoexe/unoexe.cxx18
5 files changed, 27 insertions, 21 deletions
diff --git a/cpputools/source/registercomponent/registercomponent.cxx b/cpputools/source/registercomponent/registercomponent.cxx
index c487d95c59a5..cc9d22e42a96 100644
--- a/cpputools/source/registercomponent/registercomponent.cxx
+++ b/cpputools/source/registercomponent/registercomponent.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -82,7 +83,7 @@ OUString replacePrefix(OUString const & url, OUString const & prefix) {
sal_Bool isFileUrl(const OUString& fileName)
{
- if (fileName.indexOf(OUString::createFromAscii("file://")) == 0 )
+ if (fileName.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("file://"))) == 0 )
return sal_True;
return sal_False;
}
@@ -575,7 +576,7 @@ void DoIt::operator() (const OUString & url) throw()
if ( ! _bSilent )
{
- fprintf(stderr, "register component '%s' in registry '%s' succesful!\n", sUrl.getStr(), _sRegName.getStr());
+ fprintf(stderr, "register component '%s' in registry '%s' successful!\n", sUrl.getStr(), _sRegName.getStr());
}
}
@@ -604,7 +605,7 @@ void DoIt::operator() (const OUString & url) throw()
if (bRet)
{
if ( ! _bSilent )
- fprintf(stderr, "revoke component '%s' from registry '%s' succesful!\n", sUrl.getStr(), _sRegName.getStr());
+ fprintf(stderr, "revoke component '%s' from registry '%s' successful!\n", sUrl.getStr(), _sRegName.getStr());
}
else
{
@@ -693,7 +694,7 @@ static void bootstrap(
}
reg = Reference< XSimpleRegistry >(
xSMgr->createInstance(
- rtl::OUString::createFromAscii("com.sun.star.registry.SimpleRegistry")), UNO_QUERY);
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.SimpleRegistry"))), UNO_QUERY);
if (reg.is())
{
@@ -726,15 +727,15 @@ static void bootstrap(
// we know our java loader, so we check, whether a java-loader is
// registered
Reference< XInterface > r = loadSharedLibComponentFactory(
- OUString::createFromAscii( "javavm.uno" SAL_DLLEXTENSION ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("javavm.uno" SAL_DLLEXTENSION)),
OUString(),
- OUString::createFromAscii( "com.sun.star.comp.stoc.JavaVirtualMachine" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaVirtualMachine")),
xSMgr,
Reference< XRegistryKey > () );
Reference< XInterface > r2 = loadSharedLibComponentFactory(
- OUString::createFromAscii( "javaloader.uno" SAL_DLLEXTENSION ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("javaloader.uno" SAL_DLLEXTENSION)),
OUString(),
- OUString::createFromAscii(( "com.sun.star.comp.stoc.JavaComponentLoader" ) ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaComponentLoader")),
xSMgr,
Reference< XRegistryKey > () );
Reference <XSet> xSet( xSMgr, UNO_QUERY );
@@ -844,3 +845,4 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cpputools/source/regsingleton/regsingleton.cxx b/cpputools/source/regsingleton/regsingleton.cxx
index 688bdc6d40b8..05fc7dafe67a 100644
--- a/cpputools/source/regsingleton/regsingleton.cxx
+++ b/cpputools/source/regsingleton/regsingleton.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -171,3 +172,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
return 1;
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cpputools/source/sp2bv/sp2bv.cxx b/cpputools/source/sp2bv/sp2bv.cxx
index afacab909545..27231080b3a3 100644
--- a/cpputools/source/sp2bv/sp2bv.cxx
+++ b/cpputools/source/sp2bv/sp2bv.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,10 +33,6 @@
#include "rtl/ustring.hxx"
#include "rtl/ustrbuf.h"
-
-
-using namespace rtl;
-
static sal_Bool hasOption(char const * szOption, int argc, char** argv);
@@ -139,3 +136,4 @@ static sal_Bool hasOption(char const * szOption, int argc, char** argv)
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk
index c17fe9001cde..5869f180163e 100644..100755
--- a/cpputools/source/unoexe/makefile.mk
+++ b/cpputools/source/unoexe/makefile.mk
@@ -83,9 +83,6 @@ APP1STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB)\
$(LIBXML2LIB)
-.IF "$(OS)" == "WNT"
-APP1STDLIBS += $(UNICOWSLIB)
-.ENDIF
.INCLUDE : target.mk
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index c546cdadedfc..81bf81baec91 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,7 +74,6 @@
#endif
using namespace std;
-using namespace rtl;
using namespace osl;
using namespace cppu;
using namespace com::sun::star::uno;
@@ -84,12 +84,17 @@ using namespace com::sun::star::connection;
using namespace com::sun::star::bridge;
using namespace com::sun::star::container;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+using ::rtl::OUStringBuffer;
+
namespace unoexe
{
static sal_Bool isFileUrl(const OUString& fileName)
{
- if (fileName.indexOf(OUString::createFromAscii("file://")) == 0 )
+ if (fileName.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("file://"))) == 0 )
return sal_True;
return sal_False;
}
@@ -131,7 +136,7 @@ static sal_Bool s_quiet = false;
static inline void out( const sal_Char * pText )
{
if (! s_quiet)
- fprintf( stderr, pText );
+ fprintf( stderr, "%s", pText );
}
//--------------------------------------------------------------------------------------------------
static inline void out( const OUString & rText )
@@ -139,7 +144,7 @@ static inline void out( const OUString & rText )
if (! s_quiet)
{
OString aText( OUStringToOString( rText, RTL_TEXTENCODING_ASCII_US ) );
- fprintf( stderr, aText.getStr() );
+ fprintf( stderr, "%s", aText.getStr() );
}
}
@@ -158,7 +163,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
sal_Int32 * pnIndex, const OUString & aArg)
throw (RuntimeException)
{
- const OUString dash = OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
+ const OUString dash(RTL_CONSTASCII_USTRINGPARAM("-"));
if(aArg.indexOf(dash) != 0)
return sal_False;
@@ -640,7 +645,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
rtl_getAppCommandArg(nPos, &arg.pData);
- const OUString dashdash = OUString(RTL_CONSTASCII_USTRINGPARAM("--"));
+ const OUString dashdash(RTL_CONSTASCII_USTRINGPARAM("--"));
if (dashdash == arg)
{
++nPos;
@@ -888,3 +893,4 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit (git 2.34.1) at 2024-07-19 04:14:09 +0000