diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-01 19:08:19 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-02 14:46:42 +0100 |
commit | 11d20507806d30e2d1955b93a568b84a2216ef69 (patch) | |
tree | b34fa3afac27eac9404f16e46b530aa2cbcad41d /unotools | |
parent | 7b981b7cab15e0fc2ebb159df2d40c3a2499b265 (diff) |
Move DBG_ERROR to OSL_FAIL
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/source/config/cmdoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/dynamicmenuoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/extendedsecurityoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/fltrcfg.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/fontcfg.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/pathoptions.cxx | 4 | ||||
-rw-r--r-- | unotools/source/config/saveopt.cxx | 6 | ||||
-rw-r--r-- | unotools/source/config/searchopt.cxx | 6 | ||||
-rw-r--r-- | unotools/source/config/undoopt.cxx | 4 | ||||
-rw-r--r-- | unotools/source/misc/sharedunocomponent.cxx | 4 | ||||
-rw-r--r-- | unotools/source/property/propertysethelper.cxx | 6 | ||||
-rw-r--r-- | unotools/source/property/propertysetinfo.cxx | 4 | ||||
-rw-r--r-- | unotools/source/ucbhelper/ucblockbytes.cxx | 6 |
13 files changed, 25 insertions, 25 deletions
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index 18662c4e90c0..b17771cb4369 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -362,7 +362,7 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& ) //***************************************************************************************************************** void SvtCommandOptions_Impl::Commit() { - DBG_ERROR( "SvtCommandOptions_Impl::Commit()\nNot implemented yet!\n" ); + OSL_FAIL( "SvtCommandOptions_Impl::Commit()\nNot implemented yet!\n" ); } //***************************************************************************************************************** diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index 87f535f72399..76950ee441bc 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.cxx @@ -539,7 +539,7 @@ void SvtDynamicMenuOptions_Impl::Notify( const Sequence< OUString >& ) //***************************************************************************************************************** void SvtDynamicMenuOptions_Impl::Commit() { - DBG_ERROR( "SvtDynamicMenuOptions_Impl::Commit()\nNot implemented yet!\n" ); + OSL_FAIL( "SvtDynamicMenuOptions_Impl::Commit()\nNot implemented yet!\n" ); /* // Write all properties! // Delete complete sets first. diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index 12598f4fb9ab..d64958b15b4e 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -257,7 +257,7 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl() if ( seqValues[nProperty] >>= nMode ) m_eOpenHyperlinkMode = (SvtExtendedSecurityOptions::OpenHyperlinkMode)nMode; else { - DBG_ERROR("Wrong type for Open mode!"); + OSL_FAIL("Wrong type for Open mode!"); } m_bROOpenHyperlinkMode = seqRO[nProperty]; } diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index 9b0ef5322179..e380bcbb0b7e 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.cxx @@ -374,7 +374,7 @@ static ULONG lcl_GetFlag(sal_Int32 nProp) case 10: nFlag = FILTERCFG_ENABLE_WORD_PREVIEW; break; case 11: nFlag = FILTERCFG_USE_ENHANCED_FIELDS; break; - default: DBG_ERROR("illegal value"); + default: OSL_FAIL("illegal value"); } return nFlag; } diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index d6b39f621b87..ac2e7f797f76 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -95,7 +95,7 @@ static const char* getKeyType( int nKeyType ) case DEFAULTFONT_UI_FIXED: return "UI_FIXED"; case DEFAULTFONT_UI_SANS: return "UI_SANS"; default: - DBG_ERROR( "unmatched type" ); + OSL_FAIL( "unmatched type" ); return ""; } } diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 135c3467da8a..3d7eddf9c89f 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -468,7 +468,7 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() : if ( !m_xPathSettings.is() ) { // #112719#: check for existance - DBG_ERROR( "SvtPathOptions_Impl::SvtPathOptions_Impl(): #112719# happened again!" ); + OSL_FAIL( "SvtPathOptions_Impl::SvtPathOptions_Impl(): #112719# happened again!" ); throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Service com.sun.star.util.PathSettings cannot be created" )), Reference< XInterface >() ); @@ -481,7 +481,7 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() : if ( !m_xSubstVariables.is() ) { // #112719#: check for existance - DBG_ERROR( "SvtPathOptions_Impl::SvtPathOptions_Impl(): #112719# happened again!" ); + OSL_FAIL( "SvtPathOptions_Impl::SvtPathOptions_Impl(): #112719# happened again!" ); throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Service com.sun.star.util.PathSubstitution cannot be created" )), Reference< XInterface >() ); diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 3a28cbc0a8e1..80ba32920550 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -442,7 +442,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() if ( pValues[nProp] >>= nTemp ) nAutoSaveTime = nTemp; else { - DBG_ERROR( "Wrong Type!" ); + OSL_FAIL( "Wrong Type!" ); }; bROAutoSaveTime = pROStates[nProp]; break; @@ -533,7 +533,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() } else { - DBG_ERROR( "Wrong Type!" ); + OSL_FAIL( "Wrong Type!" ); } } } @@ -559,7 +559,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeIntervall"))) >>= nAutoSaveTime; } catch(const css::uno::Exception&) - { DBG_ERROR("Could not find needed informations for AutoSave feature."); } + { OSL_FAIL("Could not find needed informations for AutoSave feature."); } } SvtSaveOptions_Impl::~SvtSaveOptions_Impl() diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index 9f9e5ff5e8d9..5da91ee1789a 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -216,18 +216,18 @@ BOOL SvtSearchOptions_Impl::Load() SetFlag( i, bVal ); } else { - DBG_ERROR( "unexpected index" ); + OSL_FAIL( "unexpected index" ); } } else { - DBG_ERROR( "unexpected type" ); + OSL_FAIL( "unexpected type" ); bSucc = FALSE; } } else { - DBG_ERROR( "value missing" ); + OSL_FAIL( "value missing" ); bSucc = FALSE; } } diff --git a/unotools/source/config/undoopt.cxx b/unotools/source/config/undoopt.cxx index 45f296fdcbe1..36c1c2308ec5 100644 --- a/unotools/source/config/undoopt.cxx +++ b/unotools/source/config/undoopt.cxx @@ -132,13 +132,13 @@ void SvtUndoOptions_Impl::Load() nUndoCount = nTemp; else { - DBG_ERROR( "Wrong Type!" ); + OSL_FAIL( "Wrong Type!" ); } break; } default: - DBG_ERROR( "Wrong Type!" ); + OSL_FAIL( "Wrong Type!" ); break; } } diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx index a921ebae3a58..62461bd2d480 100644 --- a/unotools/source/misc/sharedunocomponent.cxx +++ b/unotools/source/misc/sharedunocomponent.cxx @@ -208,7 +208,7 @@ namespace utl // this should be unreachable: As long as we're a CloseListener, we veto the closing. If we're going // to close the component ourself, then we revoke ourself as listener *before* the close call. So, // if this here fires, something went definately wrong. - DBG_ERROR( "CloseableComponentImpl::notifyClosing: unreachable!" ); + OSL_FAIL( "CloseableComponentImpl::notifyClosing: unreachable!" ); } //-------------------------------------------------------------------- @@ -219,7 +219,7 @@ namespace utl ) throw (RuntimeException) { DBG_ASSERT( Source.Source == m_xCloseable, "CloseableComponentImpl::disposing: where did this come from?" ); - DBG_ERROR( "CloseableComponentImpl::disposing: unreachable!" ); + OSL_FAIL( "CloseableComponentImpl::disposing: unreachable!" ); // same reasoning for this assertion as in ->notifyClosing } diff --git a/unotools/source/property/propertysethelper.cxx b/unotools/source/property/propertysethelper.cxx index 26901e2ca46e..8e884cffbbea 100644 --- a/unotools/source/property/propertysethelper.cxx +++ b/unotools/source/property/propertysethelper.cxx @@ -285,17 +285,17 @@ Any SAL_CALL PropertySetHelper::getPropertyDefault( const ::rtl::OUString& aProp void PropertySetHelper::_getPropertyStates( const utl::PropertyMapEntry** /*ppEntries*/, PropertyState* /*pStates*/ ) throw(UnknownPropertyException ) { - DBG_ERROR( "you have to implement this yourself!" ); + OSL_FAIL( "you have to implement this yourself!" ); } void PropertySetHelper::_setPropertyToDefault( const utl::PropertyMapEntry* /*pEntry*/ ) throw(UnknownPropertyException ) { - DBG_ERROR( "you have to implement this yourself!" ); + OSL_FAIL( "you have to implement this yourself!" ); } Any PropertySetHelper::_getPropertyDefault( const utl::PropertyMapEntry* /*pEntry*/ ) throw(UnknownPropertyException, WrappedTargetException ) { - DBG_ERROR( "you have to implement this yourself!" ); + OSL_FAIL( "you have to implement this yourself!" ); Any aAny; return aAny; diff --git a/unotools/source/property/propertysetinfo.cxx b/unotools/source/property/propertysetinfo.cxx index 06feee364746..295486d3bf4c 100644 --- a/unotools/source/property/propertysetinfo.cxx +++ b/unotools/source/property/propertysetinfo.cxx @@ -81,12 +81,12 @@ void PropertyMapImpl::add( PropertyMapEntry* pMap ) throw() PropertyMap::iterator aIter = maPropertyMap.find( aName ); if( aIter != maPropertyMap.end() ) { - DBG_ERROR( "Warning: PropertyMapEntry added twice, possible error!" ); + OSL_FAIL( "Warning: PropertyMapEntry added twice, possible error!" ); } #endif if( NULL == pMap->mpType ) { - DBG_ERROR( "No type in PropertyMapEntry!" ); + OSL_FAIL( "No type in PropertyMapEntry!" ); pMap->mpType = &::getCppuType((const sal_Int32*)0); } diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 5439aacc256d..ac97a15f4b24 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1377,7 +1377,7 @@ void UcbLockBytes::terminate_Impl() if ( GetError() == ERRCODE_NONE && !m_xInputStream.is() ) { - DBG_ERROR("No InputStream, but no error set!" ); + OSL_FAIL("No InputStream, but no error set!" ); SetError( ERRCODE_IO_NOTEXISTS ); } @@ -1648,7 +1648,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo if ( xLockBytes->GetError() == ERRCODE_NONE && ( bError || !xLockBytes->getInputStream().is() ) ) { - DBG_ERROR("No InputStream, but no error set!" ); + OSL_FAIL("No InputStream, but no error set!" ); xLockBytes->SetError( ERRCODE_IO_GENERAL ); } @@ -1699,7 +1699,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo if ( xLockBytes->GetError() == ERRCODE_NONE && ( bError || !xLockBytes->getInputStream().is() ) ) { - DBG_ERROR("No InputStream, but no error set!" ); + OSL_FAIL("No InputStream, but no error set!" ); xLockBytes->SetError( ERRCODE_IO_GENERAL ); } |