diff options
Diffstat (limited to 'svtools')
20 files changed, 86 insertions, 63 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 253db14d8205..31e4a187574f 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -76,7 +76,7 @@ namespace void BrowseBox::ConstructImpl( BrowserMode nMode ) { - DBG_TRACE1( "BrowseBox: %p->ConstructImpl", this ); + OSL_TRACE( "BrowseBox: %p->ConstructImpl", this ); bMultiSelection = sal_False; pColSel = 0; pDataWin = 0; @@ -155,7 +155,7 @@ BrowseBox::BrowseBox( Window* pParent, const ResId& rId, BrowserMode nMode ) BrowseBox::~BrowseBox() { DBG_DTOR(BrowseBox,BrowseBoxCheckInvariants); - DBG_TRACE1( "BrowseBox: %p~", this ); + OSL_TRACE( "BrowseBox: %p~", this ); if ( m_pImpl->m_pAccessible ) { @@ -386,7 +386,7 @@ void BrowseBox::SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId) { pColSel->Select( GetColumnPos( _nSelectedColumnId ) ); ToggleSelection(); - DBG_TRACE1( "BrowseBox: %p->SetToggledSelectedColumn", this ); + OSL_TRACE( "BrowseBox: %p->SetToggledSelectedColumn", this ); DoShowCursor( "SetToggledSelectedColumn" ); } } @@ -1427,7 +1427,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint ) if ( bDoPaint ) { // hide cursor and selection - DBG_TRACE1( "BrowseBox: %p->HideCursor", this ); + OSL_TRACE( "BrowseBox: %p->HideCursor", this ); ToggleSelection(); DoHideCursor( "RowRemoved" ); } @@ -1506,7 +1506,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint ) { // reshow cursor and selection ToggleSelection(); - DBG_TRACE1( "BrowseBox: %p->ShowCursor", this ); + OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); DoShowCursor( "RowRemoved" ); // adjust the vertical scrollbar @@ -1778,7 +1778,7 @@ void BrowseBox::SetNoSelection() // nothing to do return; - DBG_TRACE1( "BrowseBox: %p->HideCursor", this ); + OSL_TRACE( "BrowseBox: %p->HideCursor", this ); ToggleSelection(); // unselect all @@ -1794,7 +1794,7 @@ void BrowseBox::SetNoSelection() bSelect = sal_True; // restore screen - DBG_TRACE1( "BrowseBox: %p->ShowCursor", this ); + OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); if ( isAccessibleAlive() ) { @@ -1814,7 +1814,7 @@ void BrowseBox::SetSelection( const MultiSelection &rSel ) DBG_ASSERT( bMultiSelection, "SetSelection only allowed with Multi-Selection-Mode" ); // prepare inverted areas - DBG_TRACE1( "BrowseBox: %p->HideCursor", this ); + OSL_TRACE( "BrowseBox: %p->HideCursor", this ); ToggleSelection(); // assign Selection @@ -1831,7 +1831,7 @@ void BrowseBox::SetSelection( const MultiSelection &rSel ) // restore screen ToggleSelection(); - DBG_TRACE1( "BrowseBox: %p->ShowCursor", this ); + OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); if ( isAccessibleAlive() ) { @@ -1852,7 +1852,7 @@ void BrowseBox::SelectAll() if ( !bMultiSelection ) return; - DBG_TRACE1( "BrowseBox: %p->HideCursor", this ); + OSL_TRACE( "BrowseBox: %p->HideCursor", this ); ToggleSelection(); // select all rows @@ -1885,7 +1885,7 @@ void BrowseBox::SelectAll() bSelect = sal_True; // restore screen - DBG_TRACE1( "BrowseBox: %p->ShowCursor", this ); + OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); if ( isAccessibleAlive() ) { @@ -1924,7 +1924,7 @@ void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand ) return; } - DBG_TRACE1( "BrowseBox: %p->HideCursor", this ); + OSL_TRACE( "BrowseBox: %p->HideCursor", this ); // remove old selection? if ( !bExpand || !bMultiSelection ) @@ -1966,7 +1966,7 @@ void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand ) bSelect = sal_True; // restore screen - DBG_TRACE1( "BrowseBox: %p->ShowCursor", this ); + OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); if ( isAccessibleAlive() ) { @@ -2015,7 +2015,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B return; } - DBG_TRACE1( "BrowseBox: %p->HideCursor", this ); + OSL_TRACE( "BrowseBox: %p->HideCursor", this ); ToggleSelection(); if ( bMultiSelection ) uRow.pSel->SelectAll(sal_False); @@ -2057,7 +2057,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B } // restore screen - DBG_TRACE1( "BrowseBox: %p->ShowCursor", this ); + OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); } //------------------------------------------------------------------- @@ -2688,11 +2688,11 @@ void BrowseBox::CursorMoved() void BrowseBox::LoseFocus() { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); - DBG_TRACE1( "BrowseBox: %p->LoseFocus", this ); + OSL_TRACE( "BrowseBox: %p->LoseFocus", this ); if ( bHasFocus ) { - DBG_TRACE1( "BrowseBox: %p->HideCursor", this ); + OSL_TRACE( "BrowseBox: %p->HideCursor", this ); DoHideCursor( "LoseFocus" ); if ( !bKeepHighlight ) @@ -2711,7 +2711,7 @@ void BrowseBox::LoseFocus() void BrowseBox::GetFocus() { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); - DBG_TRACE1( "BrowseBox: %p->GetFocus", this ); + OSL_TRACE( "BrowseBox: %p->GetFocus", this ); if ( !bHasFocus ) { diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 74b930804e5d..9c9796baa90b 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1535,7 +1535,7 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt ) void BrowseBox::MouseMove( const MouseEvent& rEvt ) { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); - DBG_TRACE( "BrowseBox::MouseMove( MouseEvent )" ); + OSL_TRACE( "BrowseBox::MouseMove( MouseEvent )" ); Pointer aNewPointer; diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 246066bf8a1f..929aa3303a77 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -268,7 +268,7 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e #endif break; default: - OSL_ENSURE(0,"BrowseBox::GetAccessibleName: invalid enum!"); + OSL_FAIL("BrowseBox::GetAccessibleName: invalid enum!"); } return aRetText; } @@ -375,7 +375,7 @@ void BrowseBox::FillAccessibleStateSet( case ::svt::BBTYPE_ROWHEADERCELL: case ::svt::BBTYPE_COLUMNHEADERCELL: case ::svt::BBTYPE_CHECKBOXCELL: - OSL_ENSURE(0,"Illegal call here!"); + OSL_FAIL("Illegal call here!"); break; } } diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index fa7c3d6b87e4..59bb82aa2c56 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -123,7 +123,7 @@ public: aMessage.append( ::rtl::OUStringToOString( _sComponentName, RTL_TEXTENCODING_UTF8 ) ); aMessage.append( "\nname: " ); aMessage.append( ::rtl::OUStringToOString( _sName, RTL_TEXTENCODING_UTF8 ) ); - OSL_ENSURE( 0, aMessage.makeStringAndClear().getStr() ); + OSL_FAIL( aMessage.makeStringAndClear().getStr() ); #endif return ExtendedColorConfigValue(); } diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index b9b9a0cc93a1..7f57664af5f1 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -86,7 +86,7 @@ ItemHolder2::ItemHolder2() sMsg += ::rtl::OString(rEx.Message.getStr(), rEx.Message.getLength(), RTL_TEXTENCODING_ASCII_US); - DBG_ERROR(sMsg.getStr()); + OSL_FAIL(sMsg.getStr()); } } #else diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index f2bb42330099..b16d383ad277 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -353,7 +353,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() { if( !(seqValues[nProperty] >>= m_bPluginsEnabled) ) { - DBG_ERROR("Wrong type of \"Misc\\PluginsEnabled\"!" ); + OSL_FAIL("Wrong type of \"Misc\\PluginsEnabled\"!" ); } m_bIsPluginsEnabledRO = seqRO[nProperty]; break; @@ -363,7 +363,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() { if( !(seqValues[nProperty] >>= m_nSymbolsSize) ) { - DBG_ERROR("Wrong type of \"Misc\\SymbolSet\"!" ); + OSL_FAIL("Wrong type of \"Misc\\SymbolSet\"!" ); } m_bIsSymbolsSizeRO = seqRO[nProperty]; break; @@ -373,7 +373,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() { if( !(seqValues[nProperty] >>= m_nToolboxStyle) ) { - DBG_ERROR("Wrong type of \"Misc\\ToolboxStyle\"!" ); + OSL_FAIL("Wrong type of \"Misc\\ToolboxStyle\"!" ); } m_bIsToolboxStyleRO = seqRO[nProperty]; break; @@ -383,7 +383,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() { if( !(seqValues[nProperty] >>= m_bUseSystemFileDialog) ) { - DBG_ERROR("Wrong type of \"Misc\\UseSystemFileDialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\UseSystemFileDialog\"!" ); } m_bIsUseSystemFileDialogRO = seqRO[nProperty]; break; @@ -393,7 +393,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() { if( !(seqValues[nProperty] >>= m_bUseSystemPrintDialog) ) { - DBG_ERROR("Wrong type of \"Misc\\UseSystemPrintDialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\UseSystemPrintDialog\"!" ); } m_bIsUseSystemPrintDialogRO = seqRO[nProperty]; break; @@ -403,7 +403,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() { if( !(seqValues[nProperty] >>= m_bTryODMADialog) ) { - DBG_ERROR("Wrong type of \"Misc\\TryODMADialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\TryODMADialog\"!" ); } m_bIsTryODMADialogRO = seqRO[nProperty]; break; @@ -413,7 +413,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() { if( !(seqValues[nProperty] >>= m_bShowLinkWarningDialog) ) { - DBG_ERROR("Wrong type of \"Misc\\ShowLinkWarningDialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\ShowLinkWarningDialog\"!" ); } m_bIsShowLinkWarningDialogRO = seqRO[nProperty]; break; @@ -426,7 +426,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() SetSymbolsStyleName( aSymbolsStyle ); else { - DBG_ERROR("Wrong type of \"Misc\\SymbolStyle\"!" ); + OSL_FAIL("Wrong type of \"Misc\\SymbolStyle\"!" ); } m_bIsSymbolsStyleRO = seqRO[nProperty]; break; @@ -435,19 +435,19 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl() case PROPERTYHANDLE_DISABLEUICUSTOMIZATION : { if( !(seqValues[nProperty] >>= m_bDisableUICustomization) ) - DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" ); + OSL_FAIL("Wrong type of \"Misc\\DisableUICustomization\"!" ); break; } case PROPERTYHANDLE_ALWAYSALLOWSAVE : { if( !(seqValues[nProperty] >>= m_bAlwaysAllowSave) ) - DBG_ERROR("Wrong type of \"Misc\\AlwaysAllowSave\"!" ); + OSL_FAIL("Wrong type of \"Misc\\AlwaysAllowSave\"!" ); break; } case PROPERTYHANDLE_EXPERIMENTALMODE : { if( !(seqValues[nProperty] >>= m_bExperimentalMode) ) - DBG_ERROR("Wrong type of \"Misc\\ExperimentalMode\"!" ); + OSL_FAIL("Wrong type of \"Misc\\ExperimentalMode\"!" ); break; } } @@ -503,49 +503,49 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) case PROPERTYHANDLE_PLUGINSENABLED : { if( !(seqValues[nProperty] >>= m_bPluginsEnabled) ) { - DBG_ERROR("Wrong type of \"Misc\\PluginsEnabled\"!" ); + OSL_FAIL("Wrong type of \"Misc\\PluginsEnabled\"!" ); } } break; case PROPERTYHANDLE_SYMBOLSET : { if( !(seqValues[nProperty] >>= m_nSymbolsSize) ) { - DBG_ERROR("Wrong type of \"Misc\\SymbolSet\"!" ); + OSL_FAIL("Wrong type of \"Misc\\SymbolSet\"!" ); } } break; case PROPERTYHANDLE_TOOLBOXSTYLE : { if( !(seqValues[nProperty] >>= m_nToolboxStyle) ) { - DBG_ERROR("Wrong type of \"Misc\\ToolboxStyle\"!" ); + OSL_FAIL("Wrong type of \"Misc\\ToolboxStyle\"!" ); } } break; case PROPERTYHANDLE_USESYSTEMFILEDIALOG : { if( !(seqValues[nProperty] >>= m_bUseSystemFileDialog) ) { - DBG_ERROR("Wrong type of \"Misc\\UseSystemFileDialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\UseSystemFileDialog\"!" ); } } break; case PROPERTYHANDLE_USESYSTEMPRINTDIALOG : { if( !(seqValues[nProperty] >>= m_bUseSystemPrintDialog) ) { - DBG_ERROR("Wrong type of \"Misc\\UseSystemPrintDialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\UseSystemPrintDialog\"!" ); } } break; case PROPERTYHANDLE_TRYODMADIALOG : { if( !(seqValues[nProperty] >>= m_bTryODMADialog) ) { - DBG_ERROR("Wrong type of \"Misc\\TryODMADialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\TryODMADialog\"!" ); } } break; case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG : { if( !(seqValues[nProperty] >>= m_bShowLinkWarningDialog) ) { - DBG_ERROR("Wrong type of \"Misc\\ShowLinkWarningDialog\"!" ); + OSL_FAIL("Wrong type of \"Misc\\ShowLinkWarningDialog\"!" ); } } break; @@ -555,19 +555,19 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames ) SetSymbolsStyleName( aSymbolsStyle ); else { - DBG_ERROR("Wrong type of \"Misc\\SymbolStyle\"!" ); + OSL_FAIL("Wrong type of \"Misc\\SymbolStyle\"!" ); } } break; case PROPERTYHANDLE_DISABLEUICUSTOMIZATION : { if( !(seqValues[nProperty] >>= m_bDisableUICustomization) ) - DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" ); + OSL_FAIL("Wrong type of \"Misc\\DisableUICustomization\"!" ); } break; case PROPERTYHANDLE_ALWAYSALLOWSAVE: { if( !(seqValues[nProperty] >>= m_bAlwaysAllowSave) ) - DBG_ERROR("Wrong type of \"Misc\\AlwaysAllowSave\"!" ); + OSL_FAIL("Wrong type of \"Misc\\AlwaysAllowSave\"!" ); } break; } diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 90d0cb9e096a..4b1c00e4c873 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -1115,7 +1115,7 @@ sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Poin break; default: - OSL_ENSURE(0,"BrowseBox::GetAccessibleName: invalid enum!"); + OSL_FAIL("BrowseBox::GetAccessibleName: invalid enum!"); } return aRetText; } diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 67705c48a84a..431b9c0122ab 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1112,6 +1112,14 @@ namespace sSampleText = rtl::OUString(aEthi, SAL_N_ELEMENTS(aEthi)); break; } + case vcl::UnicodeCoverage::CHEROKEE: + { + const sal_Unicode aCher[] = { + 0x13D7, 0x13AA, 0x13EA, 0x13B6, 0x13D9, 0x13D7 + }; + sSampleText = rtl::OUString(aCher, SAL_N_ELEMENTS(aCher)); + break; + } case vcl::UnicodeCoverage::KHMER: { const sal_Unicode aKhmr[] = { @@ -1138,6 +1146,14 @@ namespace sSampleText = rtl::OUString(aTagalog, SAL_N_ELEMENTS(aTagalog)); break; } + case vcl::UnicodeCoverage::NEW_TAI_LUE: + { + const sal_Unicode aTalu[] = { + 0x1991, 0x19BA, 0x199F, 0x19B9, 0x19C9 + }; + sSampleText = rtl::OUString(aTalu, SAL_N_ELEMENTS(aTalu)); + break; + } case TRADITIONAL_CHINESE: { const sal_Unicode aTraditionalChinese[] = { @@ -1538,12 +1554,14 @@ namespace aGenericMask.set(vcl::UnicodeCoverage::SPECIALS, false); aGenericMask.set(vcl::UnicodeCoverage::NONPLANE_0, false); aGenericMask.set(vcl::UnicodeCoverage::PRIVATE_USE_PLANE_15, false); + aGenericMask.set(vcl::UnicodeCoverage::CJK_SYMBOLS_AND_PUNCTUATION, false); boost::dynamic_bitset<sal_uInt32> aMasked = rFontCapabilities.maUnicodeRange & aGenericMask; if (aMasked.count() == 1) return aMasked.find_first(); + if (aMasked[vcl::UnicodeCoverage::ARABIC]) { aMasked.set(vcl::UnicodeCoverage::ARABIC_PRESENTATION_FORMS_A, false); @@ -1569,6 +1587,13 @@ namespace if (aMasked.count() == 1) return aMasked.find_first(); + if (aMasked[vcl::UnicodeCoverage::CYRILLIC]) + { + //Probably strongly tuned for Georgian + if (aMasked.count() == 2 && aMasked[vcl::UnicodeCoverage::GEORGIAN]) + return vcl::UnicodeCoverage::GEORGIAN; + } + boost::dynamic_bitset<sal_uInt32> aCJKMask(vcl::UnicodeCoverage::MAX_UC_ENUM); aCJKMask.set(); aCJKMask.set(vcl::UnicodeCoverage::CJK_SYMBOLS_AND_PUNCTUATION, false); diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 01587623fc77..51e4fed41eb1 100755 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -3230,9 +3230,7 @@ const RulerBorder* Ruler::GetBorders() const { return mpData->pBorders; } sal_uInt16 Ruler::GetIndentCount() const { return mpData->nIndents; } const RulerIndent* Ruler::GetIndents() const { return mpData->pIndents; } -/* --------------------------------------------------- - * - * ---------------------------------------------------*/ + void Ruler::DrawTicks() { mbFormat = sal_True; diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index e8044231b49e..5f3f46aa669d 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -198,7 +198,7 @@ public: } else { - DBG_ERROR ( ( ::rtl::OString("AssigmentTransientData::AssigmentTransientData: unknown programmatic name (") + OSL_FAIL( ( ::rtl::OString("AssigmentTransientData::AssigmentTransientData: unknown programmatic name (") += ::rtl::OString(pFields->ProgrammaticName.getStr(), pFields->ProgrammaticName.getLength(), RTL_TEXTENCODING_ASCII_US) += ::rtl::OString(")!") ).getStr() diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index b921c090946d..db6e4434c980 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -349,7 +349,7 @@ namespace svt { if ( m_pImpl->getFirstDifferentIndex( aActivePathPos->second, aNewPathPos->second ) <= nCurrentStatePathIndex ) { - OSL_ENSURE( false, "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" ); + OSL_FAIL( "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" ); return; } } diff --git a/svtools/source/filter.vcl/wmf/emfwr.cxx b/svtools/source/filter.vcl/wmf/emfwr.cxx index 4c7f6b41911f..d556e889d2ad 100644 --- a/svtools/source/filter.vcl/wmf/emfwr.cxx +++ b/svtools/source/filter.vcl/wmf/emfwr.cxx @@ -1408,7 +1408,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) break; default: - DBG_ERROR( ( ByteString( "EMFWriter::ImplWriteActions: unsupported MetaAction #" ) += ByteString::CreateFromInt32( nType ) ).GetBuffer() ); + OSL_FAIL( ( ByteString( "EMFWriter::ImplWriteActions: unsupported MetaAction #" ) += ByteString::CreateFromInt32( nType ) ).GetBuffer() ); break; } } diff --git a/svtools/source/productregistration/productregistration.cxx b/svtools/source/productregistration/productregistration.cxx index 8a908bacb2dd..720cf15a41f3 100644 --- a/svtools/source/productregistration/productregistration.cxx +++ b/svtools/source/productregistration/productregistration.cxx @@ -216,7 +216,7 @@ namespace svt } catch( const Exception& ) { - OSL_ENSURE( false, "lcl_isEvalVersion: caught an exception!" ); + OSL_FAIL( "lcl_isEvalVersion: caught an exception!" ); } return bIsEvaluationVersion; @@ -266,7 +266,7 @@ namespace svt } catch( const Exception& ) { - OSL_ENSURE( false, "lcl_getOnlineRegistrationDispatch: caught an exception!" ); + OSL_FAIL( "lcl_getOnlineRegistrationDispatch: caught an exception!" ); return false; } } diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index eda54726c717..6ec1ec5e7121 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -312,7 +312,7 @@ namespace svt { namespace table aRetText = GetColumnName(_nCol); break; default: - OSL_ENSURE(0,"GridControl::GetAccessibleName: invalid enum!"); + OSL_FAIL("GridControl::GetAccessibleName: invalid enum!"); } return aRetText; } diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx index f6bd2278f478..f6c36d673691 100644 --- a/svtools/source/toolpanel/drawerlayouter.cxx +++ b/svtools/source/toolpanel/drawerlayouter.cxx @@ -88,7 +88,7 @@ namespace svt const size_t nUpperBound = !!aActivePanel ? *aActivePanel : nPanelCount - 1; for ( size_t i=0; i<=nUpperBound; ++i ) { - sal_uInt32 nDrawerHeight = m_aDrawers[i]->GetPreferredHeightPixel(); + long nDrawerHeight = m_aDrawers[i]->GetPreferredHeightPixel(); m_aDrawers[i]->SetPosSizePixel( aUpperDrawerPos, Size( nWidth, nDrawerHeight ) ); aUpperDrawerPos.Move( 0, nDrawerHeight ); @@ -98,7 +98,7 @@ namespace svt Point aLowerDrawerPos( i_rDeckPlayground.BottomLeft() ); for ( size_t j = nPanelCount - 1; j > nUpperBound; --j ) { - sal_uInt32 nDrawerHeight = m_aDrawers[j]->GetPreferredHeightPixel(); + long nDrawerHeight = m_aDrawers[j]->GetPreferredHeightPixel(); m_aDrawers[j]->SetPosSizePixel( Point( aLowerDrawerPos.X(), aLowerDrawerPos.Y() - nDrawerHeight + 1 ), Size( nWidth, nDrawerHeight ) diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 902b9a5b442e..37bbcf4678c2 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -444,14 +444,14 @@ namespace svt { if ( i_rImpl.m_rPanelDeck.GetPanelCount() != i_rImpl.m_aItems.size() ) { - OSL_ENSURE( false, "lcl_checkConsistency: inconsistent array sizes!" ); + OSL_FAIL( "lcl_checkConsistency: inconsistent array sizes!" ); return; } for ( size_t i = 0; i < i_rImpl.m_rPanelDeck.GetPanelCount(); ++i ) { if ( i_rImpl.m_rPanelDeck.GetPanel( i ).get() != i_rImpl.m_aItems[i].pPanel.get() ) { - OSL_ENSURE( false, "lcl_checkConsistency: array elements are inconsistent!" ); + OSL_FAIL( "lcl_checkConsistency: array elements are inconsistent!" ); return; } } diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx index b58d703e669e..b9615dffc774 100644 --- a/svtools/source/toolpanel/tablayouter.cxx +++ b/svtools/source/toolpanel/tablayouter.cxx @@ -78,7 +78,7 @@ namespace svt { if ( !i_rData.pTabBar.get() ) { - OSL_ENSURE( false, "lcl_checkDisposed: already disposed!" ); + OSL_FAIL( "lcl_checkDisposed: already disposed!" ); return true; } return false; diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx index 46c9273ba153..5f1286b90ed6 100755 --- a/svtools/source/uno/unogridcolumnfacade.cxx +++ b/svtools/source/uno/unogridcolumnfacade.cxx @@ -150,7 +150,7 @@ namespace svt { namespace table { if ( i_event.AttributeName.equalsAscii( "DataColumnIndex" ) ) { - SolarMutexGuard aGuard; + SolarMutexGuard aGuard; if ( m_pColumnImplementation != NULL ) m_pColumnImplementation->dataColumnIndexChanged(); return; @@ -173,7 +173,7 @@ namespace svt { namespace table OSL_ENSURE( nChangedAttributes != COL_ATTRS_NONE, "ColumnChangeMultiplexer::columnChanged: unknown column attributed changed!" ); - SolarMutexGuard aGuard; + SolarMutexGuard aGuard; if ( m_pColumnImplementation != NULL ) m_pColumnImplementation->columnChanged( nChangedAttributes ); } diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index 9f2034a3b02b..e8d7adaf58a2 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -92,7 +92,7 @@ namespace svt { namespace uno case WizardButton::CANCEL: return WZB_CANCEL; case WizardButton::HELP: return WZB_HELP; } - OSL_ENSURE( false, "lcl_convertWizardButtonToWZB: invalid WizardButton constant!" ); + OSL_FAIL( "lcl_convertWizardButtonToWZB: invalid WizardButton constant!" ); return WZB_NONE; } } diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index 66b4dfce164d..7220091d7648 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -134,7 +134,7 @@ namespace svt { namespace uno default: break; } - OSL_ENSURE( false, "WizardShell::convertCommitReasonToTravelType: unsupported CommitPageReason!" ); + OSL_FAIL( "WizardShell::convertCommitReasonToTravelType: unsupported CommitPageReason!" ); return WizardTravelType::FINISH; } |