ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

LOCRCT editeng,sfx2,sw: replace temporary SAL_DEBUG

Browse Source 
Change-Id: Ib6f3b732a7eb6f2dbf423ffd2206b0474ff6c681
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185200
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
This commit is contained in:
Michael Stahl
2025-05-13 10:00:31 +02:00
parent ee7ab3d463
commit 4727305dd2
8 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editeng/source/editeng/editdoc.cxx
+3 -3
View File
@@ -1281,7 +1281,7 @@ void YrsAddPara(IYrsTransactionSupplier *const pYrsSupplier,
{
return;
}
SAL_DEBUG("YRS YrsAddPara");
SAL_INFO("editeng.yrs", "YRS YrsAddPara");
// need to encode into 1 YText
char const para[]{ CH_PARA, '\0' };
uint32_t i{0};
@@ -3146,7 +3146,7 @@ EditDoc::EditDoc( SfxItemPool* pPool ) :
mbDisableAttributeExpanding(false)
{
#if defined(YRS)
SAL_DEBUG("YRS +EditDoc");
SAL_INFO("editeng.yrs", "YRS +EditDoc");
#endif
// Don't create an empty node, Clear() will be called in EditEngine-CTOR
};
@@ -3154,7 +3154,7 @@ EditDoc::EditDoc( SfxItemPool* pPool ) :
EditDoc::~EditDoc()
{
#if defined(YRS)
SAL_DEBUG("YRS -EditDoc");
SAL_INFO("editeng.yrs", "YRS -EditDoc");
#endif
maContents.clear();
}
editeng/source/editeng/editview.cxx
+1 -1
View File
@@ -384,7 +384,7 @@ void EditView::YrsApplyEECursor(OString const& rPeerId, OUString const& rAuthor,
::std::optional<EditSelection> const oSel{getEditEngine().GetEditDoc().YrsReadEECursor(point, oMark)};
if (!oSel)
{
SAL_DEBUG("YRS ignoring invalid cursor position");
SAL_INFO("editeng.yrs", "YRS ignoring invalid cursor position");
return;
}
ESelection const esel{getEditEngine().getImpl().CreateESel(*oSel)};
include/sal/log-areas.dox
+3
View File
@@ -199,6 +199,7 @@ certain functionality.
@li @c editeng.chaining
@li @c editeng.items
@li @c editeng.quicktextsize
@li @c editeng.yrs
@section embeddedobj
@@ -373,6 +374,7 @@ certain functionality.
@li @c sfx.notify
@li @c sfx.sidebar
@li @c sfx.view
@li @c sfx.yrs
@section slideshow
@@ -566,6 +568,7 @@ certain functionality.
@li @c sw.ww8 - .doc/.docx export filter, .doc import filter (not writerfilter)
@li @c sw.ww8.level2 - further info for sw.ww8
@li @c sw.xml - Writer .odt import/export
@li @c sw.yrs
@section writerfilter
sfx2/source/view/frmload.cxx
+2 -2
View File
@@ -635,7 +635,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
uno::Reference<connection::XConnection> xConnection;
if (!xModel.is() && aDescriptor.getOrDefault(u"URL"_ustr, OUString()) == "private:factory/swriter" && !getenv("YRSACCEPT"))
{
SAL_DEBUG("YRS connect sfx2");
SAL_INFO("sfx.yrs", "YRS connect sfx2");
// must read this SYNC
auto const conn = u"pipe,name=ytest"_ustr;
@@ -652,7 +652,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA
| static_cast<sal_uInt8>(buf[3]) << 24};
if (size != 0)
{
SAL_DEBUG("YRS connect reading file of size " << size);
SAL_INFO("sfx.yrs", "YRS connect reading file of size " << size);
uno::Sequence<sal_Int8> buff(size);
if (xConnection->read(buff, size) != size)
{
sw/source/core/crsr/viscrs.cxx
+1 -1
View File
@@ -977,7 +977,7 @@ void SwShellCursor::FillRects()
{
cursorRect.Width(20);
}
SAL_DEBUG("YRS FillRects extra rect " << cursorRect);
SAL_INFO("sw.yrs", "YRS FillRects extra rect " << cursorRect);
emplace_back(cursorRect);
SwRect const temp{Point{cursorRect.Left() - cursorRect.Height()/2,
cursorRect.Bottom()}, Size{cursorRect.Height() + 20, 20}};
sw/source/core/doc/DocumentStateManager.cxx
+20 -20
View File
@@ -214,10 +214,10 @@ public:
| static_cast<sal_uInt8>(buf[3]) << 24};
if (size == 0)
{
SAL_DEBUG("YRS 0");
SAL_INFO("sw.yrs", "YRS 0");
break;
}
SAL_DEBUG("YRS receive " << size);
SAL_INFO("sw.yrs", "YRS receive " << size);
::std::unique_ptr<uno::Sequence<sal_Int8>> pBuf{new uno::Sequence<sal_Int8>(size)};
m_xConnection->read(*pBuf, size);
Application::PostUserEvent(LINK(this, YrsThread, HandleMessage), pBuf.release());
@@ -238,7 +238,7 @@ struct ObserveState
extern "C" void observe_comments(void *const pState, uint32_t count, YEvent const*const events)
{
SAL_DEBUG("YRS observe_comments");
SAL_INFO("sw.yrs", "YRS observe_comments");
ObserveState & rState{*static_cast<ObserveState*>(pState)};
// DO NOT call rState.rYrsSupplier.GetWriteTransaction()!
YTransaction *const pTxn{rState.pTxn};
@@ -566,7 +566,7 @@ extern "C" void observe_comments(void *const pState, uint32_t count, YEvent cons
yvalidate(rNode.IsTextNode());
yvalidate(it.first.second <= o3tl::make_unsigned(rNode.GetTextNode()->Len()));
SwPosition anchorPos{*rNode.GetTextNode(), static_cast<sal_Int32>(it.first.second)};
SAL_DEBUG("YRS " << anchorPos);
SAL_INFO("sw.yrs", "YRS " << anchorPos);
SwWrtShell *const pShell{dynamic_cast<SwWrtShell*>(rState.rDoc.getIDocumentLayoutAccess().GetCurrentViewShell())};
SwPostItFieldType* pType = static_cast<SwPostItFieldType*>(pShell->GetFieldType(0, SwFieldIds::Postit));
auto pField{
@@ -824,7 +824,7 @@ void YrsReadCursor(ObserveCursorState & rState, OString const& rPeerId,
extern "C" void observe_cursors(void *const pState, uint32_t count, YEvent const*const events)
{
SAL_DEBUG("YRS observe_cursors");
SAL_INFO("sw.yrs", "YRS observe_cursors");
// note: it (very rarely) happens that observe_cursors will be called
// when a cursor is moved into a comment that is newly inserted, but
// observe_comments hasn't been called to actually insert the comment yet
@@ -952,11 +952,11 @@ void writeLength(sal_Int8 *& rpBuf, sal_Int32 const len)
IMPL_LINK(YrsThread, HandleMessage, void*, pVoid, void)
{
SAL_DEBUG("YRS HandleMessage");
SAL_INFO("sw.yrs", "YRS HandleMessage");
DBG_TESTSOLARMUTEX();
if (!m_pDSM)
{
SAL_DEBUG("m_pDSM died");
SAL_INFO("sw.yrs", "m_pDSM died");
return;
}
// wrap this, not strictly needed but can't hurt?
@@ -968,7 +968,7 @@ IMPL_LINK(YrsThread, HandleMessage, void*, pVoid, void)
{
case ::std::underlying_type_t<Message>(Message::RequestStateVector):
{
SAL_DEBUG("sending state vector");
SAL_INFO("sw.yrs", "sending state vector");
YTransaction *const pTxn{m_pDSM->m_pYrsSupplier->GetWriteTransaction()};
uint32_t len{0};
char * pSV = ytransaction_state_vector_v1(pTxn, &len);
@@ -992,7 +992,7 @@ IMPL_LINK(YrsThread, HandleMessage, void*, pVoid, void)
}
case ::std::underlying_type_t<Message>(Message::SendStateVector):
{
SAL_DEBUG("received state vector");
SAL_INFO("sw.yrs", "received state vector");
YTransaction *const pTxn{m_pDSM->m_pYrsSupplier->GetWriteTransaction()};
uint32_t len{0};
char * pUpdate = ytransaction_state_diff_v1(pTxn,
@@ -1017,13 +1017,13 @@ IMPL_LINK(YrsThread, HandleMessage, void*, pVoid, void)
}
case ::std::underlying_type_t<Message>(Message::SendStateDiff):
{
SAL_DEBUG("apply update: " << yupdate_debug_v1(reinterpret_cast<char const*>(pBuf->begin()) + 1, length - 1));
SAL_INFO("sw.yrs", "apply update: " << yupdate_debug_v1(reinterpret_cast<char const*>(pBuf->begin()) + 1, length - 1));
YTransaction *const pTxn{m_pDSM->m_pYrsSupplier->GetWriteTransaction()};
m_pDSM->m_pYrsSupplier->SetMode(IYrsTransactionSupplier::Mode::Replay);
auto const err = ytransaction_apply(pTxn, reinterpret_cast<char const*>(pBuf->begin()) + 1, length - 1);
if (err != 0)
{
SAL_DEBUG("ytransaction_apply error " << err);
SAL_INFO("sw.yrs", "ytransaction_apply error " << err);
abort();
}
// let's have one observe_deep instead of a observe on every
@@ -1066,7 +1066,7 @@ void DocumentStateManager::YrsNotifySetResolved(OString const& rCommentId, SwPos
void DocumentStateManager::YrsAddCommentImpl(SwPosition const& rAnchorPos, OString const& commentId)
{
SAL_DEBUG("YRS AddCommentImpl");
SAL_INFO("sw.yrs", "YRS AddCommentImpl");
::std::vector<SwAnnotationItem *> items;
// ??? TODO how should this work for multiple viewshells? every shell has its own EditEngine? unclear.
for (SwViewShell & rShell : m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell()->GetRingContainer())
@@ -1092,7 +1092,7 @@ void DocumentStateManager::YrsAddComment(SwPosition const& rPos,
::std::optional<SwPosition> const oAnchorStart, SwPostItField const& rField,
bool const isInsert)
{
SAL_DEBUG("YRS AddComment " << rPos);
SAL_INFO("sw.yrs", "YRS AddComment " << rPos);
OString const commentId{m_pYrsSupplier->GenNewCommentId()};
// this calls EditViewInvalidate so prevent destroying pTxn
YrsAddCommentImpl(rPos, commentId);
@@ -1199,7 +1199,7 @@ void DocumentStateManager::YrsRemoveCommentImpl(OString const& rCommentId)
void DocumentStateManager::YrsRemoveComment(SwPosition const& rPos, OString const& rCommentId)
{
SAL_DEBUG("YRS RemoveComment");
SAL_INFO("sw.yrs", "YRS RemoveComment");
YrsRemoveCommentImpl(rCommentId);
YTransaction *const pTxn{m_pYrsSupplier->GetWriteTransaction()};
if (!pTxn)
@@ -1270,7 +1270,7 @@ void DocumentStateManager::YrsNotifyCursorUpdate()
{
return;
}
SAL_DEBUG("YRS NotifyCursorUpdate");
SAL_INFO("sw.yrs", "YRS NotifyCursorUpdate");
YDoc *const pYDoc{m_pYrsSupplier->GetYDoc()};
auto const id{ydoc_id(pYDoc)};
::std::unique_ptr<YOutput, YOutputDeleter> pEntry{ymap_get(m_pYrsSupplier->m_pCursors, pTxn, OString::number(id).getStr())};
@@ -1403,7 +1403,7 @@ void DocumentStateManager::YrsInitAcceptor()
{
auto const conn = u"pipe,name=ytest"_ustr;
auto const xContext{comphelper::getProcessComponentContext()};
SAL_DEBUG("YRS accept");
SAL_INFO("sw.yrs", "YRS accept");
m_xAcceptor = css::connection::Acceptor::create(xContext);
// TODO move to thread?
uno::Reference<connection::XConnection> xConnection = m_xAcceptor->accept(conn);
@@ -1416,7 +1416,7 @@ void DocumentStateManager::YrsInitAcceptor()
{
try
{
SAL_DEBUG("YRS send file: " << url);
SAL_INFO("sw.yrs", "YRS send file: " << url);
::ucbhelper::Content temp{url, {}, xContext};
uno::Reference<io::XInputStream> const xInStream{temp.openStreamNoLock()};
uno::Reference<io::XSeekable> const xSeekable{xInStream, uno::UNO_QUERY};
@@ -1467,7 +1467,7 @@ void DocumentStateManager::YrsInitAcceptor()
m_pYrsReader = new YrsThread(xConnection, *this);
//m_xAcceptor->stopAccepting();
m_pYrsReader->launch();
SAL_DEBUG("YRS started");
SAL_INFO("sw.yrs", "YRS started");
// inserting comments needs sidebar wins so needs a view shell first
SwFieldType & rType{*m_rDoc.getIDocumentFieldsAccess().GetFieldType(SwFieldIds::Postit, OUString(), false)};
std::vector<SwFormatField*> fields;
@@ -1521,7 +1521,7 @@ void DocumentStateManager::YrsInitConnector(uno::Any const& raConnection)
m_pYrsReader = new YrsThread(xConnection, *this);
m_pYrsReader->launch();
SAL_DEBUG("YRS started (InitConnector)");
SAL_INFO("sw.yrs", "YRS started (InitConnector)");
}
#endif
@@ -1570,7 +1570,7 @@ void DocumentStateManager::SetModified()
m_rDoc.DeleteAutoCorrExceptWord();
#if defined(YRS)
SAL_DEBUG("YRS SetModified");
SAL_INFO("sw.yrs", "YRS SetModified");
YrsCommitModified();
#endif
}
sw/source/uibase/docvw/PostItMgr.cxx
+1 -1
View File
@@ -909,7 +909,7 @@ VclPtr<SwAnnotationWin> SwPostItMgr::GetOrCreateAnnotationWindow(SwAnnotationIte
pPostIt->SetReadonly(mbReadOnly);
rItem.mpPostIt = pPostIt;
#if defined(YRS)
SAL_DEBUG("YRS GetOrCreateAnnotationWindow " << rItem.mpPostIt);
SAL_INFO("sw.yrs", "YRS GetOrCreateAnnotationWindow " << rItem.mpPostIt);
#endif
if (mpAnswer)
{
sw/source/uibase/docvw/SidebarTxtControl.cxx
+2 -2
View File
@@ -206,7 +206,7 @@ OUString SidebarTextControl::RequestHelp(tools::Rectangle& rHelpRect)
#if defined(YRS)
void SidebarTextControl::EditViewInvalidate(const tools::Rectangle& rRect)
{
SAL_DEBUG("YRS EditViewInvalidate");
SAL_INFO("sw.yrs", "YRS EditViewInvalidate");
mrDocView.GetDocShell()->GetDoc()->getIDocumentState().YrsNotifyCursorUpdate();
mrDocView.GetDocShell()->GetDoc()->getIDocumentState().YrsCommitModified();
return WeldEditView::EditViewInvalidate(rRect);
@@ -214,7 +214,7 @@ void SidebarTextControl::EditViewInvalidate(const tools::Rectangle& rRect)
void SidebarTextControl::EditViewSelectionChange()
{
SAL_DEBUG("YRS EditViewSelectionChange");
SAL_INFO("sw.yrs", "YRS EditViewSelectionChange");
mrDocView.GetDocShell()->GetDoc()->getIDocumentState().YrsNotifyCursorUpdate();
return WeldEditView::EditViewSelectionChange();
}