no need to use SAL_WHERE when throwing exception
we already add the source location to UNO exception messages
Change-Id: I01e68faad85d144b41e0abd2df3c783750862654
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198650
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
(cherry picked from commit 65c0a263385d0104677ece672512bea4ae4633c0)
Reviewed-on: https://gerrit.collaboraoffice.com/c/core/+/360
Reviewed-by: Noel Grandin <noel.grandin@collabora.com>
Tested-by: Jenkins CPCI <releng@collaboraoffice.com>
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index c0ffcbe..a830e1a 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -47,12 +47,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::ucb;
-#if OSL_DEBUG_LEVEL > 0
-#define THROW_WHERE SAL_WHERE
-#else
-#define THROW_WHERE ""
-#endif
-
class fileaccess::PropertyListeners
{
typedef comphelper::OInterfaceContainerHelper4<beans::XPropertiesChangeListener> ContainerHelper;
@@ -463,7 +457,7 @@
{
if( ( m_nState & JustInserted ) || ( m_nState & Deleted ) || Name.isEmpty() )
{
- throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 0 );
+ throw lang::IllegalArgumentException( u""_ustr, uno::Reference< uno::XInterface >(), 0 );
}
m_pMyShell->associate( m_aUncPath,Name,DefaultValue,Attributes );
@@ -596,7 +590,7 @@
BaseContent::setParent(
const Reference< XInterface >& )
{
- throw lang::NoSupportException( THROW_WHERE );
+ throw lang::NoSupportException();
}
@@ -768,12 +762,12 @@
OUString NewTitle;
if( !( Values[i].Value >>= NewTitle ) )
{
- retRange[i] <<= beans::IllegalTypeException( THROW_WHERE );
+ retRange[i] <<= beans::IllegalTypeException();
break;
}
else if( NewTitle.isEmpty() )
{
- retRange[i] <<= lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 0 );
+ retRange[i] <<= lang::IllegalArgumentException( u""_ustr, uno::Reference< uno::XInterface >(), 0 );
break;
}
diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx
index ad48254..5d6602d 100644
--- a/ucb/source/ucp/file/filcmd.cxx
+++ b/ucb/source/ucp/file/filcmd.cxx
@@ -29,12 +29,6 @@
using namespace com::sun::star;
using namespace com::sun::star::ucb;
-#if OSL_DEBUG_LEVEL > 0
-#define THROW_WHERE SAL_WHERE
-#else
-#define THROW_WHERE ""
-#endif
-
XCommandInfo_impl::XCommandInfo_impl( TaskManager* pMyShell )
: m_pMyShell( pMyShell )
{
@@ -86,7 +80,7 @@
if (pCommand != std::cend(m_pMyShell->m_sCommandInfo))
return *pCommand;
- throw UnsupportedCommandException( THROW_WHERE );
+ throw UnsupportedCommandException();
}
@@ -99,7 +93,7 @@
if (pCommand != std::cend(m_pMyShell->m_sCommandInfo))
return *pCommand;
- throw UnsupportedCommandException( THROW_WHERE );
+ throw UnsupportedCommandException();
}
diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx
index 61471bd..3e2a3a7 100644
--- a/ucb/source/ucp/file/filinpstr.cxx
+++ b/ucb/source/ucp/file/filinpstr.cxx
@@ -30,12 +30,6 @@
using namespace fileaccess;
using namespace com::sun::star;
-#if OSL_DEBUG_LEVEL > 0
-#define THROW_WHERE SAL_WHERE
-#else
-#define THROW_WHERE ""
-#endif
-
XInputStream_impl::XInputStream_impl( const OUString& aUncPath, bool bLock )
: m_aFile( aUncPath ),
m_nErrorCode( TaskHandlerErr::NO_ERROR ),
@@ -80,7 +74,7 @@
uno::Sequence< sal_Int8 >& aData,
sal_Int32 nBytesToRead )
{
- if( ! m_nIsOpen ) throw io::IOException( THROW_WHERE );
+ if( ! m_nIsOpen ) throw io::IOException();
aData.realloc(nBytesToRead);
//TODO! translate memory exhaustion (if it were detectable...) into
@@ -89,7 +83,7 @@
sal_uInt64 nrc(0);
if(m_aFile.read( aData.getArray(),sal_uInt64(nBytesToRead),nrc )
!= osl::FileBase::E_None)
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
// Shrink aData in case we read less than nBytesToRead (XInputStream
// documentation does not tell whether this is required, and I do not know
@@ -104,7 +98,7 @@
sal_Int8* aData,
sal_Int32 nBytesToRead )
{
- if( ! m_nIsOpen ) throw io::IOException( THROW_WHERE );
+ if( ! m_nIsOpen ) throw io::IOException();
//TODO! translate memory exhaustion (if it were detectable...) into
// io::BufferSizeExceededException
@@ -112,7 +106,7 @@
sal_uInt64 nrc(0);
if(m_aFile.read( aData, sal_uInt64(nBytesToRead),nrc )
!= osl::FileBase::E_None)
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
return static_cast<sal_Int32>(nrc);
}
@@ -148,7 +142,7 @@
{
osl::FileBase::RC err = m_aFile.close();
if( err != osl::FileBase::E_None )
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
m_nIsOpen = false;
}
}
@@ -158,9 +152,9 @@
XInputStream_impl::seek( sal_Int64 location )
{
if( location < 0 )
- throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 0 );
+ throw lang::IllegalArgumentException( u""_ustr, uno::Reference< uno::XInterface >(), 0 );
if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) )
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
}
@@ -169,7 +163,7 @@
{
sal_uInt64 uPos;
if( osl::FileBase::E_None != m_aFile.getPos( uPos ) )
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
return sal_Int64( uPos );
}
@@ -178,7 +172,7 @@
{
sal_uInt64 uEndPos;
if ( m_aFile.getSize(uEndPos) != osl::FileBase::E_None )
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
return sal_Int64( uEndPos );
}
diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index c7b026c..a864eb2 100644
--- a/ucb/source/ucp/file/filrow.cxx
+++ b/ucb/source/ucp/file/filrow.cxx
@@ -27,12 +27,6 @@
using namespace com::sun::star;
using namespace css::uno;
-#if OSL_DEBUG_LEVEL > 0
-#define THROW_WHERE SAL_WHERE
-#else
-#define THROW_WHERE ""
-#endif
-
// Function for TypeConverting
template< class _type_ >
@@ -100,7 +94,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<OUString>(columnIndex);
}
@@ -109,7 +103,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<bool>(columnIndex);
}
@@ -119,7 +113,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<sal_Int8>(columnIndex);
}
@@ -128,7 +122,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<sal_Int16>(columnIndex);
}
@@ -138,7 +132,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<sal_Int32>(columnIndex);
}
@@ -147,7 +141,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<sal_Int64>(columnIndex);
}
@@ -156,7 +150,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<float>(columnIndex);
}
@@ -165,7 +159,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<double>(columnIndex);
}
@@ -174,7 +168,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<uno::Sequence< sal_Int8 >>(columnIndex);
}
@@ -183,7 +177,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<util::Date>(columnIndex);
}
@@ -192,7 +186,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<util::Time>(columnIndex);
}
@@ -201,7 +195,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<util::DateTime>(columnIndex);
}
@@ -211,7 +205,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<uno::Reference< io::XInputStream >>(columnIndex);
}
@@ -221,7 +215,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<uno::Reference< io::XInputStream >>(columnIndex);
}
@@ -232,7 +226,7 @@
const uno::Reference< container::XNameAccess >& )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
std::scoped_lock aGuard( m_aMutex );
uno::Any Value = m_aValueMap[columnIndex - 1];
m_nWasNull = !Value.hasValue();
@@ -244,7 +238,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<uno::Reference< sdbc::XRef >>(columnIndex);
}
@@ -253,7 +247,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<uno::Reference< sdbc::XBlob >>(columnIndex);
}
@@ -262,7 +256,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<uno::Reference< sdbc::XClob >>(columnIndex);
}
@@ -272,7 +266,7 @@
sal_Int32 columnIndex )
{
if( isIndexOutOfBounds( columnIndex ) )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
return getValue<uno::Reference< sdbc::XArray >>(columnIndex);
}
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index 9233212..2e739b7 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -41,12 +41,6 @@
using namespace fileaccess;
using namespace com::sun::star;
-#if OSL_DEBUG_LEVEL > 0
-#define THROW_WHERE SAL_WHERE
-#else
-#define THROW_WHERE ""
-#endif
-
XResultSet_impl::XResultSet_impl( TaskManager* pMyShell,
const OUString& aUnqPath,
sal_Int32 OpenMode,
@@ -222,7 +216,7 @@
}
else // error fetching anything
{
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
}
}
}
@@ -345,7 +339,7 @@
XResultSet_impl::relative( sal_Int32 row )
{
if( isAfterLast() || isBeforeFirst() )
- throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
+ throw sdbc::SQLException( u""_ustr, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() );
if( row > 0 )
while( row-- ) next();
else if( row < 0 )
@@ -463,7 +457,7 @@
std::unique_lock aGuard( m_aMutex );
if ( m_xListener.is() )
- throw ucb::ListenerAlreadySetException( THROW_WHERE );
+ throw ucb::ListenerAlreadySetException();
return uno::Reference< sdbc::XResultSet >( this );
}
@@ -477,7 +471,7 @@
std::unique_lock aGuard( m_aMutex );
if ( m_xListener.is() )
- throw ucb::ListenerAlreadySetException( THROW_WHERE );
+ throw ucb::ListenerAlreadySetException();
m_xListener = Listener;
@@ -515,7 +509,7 @@
{
std::unique_lock aGuard( m_aMutex );
if( m_xListener.is() )
- throw ucb::ListenerAlreadySetException( THROW_WHERE );
+ throw ucb::ListenerAlreadySetException();
}
uno::Reference< ucb::XSourceInitialization > xTarget(
xCache, uno::UNO_QUERY );
@@ -539,7 +533,7 @@
return;
}
}
- throw ucb::ServiceNotFoundException( THROW_WHERE );
+ throw ucb::ServiceNotFoundException();
}
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index a1624c0..86798c3 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -30,12 +30,6 @@
using namespace fileaccess;
using namespace com::sun::star;
-#if OSL_DEBUG_LEVEL > 0
-#define THROW_WHERE SAL_WHERE
-#else
-#define THROW_WHERE ""
-#endif
-
/******************************************************************************/
/* */
/* XStream_impl implementation */
@@ -109,10 +103,10 @@
void SAL_CALL XStream_impl::truncate()
{
if (osl::FileBase::E_None != m_aFile.setSize(0))
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
if (osl::FileBase::E_None != m_aFile.setPos(osl_Pos_Absolut,sal_uInt64(0)))
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
}
@@ -125,7 +119,7 @@
sal_Int32 nBytesToRead )
{
if( ! m_nIsOpen )
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
try
{
@@ -134,14 +128,14 @@
catch (const std::bad_alloc&)
{
if( m_nIsOpen ) m_aFile.close();
- throw io::BufferSizeExceededException( THROW_WHERE );
+ throw io::BufferSizeExceededException();
}
sal_uInt64 nrc(0);
if(m_aFile.read( aData.getArray(), sal_uInt64(nBytesToRead), nrc )
!= osl::FileBase::E_None)
{
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
}
if (nrc != static_cast<sal_uInt64>(nBytesToRead))
aData.realloc(nrc);
@@ -154,13 +148,13 @@
sal_Int32 nBytesToRead )
{
if( ! m_nIsOpen )
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
sal_uInt64 nrc(0);
if(m_aFile.read( pData, sal_uInt64(nBytesToRead), nrc )
!= osl::FileBase::E_None)
{
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
}
return static_cast<sal_Int32>(nrc);
}
@@ -199,7 +193,7 @@
const sal_Int8* p = aData.getConstArray();
if(osl::FileBase::E_None != m_aFile.write(static_cast<void const *>(p),sal_uInt64(length),nWrittenBytes) ||
nWrittenBytes != length )
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
}
}
@@ -245,9 +239,9 @@
XStream_impl::seek( sal_Int64 location )
{
if( location < 0 )
- throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 0 );
+ throw lang::IllegalArgumentException( u""_ustr, uno::Reference< uno::XInterface >(), 0 );
if( osl::FileBase::E_None != m_aFile.setPos( osl_Pos_Absolut, sal_uInt64( location ) ) )
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
}
@@ -256,7 +250,7 @@
{
sal_uInt64 uPos;
if( osl::FileBase::E_None != m_aFile.getPos( uPos ) )
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
return sal_Int64( uPos );
}
@@ -265,7 +259,7 @@
{
sal_uInt64 uEndPos;
if ( m_aFile.getSize(uEndPos) != osl::FileBase::E_None )
- throw io::IOException( THROW_WHERE );
+ throw io::IOException();
return sal_Int64( uEndPos );
}
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index d4ff6a7..320684b 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -70,12 +70,6 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::ucb;
-#if OSL_DEBUG_LEVEL > 0
-#define THROW_WHERE SAL_WHERE
-#else
-#define THROW_WHERE ""
-#endif
-
TaskManager::UnqPathData::UnqPathData() = default;
TaskManager::UnqPathData::UnqPathData(TaskManager::UnqPathData&&) = default;
@@ -542,7 +536,7 @@
auto it1 = m_aDefaultProperties.find( newProperty );
if( it1 != m_aDefaultProperties.end() )
- throw beans::PropertyExistException( THROW_WHERE );
+ throw beans::PropertyExistException();
{
std::unique_lock aGuard( m_aMutex );
@@ -555,7 +549,7 @@
PropertySet& properties = it->second.properties;
it1 = properties.find( newProperty );
if( it1 != properties.end() )
- throw beans::PropertyExistException(THROW_WHERE );
+ throw beans::PropertyExistException();
// Property does not exist
properties.insert( newProperty );
@@ -573,7 +567,7 @@
auto it1 = m_aDefaultProperties.find( oldProperty );
if( it1 != m_aDefaultProperties.end() )
- throw beans::NotRemoveableException( THROW_WHERE );
+ throw beans::NotRemoveableException();
std::unique_lock aGuard( m_aMutex );
@@ -855,7 +849,7 @@
it1 = properties.find( toset );
if( it1 == properties.end() )
{
- retRange[i] <<= beans::UnknownPropertyException( THROW_WHERE );
+ retRange[i] <<= beans::UnknownPropertyException();
continue;
}
@@ -865,7 +859,7 @@
if( it1->getAttributes() & beans::PropertyAttribute::READONLY )
{
- retRange[i] <<= lang::IllegalAccessException( THROW_WHERE );
+ retRange[i] <<= lang::IllegalAccessException();
continue;
}
@@ -934,7 +928,7 @@
}
}
else
- retRange[i] <<= beans::IllegalTypeException( THROW_WHERE );
+ retRange[i] <<= beans::IllegalTypeException();
}
else if(values[i].Name == IsReadOnly ||
values[i].Name == IsHidden)
@@ -1041,7 +1035,7 @@
}
}
else
- retRange[i] <<= beans::IllegalTypeException( THROW_WHERE );
+ retRange[i] <<= beans::IllegalTypeException();
}
}
} // end for
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 5356822..926df21 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -39,13 +39,6 @@
using namespace com::sun::star::beans;
using namespace com::sun::star::ucb;
-#if OSL_DEBUG_LEVEL > 0
-#define THROW_WHERE SAL_WHERE
-#else
-#define THROW_WHERE ""
-#endif
-
-
/****************************************************************************/
/* */
/* */
@@ -117,7 +110,7 @@
if( err )
{
- throw IllegalIdentifierException( THROW_WHERE );
+ throw IllegalIdentifierException();
}
return Reference<XContent>(new BaseContent(m_pMyShell.get(), xIdentifier, aUnc));