summaryrefslogtreecommitdiff
path: root/linguistic/workben
diff options
context:
space:
mode:
Diffstat (limited to 'linguistic/workben')
-rwxr-xr-x[-rw-r--r--]linguistic/workben/exports.dxp0
-rwxr-xr-x[-rw-r--r--]linguistic/workben/makefile.mk1
-rwxr-xr-x[-rw-r--r--]linguistic/workben/sprophelp.cxx18
-rwxr-xr-x[-rw-r--r--]linguistic/workben/sprophelp.hxx2
-rwxr-xr-x[-rw-r--r--]linguistic/workben/sreg.cxx2
-rwxr-xr-x[-rw-r--r--]linguistic/workben/sspellimp.cxx10
-rwxr-xr-x[-rw-r--r--]linguistic/workben/sspellimp.hxx7
7 files changed, 22 insertions, 18 deletions
diff --git a/linguistic/workben/exports.dxp b/linguistic/workben/exports.dxp
index b0f85bf7bebf..b0f85bf7bebf 100644..100755
--- a/linguistic/workben/exports.dxp
+++ b/linguistic/workben/exports.dxp
diff --git a/linguistic/workben/makefile.mk b/linguistic/workben/makefile.mk
index 26cbb7ec8d65..6c04929d7b73 100644..100755
--- a/linguistic/workben/makefile.mk
+++ b/linguistic/workben/makefile.mk
@@ -77,7 +77,6 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
SHL1STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(VOSLIB) \
$(TOOLSLIB) \
$(SVTOOLLIB) \
$(SVLLIB) \
diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx
index dcfa1d240cde..f9b3441889d2 100644..100755
--- a/linguistic/workben/sprophelp.cxx
+++ b/linguistic/workben/sprophelp.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.
@@ -28,6 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_linguistic.hxx"
+#include <sal/macros.h>
#include "linguistic/misc.hxx"
#include "sprophelp.hxx"
@@ -40,9 +42,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <osl/mutex.hxx>
-//using namespace utl;
using namespace osl;
-using namespace rtl;
using namespace com::sun::star;
using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
@@ -50,8 +50,9 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
+using ::rtl::OUString;
-#define A2OU(x) ::rtl::OUString::createFromAscii( x )
+#define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
///////////////////////////////////////////////////////////////////////////
@@ -68,7 +69,7 @@ PropertyChgHelper::PropertyChgHelper(
OUString *pName = aPropNames.getArray();
for (INT32 i = 0; i < nPropCount; ++i)
{
- pName[i] = A2OU( pPropNames[i] );
+ pName[i] = ::rtl::OUString::createFromAscii( pPropNames[i] );
}
}
@@ -192,7 +193,7 @@ static const char *aSP[] =
PropertyHelper_Spell::PropertyHelper_Spell(
const Reference< XInterface > & rxSource,
Reference< XPropertySet > &rxPropSet ) :
- PropertyChgHelper ( rxSource, rxPropSet, aSP, sizeof(aSP) / sizeof(aSP[0]) )
+ PropertyChgHelper ( rxSource, rxPropSet, aSP, SAL_N_ELEMENTS(aSP))
{
SetDefault();
INT32 nLen = GetPropNames().getLength();
@@ -315,7 +316,7 @@ void SAL_CALL
break;
}
default:
- DBG_ERROR( "unknown property" );
+ OSL_FAIL( "unknown property" );
}
if (pbVal)
rEvt.NewValue >>= *pbVal;
@@ -343,7 +344,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
bResIsSpellUpperCase = bIsSpellUpperCase;
bResIsSpellWithDigits = bIsSpellWithDigits;
bResIsSpellCapitalization = bIsSpellCapitalization;
- //
+
INT32 nLen = rPropVals.getLength();
if (nLen)
{
@@ -360,7 +361,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
case UPH_IS_SPELL_WITH_DIGITS : pbResVal = &bResIsSpellWithDigits; break;
case UPH_IS_SPELL_CAPITALIZATION : pbResVal = &bResIsSpellCapitalization; break;
default:
- DBG_ERROR( "unknown property" );
+ OSL_FAIL( "unknown property" );
}
if (pbResVal)
pVal[i].Value >>= *pbResVal;
@@ -370,3 +371,4 @@ void PropertyHelper_Spell::SetTmpPropVals( const PropertyValues &rPropVals )
///////////////////////////////////////////////////////////////////////////
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/linguistic/workben/sprophelp.hxx b/linguistic/workben/sprophelp.hxx
index 92e25e88f221..fc8798bff215 100644..100755
--- a/linguistic/workben/sprophelp.hxx
+++ b/linguistic/workben/sprophelp.hxx
@@ -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.
@@ -170,3 +171,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/linguistic/workben/sreg.cxx b/linguistic/workben/sreg.cxx
index 21fa50246472..1fb80047fa11 100644..100755
--- a/linguistic/workben/sreg.cxx
+++ b/linguistic/workben/sreg.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.
@@ -83,3 +84,4 @@ void * SAL_CALL component_getFactory(
///////////////////////////////////////////////////////////////////////////
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx
index 38123a144655..992e545b12a0 100644..100755
--- a/linguistic/workben/sspellimp.cxx
+++ b/linguistic/workben/sspellimp.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.
@@ -37,16 +38,13 @@
#include <unotools/processfactory.hxx>
#include <osl/mutex.hxx>
-#ifndef _SPELLIMP_HXX
#include <sspellimp.hxx>
-#endif
#include "linguistic/lngprops.hxx"
#include "linguistic/spelldta.hxx"
using namespace utl;
using namespace osl;
-using namespace rtl;
using namespace com::sun::star;
using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
@@ -54,6 +52,7 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
+using ::rtl::OUString;
///////////////////////////////////////////////////////////////////////////
@@ -377,7 +376,7 @@ void SAL_CALL
pPropHelper->AddAsPropListener(); //! after a reference is established
}
else
- DBG_ERROR( "wrong number of arguments in sequence" );
+ OSL_FAIL( "wrong number of arguments in sequence" );
}
}
@@ -458,7 +457,7 @@ Sequence< OUString > SpellChecker::getSupportedServiceNames_Static()
{
MutexGuard aGuard( GetLinguMutex() );
- Sequence< OUString > aSNS( 1 ); // auch mehr als 1 Service moeglich
+ Sequence< OUString > aSNS( 1 ); // more than 1 service possible
aSNS.getArray()[0] = A2OU( SN_SPELLCHECKER );
return aSNS;
}
@@ -510,3 +509,4 @@ void * SAL_CALL SpellChecker_getFactory( const sal_Char * pImplName,
///////////////////////////////////////////////////////////////////////////
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx
index e6796afc6356..d15a57d34c08 100644..100755
--- a/linguistic/workben/sspellimp.hxx
+++ b/linguistic/workben/sspellimp.hxx
@@ -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.
@@ -51,9 +52,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::linguistic2;
-
-#define A2OU(x) ::rtl::OUString::createFromAscii( x )
-
///////////////////////////////////////////////////////////////////////////
@@ -167,7 +165,7 @@ public:
inline OUString SpellChecker::getImplementationName_Static() throw()
{
- return A2OU( "com.sun.star.lingu.examples.SpellChecker" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.lingu.examples.SpellChecker" ));
}
@@ -175,3 +173,4 @@ inline OUString SpellChecker::getImplementationName_Static() throw()
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */