diff options
author | Radu Ioan <ioan.radu.g@gmail.com> | 2013-06-01 22:28:05 +0300 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-10 08:41:50 +0000 |
commit | db979ee28a360d1222ddc8a67b929434c0c51255 (patch) | |
tree | bef8791a1004782187d826e5c99bb0f3887e97a1 /starmath | |
parent | Related fdo#33895 add some checks against NULL derefs (diff) | |
download | core-db979ee28a360d1222ddc8a67b929434c0c51255.tar.gz core-db979ee28a360d1222ddc8a67b929434c0c51255.zip |
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
- replaced RTL_CONTEXT_ with SAL_INFO
- replace OSL_* with SAL_*
Change-Id: I9a7cce0d3abef42c9d9d0ad56609d94d504854cb
Reviewed-on: https://gerrit.libreoffice.org/4128
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/source/document.cxx | 79 | ||||
-rw-r--r-- | starmath/source/toolbox.cxx | 7 | ||||
-rw-r--r-- | starmath/source/view.cxx | 65 |
3 files changed, 74 insertions, 77 deletions
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 91d4088e8f57..52e6319e13a6 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -24,7 +24,6 @@ #include <comphelper/accessibletexthelper.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> -#include <rtl/logfile.hxx> #include <rtl/ustring.hxx> #include <unotools/eventcfg.hxx> #include <sfx2/event.hxx> @@ -133,7 +132,7 @@ void SmDocShell::SFX_NOTIFY(SfxBroadcaster&, const TypeId&, void SmDocShell::LoadSymbols() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::LoadSymbols" ); + SAL_INFO( "starmath", "starmath: SmDocShell::LoadSymbols" ); SmModule *pp = SM_MOD(); pp->GetSymbolManager().Load(); @@ -142,7 +141,7 @@ void SmDocShell::LoadSymbols() const String SmDocShell::GetComment() const { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::GetComment" ); + SAL_INFO( "starmath", "starmath: SmDocShell::GetComment" ); uno::Reference<document::XDocumentPropertiesSupplier> xDPS( const_cast<SmDocShell*>(this)->GetModel(), uno::UNO_QUERY_THROW); uno::Reference<document::XDocumentProperties> xDocProps( @@ -153,7 +152,7 @@ const String SmDocShell::GetComment() const void SmDocShell::SetText(const OUString& rBuffer) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SetText" ); + SAL_INFO( "starmath", "starmath: SmDocShell::SetText" ); if (rBuffer != OUString(aText)) { @@ -206,7 +205,7 @@ void SmDocShell::SetText(const OUString& rBuffer) void SmDocShell::SetFormat(SmFormat& rFormat) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SetFormat" ); + SAL_INFO( "starmath", "starmath: SmDocShell::SetFormat" ); aFormat = rFormat; SetFormulaArranged( false ); @@ -226,7 +225,7 @@ void SmDocShell::SetFormat(SmFormat& rFormat) OUString SmDocShell::GetAccessibleText() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::GetAccessibleText" ); + SAL_INFO( "starmath", "starmath: SmDocShell::GetAccessibleText" ); if (!IsFormulaArranged()) ArrangeFormula(); @@ -245,7 +244,7 @@ OUString SmDocShell::GetAccessibleText() void SmDocShell::Parse() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::Parse" ); + SAL_INFO( "starmath", "starmath: SmDocShell::Parse" ); if (pTree) delete pTree; @@ -260,7 +259,7 @@ void SmDocShell::Parse() void SmDocShell::ArrangeFormula() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::ArrangeFormula" ); + SAL_INFO( "starmath", "starmath: SmDocShell::ArrangeFormula" ); if (IsFormulaArranged()) return; @@ -273,7 +272,7 @@ void SmDocShell::ArrangeFormula() if (!pOutDev) { #if OSL_DEBUG_LEVEL > 1 - OSL_FAIL("!! SmDocShell::ArrangeFormula: reference device missing !!"); + SAL_WARN( "starmath", "!! SmDocShell::ArrangeFormula: reference device missing !!"); #endif } @@ -371,7 +370,7 @@ void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool) EditEngine& SmDocShell::GetEditEngine() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::GetEditEngine" ); + SAL_INFO( "starmath", "starmath: SmDocShell::GetEditEngine" ); if (!pEditEngine) { @@ -416,7 +415,7 @@ EditEngine& SmDocShell::GetEditEngine() SfxItemPool& SmDocShell::GetEditEngineItemPool() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::GetEditEngineItemPool" ); + SAL_INFO( "starmath", "starmath: SmDocShell::GetEditEngineItemPool" ); if (!pEditEngineItemPool) GetEditEngine(); @@ -426,7 +425,7 @@ SfxItemPool& SmDocShell::GetEditEngineItemPool() void SmDocShell::DrawFormula(OutputDevice &rDev, Point &rPosition, bool bDrawSelection) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::Draw" ); + SAL_INFO( "starmath", "starmath: SmDocShell::Draw" ); if (!pTree) Parse(); @@ -483,7 +482,7 @@ void SmDocShell::DrawFormula(OutputDevice &rDev, Point &rPosition, bool bDrawSel Size SmDocShell::GetSize() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::GetSize" ); + SAL_INFO( "starmath", "starmath: SmDocShell::GetSize" ); Size aRet; @@ -590,7 +589,7 @@ SmPrinterAccess::~SmPrinterAccess() Printer* SmDocShell::GetPrt() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::GetPrt" ); + SAL_INFO( "starmath", "starmath: SmDocShell::GetPrt" ); if ( SFX_CREATE_MODE_EMBEDDED == GetCreateMode() ) { @@ -625,7 +624,7 @@ Printer* SmDocShell::GetPrt() OutputDevice* SmDocShell::GetRefDev() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::GetRefDev" ); + SAL_INFO( "starmath", "starmath: SmDocShell::GetRefDev" ); if ( SFX_CREATE_MODE_EMBEDDED == GetCreateMode() ) { @@ -640,7 +639,7 @@ OutputDevice* SmDocShell::GetRefDev() void SmDocShell::SetPrinter( SfxPrinter *pNew ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SetPrinter" ); + SAL_INFO( "starmath", "starmath: SmDocShell::SetPrinter" ); delete pPrinter; pPrinter = pNew; //Transfer ownership @@ -651,7 +650,7 @@ void SmDocShell::SetPrinter( SfxPrinter *pNew ) void SmDocShell::OnDocumentPrinterChanged( Printer *pPrt ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::OnDocumentPrinterChanged" ); + SAL_INFO( "starmath", "starmath: SmDocShell::OnDocumentPrinterChanged" ); pTmpPrinter = pPrt; SetFormulaArranged(false); @@ -664,7 +663,7 @@ void SmDocShell::OnDocumentPrinterChanged( Printer *pPrt ) void SmDocShell::Repaint() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::Repaint" ); + SAL_INFO( "starmath", "starmath: SmDocShell::Repaint" ); bool bIsEnabled = IsEnableSetModified(); if ( bIsEnabled ) @@ -694,7 +693,7 @@ SmDocShell::SmDocShell( const sal_uInt64 i_nSfxCreationFlags ) : bIsFormulaArranged ( false ) { pCursor = NULL; - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SmDocShell" ); + SAL_INFO( "starmath", "starmath: SmDocShell::SmDocShell" ); SetPool(&SFX_APP()->GetPool()); @@ -711,7 +710,7 @@ SmDocShell::SmDocShell( const sal_uInt64 i_nSfxCreationFlags ) : SmDocShell::~SmDocShell() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::~SmDocShell" ); + SAL_INFO( "starmath", "starmath: SmDocShell::~SmDocShell" ); SmModule *pp = SM_MOD(); @@ -732,7 +731,7 @@ SmDocShell::~SmDocShell() sal_Bool SmDocShell::SetData( const String& rData ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SetData" ); + SAL_INFO( "starmath", "starmath: SmDocShell::SetData" ); SetText( rData ); return true; @@ -741,7 +740,7 @@ sal_Bool SmDocShell::SetData( const String& rData ) sal_Bool SmDocShell::ConvertFrom(SfxMedium &rMedium) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::ConvertFrom" ); + SAL_INFO( "starmath", "starmath: SmDocShell::ConvertFrom" ); bool bSuccess = false; const String& rFltName = rMedium.GetFilter()->GetFilterName(); @@ -792,7 +791,7 @@ sal_Bool SmDocShell::ConvertFrom(SfxMedium &rMedium) sal_Bool SmDocShell::InitNew( const uno::Reference < embed::XStorage >& xStorage ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::InitNew" ); + SAL_INFO( "starmath", "starmath: SmDocShell::InitNew" ); bool bRet = false; if ( SfxObjectShell::InitNew( xStorage ) ) @@ -806,7 +805,7 @@ sal_Bool SmDocShell::InitNew( const uno::Reference < embed::XStorage >& xStorage sal_Bool SmDocShell::Load( SfxMedium& rMedium ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::Load" ); + SAL_INFO( "starmath", "starmath: SmDocShell::Load" ); bool bRet = false; if( SfxObjectShell::Load( rMedium )) @@ -847,7 +846,7 @@ sal_Bool SmDocShell::Load( SfxMedium& rMedium ) sal_Bool SmDocShell::Save() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::Save" ); + SAL_INFO( "starmath", "starmath: SmDocShell::Save" ); //! apply latest changes if necessary UpdateText(); @@ -905,7 +904,7 @@ sal_Bool SmDocShell::ReplaceBadChars() void SmDocShell::UpdateText() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::UpdateText" ); + SAL_INFO( "starmath", "starmath: SmDocShell::UpdateText" ); if (pEditEngine && pEditEngine->IsModified()) { @@ -918,7 +917,7 @@ void SmDocShell::UpdateText() sal_Bool SmDocShell::SaveAs( SfxMedium& rMedium ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SaveAs" ); + SAL_INFO( "starmath", "starmath: SmDocShell::SaveAs" ); bool bRet = false; @@ -942,7 +941,7 @@ sal_Bool SmDocShell::SaveAs( SfxMedium& rMedium ) sal_Bool SmDocShell::ConvertTo( SfxMedium &rMedium ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::ConvertTo" ); + SAL_INFO( "starmath", "starmath: SmDocShell::ConvertTo" ); bool bRet = false; const SfxFilter* pFlt = rMedium.GetFilter(); @@ -976,7 +975,7 @@ sal_Bool SmDocShell::ConvertTo( SfxMedium &rMedium ) bool SmDocShell::writeFormulaOoxml( ::sax_fastparser::FSHelperPtr pSerializer, oox::core::OoxmlVersion version ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::writeFormulaOoxml" ); + SAL_INFO( "starmath", "starmath: SmDocShell::writeFormulaOoxml" ); if( !pTree ) Parse(); @@ -998,7 +997,7 @@ void SmDocShell::writeFormulaRtf(OStringBuffer& rBuffer, rtl_TextEncoding nEncod void SmDocShell::readFormulaOoxml( oox::formulaimport::XmlStream& stream ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::readFormulaOoxml" ); + SAL_INFO( "starmath", "starmath: SmDocShell::readFormulaOoxml" ); SmOoxmlImport aEquation( stream ); SetText( aEquation.ConvertToStarMath()); @@ -1006,7 +1005,7 @@ void SmDocShell::readFormulaOoxml( oox::formulaimport::XmlStream& stream ) sal_Bool SmDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SaveCompleted" ); + SAL_INFO( "starmath", "starmath: SmDocShell::SaveCompleted" ); if( SfxObjectShell::SaveCompleted( xStorage )) return true; @@ -1017,7 +1016,7 @@ sal_Bool SmDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::co void SmDocShell::Execute(SfxRequest& rReq) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::Execute" ); + SAL_INFO( "starmath", "starmath: SmDocShell::Execute" ); switch (rReq.GetSlot()) { @@ -1225,7 +1224,7 @@ void SmDocShell::Execute(SfxRequest& rReq) void SmDocShell::GetState(SfxItemSet &rSet) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::GetState" ); + SAL_INFO( "starmath", "starmath: SmDocShell::GetState" ); SfxWhichIter aIter(rSet); @@ -1324,7 +1323,7 @@ void SmDocShell::GetState(SfxItemSet &rSet) ::svl::IUndoManager *SmDocShell::GetUndoManager() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::GetUndoManager" ); + SAL_INFO( "starmath", "starmath: SmDocShell::GetUndoManager" ); if (!pEditEngine) GetEditEngine(); @@ -1334,7 +1333,7 @@ void SmDocShell::GetState(SfxItemSet &rSet) void SmDocShell::SaveSymbols() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SaveSymbols" ); + SAL_INFO( "starmath", "starmath: SmDocShell::SaveSymbols" ); SmModule *pp = SM_MOD(); pp->GetSymbolManager().Save(); @@ -1345,7 +1344,7 @@ void SmDocShell::Draw(OutputDevice *pDevice, const JobSetup &, sal_uInt16 /*nAspect*/) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::Draw" ); + SAL_INFO( "starmath", "starmath: SmDocShell::Draw" ); pDevice->IntersectClipRegion(GetVisArea()); Point atmppoint; @@ -1359,7 +1358,7 @@ SfxItemPool& SmDocShell::GetPool() const void SmDocShell::SetVisArea(const Rectangle & rVisArea) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SetVisArea" ); + SAL_INFO( "starmath", "starmath: SmDocShell::SetVisArea" ); Rectangle aNewRect(rVisArea); @@ -1402,7 +1401,7 @@ void SmDocShell::FillClass(SvGlobalName* pClassName, sal_Int32 nFileFormat, sal_Bool bTemplate /* = sal_False */) const { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::FillClass" ); + SAL_INFO( "starmath", "starmath: SmDocShell::FillClass" ); if (nFileFormat == SOFFICE_FILEFORMAT_60 ) { @@ -1428,7 +1427,7 @@ sal_uLong SmDocShell::GetMiscStatus() const void SmDocShell::SetModified(sal_Bool bModified) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SetModified" ); + SAL_INFO( "starmath", "starmath: SmDocShell::SetModified" ); if( IsEnableSetModified() ) { @@ -1439,7 +1438,7 @@ void SmDocShell::SetModified(sal_Bool bModified) bool SmDocShell::WriteAsMathType3( SfxMedium& rMedium ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::WriteAsMathType3" ); + SAL_INFO( "starmath", "starmath: SmDocShell::WriteAsMathType3" ); MathType aEquation( aText, pTree ); diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx index 75f606526a26..e556fd720147 100644 --- a/starmath/source/toolbox.cxx +++ b/starmath/source/toolbox.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <rtl/logfile.hxx> #include <svl/eitem.hxx> #include <sfx2/app.hxx> #include <svl/intitem.hxx> @@ -48,7 +47,7 @@ static sal_uInt16 GetImageListRID( sal_uInt16 nCategoryRID ) case RID_FORMAT_CAT : nRes = RID_IL_FORMAT; break; case RID_MISC_CAT : nRes = RID_IL_MISC; break; default : - OSL_FAIL( "unknown category" ); + SAL_WARN( "starmath", "unknown category" ); } return nRes; } @@ -93,7 +92,7 @@ static sal_uInt16 GetCategoryRID( sal_uInt16 nResId ) if (nResId != RID_IL_CATALOG) { #if OSL_DEBUG_LEVEL > 1 - OSL_FAIL( "unknown category" ); + SAL_WARN( "starmath", "unknown category" ); #endif } } @@ -111,7 +110,7 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings, aToolBoxCat(this, SmResId(TOOLBOX_CATALOG)), aToolBoxCat_Delim(this, SmResId( FL_TOOLBOX_CAT_DELIM )) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmToolBoxWindow::SmToolBoxWindow" ); + SAL_INFO( "starmath", "starmath: SmToolBoxWindow::SmToolBoxWindow" ); // allow for cursor travelling between toolbox and sub-categories SetStyle( GetStyle() | WB_DIALOGCONTROL ); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 42325559e34f..d3ffcfea2aac 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -29,7 +29,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/string.hxx> -#include <rtl/logfile.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> @@ -842,7 +841,7 @@ IMPL_LINK( SmCmdBoxWindow, InitialFocusTimerHdl, Timer *, EMPTYARG /*pTimer*/ ) } catch (uno::Exception &) { - OSL_FAIL( "failed to properly set initial focus to edit window" ); + SAL_WARN( "starmath", "failed to properly set initial focus to edit window" ); } return 0; } @@ -947,7 +946,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SmViewShell, "Default") void SmViewShell::AdjustPosSizePixel(const Point &rPos, const Size &rSize) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::AdjustPosSizePixel" ); + SAL_INFO( "starmath", "starmath: SmViewShell::AdjustPosSizePixel" ); aGraphic.SetPosSizePixel(rPos, rSize); } @@ -955,7 +954,7 @@ void SmViewShell::AdjustPosSizePixel(const Point &rPos, const Size &rSize) void SmViewShell::InnerResizePixel(const Point &rOfs, const Size &rSize) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::InnerResizePixel" ); + SAL_INFO( "starmath", "starmath: SmViewShell::InnerResizePixel" ); Size aObjSize = GetObjectShell()->GetVisArea().GetSize(); if ( aObjSize.Width() > 0 && aObjSize.Height() > 0 ) @@ -973,7 +972,7 @@ void SmViewShell::InnerResizePixel(const Point &rOfs, const Size &rSize) void SmViewShell::OuterResizePixel(const Point &rOfs, const Size &rSize) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::OuterResizePixel" ); + SAL_INFO( "starmath", "starmath: SmViewShell::OuterResizePixel" ); SmGraphicWindow &rWin = GetGraphicWindow(); rWin.SetPosSizePixel(rOfs, rSize); @@ -985,7 +984,7 @@ void SmViewShell::OuterResizePixel(const Point &rOfs, const Size &rSize) void SmViewShell::QueryObjAreaPixel( Rectangle& rRect ) const { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::QueryObjAreaPixel" ); + SAL_INFO( "starmath", "starmath: SmViewShell::QueryObjAreaPixel" ); rRect.SetSize( GetGraphicWindow().GetSizePixel() ); } @@ -993,7 +992,7 @@ void SmViewShell::QueryObjAreaPixel( Rectangle& rRect ) const void SmViewShell::SetZoomFactor( const Fraction &rX, const Fraction &rY ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::SetZoomFactor" ); + SAL_INFO( "starmath", "starmath: SmViewShell::SetZoomFactor" ); const Fraction &rFrac = rX < rY ? rX : rY; GetGraphicWindow().SetZoom( (sal_uInt16) long(rFrac * Fraction( 100, 1 )) ); @@ -1006,7 +1005,7 @@ void SmViewShell::SetZoomFactor( const Fraction &rX, const Fraction &rY ) Size SmViewShell::GetTextLineSize(OutputDevice& rDevice, const String& rLine) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::GetTextLineSize" ); + SAL_INFO( "starmath", "starmath: SmViewShell::GetTextLineSize" ); Size aSize(rDevice.GetTextWidth(rLine), rDevice.GetTextHeight()); sal_uInt16 nTabs = comphelper::string::getTokenCount(rLine, '\t'); @@ -1035,7 +1034,7 @@ Size SmViewShell::GetTextLineSize(OutputDevice& rDevice, const String& rLine) Size SmViewShell::GetTextSize(OutputDevice& rDevice, const String& rText, long MaxWidth) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::GetTextSize" ); + SAL_INFO( "starmath", "starmath: SmViewShell::GetTextSize" ); Size aSize; Size TextSize; @@ -1096,7 +1095,7 @@ Size SmViewShell::GetTextSize(OutputDevice& rDevice, const String& rText, long M void SmViewShell::DrawTextLine(OutputDevice& rDevice, const Point& rPosition, const String& rLine) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::DrawTextLine" ); + SAL_INFO( "starmath", "starmath: SmViewShell::DrawTextLine" ); Point aPoint (rPosition); sal_uInt16 nTabs = comphelper::string::getTokenCount(rLine, '\t'); @@ -1124,7 +1123,7 @@ void SmViewShell::DrawTextLine(OutputDevice& rDevice, const Point& rPosition, co void SmViewShell::DrawText(OutputDevice& rDevice, const Point& rPosition, const String& rText, sal_uInt16 MaxWidth) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::DrawText" ); + SAL_INFO( "starmath", "starmath: SmViewShell::DrawText" ); sal_uInt16 nLines = comphelper::string::getTokenCount(rText, '\n'); Point aPoint (rPosition); @@ -1189,7 +1188,7 @@ void SmViewShell::Impl_Print( const SmPrintUIOptions &rPrintUIOptions, Rectangle aOutRect, Point aZeroPoint ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::Impl_Print" ); + SAL_INFO( "starmath", "starmath: SmViewShell::Impl_Print" ); const bool bIsPrintTitle = rPrintUIOptions.getBoolValue( PRTUIOPT_TITLE_ROW, sal_True ); const bool bIsPrintFrame = rPrintUIOptions.getBoolValue( PRTUIOPT_BORDER, sal_True ); @@ -1338,15 +1337,15 @@ void SmViewShell::Impl_Print( sal_uInt16 SmViewShell::Print(SfxProgress & /*rProgress*/, sal_Bool /*bIsAPI*/) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::Print" ); - OSL_FAIL( "SmViewShell::Print: no longer used with new UI print dialog. Should be removed!!" ); + SAL_INFO( "starmath", "starmath: SmViewShell::Print" ); + SAL_WARN( "starmath", "SmViewShell::Print: no longer used with new UI print dialog. Should be removed!!" ); return 0; } SfxPrinter* SmViewShell::GetPrinter(sal_Bool bCreate) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::GetPrinter" ); + SAL_INFO( "starmath", "starmath: SmViewShell::GetPrinter" ); SmDocShell *pDoc = GetDoc(); if ( pDoc->HasPrinter() || bCreate ) @@ -1357,7 +1356,7 @@ SfxPrinter* SmViewShell::GetPrinter(sal_Bool bCreate) sal_uInt16 SmViewShell::SetPrinter(SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags, bool ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::SetPrinter" ); + SAL_INFO( "starmath", "starmath: SmViewShell::SetPrinter" ); SfxPrinter *pOld = GetDoc()->GetPrinter(); if ( pOld && pOld->IsPrinting() ) return SFX_PRINTERROR_BUSY; @@ -1381,7 +1380,7 @@ bool SmViewShell::HasPrintOptionsPage() const SfxTabPage* SmViewShell::CreatePrintOptionsPage(Window *pParent, const SfxItemSet &rOptions) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::CreatePrintOptionsPage" ); + SAL_INFO( "starmath", "starmath: SmViewShell::CreatePrintOptionsPage" ); return SmPrintOptionsTabPage::Create(pParent, rOptions); } @@ -1389,7 +1388,7 @@ SfxTabPage* SmViewShell::CreatePrintOptionsPage(Window *pParent, SmEditWindow *SmViewShell::GetEditWindow() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::GetEditWindow" ); + SAL_INFO( "starmath", "starmath: SmViewShell::GetEditWindow" ); SmCmdBoxWrapper *pWrapper = (SmCmdBoxWrapper *) GetViewFrame()-> GetChildWindow( SmCmdBoxWrapper::GetChildWindowId() ); @@ -1407,7 +1406,7 @@ SmEditWindow *SmViewShell::GetEditWindow() void SmViewShell::SetStatusText(const OUString& rText) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::SetStatusText" ); + SAL_INFO( "starmath", "starmath: SmViewShell::SetStatusText" ); aStatusText = rText; GetViewFrame()->GetBindings().Invalidate(SID_TEXTSTATUS); @@ -1416,7 +1415,7 @@ void SmViewShell::SetStatusText(const OUString& rText) void SmViewShell::ShowError( const SmErrorDesc *pErrorDesc ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::ShowError" ); + SAL_INFO( "starmath", "starmath: SmViewShell::ShowError" ); OSL_ENSURE(GetDoc(), "Sm : Document missing"); if (pErrorDesc || 0 != (pErrorDesc = GetDoc()->GetParser().GetError(0)) ) @@ -1430,7 +1429,7 @@ void SmViewShell::ShowError( const SmErrorDesc *pErrorDesc ) void SmViewShell::NextError() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::NextError" ); + SAL_INFO( "starmath", "starmath: SmViewShell::NextError" ); OSL_ENSURE(GetDoc(), "Sm : Document missing"); const SmErrorDesc *pErrorDesc = GetDoc()->GetParser().NextError(); @@ -1442,7 +1441,7 @@ void SmViewShell::NextError() void SmViewShell::PrevError() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::PrevError" ); + SAL_INFO( "starmath", "starmath: SmViewShell::PrevError" ); OSL_ENSURE(GetDoc(), "Sm : Document missing"); const SmErrorDesc *pErrorDesc = GetDoc()->GetParser().PrevError(); @@ -1454,7 +1453,7 @@ void SmViewShell::PrevError() bool SmViewShell::Insert( SfxMedium& rMedium ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::Insert" ); + SAL_INFO( "starmath", "starmath: SmViewShell::Insert" ); SmDocShell *pDoc = GetDoc(); bool bRet = false; @@ -1480,7 +1479,7 @@ bool SmViewShell::Insert( SfxMedium& rMedium ) pEditWin->InsertText( aText ); else { - OSL_FAIL( "EditWindow missing" ); + SAL_WARN( "starmath", "EditWindow missing" ); } pDoc->Parse(); @@ -1496,7 +1495,7 @@ bool SmViewShell::Insert( SfxMedium& rMedium ) bool SmViewShell::InsertFrom(SfxMedium &rMedium) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::InsertFrom" ); + SAL_INFO( "starmath", "starmath: SmViewShell::InsertFrom" ); bool bSuccess = false; SmDocShell *pDoc = GetDoc(); @@ -1521,7 +1520,7 @@ bool SmViewShell::InsertFrom(SfxMedium &rMedium) pEditWin->InsertText( aText ); else { - OSL_FAIL( "EditWindow missing" ); + SAL_WARN( "starmath", "EditWindow missing" ); } pDoc->Parse(); @@ -1538,7 +1537,7 @@ bool SmViewShell::InsertFrom(SfxMedium &rMedium) void SmViewShell::Execute(SfxRequest& rReq) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::Execute" ); + SAL_INFO( "starmath", "starmath: SmViewShell::Execute" ); SmEditWindow *pWin = GetEditWindow(); @@ -1627,7 +1626,7 @@ void SmViewShell::Execute(SfxRequest& rReq) } catch (uno::Exception &) { - OSL_FAIL( "SmViewShell::Execute (SID_PASTEOBJECT): failed to get storage from input stream" ); + SAL_WARN( "starmath", "SmViewShell::Execute (SID_PASTEOBJECT): failed to get storage from input stream" ); } } } @@ -1893,7 +1892,7 @@ void SmViewShell::Execute(SfxRequest& rReq) void SmViewShell::GetState(SfxItemSet &rSet) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::GetState" ); + SAL_INFO( "starmath", "starmath: SmViewShell::GetState" ); SfxWhichIter aIter(rSet); @@ -1999,7 +1998,7 @@ SmViewShell::SmViewShell(SfxViewFrame *pFrame_, SfxViewShell *): aGraphic(this), aGraphicController(aGraphic, SID_GAPHIC_SM, pFrame_->GetBindings()) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::SmViewShell" ); + SAL_INFO( "starmath", "starmath: SmViewShell::SmViewShell" ); SetStatusText(OUString()); SetWindow(&aGraphic); @@ -2011,7 +2010,7 @@ SmViewShell::SmViewShell(SfxViewFrame *pFrame_, SfxViewShell *): SmViewShell::~SmViewShell() { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::~SmViewShell" ); + SAL_INFO( "starmath", "starmath: SmViewShell::~SmViewShell" ); //!! this view shell is not active anymore !! // Thus 'SmGetActiveView' will give a 0 pointer. @@ -2024,7 +2023,7 @@ SmViewShell::~SmViewShell() void SmViewShell::Deactivate( sal_Bool bIsMDIActivate ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::Deactivate" ); + SAL_INFO( "starmath", "starmath: SmViewShell::Deactivate" ); SmEditWindow *pEdit = GetEditWindow(); if ( pEdit ) @@ -2036,7 +2035,7 @@ void SmViewShell::Deactivate( sal_Bool bIsMDIActivate ) void SmViewShell::Activate( sal_Bool bIsMDIActivate ) { - RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::Activate" ); + SAL_INFO( "starmath", "starmath: SmViewShell::Activate" ); SfxViewShell::Activate( bIsMDIActivate ); |