diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-01 17:55:09 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-02 15:00:30 +0100 |
commit | fdeb50167836803f1a79082ddd25e4ae8ac20611 (patch) | |
tree | 3e9ff2e3cba72052ce97b0b16575791d2cdbdf6f /cui | |
parent | 096b61aa08ee37c6d6818791a7c5fb94d2f1ef7d (diff) |
Move DBG_ERROR to OSL_FAIL
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/customize/cfgutil.cxx | 2 | ||||
-rw-r--r-- | cui/source/customize/selector.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/cuigrfflt.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/dlgname.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/hltpbase.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/insdlg.cxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/showcols.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/zoom.cxx | 8 | ||||
-rw-r--r-- | cui/source/options/optasian.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/optgdlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optlingu.cxx | 10 | ||||
-rw-r--r-- | cui/source/options/optsave.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/treeopt.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/macroass.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/paragrph.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/swpossizetabpage.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/textattr.cxx | 2 |
20 files changed, 35 insertions, 35 deletions
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index c971e26d6aed..18f1fa122562 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -1510,7 +1510,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry ) } default: - DBG_ERROR( "Falscher Gruppentyp!" ); + OSL_FAIL( "Falscher Gruppentyp!" ); break; } } diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 09bb03b22d22..6fee34f67ca6 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -953,7 +953,7 @@ void SvxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry ) } default: - DBG_ERROR( "Falscher Gruppentyp!" ); + OSL_FAIL( "Falscher Gruppentyp!" ); break; } } diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 9a31c62a2ffd..0e67419122ce 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -1058,7 +1058,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG ) catch(IllegalArgumentException) { #ifdef DBG_UTIL - DBG_ERROR( "Folder picker failed with illegal arguments" ); + OSL_FAIL( "Folder picker failed with illegal arguments" ); #endif } } diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index cc5981f2ef97..82e95178a2bb 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -447,7 +447,7 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, switch( maCtlLight.GetActualRP() ) { - default: DBG_ERROR("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" ); + default: OSL_FAIL("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" ); case( RP_LT ): nAzim = 4500, nElev = 4500; break; case( RP_MT ): nAzim = 9000, nElev = 4500; break; case( RP_RT ): nAzim = 13500, nElev = 4500; break; diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index c5941a6f8419..e624b0ef2d5d 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -223,7 +223,7 @@ void SvxMessDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt ) break; default: - DBG_ERROR( "Falsche Button-Nummer!!!" ); + OSL_FAIL( "Falsche Button-Nummer!!!" ); } } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 299673965ce1..01d01525bc1f 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -906,7 +906,7 @@ namespace svx case HHC::eRubyHangulAbove: m_pHangulAbove->Check(); break; case HHC::eRubyHangulBelow: m_pHangulBelow->Check(); break; default: - DBG_ERROR( "HangulHanjaConversionDialog::SetConversionFormat: unknown type!" ); + OSL_FAIL( "HangulHanjaConversionDialog::SetConversionFormat: unknown type!" ); } } @@ -928,7 +928,7 @@ namespace svx if ( m_pHangulBelow->IsChecked() ) return HHC::eRubyHangulBelow; - DBG_ERROR( "HangulHanjaConversionDialog::GetConversionFormat: no radio checked?" ); + OSL_FAIL( "HangulHanjaConversionDialog::GetConversionFormat: no radio checked?" ); return HHC::eSimpleConversion; } diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index cdf0c492c24c..0b4abd3a03f9 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -532,7 +532,7 @@ BOOL SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL ) } catch( ... ) { - DBG_ERROR( "FileExists: ucb error" ); + OSL_FAIL( "FileExists: ucb error" ); } } diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index e12ad0ddfce1..041ef64e5d26 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -676,7 +676,7 @@ short SvInsertAppletDialog::Execute() } catch ( uno::Exception& ) { - DBG_ERROR( "No Applet!" ); + OSL_FAIL( "No Applet!" ); } } else @@ -726,7 +726,7 @@ short SvInsertAppletDialog::Execute() } catch ( uno::Exception& ) { - DBG_ERROR( "No Applet!" ); + OSL_FAIL( "No Applet!" ); } } } @@ -909,7 +909,7 @@ short SfxInsertFloatingFrameDialog::Execute() } catch ( uno::Exception& ) { - DBG_ERROR( "No IFrame!" ); + OSL_FAIL( "No IFrame!" ); } } else @@ -996,7 +996,7 @@ short SfxInsertFloatingFrameDialog::Execute() } catch ( uno::Exception& ) { - DBG_ERROR( "No IFrame!" ); + OSL_FAIL( "No IFrame!" ); } } } diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index e43d8b5dd8b3..f5b9affb4d80 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -83,7 +83,7 @@ IMPL_LINK( FmShowColsDialog, OnClickedOk, Button*, EMPTYARG ) } catch(...) { - DBG_ERROR("FmShowColsDialog::OnClickedOk Exception occurred!"); + OSL_FAIL("FmShowColsDialog::OnClickedOk Exception occurred!"); } } } @@ -121,7 +121,7 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com: } catch(...) { - DBG_ERROR("FmShowColsDialog::SetColumns Exception occurred!"); + OSL_FAIL("FmShowColsDialog::SetColumns Exception occurred!"); } // if the col is hidden, put it into the list diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index fb5c9c2bf8d9..42eda26ff2ff 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -139,7 +139,7 @@ void SvxZoomDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt ) break; default: - DBG_ERROR( "wrong button number" ); + OSL_FAIL( "wrong button number" ); } } @@ -162,7 +162,7 @@ void SvxZoomDialog::HideButton( USHORT nBtnId ) break; default: - DBG_ERROR( "Falsche Button-Nummer!!!" ); + OSL_FAIL( "Falsche Button-Nummer!!!" ); } } @@ -424,7 +424,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn ) } else { - DBG_ERROR( "Wrong Button" ); + OSL_FAIL( "Wrong Button" ); return 0; } @@ -506,7 +506,7 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn ) } else { - DBG_ERROR( "Wrong Button" ); + OSL_FAIL( "Wrong Button" ); return 0; } pOutSet = new SfxItemSet( rSet ); diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 45e28014db95..f04a50dc076f 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -225,7 +225,7 @@ BOOL SvxAsianLayoutPage::FillItemSet( SfxItemSet& ) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters"); + OSL_FAIL("exception in XForbiddenCharacters"); } } eLastUsedLanguageTypeForForbiddenCharacters = aLanguageLB.GetSelectLanguage(); @@ -359,7 +359,7 @@ IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG ) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters"); + OSL_FAIL("exception in XForbiddenCharacters"); } } } @@ -422,7 +422,7 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit) } catch(Exception&) { - DBG_ERROR("exception in XForbiddenCharacters"); + OSL_FAIL("exception in XForbiddenCharacters"); } } pImpl->aConfig.SetStartEndChars( aLocale, bEnable ? &sStart : 0, bEnable ? &sEnd : 0); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index b187dc698993..138d67e30f39 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -940,7 +940,7 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& ) case 1: eSet = SFX_SYMBOLS_SIZE_SMALL; break; case 2: eSet = SFX_SYMBOLS_SIZE_LARGE; break; default: - DBG_ERROR( "OfaViewTabPage::FillItemSet(): This state of aIconSizeLB should not be possible!" ); + OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of aIconSizeLB should not be possible!" ); } aMiscOptions.SetSymbolsSize( eSet ); } diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 7b352ed2f5ef..caa0f8c66776 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1845,7 +1845,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) case EID_NUM_POST_BREAK : nRID = STR_NUM_POST_BREAK_DLG; break; case EID_NUM_MIN_WORDLEN: nRID = STR_NUM_MIN_WORDLEN_DLG; break; default: - DBG_ERROR( "unexpected case" ); + OSL_FAIL( "unexpected case" ); } OptionsBreakSet aDlg( this, nRID ); @@ -1865,7 +1865,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) } else { - DBG_ERROR( "pBtn unexpected value" ); + OSL_FAIL( "pBtn unexpected value" ); } return 0; @@ -1901,7 +1901,7 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox ) } else { - DBG_ERROR( "pBox unexpected value" ); + OSL_FAIL( "pBox unexpected value" ); } return 0; @@ -2122,7 +2122,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) } else { - DBG_ERROR( "pBox unexpected value" ); + OSL_FAIL( "pBox unexpected value" ); } return 0; @@ -2467,7 +2467,7 @@ IMPL_LINK( SvxEditModulesDlg, ClickHdl_Impl, PushButton *, pBtn ) } else { - DBG_ERROR( "pBtn unexpected value" ); + OSL_FAIL( "pBtn unexpected value" ); } return 0; diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 37c728a6d602..625f9f6fed90 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -495,7 +495,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& ) case APP_IMPRESS : sReplace = C2U("com.sun.star.presentation.PresentationDocument");break; case APP_DRAW : sReplace = C2U("com.sun.star.drawing.DrawingDocument");break; case APP_MATH : sReplace = C2U("com.sun.star.formula.FormulaProperties");break; - default: DBG_ERROR("illegal user data"); + default: OSL_FAIL("illegal user data"); } String sTmp(sCommand); sTmp.SearchAndReplaceAscii("%1", sReplace); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 4a54bfd4a42b..0fb8a89b667f 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1692,7 +1692,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet default: { - DBG_ERROR( "Unhandled option in ApplyItemSet" ); + OSL_FAIL( "Unhandled option in ApplyItemSet" ); } break; } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index ce9bdc84f5da..04583b55b0fb 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2151,7 +2151,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) cDlg = pAutoCorrect->GetQuote('\"',FALSE,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 break; default: - DBG_ERROR("svx::OfaQuoteTabPage::QuoteHdl(), how to initialize cDlg?" ); + OSL_FAIL("svx::OfaQuoteTabPage::QuoteHdl(), how to initialize cDlg?" ); cDlg = 0; break; diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index b60c158f27aa..fe8107ef8b85 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -175,7 +175,7 @@ void _SfxMacroTabPage::EnableButtons( const String& rLangName ) sEventMacro = ((SvLBoxString*)pE->GetItem( LB_MACROS_ITEMPOS ))->GetText(); if ( rLangName.EqualsAscii("JavaScript") ) { - DBG_ERROR( "_SfxMacroTabPage::EnableButtons(): this is not an up to date usage!" ); + OSL_FAIL( "_SfxMacroTabPage::EnableButtons(): this is not an up to date usage!" ); } else { diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index ee7f6256a66d..afabe8b31d02 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -268,7 +268,7 @@ BOOL SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) break; default: - DBG_ERROR( "unbekannter Type fuer Zeilenabstand." ); + OSL_FAIL( "unbekannter Type fuer Zeilenabstand." ); break; } eState = GetItemSet().GetItemState( nWhich ); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 802440a55464..7a53da94b26c 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1787,7 +1787,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) m_pSdrView = pSdrView; if(!m_pSdrView) { - DBG_ERROR("No SdrView* set"); + OSL_FAIL("No SdrView* set"); return; } @@ -1858,7 +1858,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) ( eKind==OBJ_TEXT || eKind==OBJ_TITLETEXT || eKind==OBJ_OUTLINETEXT) && ( (SdrTextObj*) pObj )->HasText() ) { - DBG_ERROR("AutoWidth/AutoHeight should be enabled"); + OSL_FAIL("AutoWidth/AutoHeight should be enabled"); } } #endif diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index cda0759de37e..8a4a59fa238f 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -418,7 +418,7 @@ BOOL SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) switch( eState ) { default: ; //prevent warning - DBG_ERROR( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" ); + OSL_FAIL( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" ); case STATE_NOCHECK: eFTS = SDRTEXTFIT_NONE; break; case STATE_CHECK: eFTS = SDRTEXTFIT_AUTOFIT; break; } |