diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-14 09:49:39 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-15 06:45:14 +0000 |
commit | d15b4e204598fc7e4c1682c4f10228e217575937 (patch) | |
tree | 1173b2725abac5f06bfd2e28965a95256283e6a4 /sw | |
parent | 14a0d26d6ae0ee59a685c254ec235fea81636475 (diff) |
teach sallogareas plugin to catch inconsistencies
Change-Id: I8bcea5ffc74d48148bea78da8c17744e288c069a
Reviewed-on: https://gerrit.libreoffice.org/32004
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/crsr/crsrsh.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/doc/docfmt.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/draw/dcontact.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/ftnfrm.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/unocore/unorefmk.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 38 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxexport.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/swxml.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uiview/view.cxx | 2 |
12 files changed, 36 insertions, 36 deletions
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index a16ce8dc3ffa..4b1d6b78904d 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -1382,7 +1382,7 @@ static bool lcl_CheckHiddenSection( SwNodeIndex& rIdx ) const SwNode* pFrameNd = rIdx.GetNodes().FindPrvNxtFrameNode( aTmp, pSectNd->EndOfSectionNode() ); bOk = pFrameNd != nullptr; - SAL_WARN_IF(!bOk, "sw", "found no Node with Frames"); + SAL_WARN_IF(!bOk, "sw.core", "found no Node with Frames"); rIdx = aTmp; } return bOk; @@ -1549,7 +1549,7 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd ) CheckTableBoxContent(); if(!m_pTableCursor) { - SAL_WARN("sw", "fdo#74854: " + SAL_WARN("sw.core", "fdo#74854: " "this should not happen, but better lose the selection " "rather than crashing"); return; diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 738ad8b6dfbe..067dadcb72dd 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -2078,7 +2078,7 @@ void SwFrameFormats::DeleteAndDestroyAll( bool keepDefault ) std::pair<SwFrameFormats::const_iterator,bool> SwFrameFormats::push_back( const value_type& x ) { - SAL_WARN_IF(x->m_ffList != nullptr, "sw", "Inserting already assigned item"); + SAL_WARN_IF(x->m_ffList != nullptr, "sw.core", "Inserting already assigned item"); assert(x->m_ffList == nullptr); x->m_ffList = this; return m_PosIndex.push_back( x ); @@ -2087,7 +2087,7 @@ std::pair<SwFrameFormats::const_iterator,bool> SwFrameFormats::push_back( const bool SwFrameFormats::erase( const value_type& x ) { const_iterator const ret = find( x ); - SAL_WARN_IF(x->m_ffList != this, "sw", "Removing invalid / unassigned item"); + SAL_WARN_IF(x->m_ffList != this, "sw.core", "Removing invalid / unassigned item"); if (ret != end()) { assert( x == *ret ); m_PosIndex.erase( ret ); diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 431bc11c937e..73d2b38f85e3 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1396,7 +1396,7 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint) SwClient::SwClientNotify(rMod, rHint); if (auto pLegacyHint = dynamic_cast<const sw::LegacyModifyHint*>(&rHint)) { - SAL_WARN_IF(mbDisconnectInProgress, "sw", "<SwDrawContact::Modify(..)> called during disconnection."); + SAL_WARN_IF(mbDisconnectInProgress, "sw.core", "<SwDrawContact::Modify(..)> called during disconnection."); const SfxPoolItem* pNew = pLegacyHint->m_pNew; sal_uInt16 nWhich = pNew ? pNew->Which() : 0; @@ -1435,7 +1435,7 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint) maAnchoredDrawObj.DrawObj()->notifyShapePropertyChange(svx::ShapeProperty::TextDocAnchor); } else - SAL_WARN("sw", "SwDrawContact::Modify: no draw object here?"); + SAL_WARN("sw.core", "SwDrawContact::Modify: no draw object here?"); } } } diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 230b5edd0de7..9c1d17a55758 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2539,7 +2539,7 @@ void SwFrameFormat::SetName( const OUString& rNewName, bool bBroadcast ) if (m_ffList != nullptr) { SwFrameFormats::iterator it = m_ffList->find( this ); assert( m_ffList->end() != it ); - SAL_INFO_IF(m_aFormatName == rNewName, "sw", "SwFrmFmt not really renamed, as both names are equal"); + SAL_INFO_IF(m_aFormatName == rNewName, "sw.core", "SwFrmFmt not really renamed, as both names are equal"); SwStringMsgPoolItem aOld( RES_NAME_CHANGED, m_aFormatName ); // As it's a non-unique list, rename should never fail! diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index bd5fef550b30..775059c5d966 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -2789,7 +2789,7 @@ const SwContentFrame* SwFootnoteFrame::GetRef() const const SwContentFrame* pRefAttr = GetRefFromAttr(); SAL_WARN_IF( pRef != pRefAttr && !pRef->IsAnFollow( pRefAttr ) && !pRefAttr->IsAnFollow( pRef ), - "sw", "access to deleted Frame? pRef != pAttr->GetRef()" ); + "sw.core", "access to deleted Frame? pRef != pAttr->GetRef()" ); return pRef; } @@ -2798,7 +2798,7 @@ SwContentFrame* SwFootnoteFrame::GetRef() const SwContentFrame* pRefAttr = GetRefFromAttr(); SAL_WARN_IF( pRef != pRefAttr && !pRef->IsAnFollow( pRefAttr ) && !pRefAttr->IsAnFollow( pRef ), - "sw", "access to deleted Frame? pRef != pAttr->GetRef()" ); + "sw.core", "access to deleted Frame? pRef != pAttr->GetRef()" ); return pRef; } #endif diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 3592fc4e6008..d6d65727a625 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -1539,7 +1539,7 @@ lcl_getPrefixOrSuffix( uno::UNO_QUERY); if (!xObject.is()) continue; if (xEnum->hasMoreElements()) { - SAL_INFO("sw", "ignoring other odf:Prefix/odf:Suffix statements"); + SAL_INFO("sw.uno", "ignoring other odf:Prefix/odf:Suffix statements"); } return xObject->getValue(); } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index c3ebd97d479d..232403919894 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2195,7 +2195,7 @@ void DocxAttributeOutput::RunText( const OUString& rText, rtl_TextEncoding /*eCh if ( *pIt < 0x0020 ) // filter out the control codes { impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt ); - SAL_INFO("sw", "Ignored control code in a text run: " << *pIt ); + SAL_INFO("sw.ww8", "Ignored control code in a text run: " << *pIt ); } prevUnicode = *pIt; break; @@ -2207,12 +2207,12 @@ void DocxAttributeOutput::RunText( const OUString& rText, rtl_TextEncoding /*eCh void DocxAttributeOutput::RawText(const OUString& /*rText*/, rtl_TextEncoding /*eCharSet*/) { - SAL_INFO("sw", "TODO DocxAttributeOutput::RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet )" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet )" ); } void DocxAttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) { - SAL_INFO("sw", "TODO DocxAttributeOutput::StartRuby( const SwTextNode& rNode, const SwFormatRuby& rRuby )" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::StartRuby( const SwTextNode& rNode, const SwFormatRuby& rRuby )" ); EndRun(); // end run before starting ruby to avoid nested runs, and overlap assert(!m_closeHyperlinkInThisRun); // check that no hyperlink overlaps ruby assert(!m_closeHyperlinkInPreviousRun); @@ -2276,7 +2276,7 @@ void DocxAttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 nPos, co void DocxAttributeOutput::EndRuby() { - SAL_INFO("sw", "TODO DocxAttributeOutput::EndRuby()" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::EndRuby()" ); EndRun( ); m_pSerializer->endElementNS( XML_w, XML_rubyBase ); m_pSerializer->endElementNS( XML_w, XML_ruby ); @@ -2558,7 +2558,7 @@ void DocxAttributeOutput::StartRedline( const SwRedlineData * pRedlineData ) break; case nsRedlineType_t::REDLINE_FORMAT: - SAL_INFO("sw", "TODO DocxAttributeOutput::StartRedline()" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::StartRedline()" ); break; default: break; @@ -2581,7 +2581,7 @@ void DocxAttributeOutput::EndRedline( const SwRedlineData * pRedlineData ) break; case nsRedlineType_t::REDLINE_FORMAT: - SAL_INFO("sw", "TODO DocxAttributeOutput::EndRedline()" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::EndRedline()" ); break; default: break; @@ -2590,7 +2590,7 @@ void DocxAttributeOutput::EndRedline( const SwRedlineData * pRedlineData ) void DocxAttributeOutput::FormatDrop( const SwTextNode& /*rNode*/, const SwFormatDrop& /*rSwFormatDrop*/, sal_uInt16 /*nStyle*/, ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/, ww8::WW8TableNodeInfoInner::Pointer_t ) { - SAL_INFO("sw", "TODO DocxAttributeOutput::FormatDrop( const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle )" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::FormatDrop( const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle )" ); } void DocxAttributeOutput::ParagraphStyle( sal_uInt16 nStyle ) @@ -3758,17 +3758,17 @@ void DocxAttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointe void DocxAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ ) { - SAL_INFO("sw", "TODO: DocxAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )" ); + SAL_INFO("sw.ww8", "TODO: DocxAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )" ); } void DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ ) { - SAL_INFO("sw", "TODO: DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )\n" ); + SAL_INFO("sw.ww8", "TODO: DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )\n" ); } void DocxAttributeOutput::TableRowEnd( sal_uInt32 /*nDepth*/ ) { - SAL_INFO("sw", "TODO: DocxAttributeOutput::TableRowEnd( sal_uInt32 nDepth = 1 )" ); + SAL_INFO("sw.ww8", "TODO: DocxAttributeOutput::TableRowEnd( sal_uInt32 nDepth = 1 )" ); } void DocxAttributeOutput::StartStyles() @@ -4116,7 +4116,7 @@ void DocxAttributeOutput::EndStyles( sal_uInt16 nNumberOfStyles ) void DocxAttributeOutput::DefaultStyle() { // are these the values of enum ww::sti (see ../inc/wwstyles.hxx)? - SAL_INFO("sw", "TODO DocxAttributeOutput::DefaultStyle()"); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::DefaultStyle()"); } /* Writes <a:srcRect> tag back to document.xml if a file conatins a cropped image. @@ -4209,7 +4209,7 @@ void DocxAttributeOutput::CacheRelId(BitmapChecksum nChecksum, const OUString& r void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* pSdrObj ) { - SAL_INFO("sw", "TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* pSdrObj ) - some stuff still missing" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* pSdrObj ) - some stuff still missing" ); GetSdtEndBefore(pSdrObj); @@ -4474,7 +4474,7 @@ void DocxAttributeOutput::WritePostponedChart() if( xChartDoc.is() ) { - SAL_INFO("sw", "DocxAttributeOutput::WriteOLE2Obj: export chart "); + SAL_INFO("sw.ww8", "DocxAttributeOutput::WriteOLE2Obj: export chart "); m_pSerializer->startElementNS( XML_w, XML_drawing, FSEND ); m_pSerializer->startElementNS( XML_wp, XML_inline, @@ -5046,7 +5046,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame &rFrame, const P } break; default: - SAL_INFO("sw", "TODO DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame& rFrame, const Point& rNdTopLeft ) - frame type " << + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame& rFrame, const Point& rNdTopLeft ) - frame type " << ( rFrame.GetWriterType() == ww8::Frame::eTextBox ? "eTextBox": ( rFrame.GetWriterType() == ww8::Frame::eOle ? "eOle": "???" ) ) ); break; @@ -5462,7 +5462,7 @@ void DocxAttributeOutput::SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectio break; default: - SAL_INFO("sw", "Unknown section break to write: " << nC ); + SAL_INFO("sw.ww8", "Unknown section break to write: " << nC ); break; } } @@ -5757,7 +5757,7 @@ void DocxAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, const ::boo m_pSerializer->singleElementNS( XML_w, XML_pgNumType, xAttrs ); // see 2.6.12 pgNumType (Page Numbering Settings) - SAL_INFO("sw", "TODO DocxAttributeOutput::SectionPageNumbering()" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::SectionPageNumbering()" ); } void DocxAttributeOutput::SectionType( sal_uInt8 nBreakCode ) @@ -6420,7 +6420,7 @@ void DocxAttributeOutput::CharWeight( const SvxWeightItem& rWeight ) void DocxAttributeOutput::CharAutoKern( const SvxAutoKernItem& ) { - SAL_INFO("sw", "TODO DocxAttributeOutput::CharAutoKern()" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::CharAutoKern()" ); } void DocxAttributeOutput::CharAnimatedText( const SvxBlinkItem& rBlink ) @@ -6645,7 +6645,7 @@ void DocxAttributeOutput::RefField( const SwField& rField, const OUString& rRef void DocxAttributeOutput::HiddenField( const SwField& /*rField*/ ) { - SAL_INFO("sw", "TODO DocxAttributeOutput::HiddenField()" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::HiddenField()" ); } void DocxAttributeOutput::PostitField( const SwField* pField ) @@ -7294,7 +7294,7 @@ void DocxAttributeOutput::FormatFrameSize( const SwFormatFrameSize& rSize ) void DocxAttributeOutput::FormatPaperBin( const SvxPaperBinItem& ) { - SAL_INFO("sw", "TODO DocxAttributeOutput::FormatPaperBin()" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::FormatPaperBin()" ); } void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace ) diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 0ae22daa9997..5f41a530dd56 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -348,7 +348,7 @@ void DocxExport::DoComboBox(const OUString& rName, void DocxExport::DoFormText(const SwInputField* /*pField*/) { - SAL_INFO("sw", "TODO DocxExport::ForFormText()" ); + SAL_INFO("sw.ww8", "TODO DocxExport::ForFormText()" ); } OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr const & m_pSerializer ) @@ -521,12 +521,12 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode ) void DocxExport::OutputGrfNode( const SwGrfNode& ) { - SAL_INFO("sw", "TODO DocxExport::OutputGrfNode( const SwGrfNode& )" ); + SAL_INFO("sw.ww8", "TODO DocxExport::OutputGrfNode( const SwGrfNode& )" ); } void DocxExport::OutputOLENode( const SwOLENode& ) { - SAL_INFO("sw", "TODO DocxExport::OutputOLENode( const SwOLENode& )" ); + SAL_INFO("sw.ww8", "TODO DocxExport::OutputOLENode( const SwOLENode& )" ); } void DocxExport::OutputLinkedOLE( const OUString& ) diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 4b39b7901b66..627b3e1e5cd6 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -3108,7 +3108,7 @@ void MSWordExportBase::OutputContentNode( const SwContentNode& rNode ) OutputOLENode( *rNode.GetOLENode() ); break; default: - SAL_WARN("sw", "Unhandled node, type == " << (int)rNode.GetNodeType() ); + SAL_WARN("sw.ww8", "Unhandled node, type == " << (int)rNode.GetNodeType() ); break; } } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 68894bdb3655..841816796d99 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4755,7 +4755,7 @@ void SwWW8ImplReader::ReadDocInfo() Sttb aSttb; m_pTableStream->Seek( m_pWwFib->m_fcSttbfAssoc ); // point at tgc record if (!aSttb.Read( *m_pTableStream ) ) - SAL_WARN("sw", "** Read of SttbAssoc data failed!!!! "); + SAL_WARN("sw.ww8", "** Read of SttbAssoc data failed!!!! "); m_pTableStream->Seek( nCur ); // return to previous position, is that necessary? #if OSL_DEBUG_LEVEL > 1 aSttb.Print( stderr ); diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index d9169ef84505..66327a29117e 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -154,7 +154,7 @@ sal_Int32 ReadThroughComponent( uno::Reference< xml::sax::XDocumentHandler > xFilter( rxContext->getServiceManager()->createInstanceWithArgumentsAndContext(aFilterName, rFilterArguments, rxContext), UNO_QUERY); - SAL_WARN_IF(!xFilter.is(), "sw", "Can't instantiate filter component: " << aFilterName); + SAL_WARN_IF(!xFilter.is(), "sw.filter", "Can't instantiate filter component: " << aFilterName); if( !xFilter.is() ) return ERR_SWG_READ_ERROR; SAL_INFO( "sw.filter", "" << pFilterName << " created" ); diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index fcaf9de3fa8f..fb86d2776306 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -912,7 +912,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) SAL_WARN_IF( officecfg::Office::Common::Undo::Steps::get() <= 0, - "sw", "/org.openoffice.Office.Common/Undo/Steps <= 0"); + "sw.ui", "/org.openoffice.Office.Common/Undo/Steps <= 0"); m_pWrtShell->DoUndo(); const bool bBrowse = m_pWrtShell->GetViewOptions()->getBrowseMode(); |