diff options
Diffstat (limited to 'connectivity/source/sdbcx')
-rw-r--r-- | connectivity/source/sdbcx/VCatalog.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VCollection.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VColumn.cxx | 10 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VDescriptor.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VGroup.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VIndex.cxx | 12 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VIndexColumn.cxx | 10 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VKey.cxx | 10 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VKeyColumn.cxx | 10 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VTable.cxx | 11 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VUser.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/sdbcx/VView.cxx | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | connectivity/source/sdbcx/makefile.mk | 0 |
13 files changed, 53 insertions, 28 deletions
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx index c9576d5b3d35..8ea37b7cb216 100644 --- a/connectivity/source/sdbcx/VCatalog.cxx +++ b/connectivity/source/sdbcx/VCatalog.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. @@ -60,7 +61,7 @@ OCatalog::OCatalog(const Reference< XConnection> &_xConnection) : OCatalog_BASE( } catch(const Exception&) { - OSL_ENSURE(0,"No Metadata available!"); + OSL_FAIL("No Metadata available!"); } } //----------------------------------------------------------------------------- @@ -239,3 +240,4 @@ ODescriptor::~ODescriptor() } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index 46ecc3f134d7..b620f398cc84 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.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. @@ -106,7 +107,6 @@ namespace // during the swap. If we would not do this, the UStringMixLess instance which is used would be // default constructed (instead of being constructed from the same instance in m_aNameMap), and // it's case-sensitive flag would have an unpredictable value. - // 2002-01-09 - #106589# - fs@openoffice.org } // ----------------------------------------------------------------------------- virtual void clear() @@ -601,3 +601,5 @@ void OCollection::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString /*_sEleme { } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx index 65bc1b368b1e..0d8827f8fc8d 100644 --- a/connectivity/source/sdbcx/VColumn.cxx +++ b/connectivity/source/sdbcx/VColumn.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. @@ -46,17 +47,17 @@ using namespace ::com::sun::star::sdbc; ::rtl::OUString SAL_CALL OColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { if(isNew()) - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VColumnDescription"); - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VColumn"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VColumnDescription")); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VColumn")); } // ----------------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); if(isNew()) - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ColumnDescription"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ColumnDescription")); else - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Column"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Column")); return aSupported; } @@ -227,3 +228,4 @@ void SAL_CALL OColumn::setName( const ::rtl::OUString& aName ) throw(::com::sun: } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx index 539726339809..90a83e6170e8 100644 --- a/connectivity/source/sdbcx/VDescriptor.cxx +++ b/connectivity/source/sdbcx/VDescriptor.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. @@ -153,3 +154,4 @@ namespace connectivity } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx index bb8d49bb7499..5c5bfb326ffd 100644 --- a/connectivity/source/sdbcx/VGroup.cxx +++ b/connectivity/source/sdbcx/VGroup.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. @@ -181,3 +182,4 @@ void SAL_CALL OGroup::release() throw() // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx index a9ae6eaa1538..3326952d231d 100644 --- a/connectivity/source/sdbcx/VIndex.cxx +++ b/connectivity/source/sdbcx/VIndex.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. @@ -51,17 +52,17 @@ using namespace ::com::sun::star::lang; ::rtl::OUString SAL_CALL OIndex::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { if(isNew()) - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndexDescriptor"); - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndex"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VIndexDescriptor")); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VIndex")); } // ----------------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OIndex::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); if(isNew()) - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.IndexDescriptor"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.IndexDescriptor")); else - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Index"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Index")); return aSupported; } @@ -176,7 +177,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OIndex::getColumn } catch( const Exception& ) { - OSL_ENSURE( false, "OIndex::getColumns: caught an exception!" ); + OSL_FAIL( "OIndex::getColumns: caught an exception!" ); } return const_cast<OIndex*>(this)->m_pColumns; @@ -221,3 +222,4 @@ void OIndex::refreshColumns() } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx index ca1649b06384..ac75c14ef778 100644 --- a/connectivity/source/sdbcx/VIndexColumn.cxx +++ b/connectivity/source/sdbcx/VIndexColumn.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. @@ -38,17 +39,17 @@ using namespace ::com::sun::star::uno; ::rtl::OUString SAL_CALL OIndexColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { if(isNew()) - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndexColumnDescription"); - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VIndex"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VIndexColumnDescription")); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VIndex")); } // ----------------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OIndexColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); if(isNew()) - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.IndexDescription"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.IndexDescription")); else - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Index"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Index")); return aSupported; } @@ -118,3 +119,4 @@ void OIndexColumn::construct() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx index b73d8721f88e..a6ae492de35b 100644 --- a/connectivity/source/sdbcx/VKey.cxx +++ b/connectivity/source/sdbcx/VKey.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. @@ -50,17 +51,17 @@ using namespace ::com::sun::star::lang; ::rtl::OUString SAL_CALL OKey::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { if(isNew()) - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKeyDescription"); - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKey"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VKeyDescription")); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VKey")); } // ----------------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OKey::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); if(isNew()) - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.KeyDescription"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.KeyDescription")); else - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Key"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Key")); return aSupported; } @@ -226,3 +227,4 @@ void SAL_CALL OKey::release() throw() } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx index 97e83f5c633a..5a8baf11f62c 100644 --- a/connectivity/source/sdbcx/VKeyColumn.cxx +++ b/connectivity/source/sdbcx/VKeyColumn.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. @@ -39,17 +40,17 @@ using namespace cppu; ::rtl::OUString SAL_CALL OKeyColumn::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { if(isNew()) - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKeyColumnDescription"); - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VKeyColumn"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VKeyColumnDescription")); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VKeyColumn")); } // ----------------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OKeyColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); if(isNew()) - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.KeyColumnDescription"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.KeyColumnDescription")); else - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.KeyColumn"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.KeyColumn")); return aSupported; } @@ -123,3 +124,4 @@ void OKeyColumn::construct() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx index 743980a345ce..4f12f0daa4e1 100644 --- a/connectivity/source/sdbcx/VTable.cxx +++ b/connectivity/source/sdbcx/VTable.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. @@ -53,8 +54,8 @@ using namespace ::com::sun::star::lang; ::rtl::OUString SAL_CALL OTable::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) { if(isNew()) - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.VTableDescriptor"); - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Table"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.VTableDescriptor")); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Table")); } // ----------------------------------------------------------------------------- @@ -62,9 +63,9 @@ using namespace ::com::sun::star::lang; { ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); if(isNew()) - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.TableDescriptor"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.TableDescriptor")); else - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.Table"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.Table")); return aSupported; } @@ -334,3 +335,5 @@ void OTable::refreshIndexes() { } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx index ee05eb1b2139..7bcdd52f8541 100644 --- a/connectivity/source/sdbcx/VUser.cxx +++ b/connectivity/source/sdbcx/VUser.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. @@ -175,7 +176,7 @@ void SAL_CALL OUser::revokePrivileges( const ::rtl::OUString& /*objName*/, sal_I // ----------------------------------------------------------------------------- void SAL_CALL OUser::setName( const ::rtl::OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException) { - OSL_ENSURE( false, "OUser::setName: not implemented!" ); + OSL_FAIL( "OUser::setName: not implemented!" ); // not allowed to throw an SQLException here ... } // ----------------------------------------------------------------------------- @@ -192,3 +193,4 @@ void SAL_CALL OUser::release() throw() // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx index 281566162db7..2f92e2fb55b4 100644 --- a/connectivity/source/sdbcx/VView.cxx +++ b/connectivity/source/sdbcx/VView.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. @@ -148,3 +149,4 @@ void SAL_CALL OView::release() throw() // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/makefile.mk b/connectivity/source/sdbcx/makefile.mk index c036e83db58b..c036e83db58b 100644..100755 --- a/connectivity/source/sdbcx/makefile.mk +++ b/connectivity/source/sdbcx/makefile.mk |