diff options
author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-09-20 01:42:12 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-09-20 13:05:16 +0200 |
commit | 3a3c68aeafb1ed3c02dd863112d49e61727cf84c (patch) | |
tree | 79161a7c633a70f5396eef8f937da90e76903e3f /svx | |
parent | 04bc1bd40c57a815cd25c61401c4b710d77edcf8 (diff) |
chained editeng: Convert fprintf to SAL_INFO
Change-Id: I8e0cfedd34d7e0d70a30147a3bbf0f1cd8e6d3cc
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdotext.cxx | 12 | ||||
-rw-r--r-- | svx/source/svdraw/svdotextdecomposition.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/textchainflow.cxx | 15 |
4 files changed, 15 insertions, 16 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 0b477cac39cf..0d7d0137fa76 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -543,7 +543,7 @@ void SdrObjEditView::ImpChainingEventHdl() pTextChain->SetNilChainingEvent(pTextObj, false); } else { // XXX - fprintf(stderr, "[OnChaining] No Edit Outliner View\n"); + SAL_INFO("svx.chaining", "[OnChaining] No Edit Outliner View"); } } diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 55948aa285c2..cc3f4791c37e 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -2020,7 +2020,7 @@ void ImpUpdateChainLinks(SdrTextObj *pTextObj, OUString aNextLinkName) SdrTextObj *pNextTextObj = dynamic_cast< SdrTextObj * > (ImpGetObjByName(pPage, aNextLinkName)); if (!pNextTextObj) { - fprintf(stderr, "[CHAINING] Can't find object as next link.\n"); + SAL_INFO("svx.chaining", "[CHAINING] Can't find object as next link."); return; } @@ -2061,25 +2061,21 @@ void SdrTextObj::onChainingEvent() EditingTextChainFlow aTxtChainFlow(this); aTxtChainFlow.CheckForFlowEvents(pEdtOutl); - if (aTxtChainFlow.IsOverflow()) { - fprintf(stderr, "[CHAINING] Overflow going on\n"); + SAL_INFO("svx.chaining", "[CHAINING] Overflow going on"); // One outliner is for non-overflowing text, the other for overflowing text // We remove text directly from the editing outliner aTxtChainFlow.ExecuteOverflow(pEdtOutl, &aDrawOutliner); } else if (aTxtChainFlow.IsUnderflow()) { - fprintf(stderr, "[CHAINING] Underflow going on\n"); + SAL_INFO("svx.chaining", "[CHAINING] Underflow going on"); // underflow-induced overflow aTxtChainFlow.ExecuteUnderflow(&aDrawOutliner); bool bIsOverflowFromUnderflow = aTxtChainFlow.IsOverflow(); // handle overflow if (bIsOverflowFromUnderflow) { - fprintf(stderr, "[CHAINING] Overflow going on (underflow induced)\n"); + SAL_INFO("svx.chaining", "[CHAINING] Overflow going on (underflow induced)"); // prevents infinite loops when setting text for editing outliner - - aTxtChainFlow.ExecuteOverflow(&aDrawOutliner, &aDrawOutliner); - } } } diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index be19e39cd965..3ad8f7121e76 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -1425,7 +1425,7 @@ void SdrTextObj::impHandleChainingEventsDuringDecomposition(SdrOutliner &rOutlin SdrTextObj *pCurObj = (SdrTextObj *) pPage->GetObj(i); if (pCurObj == this) { - fprintf(stderr, "Working on TextBox %d\n", i); + SAL_INFO("svx.chaining", "Working on TextBox " << i); break; } } diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx index 3286b86c3564..71d46494355a 100644 --- a/svx/source/svdraw/textchainflow.cxx +++ b/svx/source/svdraw/textchainflow.cxx @@ -28,7 +28,7 @@ TextChainFlow::TextChainFlow(SdrTextObj *pChainTarget) : mpTargetLink(pChainTarget) { - fprintf(stderr, "\n[TEXTCHAINFLOW] Creating a new TextChainFlow\n"); + SAL_INFO("svx.chaining", "[TEXTCHAINFLOW] Creating a new TextChainFlow"); mpTextChain = mpTargetLink->GetTextChain(); mpNextLink = mpTargetLink->GetNextLinkInChain(); @@ -205,7 +205,8 @@ void TextChainFlow::impLeaveOnlyNonOverflowingText(SdrOutliner *pNonOverflOutl) { OutlinerParaObject *pNewText = mpOverflChText->RemoveOverflowingText(pNonOverflOutl); - fprintf(stderr, "[TEXTCHAINFLOW - OF] SOURCE box set to %d paras \n", pNewText->GetTextObject().GetParagraphCount()); + SAL_INFO("svx.chaining", "[TEXTCHAINFLOW - OF] SOURCE box set to " + << pNewText->GetTextObject().GetParagraphCount() << " paras"); // adds it to current outliner anyway (useful in static decomposition) pNonOverflOutl->SetText(*pNewText); @@ -221,20 +222,22 @@ void TextChainFlow::impMoveChainedTextToNextLink(SdrOutliner *pOverflOutl) { // prevent copying text in same box if ( mpNextLink == mpTargetLink ) { - fprintf(stderr, "[CHAINING] Trying to copy text for next link in same object\n"); + SAL_INFO("svx.chaining", "[CHAINING] Trying to copy text for next link in same object"); return; } OutlinerParaObject *pNewText = mpOverflChText->InsertOverflowingText(pOverflOutl, mpNextLink->GetOutlinerParaObject()); - fprintf(stderr, "[TEXTCHAINFLOW - OF] DEST box set to %d paras \n", pNewText->GetTextObject().GetParagraphCount()); + SAL_INFO("svx.chaining", "[TEXTCHAINFLOW - OF] DEST box set to " + << pNewText->GetTextObject().GetParagraphCount() << " paras"); if (pNewText) mpNextLink->NbcSetOutlinerParaObject(pNewText); // Set Deep Merge status - fprintf(stderr, "[DEEPMERGE] Setting deepMerge to %d\n", mpOverflChText->IsLastParaInterrupted()); + SAL_INFO("svx.chaining", "[DEEPMERGE] Setting deepMerge to " + << mpOverflChText->IsLastParaInterrupted()); GetTextChain()->SetIsPartOfLastParaInNextLink( mpTargetLink, mpOverflChText->IsLastParaInterrupted()); @@ -284,7 +287,7 @@ UFlowChainedText *TextChainFlow::GetUnderflowChainedText() const EditingTextChainFlow::EditingTextChainFlow(SdrTextObj *pLinkTarget) : TextChainFlow(pLinkTarget) { - fprintf(stderr, "[TEXTCHAINFLOW] Creating a new EditingTextChainFlow\n"); + SAL_INFO("svx.chaining", "[TEXTCHAINFLOW] Creating a new EditingTextChainFlow"); } void EditingTextChainFlow::CheckForFlowEvents(SdrOutliner *pFlowOutl) |