[Libreoffice-commits] .: 16 commits - accessibility/source automation/inc automation/source basctl/source cui/source extensions/source forms/source package/source xmlsecurity/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sun Mar 13 08:45:15 PDT 2011
accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 2
accessibility/source/extended/textwindowaccessibility.cxx | 2
automation/inc/automation/commtypes.hxx | 2
automation/source/miniapp/testapp.cxx | 2
automation/source/server/cmdbasestream.cxx | 16 +++----
automation/source/server/recorder.cxx | 4 -
automation/source/server/scmdstrm.cxx | 4 -
automation/source/server/server.cxx | 4 -
automation/source/server/statemnt.cxx | 4 -
automation/source/testtool/cretstrm.cxx | 2
automation/source/testtool/objtest.cxx | 8 +--
basctl/source/basicide/basobj2.cxx | 4 -
basctl/source/basicide/basobj3.cxx | 2
basctl/source/basicide/scriptdocument.cxx | 2
cui/source/customize/macropg.cxx | 2
cui/source/dialogs/cuigaldlg.cxx | 4 -
cui/source/options/optsave.cxx | 2
extensions/source/bibliography/datman.cxx | 2
extensions/source/config/ldap/ldapaccess.cxx | 2
extensions/source/dbpilots/gridwizard.cxx | 6 +-
extensions/source/logging/filehandler.cxx | 2
extensions/source/ole/oleobjw.cxx | 2
extensions/source/plugin/aqua/sysplug.cxx | 4 -
extensions/source/plugin/win/sysplug.cxx | 4 -
extensions/source/propctrlr/browserlistbox.cxx | 18 ++++----
extensions/source/propctrlr/composeduiupdate.cxx | 4 -
extensions/source/propctrlr/formcomponenthandler.cxx | 12 ++---
extensions/source/propctrlr/formgeometryhandler.cxx | 10 ++--
extensions/source/propctrlr/genericpropertyhandler.cxx | 4 -
extensions/source/propctrlr/propcontroller.cxx | 4 -
extensions/source/propctrlr/propertycomposer.cxx | 4 -
extensions/source/propctrlr/stringrepresentation.cxx | 8 +--
extensions/source/resource/oooresourceloader.cxx | 4 -
extensions/source/svg/svgaction.cxx | 2
extensions/source/update/check/updatehdl.cxx | 14 +++---
extensions/source/update/check/updateprotocol.cxx | 4 -
forms/source/component/ComboBox.cxx | 2
forms/source/component/FormComponent.cxx | 6 +-
forms/source/component/Grid.cxx | 2
forms/source/component/ImageControl.cxx | 6 +-
forms/source/component/ListBox.cxx | 12 ++---
forms/source/component/refvaluecomponent.cxx | 2
forms/source/richtext/attributedispatcher.cxx | 2
forms/source/richtext/richtextcontrol.cxx | 6 +-
forms/source/solar/control/navtoolbar.cxx | 2
forms/source/xforms/datatypes.cxx | 2
forms/source/xforms/model.cxx | 2
forms/source/xforms/model_ui.cxx | 8 +--
package/source/zipapi/ZipOutputStream.cxx | 10 ++--
package/source/zippackage/ZipPackage.cxx | 4 -
package/source/zippackage/ZipPackageFolder.cxx | 22 +++++-----
package/source/zippackage/ZipPackageStream.cxx | 8 +--
xmlsecurity/source/component/documentdigitalsignatures.cxx | 2
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2
54 files changed, 137 insertions(+), 139 deletions(-)
New commits:
commit aedd92ffa94b98ca9fc8147eb45158df92de14ff
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 12:35:09 2011 +0100
OSL_TRACE: Use format string
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index f70f311..22cca47 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -633,7 +633,7 @@ namespace frm
#if OSL_DEBUG_LEVEL > 0
::rtl::OString sTrace( "ORichTextPeer::implCreateDispatcher: creating *parametrized* dispatcher for " );
sTrace += ::rtl::OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( sTrace.getStr() );
+ OSL_TRACE( "%s", sTrace.getStr() );
#endif
pAttributeDispatcher = new OParametrizedAttributeDispatcher( pRichTextControl->getView(), _nSlotId, _rURL, pRichTextControl );
}
@@ -642,7 +642,7 @@ namespace frm
#if OSL_DEBUG_LEVEL > 0
::rtl::OString sTrace( "ORichTextPeer::implCreateDispatcher: creating *normal* dispatcher for " );
sTrace += ::rtl::OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( sTrace.getStr() );
+ OSL_TRACE( "%s", sTrace.getStr() );
#endif
pAttributeDispatcher = new OAttributeDispatcher( pRichTextControl->getView(), _nSlotId, _rURL, pRichTextControl );
}
@@ -652,7 +652,7 @@ namespace frm
{
::rtl::OString sTrace( "ORichTextPeer::implCreateDispatcher: not creating dispatcher (unsupported slot) for " );
sTrace += ::rtl::OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( sTrace.getStr() );
+ OSL_TRACE( "%s", sTrace.getStr() );
}
#endif
}
commit d712a6de3105e1369baef1562c5ca0442469cdac
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 12:05:07 2011 +0100
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 191478e..1fed3ad 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -332,7 +332,7 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName,
OUString msg(OUSTR("[automation bridge] Property ") + aPropertyName +
OUSTR(" is read-only"));
OString sMsg = OUStringToOString(msg, osl_getThreadTextEncoding());
- OSL_ENSURE(0, sMsg.getStr());
+ OSL_FAIL(sMsg.getStr());
// ignore silently
return;
}
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 099fd13..67f1f5f 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -988,7 +988,7 @@ void ZipPackage::WriteMimetypeMagicFile( ZipOutputStream& aZipOut )
}
catch ( ::com::sun::star::io::IOException & r )
{
- OSL_ENSURE( 0, "Error adding mimetype to the ZipOutputStream" );
+ OSL_FAIL( "Error adding mimetype to the ZipOutputStream" );
throw WrappedTargetException(
OUString( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX "Error adding mimetype to the ZipOutputStream!" ) ),
static_cast < OWeakObject * > ( this ),
@@ -1033,7 +1033,7 @@ void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const vector< Sequence
}
else
{
- OSL_ENSURE ( 0, "Couldn't get a ManifestWriter!" );
+ OSL_FAIL( "Couldn't get a ManifestWriter!" );
IOException aException;
throw WrappedTargetException(
OUString( RTL_CONSTASCII_USTRINGPARAM ( OSL_LOG_PREFIX "Couldn't get a ManifestWriter!" ) ),
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index 97b96c2..5b0708d 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -341,12 +341,12 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
}
catch ( ZipException& )
{
- OSL_ENSURE( 0, "Error writing ZipOutputStream" );
+ OSL_FAIL( "Error writing ZipOutputStream" );
bWritingFailed = sal_True;
}
catch ( IOException& )
{
- OSL_ENSURE( 0, "Error writing ZipOutputStream" );
+ OSL_FAIL( "Error writing ZipOutputStream" );
bWritingFailed = sal_True;
}
}
@@ -437,7 +437,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
if ( !xStream.is() )
{
- OSL_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" );
+ OSL_FAIL( "ZipPackageStream didn't have a stream associated with it, skipping!" );
bWritingFailed = sal_True;
continue;
}
@@ -490,14 +490,14 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
}
else
{
- OSL_ENSURE( 0, "The package component requires that every stream either be FROM a package or it must support XSeekable!" );
+ OSL_FAIL( "The package component requires that every stream either be FROM a package or it must support XSeekable!" );
continue;
}
}
}
catch ( Exception& )
{
- OSL_ENSURE( 0, "The stream provided to the package component has problems!" );
+ OSL_FAIL( "The stream provided to the package component has problems!" );
bWritingFailed = sal_True;
continue;
}
@@ -560,7 +560,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
if ( !xStream.is() )
{
// Make sure that we actually _got_ a new one !
- OSL_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" );
+ OSL_FAIL( "ZipPackageStream didn't have a stream associated with it, skipping!" );
continue;
}
}
@@ -588,12 +588,12 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
}
catch ( ZipException& )
{
- OSL_ENSURE( 0, "Error writing ZipOutputStream" );
+ OSL_FAIL( "Error writing ZipOutputStream" );
bWritingFailed = sal_True;
}
catch ( IOException& )
{
- OSL_ENSURE( 0, "Error writing ZipOutputStream" );
+ OSL_FAIL( "Error writing ZipOutputStream" );
bWritingFailed = sal_True;
}
}
@@ -615,7 +615,7 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
if ( !xStream.is() )
{
// Make sure that we actually _got_ a new one !
- OSL_ENSURE( 0, "ZipPackageStream didn't have a stream associated with it, skipping!" );
+ OSL_FAIL( "ZipPackageStream didn't have a stream associated with it, skipping!" );
continue;
}
}
@@ -645,12 +645,12 @@ void ZipPackageFolder::saveContents(OUString &rPath, std::vector < Sequence < Pr
}
catch ( ZipException& )
{
- OSL_ENSURE( 0, "Error writing ZipOutputStream" );
+ OSL_FAIL( "Error writing ZipOutputStream" );
bWritingFailed = sal_True;
}
catch ( IOException& )
{
- OSL_ENSURE( 0, "Error writing ZipOutputStream" );
+ OSL_FAIL( "Error writing ZipOutputStream" );
bWritingFailed = sal_True;
}
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index f3c6d71..ff449d9 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -417,12 +417,12 @@ Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData()
}
catch (ZipException &)//rException)
{
- OSL_ENSURE( 0, "ZipException thrown");//rException.Message);
+ OSL_FAIL( "ZipException thrown");//rException.Message);
return Reference < io::XInputStream > ();
}
catch (Exception &)
{
- OSL_ENSURE( 0, "Exception is thrown during stream wrapping!\n");
+ OSL_FAIL( "Exception is thrown during stream wrapping!\n");
return Reference < io::XInputStream > ();
}
}
@@ -448,12 +448,12 @@ Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream( )
}
catch (ZipException &)//rException)
{
- OSL_ENSURE( 0,"ZipException thrown");//rException.Message);
+ OSL_FAIL( "ZipException thrown");//rException.Message);
return Reference < io::XInputStream > ();
}
catch (Exception &)
{
- OSL_ENSURE( 0, "Exception is thrown during stream wrapping!\n");
+ OSL_FAIL( "Exception is thrown during stream wrapping!\n");
return Reference < io::XInputStream > ();
}
}
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index fd10c90..88c024e 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -340,7 +340,7 @@ DocumentDigitalSignatures::ImplVerifySignatures(
rSigInfo.CertificateStatus = xSecEnv->verifyCertificate(rSigInfo.Signer,
Sequence<Reference<css::security::XCertificate> >());
} catch (SecurityException& ) {
- OSL_ENSURE(0, "Verification of certificate failed");
+ OSL_FAIL("Verification of certificate failed");
rSigInfo.CertificateStatus = css::security::CertificateValidity::INVALID;
}
}
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index f287c62..4a95db3 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -640,7 +640,7 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
nValidCerts++;
} catch (css::uno::SecurityException& ) {
- OSL_ENSURE(0, "Verification of certificate failed");
+ OSL_FAIL("Verification of certificate failed");
bCertValid = false;
}
commit 1eaec2e1b03631b14ebc16b5c8356db17bc1e013
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Mar 12 11:29:14 2011 +0100
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index 765ee2e..12bd5f5 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -259,7 +259,7 @@ namespace accessibility
catch( const Exception& e )
{
(void)e;
- OSL_ENSURE( false, "EditBrowseBoxTableCellAccess::disposing: caught an exception while disposing the context!" );
+ OSL_FAIL( "EditBrowseBoxTableCellAccess::disposing: caught an exception while disposing the context!" );
}
}
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 0422996..6f4689e 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -2003,7 +2003,7 @@ void Document::handleParagraphNotifications()
break;
}
default:
- OSL_ENSURE(false, "bad buffered hint");
+ OSL_FAIL( "bad buffered hint");
break;
}
}
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index b60ad4b..e47addb 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -167,7 +167,7 @@ bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const
{
if ( !rDocument.hasModule( rLibName, rOldName ) )
{
- OSL_ENSURE( false, "BasicIDE::RenameModule: old module name is invalid!" );
+ OSL_FAIL( "BasicIDE::RenameModule: old module name is invalid!" );
return false;
}
@@ -300,7 +300,7 @@ bool RenameModule( Window* pErrorParent, const ScriptDocument& rDocument, const
xLimitToDocument.set( xScripts, UNO_QUERY );
if ( !xLimitToDocument.is() )
{
- OSL_ENSURE( false, "BasicIDE::ChooseMacro: a script container which is no document!?" );
+ OSL_FAIL( "BasicIDE::ChooseMacro: a script container which is no document!?" );
xLimitToDocument = rxLimitToDocument;
}
}
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index e8fad86..5ec78c8 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -178,7 +178,7 @@ bool RenameDialog( Window* pErrorParent, const ScriptDocument& rDocument, const
{
if ( !rDocument.hasDialog( rLibName, rOldName ) )
{
- OSL_ENSURE( false, "BasicIDE::RenameDialog: old module name is invalid!" );
+ OSL_FAIL( "BasicIDE::RenameDialog: old module name is invalid!" );
return false;
}
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 069fb87..5bb34af 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -1134,7 +1134,7 @@ namespace basctl
}
}
- OSL_ENSURE( false, "ScriptDocument::getDocumentForBasicManager: did not find a document for this manager!" );
+ OSL_FAIL( "ScriptDocument::getDocumentForBasicManager: did not find a document for this manager!" );
return ScriptDocument( NoDocument );
}
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 0e0c3de..2aebba2 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -542,7 +542,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
EventsHash::iterator h_it = eventsHash->find( sEventName );
if( h_it == eventsHash->end() )
{
- OSL_ENSURE( false, "_SvxMacroTabPage::DisplayAppEvents: something's suspicious here!" );
+ OSL_FAIL( "_SvxMacroTabPage::DisplayAppEvents: something's suspicious here!" );
continue;
}
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index a38638f..babd1e7 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -269,7 +269,7 @@ void LdapConnection::initConnection()
}
else
{
- OSL_ENSURE( false, "LdapConnection::findUserDn-could not get DN for User ");
+ OSL_FAIL( "LdapConnection::findUserDn-could not get DN for User ");
}
return userDn ;
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index beeccbb..ca35aad 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -208,7 +208,7 @@ namespace logging
sMessage.append( ::rtl::OString( m_sFileURL.getStr(), m_sFileURL.getLength(), osl_getThreadTextEncoding() ) );
sMessage.append( "\nerror code: " );
sMessage.append( (sal_Int32)res );
- OSL_ENSURE( false, sMessage.makeStringAndClear() );
+ OSL_FAIL( sMessage.makeStringAndClear() );
}
#endif
if ( m_eFileValidity == eValid )
diff --git a/extensions/source/plugin/aqua/sysplug.cxx b/extensions/source/plugin/aqua/sysplug.cxx
index 98ca841..d43d6ab 100644
--- a/extensions/source/plugin/aqua/sysplug.cxx
+++ b/extensions/source/plugin/aqua/sysplug.cxx
@@ -488,11 +488,11 @@ long MacPluginComm::doIt()
break;
case eNPP_Initialize:
TRACE( "eNPP_Initialize" );
- OSL_ENSURE( false, "NPP_Initialize: not implemented!" );
+ OSL_FAIL( "NPP_Initialize: not implemented!" );
break;
case eNPP_GetJavaClass:
TRACE( "eNPP_GetJavaClass" );
- OSL_ENSURE( false, "NPP_GetJavaClass: not implemented!" );
+ OSL_FAIL( "NPP_GetJavaClass: not implemented!" );
break;
}
return nRet;
diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx
index d5b4934..1ed9f18 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -271,11 +271,11 @@ long PluginComm_Impl::doIt()
break;
case eNPP_Initialize:
TRACE( "eNPP_Initialize" );
- OSL_ENSURE( false, "NPP_Initialize: not implemented!" );
+ OSL_FAIL( "NPP_Initialize: not implemented!" );
break;
case eNPP_GetJavaClass:
TRACE( "eNPP_GetJavaClass" );
- OSL_ENSURE( false, "NPP_GetJavaClass: not implemented!" );
+ OSL_FAIL( "NPP_GetJavaClass: not implemented!" );
break;
}
return nRet;
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index b4d91c0..a34c749 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -1264,7 +1264,7 @@ namespace pcr
m_aOrderedLines[ nFocusControlPos ]->second.pLine->GrabFocus();
}
else
- OSL_ENSURE( false, "OBrowserListBox::PreNotify: internal error, invalid focus control position!" );
+ OSL_FAIL( "OBrowserListBox::PreNotify: internal error, invalid focus control position!" );
}
}
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index f40d92e..b8aa757 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -374,7 +374,7 @@ namespace pcr
//--------------------------------------------------------------------
void SAL_CALL CachedInspectorUI::registerControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException)
{
- OSL_ENSURE( false, "CachedInspectorUI::registerControlObserver: not expected to be called!" );
+ OSL_FAIL( "CachedInspectorUI::registerControlObserver: not expected to be called!" );
// CachedInspectorUI is used as context for the controls, and we don't expect them to
// register listeners themself
m_rMaster.getDelegatorUI()->registerControlObserver( _Observer );
@@ -383,7 +383,7 @@ namespace pcr
//--------------------------------------------------------------------
void SAL_CALL CachedInspectorUI::revokeControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException)
{
- OSL_ENSURE( false, "CachedInspectorUI::revokeControlObserver: not expected to be called!" );
+ OSL_FAIL( "CachedInspectorUI::revokeControlObserver: not expected to be called!" );
// CachedInspectorUI is used as context for the controls, and we don't expect them to
// register listeners themself
m_rMaster.getDelegatorUI()->revokeControlObserver( _Observer );
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index b0abab6..e6d47b8 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -618,7 +618,7 @@ namespace pcr
case 1: nWritingMode = WritingMode2::RL_TB; break;
case 2: nWritingMode = WritingMode2::CONTEXT; break;
default:
- OSL_ENSURE( false, "FormComponentPropertyHandler::convertToPropertyValue: unexpected 'normalized value' for WritingMode!" );
+ OSL_FAIL( "FormComponentPropertyHandler::convertToPropertyValue: unexpected 'normalized value' for WritingMode!" );
nWritingMode = WritingMode2::CONTEXT;
break;
}
@@ -754,7 +754,7 @@ namespace pcr
case WritingMode2::RL_TB: nNormalized = 1; break;
case WritingMode2::CONTEXT: nNormalized = 2; break;
default:
- OSL_ENSURE( false, "FormComponentPropertyHandler::convertToControlValue: unsupported API value for WritingMode!" );
+ OSL_FAIL( "FormComponentPropertyHandler::convertToControlValue: unsupported API value for WritingMode!" );
nNormalized = 2;
break;
}
@@ -2015,7 +2015,7 @@ namespace pcr
break;
default:
- OSL_ENSURE( false, "FormComponentPropertyHandler::impl_updateDependentProperty_nothrow: unexpected property to update!" );
+ OSL_FAIL( "FormComponentPropertyHandler::impl_updateDependentProperty_nothrow: unexpected property to update!" );
break;
} // switch
@@ -3140,7 +3140,7 @@ namespace pcr
return sValue;
}
- OSL_ENSURE( false, "ValueListCommandUI::getSQLCommand: unexpected property type!" );
+ OSL_FAIL( "ValueListCommandUI::getSQLCommand: unexpected property type!" );
return sValue;
}
@@ -3215,7 +3215,7 @@ namespace pcr
xCommandUI = new ValueListCommandUI( xComponentProperties );
break;
default:
- OSL_ENSURE( false, "FormComponentPropertyHandler::OnDesignerClosed: invalid property id!" );
+ OSL_FAIL( "FormComponentPropertyHandler::OnDesignerClosed: invalid property id!" );
return false;
}
@@ -3296,7 +3296,7 @@ namespace pcr
}
catch( const Exception& )
{
- OSL_ENSURE( false, "FormComponentPropertyHandler::impl_hasValidDataSourceSignature_nothrow: caught an exception!" );
+ OSL_FAIL( "FormComponentPropertyHandler::impl_hasValidDataSourceSignature_nothrow: caught an exception!" );
}
}
return bHas;
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 77e82a3..9f02c35 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -376,7 +376,7 @@ namespace pcr
break;
default:
- OSL_ENSURE( false, "FormGeometryHandler::getPropertyValue: huh?" );
+ OSL_FAIL( "FormGeometryHandler::getPropertyValue: huh?" );
break;
}
}
@@ -443,7 +443,7 @@ namespace pcr
break;
default:
- OSL_ENSURE( false, "FormGeometryHandler::getPropertyValue: huh?" );
+ OSL_FAIL( "FormGeometryHandler::getPropertyValue: huh?" );
break;
}
}
@@ -491,7 +491,7 @@ namespace pcr
break;
default:
- OSL_ENSURE( false, "FormGeometryHandler::describePropertyLine: huh?" );
+ OSL_FAIL( "FormGeometryHandler::describePropertyLine: huh?" );
break;
}
}
@@ -547,7 +547,7 @@ namespace pcr
}
break;
default:
- OSL_ENSURE( false, "FormGeometryHandler::actuatingPropertyChanged: not registered for this property!" );
+ OSL_FAIL( "FormGeometryHandler::actuatingPropertyChanged: not registered for this property!" );
break;
}
}
@@ -706,7 +706,7 @@ namespace pcr
break;
default:
- OSL_ENSURE( false, "FormGeometryHandler::impl_setSheetAnchorType_nothrow: illegal anchor type!" );
+ OSL_FAIL( "FormGeometryHandler::impl_setSheetAnchorType_nothrow: illegal anchor type!" );
break;
}
}
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index e40df77..2068370 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -516,7 +516,7 @@ namespace pcr
}
catch( const UnknownPropertyException& )
{
- OSL_ENSURE( false, "GenericPropertyHandler::addPropertyChangeListener:\nThe inspected component does not allow registering for all properties at once! This violates the interface contract!" );
+ OSL_FAIL( "GenericPropertyHandler::addPropertyChangeListener:\nThe inspected component does not allow registering for all properties at once! This violates the interface contract!" );
}
}
}
@@ -533,7 +533,7 @@ namespace pcr
}
catch( const UnknownPropertyException& )
{
- OSL_ENSURE( false, "GenericPropertyHandler::removePropertyChangeListener:\nThe inspected component does not allow de-registering for all properties at once! This violates the interface contract!" );
+ OSL_FAIL( "GenericPropertyHandler::removePropertyChangeListener:\nThe inspected component does not allow de-registering for all properties at once! This violates the interface contract!" );
}
}
m_aPropertyListeners.removeInterface( _rxListener );
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index f8b2d02..17a7796 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -1257,7 +1257,7 @@ namespace pcr
::rtl::OString sMessage( "OPropertyBrowserController::UpdateUI: empty category provided for property '" );
sMessage += ::rtl::OString( property->second.Name.getStr(), property->second.Name.getLength(), osl_getThreadTextEncoding() );
sMessage += "'!";
- OSL_ENSURE( false, sMessage );
+ OSL_FAIL( sMessage );
}
#endif
// finally insert this property control
@@ -1365,7 +1365,7 @@ namespace pcr
// also okay, we expect that the handler has disabled the UI as necessary
break;
default:
- OSL_ENSURE( false, "OPropertyBrowserController::Clicked: unknown result value!" );
+ OSL_FAIL( "OPropertyBrowserController::Clicked: unknown result value!" );
break;
}
}
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index 469a460..82a275f 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -355,7 +355,7 @@ namespace pcr
case InteractiveSelectionResult_Success:
case InteractiveSelectionResult_Pending:
- OSL_ENSURE( false, "PropertyComposer::onInteractivePropertySelection: no chance to forward the new value to the other handlers!" );
+ OSL_FAIL( "PropertyComposer::onInteractivePropertySelection: no chance to forward the new value to the other handlers!" );
// This means that we cannot know the new property value, which either has already been set
// at the first component ("Success"), or will be set later on once the asynchronous input
// is finished ("Pending"). So, we also cannot forward this new property value to the other
@@ -372,7 +372,7 @@ namespace pcr
break;
default:
- OSL_ENSURE( false, "OPropertyBrowserController::onInteractivePropertySelection: unknown result value!" );
+ OSL_FAIL( "OPropertyBrowserController::onInteractivePropertySelection: unknown result value!" );
break;
}
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index ff340de..dd39ac4 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -428,7 +428,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue,
// some structs
case uno::TypeClass_STRUCT:
- OSL_ENSURE( false, "StringRepresentation::convertGenericValueToString(STRUCT): this is dead code - isn't it?" );
+ OSL_FAIL( "StringRepresentation::convertGenericValueToString(STRUCT): this is dead code - isn't it?" );
if ( _rValue.getValueType().equals( ::getCppuType( static_cast< util::Date* >( NULL ) ) ) )
{
// weird enough, the string representation of dates, as used
@@ -572,7 +572,7 @@ bool StringRepresentation::convertStringToGenericValue( const ::rtl::OUString& _
break;
case uno::TypeClass_STRUCT:
- OSL_ENSURE( false, "StringRepresentation::convertStringToGenericValue(STRUCT): this is dead code - isn't it?" );
+ OSL_FAIL( "StringRepresentation::convertStringToGenericValue(STRUCT): this is dead code - isn't it?" );
if ( _rTargetType.equals( ::getCppuType( static_cast< util::Date* >( NULL ) ) ) )
{
// weird enough, the string representation of dates, as used
diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx
index 59b71c1..bfe299b 100644
--- a/extensions/source/resource/oooresourceloader.cxx
+++ b/extensions/source/resource/oooresourceloader.cxx
@@ -447,7 +447,7 @@ namespace res
Sequence< ::rtl::OUString > SAL_CALL OpenOfficeResourceBundle::getElementNames( ) throw (RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- OSL_ENSURE( false, "OpenOfficeResourceBundle::getElementNames: not implemented!" );
+ OSL_FAIL( "OpenOfficeResourceBundle::getElementNames: not implemented!" );
// the (Simple)ResManager does not provide an API to enumerate the resources
return Sequence< ::rtl::OUString >( );
}
@@ -478,7 +478,7 @@ namespace res
::sal_Bool SAL_CALL OpenOfficeResourceBundle::hasElements( ) throw (RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- OSL_ENSURE( false, "OpenOfficeResourceBundle::hasElements: not implemented!" );
+ OSL_FAIL( "OpenOfficeResourceBundle::hasElements: not implemented!" );
// the (Simple)ResManager does not provide an API to enumerate the resources
return ::sal_Bool( );
}
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 6210a8a..a433a6e 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -379,7 +379,7 @@ void SAL_CALL UpdateHandler::actionPerformed( awt::ActionEvent const & rEvent )
case HELP_BUTTON:
break;
default:
- OSL_ENSURE( false, "UpdateHandler::actionPerformed: unknown command!" );
+ OSL_FAIL( "UpdateHandler::actionPerformed: unknown command!" );
}
}
@@ -649,7 +649,7 @@ rtl::OUString UpdateHandler::loadString( const uno::Reference< resource::XResour
}
catch( const uno::Exception& )
{
- OSL_ENSURE( false, "UpdateHandler::loadString: caught an exception!" );
+ OSL_FAIL( "UpdateHandler::loadString: caught an exception!" );
sString = UNISTRING("Missing ") + sKey;
}
@@ -685,7 +685,7 @@ void UpdateHandler::loadStrings()
}
catch( const uno::Exception& )
{
- OSL_ENSURE( false, "UpdateHandler::loadStrings: could not create the resource loader!" );
+ OSL_FAIL( "UpdateHandler::loadStrings: could not create the resource loader!" );
}
if ( !xLoader.is() ) return;
@@ -698,7 +698,7 @@ void UpdateHandler::loadStrings()
}
catch( const resource::MissingResourceException& )
{
- OSL_ENSURE( false, "UpdateHandler::loadStrings: missing the resource bundle!" );
+ OSL_FAIL( "UpdateHandler::loadStrings: missing the resource bundle!" );
}
if ( !xBundle.is() ) return;
@@ -791,7 +791,7 @@ void UpdateHandler::setControlProperty( const rtl::OUString &rCtrlName,
}
catch( const beans::UnknownPropertyException& )
{
- OSL_ENSURE( false, "UpdateHandler::setControlProperty: caught an exception!" );
+ OSL_FAIL( "UpdateHandler::setControlProperty: caught an exception!" );
}
}
@@ -802,7 +802,7 @@ void UpdateHandler::showControl( const rtl::OUString &rCtrlName, bool bShow )
if ( !xContainer.is() )
{
- OSL_ENSURE( false, "UpdateHandler::showControl: could not get control container!" );
+ OSL_FAIL( "UpdateHandler::showControl: could not get control container!" );
return;
}
@@ -818,7 +818,7 @@ void UpdateHandler::focusControl( DialogControls eID )
if ( !xContainer.is() )
{
- OSL_ENSURE( false, "UpdateHandler::focusControl: could not get control container!" );
+ OSL_FAIL( "UpdateHandler::focusControl: could not get control container!" );
return;
}
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index cafda1b..6184d19 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -282,7 +282,7 @@ bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > &
}
catch( const uno::Exception& )
{
- OSL_ENSURE( false, "checkForExtensionUpdates: could not create the PackageInformationProvider!" );
+ OSL_FAIL( "checkForExtensionUpdates: could not create the PackageInformationProvider!" );
}
if ( !xInfoProvider.is() ) return false;
@@ -308,7 +308,7 @@ bool checkForPendingUpdates( const uno::Reference< uno::XComponentContext > & rx
}
catch( const uno::Exception& )
{
- OSL_ENSURE( false, "checkForExtensionUpdates: could not create the PackageInformationProvider!" );
+ OSL_FAIL( "checkForExtensionUpdates: could not create the PackageInformationProvider!" );
}
if ( !xInfoProvider.is() ) return false;
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 8fa821b..b270e12 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -668,7 +668,7 @@ void OComboBoxModel::loadData( bool _bForce )
}
break;
default:
- OSL_ENSURE( false, "OComboBoxModel::loadData: unreachable!" );
+ OSL_FAIL( "OComboBoxModel::loadData: unreachable!" );
break;
}
}
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 8da97a1..3500a9d 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -992,7 +992,7 @@ Any OControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
if ( m_aPropertyBagHelper.hasDynamicPropertyByHandle( _nHandle ) )
m_aPropertyBagHelper.getDynamicPropertyDefaultByHandle( _nHandle, aReturn );
else
- OSL_ENSURE( false, "OControlModel::convertFastPropertyValue: unknown handle!" );
+ OSL_FAIL( "OControlModel::convertFastPropertyValue: unknown handle!" );
}
return aReturn;
}
@@ -1050,7 +1050,7 @@ sal_Bool OControlModel::convertFastPropertyValue(
if ( m_aPropertyBagHelper.hasDynamicPropertyByHandle( _nHandle ) )
bModified = m_aPropertyBagHelper.convertDynamicFastPropertyValue( _nHandle, _rValue, _rConvertedValue, _rOldValue );
else
- OSL_ENSURE( false, "OControlModel::convertFastPropertyValue: unknown handle!" );
+ OSL_FAIL( "OControlModel::convertFastPropertyValue: unknown handle!" );
break;
}
return bModified;
@@ -1084,7 +1084,7 @@ void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const A
if ( m_aPropertyBagHelper.hasDynamicPropertyByHandle( _nHandle ) )
m_aPropertyBagHelper.setDynamicFastPropertyValue( _nHandle, _rValue );
else
- OSL_ENSURE( false, "OControlModel::setFastPropertyValue_NoBroadcast: unknown handle!" );
+ OSL_FAIL( "OControlModel::setFastPropertyValue_NoBroadcast: unknown handle!" );
break;
}
}
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 5c486ab..3b68a88 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -256,7 +256,7 @@ Reference< XRowSet > SAL_CALL OGridControlModel::getRowSet( ) throw (RuntimeExc
//------------------------------------------------------------------------------
void SAL_CALL OGridControlModel::setRowSet( const Reference< XRowSet >& /*_rxDataSource*/ ) throw (RuntimeException)
{
- OSL_ENSURE( false, "OGridControlModel::setRowSet: not supported!" );
+ OSL_FAIL( "OGridControlModel::setRowSet: not supported!" );
}
//--------------------------------------------------------------------
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 8806ff1..07cc210 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -488,7 +488,7 @@ sal_Bool OImageControlModel::impl_handleNewImageURL_lck( ValueChangeInstigator _
break;
case ImageStoreInvalid:
- OSL_ENSURE( false, "OImageControlModel::impl_handleNewImageURL_lck: image storage type type!" );
+ OSL_FAIL( "OImageControlModel::impl_handleNewImageURL_lck: image storage type type!" );
break;
}
@@ -588,7 +588,7 @@ Any OImageControlModel::translateDbColumnToControlValue()
return makeAny( sImageLink );
}
case ImageStoreInvalid:
- OSL_ENSURE( false, "OImageControlModel::translateDbColumnToControlValue: invalid field type!" );
+ OSL_FAIL( "OImageControlModel::translateDbColumnToControlValue: invalid field type!" );
break;
}
return Any();
@@ -630,7 +630,7 @@ void OImageControlModel::doSetControlValue( const Any& _rValue )
break;
case ImageStoreInvalid:
- OSL_ENSURE( false, "OImageControlModel::doSetControlValue: invalid field type!" );
+ OSL_FAIL( "OImageControlModel::doSetControlValue: invalid field type!" );
break;
} // switch ( lcl_getImageStoreType( getFieldType() ) )
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 3b92933..662bf47 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -339,7 +339,7 @@ namespace frm
break;
case PROPERTY_ID_VALUE_SEQ :
- OSL_ENSURE( false, "ValueItemList is read-only!" );
+ OSL_FAIL( "ValueItemList is read-only!" );
throw PropertyVetoException();
case PROPERTY_ID_DEFAULT_SELECT_SEQ :
@@ -390,7 +390,7 @@ namespace frm
break;
case PROPERTY_ID_VALUE_SEQ :
- OSL_ENSURE( false, "ValueItemList is read-only!" );
+ OSL_FAIL( "ValueItemList is read-only!" );
throw PropertyVetoException();
case PROPERTY_ID_DEFAULT_SELECT_SEQ :
@@ -894,7 +894,7 @@ namespace frm
}
break;
default:
- OSL_ENSURE( false, "OListBoxModel::loadData: unreachable!" );
+ OSL_FAIL( "OListBoxModel::loadData: unreachable!" );
break;
}
}
@@ -996,7 +996,7 @@ namespace frm
size_t selectedValue = aSelectedIndices[0];
if ( selectedValue >= aValues.size() )
{
- OSL_ENSURE( false, "OListBoxModel::getFirstSelectedValue: inconsistent selection/valuelist!" );
+ OSL_FAIL( "OListBoxModel::getFirstSelectedValue: inconsistent selection/valuelist!" );
return s_aEmptyVaue;
}
@@ -1035,7 +1035,7 @@ namespace frm
Reference< XPropertySet > xBoundField( getField() );
if ( !xBoundField.is() )
{
- OSL_ENSURE( false, "OListBoxModel::translateDbColumnToControlValue: no field? How could that happen?!" );
+ OSL_FAIL( "OListBoxModel::translateDbColumnToControlValue: no field? How could that happen?!" );
return Any();
}
@@ -1143,7 +1143,7 @@ namespace frm
default:
break;
}
- OSL_ENSURE( false, "lcl_getCurrentExchangeType: unsupported (unexpected) exchange type!" );
+ OSL_FAIL( "lcl_getCurrentExchangeType: unsupported (unexpected) exchange type!" );
return eEntry;
}
}
diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx
index e23b0fc..b3579a7 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -218,7 +218,7 @@ namespace frm
}
else
{
- OSL_ENSURE( false, "OReferenceValueComponent::translateExternalValueToControlValue: unexpected value type!" );
+ OSL_FAIL( "OReferenceValueComponent::translateExternalValueToControlValue: unexpected value type!" );
}
return makeAny( nState );
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index b1c6f0d..b408b70 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -102,7 +102,7 @@ namespace frm
if ( pAsciiCommandName != NULL )
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ) ) + ::rtl::OUString::createFromAscii( pAsciiCommandName );
- OSL_ENSURE( false, "lcl_getCommandURL: unknown FormFeature!" );
+ OSL_FAIL( "lcl_getCommandURL: unknown FormFeature!" );
return ::rtl::OUString();
}
}
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index efb6ff0..00be866 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -503,7 +503,7 @@ namespace xforms
break;
default:
- OSL_ENSURE( false, "OValueLimitedType::_explainInvalid: unknown reason!" );
+ OSL_FAIL( "OValueLimitedType::_explainInvalid: unknown reason!" );
break;
}
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 08412f6..dd9eb90 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -385,7 +385,7 @@ bool Model::setSimpleContent( const XNode_t& xConstNode,
default:
{
- OSL_ENSURE( false, "bound to unknown node type?" );
+ OSL_FAIL( "bound to unknown node type?" );
}
break;
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index dd433c1..198b606 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -257,7 +257,7 @@ OUString Model::getDefaultBindingExpressionForNode(
default:
// unknown type? fail!
- OSL_ENSURE( false, "unknown node type!" );
+ OSL_FAIL( "unknown node type!" );
xCurrent.set( NULL );
aBuffer.makeStringAndClear();
// we'll remove the slash below
@@ -332,7 +332,7 @@ OUString Model::getNodeDisplayName( const XNode_t& xNode,
default:
// unknown type? fail!
- OSL_ENSURE( false, "unknown node type!" );
+ OSL_FAIL( "unknown node type!" );
break;
}
@@ -355,7 +355,7 @@ OUString Model::getNodeName( const XNode_t& xNode )
case NodeType_DOCUMENT_NODE:
default:
// unknown type? fail!
- OSL_ENSURE( false, "no name for this node type!" );
+ OSL_FAIL( "no name for this node type!" );
break;
}
@@ -684,7 +684,7 @@ Model::XNode_t Model::renameNode( const XNode_t& xNode,
}
else
{
- OSL_ENSURE( false, "can't rename this node type" );
+ OSL_FAIL( "can't rename this node type" );
}
// adjust bindings (if necessary):
diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx
index 729726f..1d29e17 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -129,7 +129,7 @@ void SAL_CALL ZipOutputStream::closeEntry( )
{
if (pEntry->nSize != aDeflater.getTotalIn())
{
- OSL_ENSURE(false,"Invalid entry size");
+ OSL_FAIL("Invalid entry size");
}
if (pEntry->nCompressedSize != aDeflater.getTotalOut())
{
@@ -139,7 +139,7 @@ void SAL_CALL ZipOutputStream::closeEntry( )
}
if (pEntry->nCrc != aCRC.getValue())
{
- OSL_ENSURE(false,"Invalid entry CRC-32");
+ OSL_FAIL("Invalid entry CRC-32");
}
}
else
@@ -156,10 +156,10 @@ void SAL_CALL ZipOutputStream::closeEntry( )
break;
case STORED:
if (!((pEntry->nFlag & 8) == 0))
- OSL_ENSURE ( false, "Serious error, one of compressed size, size or CRC was -1 in a STORED stream");
+ OSL_FAIL( "Serious error, one of compressed size, size or CRC was -1 in a STORED stream");
break;
default:
- OSL_ENSURE(false,"Invalid compression method");
+ OSL_FAIL("Invalid compression method");
break;
}
@@ -230,7 +230,7 @@ void SAL_CALL ZipOutputStream::finish( )
closeEntry();
if (aZipList.size() < 1)
- OSL_ENSURE(false,"Zip file must have at least one entry!\n");
+ OSL_FAIL("Zip file must have at least one entry!\n");
sal_Int32 nOffset= static_cast < sal_Int32 > (aChucker.GetPosition());
for (sal_Int32 i =0, nEnd = aZipList.size(); i < nEnd; i++)
commit a2cd4b24d26270db92ed337568f568b457ba33aa
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 8 14:32:33 2011 +0100
Move DBG_TRACE to OSL_TRACE for getStr()
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 587b454..f70f311 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -633,7 +633,7 @@ namespace frm
#if OSL_DEBUG_LEVEL > 0
::rtl::OString sTrace( "ORichTextPeer::implCreateDispatcher: creating *parametrized* dispatcher for " );
sTrace += ::rtl::OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US );
- DBG_TRACE( sTrace.getStr() );
+ OSL_TRACE( sTrace.getStr() );
#endif
pAttributeDispatcher = new OParametrizedAttributeDispatcher( pRichTextControl->getView(), _nSlotId, _rURL, pRichTextControl );
}
@@ -642,7 +642,7 @@ namespace frm
#if OSL_DEBUG_LEVEL > 0
::rtl::OString sTrace( "ORichTextPeer::implCreateDispatcher: creating *normal* dispatcher for " );
sTrace += ::rtl::OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US );
- DBG_TRACE( sTrace.getStr() );
+ OSL_TRACE( sTrace.getStr() );
#endif
pAttributeDispatcher = new OAttributeDispatcher( pRichTextControl->getView(), _nSlotId, _rURL, pRichTextControl );
}
@@ -652,7 +652,7 @@ namespace frm
{
::rtl::OString sTrace( "ORichTextPeer::implCreateDispatcher: not creating dispatcher (unsupported slot) for " );
sTrace += ::rtl::OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US );
- DBG_TRACE( sTrace.getStr() );
+ OSL_TRACE( sTrace.getStr() );
}
#endif
}
commit a5c76e8c470eb5d52f9af8d5f4d643556210a269
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Mar 8 13:48:37 2011 +0100
Move DBG_TRACE to OSL_TRACE
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 96c8b05..b4d91c0 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -282,21 +282,21 @@ namespace pcr
//--------------------------------------------------------------------
void SAL_CALL PropertyControlContext_Impl::focusGained( const Reference< XPropertyControl >& Control ) throw (RuntimeException)
{
- DBG_TRACE( "PropertyControlContext_Impl: FOCUS_GAINED" );
+ OSL_TRACE( "PropertyControlContext_Impl: FOCUS_GAINED" );
impl_notify_throw( Control, FOCUS_GAINED );
}
//--------------------------------------------------------------------
void SAL_CALL PropertyControlContext_Impl::valueChanged( const Reference< XPropertyControl >& Control ) throw (RuntimeException)
{
- DBG_TRACE( "PropertyControlContext_Impl: VALUE_CHANGED" );
+ OSL_TRACE( "PropertyControlContext_Impl: VALUE_CHANGED" );
impl_notify_throw( Control, VALUE_CHANGED );
}
//--------------------------------------------------------------------
void SAL_CALL PropertyControlContext_Impl::activateNextControl( const Reference< XPropertyControl >& CurrentControl ) throw (RuntimeException)
{
- DBG_TRACE( "PropertyControlContext_Impl: ACTIVATE_NEXT" );
+ OSL_TRACE( "PropertyControlContext_Impl: ACTIVATE_NEXT" );
impl_notify_throw( CurrentControl, ACTIVATE_NEXT );
}
@@ -338,15 +338,15 @@ namespace pcr
switch ( rControlEvent.eType )
{
case FOCUS_GAINED:
- DBG_TRACE( "PropertyControlContext_Impl::processEvent: FOCUS_GAINED" );
+ OSL_TRACE( "PropertyControlContext_Impl::processEvent: FOCUS_GAINED" );
m_pContext->focusGained( rControlEvent.xControl );
break;
case VALUE_CHANGED:
- DBG_TRACE( "PropertyControlContext_Impl::processEvent: VALUE_CHANGED" );
+ OSL_TRACE( "PropertyControlContext_Impl::processEvent: VALUE_CHANGED" );
m_pContext->valueChanged( rControlEvent.xControl );
break;
case ACTIVATE_NEXT:
- DBG_TRACE( "PropertyControlContext_Impl::processEvent: ACTIVATE_NEXT" );
+ OSL_TRACE( "PropertyControlContext_Impl::processEvent: ACTIVATE_NEXT" );
m_pContext->activateNextControl( rControlEvent.xControl );
break;
}
commit 5c94b624f33765ce5114b74bea99ce52090974e5
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Mar 7 13:17:50 2011 +0100
Move DBG_TRACE3 to OSL_TRACE
diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index 408c15c..576ea83 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -578,14 +578,14 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
case WINDOW_DOCKINGWINDOW:
{
// case 1 .. 0xffff:
- DBG_TRACE3( "TT_VCLMessage %u %u %X",nEventID, pWin->GetType(), pWin );
+ OSL_TRACE( "TT_VCLMessage %u %u %X",nEventID, pWin->GetType(), pWin );
// BOOL bx = ((DockingWindow*)pWin)->IsFloatingMode();
// break;
}
break;
case WINDOW_FLOATINGWINDOW:
{
- DBG_TRACE3( "TT_VCLMessage %u %u %X",nEventID, pWin->GetType(), pWin );
+ OSL_TRACE( "TT_VCLMessage %u %u %X",nEventID, pWin->GetType(), pWin );
// FloatingWindow *pFW = ((FloatingWindow*)pWin);
}
break;
commit 43160420de5baf6693ce22b068e32f0da0b5429c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Mar 7 11:37:15 2011 +0100
Move #ifdef DBG_UTIL to #if OSL_DEBUG_LEVEL > 1 for OSL_TRACE
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index 470a014..cebe6d4 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -162,7 +162,7 @@ void CmdBaseStream::Read (comm_USHORT &nNr)
comm_USHORT nId;
*pCommStream >> nId;
if (pCommStream->IsEof()) return;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
if (nId != BinUSHORT) OSL_TRACE( "Falscher Typ im Stream: Erwartet USHORT, gefunden :%hu", nId );
#endif
*pCommStream >> nNr;
@@ -173,7 +173,7 @@ void CmdBaseStream::Read (comm_ULONG &nNr)
comm_USHORT nId;
*pCommStream >> nId;
if (pCommStream->IsEof()) return;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
if (nId != BinULONG) OSL_TRACE( "Falscher Typ im Stream: Erwartet ULONG, gefunden :%hu", nId );
#endif
*pCommStream >> nNr;
@@ -183,7 +183,7 @@ void CmdBaseStream::Read (comm_UniChar* &aString, comm_USHORT &nLenInChars )
{
comm_USHORT nId;
*pCommStream >> nId;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
if (nId != BinString) OSL_TRACE( "Falscher Typ im Stream: Erwartet String, gefunden :%hu", nId );
#endif
@@ -203,7 +203,7 @@ void CmdBaseStream::Read (comm_BOOL &bBool)
{
comm_USHORT nId;
*pCommStream >> nId;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
if (nId != BinBool) OSL_TRACE( "Falscher Typ im Stream: Erwartet BOOL, gefunden :%hu", nId );
#endif
*pCommStream >> bBool;
commit 2eeb3f091700581a4953be8b3bea94974bc4e018
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Mar 4 21:30:05 2011 +0100
Move DBG_ERROR1 to OSL_TRACE
diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx
index 89a8161..99740d6 100644
--- a/automation/source/miniapp/testapp.cxx
+++ b/automation/source/miniapp/testapp.cxx
@@ -207,7 +207,7 @@ USHORT MyDispatcher::ExecuteFunction( USHORT nSID, SfxPoolItem** ppArgs, USHORT
case IDM_SYS_DLG: pMainWin->SysDlg(); break;
default:
{
- DBG_ERROR1("Dispatcher kennt Funktion nicht %s",ByteString::CreateFromInt64(nSID).GetBuffer());
+ OSL_TRACE("Dispatcher kennt Funktion nicht %s",ByteString::CreateFromInt64(nSID).GetBuffer());
return EXECUTE_NO;
}
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index d71dcf1..470a014 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -163,7 +163,7 @@ void CmdBaseStream::Read (comm_USHORT &nNr)
*pCommStream >> nId;
if (pCommStream->IsEof()) return;
#ifdef DBG_UTIL
- if (nId != BinUSHORT) DBG_ERROR1( "Falscher Typ im Stream: Erwartet USHORT, gefunden :%hu", nId );
+ if (nId != BinUSHORT) OSL_TRACE( "Falscher Typ im Stream: Erwartet USHORT, gefunden :%hu", nId );
#endif
*pCommStream >> nNr;
}
@@ -174,7 +174,7 @@ void CmdBaseStream::Read (comm_ULONG &nNr)
*pCommStream >> nId;
if (pCommStream->IsEof()) return;
#ifdef DBG_UTIL
- if (nId != BinULONG) DBG_ERROR1( "Falscher Typ im Stream: Erwartet ULONG, gefunden :%hu", nId );
+ if (nId != BinULONG) OSL_TRACE( "Falscher Typ im Stream: Erwartet ULONG, gefunden :%hu", nId );
#endif
*pCommStream >> nNr;
}
@@ -184,7 +184,7 @@ void CmdBaseStream::Read (comm_UniChar* &aString, comm_USHORT &nLenInChars )
comm_USHORT nId;
*pCommStream >> nId;
#ifdef DBG_UTIL
- if (nId != BinString) DBG_ERROR1( "Falscher Typ im Stream: Erwartet String, gefunden :%hu", nId );
+ if (nId != BinString) OSL_TRACE( "Falscher Typ im Stream: Erwartet String, gefunden :%hu", nId );
#endif
*pCommStream >> nLenInChars;
@@ -204,7 +204,7 @@ void CmdBaseStream::Read (comm_BOOL &bBool)
comm_USHORT nId;
*pCommStream >> nId;
#ifdef DBG_UTIL
- if (nId != BinBool) DBG_ERROR1( "Falscher Typ im Stream: Erwartet BOOL, gefunden :%hu", nId );
+ if (nId != BinBool) OSL_TRACE( "Falscher Typ im Stream: Erwartet BOOL, gefunden :%hu", nId );
#endif
*pCommStream >> bBool;
}
diff --git a/automation/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx
index af88f9b..2299256 100644
--- a/automation/source/server/scmdstrm.cxx
+++ b/automation/source/server/scmdstrm.cxx
@@ -133,7 +133,7 @@ void SCmdStream::Read ( SfxPoolItem *&pItem )
}
break;
default:
- DBG_ERROR1( "Ungültiger Typ im Stream:%hu", nType );
+ OSL_TRACE( "Ungültiger Typ im Stream:%hu", nType );
#if OSL_DEBUG_LEVEL > 1
StatementList::m_pDbgWin->AddText( "Ungültiger Typ !!!! " );
#endif
@@ -203,7 +203,7 @@ void SCmdStream::Read ( ::com::sun::star::beans::PropertyValue &rItem )
}
break;
default:
- DBG_ERROR1( "Ungültiger Typ im Stream:%hu", nType );
+ OSL_TRACE( "Ungültiger Typ im Stream:%hu", nType );
#if OSL_DEBUG_LEVEL > 1
StatementList::m_pDbgWin->AddText( "Ungültiger Typ !!!! " );
#endif
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index 4d22660..164e680 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -700,7 +700,7 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn )
if( nServiceId != SI_IPCCommandBlock && nServiceId != SI_DirectCommandBlock )
{
- DBG_ERROR1( "Ungültiger Request :%i", (int)nServiceId );
+ OSL_TRACE( "Ungültiger Request :%i", (int)nServiceId );
return FALSE;
}
@@ -738,7 +738,7 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn )
break;
}
default:
- DBG_ERROR1( "Unbekannter Request Nr:%i", nId );
+ OSL_TRACE( "Unbekannter Request Nr:%i", nId );
break;
}
if( !pIn->IsEof() )
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 58b1afc..6399853 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -987,7 +987,7 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
aToolBoxItemType.AssignAscii("TOOLBOXITEM_BREAK");
break;
default:
- DBG_ERROR1( "Unknown TOOLBOXITEM %i", pTB->GetItemType( i ) );
+ OSL_TRACE( "Unknown TOOLBOXITEM %i", pTB->GetItemType( i ) );
}
if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE,
@@ -1090,7 +1090,7 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
aMenuItemType.AssignAscii("MENUITEM_DONTKNOW");
break;
default:
- DBG_ERROR1( "Unknown MENUITEM %i", pMenu->GetItemType( i ) );
+ OSL_TRACE( "Unknown MENUITEM %i", pMenu->GetItemType( i ) );
}
if ( pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) )
pRet->GenReturn ( RET_WinInfo, SmartId( pMenu->GetItemCommand(nID) ), (comm_ULONG)0,
diff --git a/automation/source/testtool/cretstrm.cxx b/automation/source/testtool/cretstrm.cxx
index b07271b..694cabd 100644
--- a/automation/source/testtool/cretstrm.cxx
+++ b/automation/source/testtool/cretstrm.cxx
@@ -63,7 +63,7 @@ void CRetStream::Read( SbxValue &aValue )
*pSammel >> nId;
if (nId != BinSbxValue)
{
- DBG_ERROR1( "Falscher Typ im Stream: Erwartet SbxValue, gefunden :%hu", nId );
+ OSL_TRACE( "Falscher Typ im Stream: Erwartet SbxValue, gefunden :%hu", nId );
}
SbxBaseRef xBase = SbxBase::Load( *pSammel );
if ( IS_TYPE( SbxValue, xBase ) )
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 7d1d67b..7aedc22 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -2317,7 +2317,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
long aMS = long( aDiff.GetMSFromTime() );
if ( Abs( aMS - nWait ) > 100 )
{
- DBG_ERROR1("Wait was off limit by %i", aDiff.GetMSFromTime() - nWait );
+ OSL_TRACE("Wait was off limit by %i", aDiff.GetMSFromTime() - nWait );
}
#endif
}
@@ -3428,7 +3428,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
break;
}
default:
- DBG_ERROR1("Unbekannter Sub Return Code bei Profile: %hu", nUId );
+ OSL_TRACE("Unbekannter Sub Return Code bei Profile: %hu", nUId );
break;
}
}
@@ -3708,7 +3708,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
}
break;
default:
- DBG_ERROR1( "Unbekannter Return Code: %iu", nRet );
+ OSL_TRACE( "Unbekannter Return Code: %iu", nRet );
break;
}
@@ -3743,7 +3743,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn )
break;
}
default:
- DBG_ERROR1( "Unbekannter Request im Return Stream Nr: %iu", nId );
+ OSL_TRACE( "Unbekannter Request im Return Stream Nr: %iu", nId );
break;
}
if( !pIn->IsEof() )
commit 4849046983319b9ef75d28deaeeb62763198ed97
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Mar 4 20:59:09 2011 +0100
Move DBG_ERROR to OSL_FAIL and correct OString usage
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index dc8f4b7..14df745 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -227,9 +227,9 @@ namespace dbp
}
catch(Exception&)
{
- DBG_ERROR( ::rtl::OString("OGridWizard::implApplySettings: unexpected exception while creating the grid column for field ")
- += ::rtl::OString(pFormFieldName->getStr(), pFormFieldName->getLength(), gsl_getSystemTextEncoding())
- += ::rtl::OString("!"));
+ OSL_FAIL( ( ::rtl::OString("OGridWizard::implApplySettings: unexpected exception while creating the grid column for field ")
+ += ::rtl::OString(pFormFieldName->getStr(), pFormFieldName->getLength(), gsl_getSystemTextEncoding())
+ += ::rtl::OString("!") ).getStr() );
}
}
}
commit 916adbef625e7a79a053c37239a480c76290ba49
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Mar 4 20:27:21 2011 +0100
Move DBG_ERROR to OSL_FAIL (multiline)
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 6d8f597..4b2ee5a 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -527,7 +527,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
catch(Exception& e)
{
(void) e;
- DBG_ERROR(
+ OSL_FAIL(
rtl::OUStringToOString(
(rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
commit 0a01eebf35b4c81192fe710ef3483723e1111427
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Mar 4 20:22:04 2011 +0100
Move DBG_ERROR to OSL_FAIL (multiline)
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 9f40dcb..c98375a 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -259,7 +259,7 @@ IMPL_LINK( SearchProgress, CleanUpHdl, void*, EMPTYARG )
short SearchProgress::Execute()
{
- DBG_ERROR( "SearchProgress cannot be executed via Dialog::Execute!\n"
+ OSL_FAIL( "SearchProgress cannot be executed via Dialog::Execute!\n"
"It creates a thread that will call back to VCL apartment => deadlock!\n"
"Use Dialog::StartExecuteModal to execute the dialog!" );
return RET_CANCEL;
@@ -434,7 +434,7 @@ IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG )
short TakeProgress::Execute()
{
- DBG_ERROR( "TakeProgress cannot be executed via Dialog::Execute!\n"
+ OSL_FAIL( "TakeProgress cannot be executed via Dialog::Execute!\n"
"It creates a thread that will call back to VCL apartment => deadlock!\n"
"Use Dialog::StartExecuteModal to execute the dialog!" );
return RET_CANCEL;
commit a3e9d39c1561976782e2db29947449f6c82488db
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Mar 4 20:07:42 2011 +0100
Remove dead code
diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx
index b95f894..dc6e44f 100644
--- a/automation/inc/automation/commtypes.hxx
+++ b/automation/inc/automation/commtypes.hxx
@@ -69,8 +69,6 @@ typedef sal_Unicode comm_UniChar;
#endif
-//#define DBG_ASSERT( cond, text )
-//#define DBG_ERROR( text )
#include <tools/debug.hxx>
#include <tools/solar.h>
commit 5ddae2a28d5d6be8b53e0bf7899e327a86a66dc9
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Mar 4 20:05:32 2011 +0100
Move DBG_ERROR to OSL_FAIL and correct OString usage
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 3673ac0..96c8b05 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -919,7 +919,7 @@ namespace pcr
::rtl::OUString sPropertyName( _rLine.pLine->GetEntryName() );
sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US );
sMessage += ::rtl::OString( "')!" );
- DBG_ERROR( sMessage );
+ OSL_FAIL( sMessage.getStr() );
}
#endif
if ( _rLine.xHandler.is() )
@@ -950,7 +950,7 @@ namespace pcr
::rtl::OUString sPropertyName( _rLine.pLine->GetEntryName() );
sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), RTL_TEXTENCODING_ASCII_US );
sMessage += ::rtl::OString( "')!" );
- DBG_ERROR( sMessage );
+ OSL_FAIL( sMessage.getStr() );
}
#endif
if ( _rLine.xHandler.is() )
commit c5b2d45f032c8ef27c03fae8106ab53ff792dfda
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Mar 3 14:37:38 2011 +0100
Move DBG_ERROR to OSL_FAIL for getStr()
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index e8b8271..ff340de 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -181,7 +181,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL StringRepresentation::getSupportedSer
::rtl::OString sMessage( "StringRepresentation::convertPropertyValueToStringRepresentation: cannot convert values of type '" );
sMessage += ::rtl::OString( PropertyValue.getValueType().getTypeName().getStr(), PropertyValue.getValueType().getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US );
sMessage += ::rtl::OString( "'!" );
- DBG_ERROR( sMessage.getStr() );
+ OSL_FAIL( sMessage.getStr() );
}
#endif
}
@@ -226,7 +226,7 @@ uno::Any SAL_CALL StringRepresentation::convertToPropertyValue(const ::rtl::OUSt
::rtl::OString sMessage( "StringRepresentation::convertStringRepresentationToPropertyValue: cannot convert into values of type '" );
sMessage += ::rtl::OString( ControlValueType.getTypeName().getStr(), ControlValueType.getTypeName().getLength(), RTL_TEXTENCODING_ASCII_US );
sMessage += ::rtl::OString( "'!" );
- DBG_ERROR( sMessage.getStr() );
+ OSL_FAIL( sMessage.getStr() );
}
#endif
}
diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx
index b933708..88251a5 100644
--- a/forms/source/richtext/attributedispatcher.cxx
+++ b/forms/source/richtext/attributedispatcher.cxx
@@ -114,7 +114,7 @@ namespace frm
sMessage += "\n (URL: ";
sMessage += ::rtl::OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US );
sMessage += ")";
- DBG_ERROR( sMessage.getStr() );
+ OSL_FAIL( sMessage.getStr() );
}
#endif
commit 9b7bf35aa5575cb4e6e3c542321546593cddd077
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Mar 3 13:24:43 2011 +0100
Move DBG_ERROR to OSL_FAIL for strings foo().GetBuffer()
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index d85cbe1..29ee460 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -215,7 +215,7 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm)
String sMsg(String::CreateFromAscii("::getColumns : catched an exception ("));
sMsg += String(e.Message);
sMsg.AppendAscii(") ...");
- DBG_ERROR( ByteString(sMsg, RTL_TEXTENCODING_ASCII_US ).GetBuffer());
+ OSL_FAIL( ByteString(sMsg, RTL_TEXTENCODING_ASCII_US ).GetBuffer());
#endif
}
commit fdc4c5d387fbbf6900c6e60e2dbc7f614a798f5c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Mar 3 12:59:38 2011 +0100
Move DBG_ERROR to OSL_FAIL for strings GetBuffer()
diff --git a/extensions/source/svg/svgaction.cxx b/extensions/source/svg/svgaction.cxx
index 43967a0..b3d1653 100644
--- a/extensions/source/svg/svgaction.cxx
+++ b/extensions/source/svg/svgaction.cxx
@@ -1449,7 +1449,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
default :
ByteString aDbgOut( "SVGActionWriter::ImplWriteActions: unsupported MetaAction #" );
aDbgOut.Append( ByteString::CreateFromInt32( nType ) );
- DBG_ERROR( aDbgOut.GetBuffer() );
+ OSL_FAIL( aDbgOut.GetBuffer() );
break;
#endif
}
More information about the Libreoffice-commits
mailing list