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>

7 files changed, 46 insertions, 46 deletions

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 0b89aa15dc4d..61f53e03219a 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -885,14 +885,14 @@ bool lcl_emptyRow(std::vector<RowSequence_t>& rTableRanges, sal_Int32 nRow)
 {
     if (nRow >= static_cast<sal_Int32>(rTableRanges.size()))
     {
-        SAL_WARN("writerfilter", "m_aCellProperties not in sync with rTableRanges?");
+        SAL_WARN("writerfilter.dmapper", "m_aCellProperties not in sync with rTableRanges?");
         return false;
     }
 
     RowSequence_t rRowSeq = rTableRanges[nRow];
     if (rRowSeq.getLength() == 0)
     {
-        SAL_WARN("writerfilter", "m_aCellProperties not in sync with rTableRanges?");
+        SAL_WARN("writerfilter.dmapper", "m_aCellProperties not in sync with rTableRanges?");
         return false;
     }
 
@@ -908,7 +908,7 @@ bool lcl_emptyRow(std::vector<RowSequence_t>& rTableRanges, sal_Int32 nRow)
     }
     catch (const lang::IllegalArgumentException& e)
     {
-        SAL_WARN("writerfilter", "compareRegionStarts() failed: " << e.Message);
+        SAL_WARN( "writerfilter.dmapper", "compareRegionStarts() failed: " << e.Message);
         return false;
     }
     return true;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 87d93bec313f..fec064cbc826 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -571,7 +571,7 @@ void    DomainMapper_Impl::PopProperties(ContextType eId)
 PropertyMapPtr DomainMapper_Impl::GetTopContextOfType(ContextType eId)
 {
     PropertyMapPtr pRet;
-    SAL_WARN_IF( m_aPropertyStacks[eId].empty(), "writerfilter",
+    SAL_WARN_IF( m_aPropertyStacks[eId].empty(), "writerfilter.dmapper",
         "no context of type " << static_cast<int>(eId) << " available");
     if(!m_aPropertyStacks[eId].empty())
         pRet = m_aPropertyStacks[eId].top();
@@ -587,7 +587,7 @@ uno::Reference< text::XTextAppend >  DomainMapper_Impl::GetTopTextAppend()
 
 FieldContextPtr  DomainMapper_Impl::GetTopFieldContext()
 {
-    SAL_WARN_IF(m_aFieldStack.empty(), "writerfilter", "Field stack is empty");
+    SAL_WARN_IF(m_aFieldStack.empty(), "writerfilter.dmapper", "Field stack is empty");
     return m_aFieldStack.top();
 }
 
@@ -662,7 +662,7 @@ uno::Any DomainMapper_Impl::GetPropertyFromStyleSheet(PropertyIds eId)
         //search until the property is set or no parent is available
         StyleSheetEntryPtr pNewEntry = GetStyleSheetTable()->FindParentStyleSheet(pEntry->sBaseStyleIdentifier);
 
-        SAL_WARN_IF( pEntry == pNewEntry, "writerfilter", "circular loop in style hierarchy?");
+        SAL_WARN_IF( pEntry == pNewEntry, "writerfilter.dmapper", "circular loop in style hierarchy?");
 
         if (pEntry == pNewEntry) //fdo#49587
             break;
@@ -1199,7 +1199,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap )
         }
         catch(const uno::Exception& e)
         {
-            SAL_WARN( "writerfilter", "finishParagraph() exception: " << e.Message );
+            SAL_WARN( "writerfilter.dmapper", "finishParagraph() exception: " << e.Message );
         }
     }
 
@@ -1630,7 +1630,7 @@ void DomainMapper_Impl::PushFootOrEndnote( bool bIsFootnote )
     }
     catch( const uno::Exception& e )
     {
-        SAL_WARN("writerfilter", "exception in PushFootOrEndnote: " << e.Message);
+        SAL_WARN("writerfilter.dmapper", "exception in PushFootOrEndnote: " << e.Message);
     }
 }
 
@@ -1748,7 +1748,7 @@ void DomainMapper_Impl::PushAnnotation()
     }
     catch( const uno::Exception& rException)
     {
-        SAL_WARN("writerfilter", "exception in PushAnnotation: " << rException.Message);
+        SAL_WARN("writerfilter.dmapper", "exception in PushAnnotation: " << rException.Message);
     }
 }
 
@@ -1766,7 +1766,7 @@ void DomainMapper_Impl::PopFootOrEndnote()
 
     if (m_aRedlines.size() == 1)
     {
-        SAL_WARN("writerfilter", "PopFootOrEndnote() is called without PushFootOrEndnote()?");
+        SAL_WARN("writerfilter.dmapper", "PopFootOrEndnote() is called without PushFootOrEndnote()?");
         return;
     }
     m_aRedlines.pop();
@@ -1815,7 +1815,7 @@ void DomainMapper_Impl::PopAnnotation()
     }
     catch (uno::Exception const& e)
     {
-        SAL_WARN("writerfilter",
+        SAL_WARN("writerfilter.dmapper",
                 "Cannot insert annotation field: exception: " << e.Message);
     }
 
@@ -2007,7 +2007,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
     }
     catch ( const uno::Exception& e )
     {
-        SAL_WARN("writerfilter", "Exception when adding shape: " << e.Message);
+        SAL_WARN("writerfilter.dmapper", "Exception when adding shape: " << e.Message);
     }
 }
 /*
@@ -2614,7 +2614,7 @@ void DomainMapper_Impl::ChainTextFrames()
     }
     catch (const uno::Exception& rException)
     {
-        SAL_WARN("writerfilter", "failed. message: " << rException.Message);
+        SAL_WARN("writerfilter.dmapper", "failed. message: " << rException.Message);
     }
 }
 
@@ -4250,7 +4250,7 @@ void DomainMapper_Impl::CloseFieldCommand()
         }
         catch( const uno::Exception& e )
         {
-            SAL_WARN( "writerfilter", "Exception in CloseFieldCommand(): " << e.Message );
+            SAL_WARN( "writerfilter.dmapper", "Exception in CloseFieldCommand(): " << e.Message );
         }
         pContext->SetCommandCompleted();
     }
@@ -4903,7 +4903,7 @@ void DomainMapper_Impl::ExecuteFrameConversion()
         }
         catch( const uno::Exception& rEx)
         {
-            SAL_WARN( "writerfilter", "Exception caught when converting to frame: " + rEx.Message );
+            SAL_WARN( "writerfilter.dmapper", "Exception caught when converting to frame: " + rEx.Message );
         }
     }
     m_xFrameStartRange = nullptr;
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index 3841f4ea19be..452dd95211db 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -68,7 +68,7 @@ void FontTable::lcl_attribute(Id Name, Value & val)
             else if (static_cast<Id>(nIntValue) == NS_ooxml::LN_Value_ST_Pitch_default)
                 m_pImpl->pCurrentEntry->nPitchRequest = awt::FontPitch::DONTKNOW;
             else
-                SAL_WARN("writerfilter", "FontTable::lcl_attribute: unhandled NS_ooxml::CT_Pitch_val: " << nIntValue);
+                SAL_WARN("writerfilter.dmapper", "FontTable::lcl_attribute: unhandled NS_ooxml::CT_Pitch_val: " << nIntValue);
             break;
         case NS_ooxml::LN_CT_Font_name:
             m_pImpl->pCurrentEntry->sFontName = sValue;
@@ -143,7 +143,7 @@ void FontTable::lcl_sprm(Sprm& rSprm)
         case NS_ooxml::LN_CT_Font_notTrueType:
             break;
         default:
-            SAL_WARN("writerfilter", "FontTable::lcl_sprm: unhandled token: " << nSprmId);
+            SAL_WARN("writerfilter.dmapper", "FontTable::lcl_sprm: unhandled token: " << nSprmId);
             break;
     }
 }
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index f8d5bdc883df..32b25c3d3a64 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -81,7 +81,7 @@ void OOXMLDocumentImpl::resolveFastSubStream(Stream & rStreamHandler,
     }
     catch (uno::Exception const& e)
     {
-        SAL_INFO("writerfilter", "resolveFastSubStream: exception while "
+        SAL_INFO("writerfilter.ooxml", "resolveFastSubStream: exception while "
                 "resolving stream " << nType << " : " << e.Message);
         return;
     }
@@ -139,7 +139,7 @@ uno::Reference<xml::dom::XDocument> OOXMLDocumentImpl::importSubStream(OOXMLStre
     }
     catch (uno::Exception const& e)
     {
-        SAL_INFO("writerfilter", "importSubStream: exception while "
+        SAL_INFO("writerfilter.ooxml", "importSubStream: exception while "
                 "importing stream " << nType << " : " << e.Message);
         return xRet;
     }
@@ -157,7 +157,7 @@ uno::Reference<xml::dom::XDocument> OOXMLDocumentImpl::importSubStream(OOXMLStre
         }
         catch (uno::Exception const& e)
         {
-            SAL_INFO("writerfilter", "importSubStream: exception while "
+            SAL_INFO("writerfilter.ooxml", "importSubStream: exception while "
                      "parsing stream " << nType << " : " << e.Message);
             return xRet;
         }
@@ -190,7 +190,7 @@ void OOXMLDocumentImpl::importSubStreamRelations(const OOXMLStream::Pointer_t& p
     }
     catch (uno::Exception const& e)
     {
-        SAL_WARN("writerfilter", "importSubStreamRelations: exception while "
+        SAL_WARN("writerfilter.ooxml", "importSubStreamRelations: exception while "
             "importing stream " << nType << " : " << e.Message);
         return;
     }
@@ -211,7 +211,7 @@ void OOXMLDocumentImpl::importSubStreamRelations(const OOXMLStream::Pointer_t& p
             }
             catch (uno::Exception const& e)
             {
-                SAL_WARN("writerfilter", "importSubStream: exception while "
+                SAL_WARN("writerfilter.ooxml", "importSubStream: exception while "
                          "parsing stream " << nType << " : " << e.Message);
                 mxCustomXmlProsDom = xRelation;
             }
@@ -617,7 +617,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/)
     }
     catch (uno::Exception const& e)
     {
-        SAL_INFO("writerfilter", "resolveGlossaryStream: exception while "
+        SAL_INFO("writerfilter.ooxml", "resolveGlossaryStream: exception while "
                  "createStream for glossary" << OOXMLStream::GLOSSARY << " : " << e.Message);
         return;
     }
@@ -684,7 +684,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/)
                   }
                   catch (uno::Exception const& e)
                   {
-                      SAL_INFO("writerfilter", "importSubStream: exception while "
+                      SAL_INFO("writerfilter.ooxml", "importSubStream: exception while "
                       "parsing stream of Type" << nType << " : " << e.Message);
                       return;
                   }
@@ -771,7 +771,7 @@ void OOXMLDocumentImpl::resolveEmbeddingsStream(const OOXMLStream::Pointer_t& pS
                     }
                     catch (uno::Exception const& e)
                     {
-                        SAL_INFO("writerfilter", "resolveEmbeddingsStream: can't find header/footer whilst "
+                        SAL_INFO("writerfilter.ooxml", "resolveEmbeddingsStream: can't find header/footer whilst "
                                "resolving stream " << streamType << " : " << e.Message);
                         return;
                     }
diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
index 2529492494d7..6905f1c4d983 100644
--- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
@@ -408,7 +408,7 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
     break;
     default:
     {
-        SAL_INFO("writerfilter", "TODO handle symbol '" << keywordToString(nKeyword) << "'");
+        SAL_INFO("writerfilter.rtf", "TODO handle symbol '" << keywordToString(nKeyword) << "'");
         aSkip.setParsed(false);
     }
     break;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index c113167c1cc8..6cd868a1149f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -140,7 +140,7 @@ RTFSprms& getLastAttributes(RTFSprms& rSprms, Id nId)
         return p->getSprms().back().second->getAttributes();
     else
     {
-        SAL_WARN("writerfilter", "trying to set property when no type is defined");
+        SAL_WARN("writerfilter.rtf", "trying to set property when no type is defined");
         return rSprms;
     }
 }
@@ -366,9 +366,9 @@ void RTFDocumentImpl::resolveSubstream(std::size_t nPos, Id nId, OUString& rIgno
     }
     pImpl->m_nDefaultFontIndex = m_nDefaultFontIndex;
     pImpl->Strm().Seek(nPos);
-    SAL_INFO("writerfilter", "substream start");
+    SAL_INFO("writerfilter.rtf", "substream start");
     Mapper().substream(nId, pImpl);
-    SAL_INFO("writerfilter", "substream end");
+    SAL_INFO("writerfilter.rtf", "substream end");
     Strm().Seek(nCurrent);
 }
 
@@ -585,7 +585,7 @@ void RTFDocumentImpl::parBreak()
 
 void RTFDocumentImpl::sectBreak(bool bFinal)
 {
-    SAL_INFO("writerfilter", OSL_THIS_FUNC << ": final? " << bFinal << ", needed? " << m_bNeedSect);
+    SAL_INFO("writerfilter.rtf", OSL_THIS_FUNC << ": final? " << bFinal << ", needed? " << m_bNeedSect);
     bool bNeedSect = m_bNeedSect;
     RTFValue::Pointer_t pBreak = m_aStates.top().aSectionSprms.find(NS_ooxml::LN_EG_SectPrContents_type);
     bool bContinuous = pBreak.get() && pBreak->getInt() == static_cast<sal_Int32>(NS_ooxml::LN_Value_ST_SectionMark_continuous);
@@ -738,28 +738,28 @@ void RTFDocumentImpl::resolve(Stream& rMapper)
     switch (m_pTokenizer->resolveParse())
     {
     case RTFError::OK:
-        SAL_INFO("writerfilter", "RTFDocumentImpl::resolve: finished without errors");
+        SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolve: finished without errors");
         break;
     case RTFError::GROUP_UNDER:
-        SAL_INFO("writerfilter", "RTFDocumentImpl::resolve: unmatched '}'");
+        SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolve: unmatched '}'");
         break;
     case RTFError::GROUP_OVER:
-        SAL_INFO("writerfilter", "RTFDocumentImpl::resolve: unmatched '{'");
+        SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolve: unmatched '{'");
         throw io::WrongFormatException(m_pTokenizer->getPosition());
         break;
     case RTFError::UNEXPECTED_EOF:
-        SAL_INFO("writerfilter", "RTFDocumentImpl::resolve: unexpected end of file");
+        SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolve: unexpected end of file");
         throw io::WrongFormatException(m_pTokenizer->getPosition());
         break;
     case RTFError::HEX_INVALID:
-        SAL_INFO("writerfilter", "RTFDocumentImpl::resolve: invalid hex char");
+        SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolve: invalid hex char");
         throw io::WrongFormatException(m_pTokenizer->getPosition());
         break;
     case RTFError::CHAR_OVER:
-        SAL_INFO("writerfilter", "RTFDocumentImpl::resolve: characters after last '}'");
+        SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolve: characters after last '}'");
         break;
     case RTFError::CLASSIFICATION:
-        SAL_INFO("writerfilter", "RTFDocumentImpl::resolve: classification prevented paste");
+        SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolve: classification prevented paste");
         break;
     }
 }
@@ -1148,7 +1148,7 @@ RTFError RTFDocumentImpl::resolveChars(char ch)
     }
 
     OUString aOUStr(OStringToOUString(aStr, m_aStates.top().nCurrentEncoding));
-    SAL_INFO("writerfilter", "RTFDocumentImpl::resolveChars: collected '" << aOUStr << "'");
+    SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolveChars: collected '" << aOUStr << "'");
 
     if (m_aStates.top().eDestination == Destination::COLORTABLE)
     {
@@ -1273,7 +1273,7 @@ void RTFDocumentImpl::text(OUString& rString)
                     m_aStyleTableEntries.insert(std::make_pair(m_nCurrentStyleIndex, pProp));
                 }
                 else
-                    SAL_INFO("writerfilter", "no RTF style type defined, ignoring");
+                    SAL_INFO("writerfilter.rtf", "no RTF style type defined, ignoring");
                 break;
             }
             case Destination::LISTNAME:
@@ -1761,7 +1761,7 @@ RTFError RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int n
         break;
     default:
     {
-        SAL_INFO("writerfilter", "TODO handle toggle '" << keywordToString(nKeyword) << "'");
+        SAL_INFO("writerfilter.rtf", "TODO handle toggle '" << keywordToString(nKeyword) << "'");
         aSkip.setParsed(false);
     }
     break;
@@ -1771,7 +1771,7 @@ RTFError RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int n
 
 RTFError RTFDocumentImpl::pushState()
 {
-    //SAL_INFO("writerfilter", OSL_THIS_FUNC << " before push: " << m_pTokenizer->getGroup());
+    //SAL_INFO("writerfilter.rtf", OSL_THIS_FUNC << " before push: " << m_pTokenizer->getGroup());
 
     checkUnicode(/*bUnicode =*/ true, /*bHex =*/ true);
     m_nGroupStartPos = Strm().Tell();
@@ -1979,7 +1979,7 @@ RTFError RTFDocumentImpl::popState()
             }
             catch (const rtl::MalformedUriException& rException)
             {
-                SAL_WARN("writerfilter", "rtl::Uri::convertRelToAbs() failed: " << rException.getMessage());
+                SAL_WARN("writerfilter.rtf", "rtl::Uri::convertRelToAbs() failed: " << rException.getMessage());
             }
 
             if (!aPictureURL.isEmpty())
@@ -2762,7 +2762,7 @@ RTFError RTFDocumentImpl::popState()
                 }
                 catch (const uno::Exception& rException)
                 {
-                    SAL_WARN("writerfilter", "failed to set property " << rKey << ": " << rException.Message);
+                    SAL_WARN("writerfilter.rtf", "failed to set property " << rKey << ": " << rException.Message);
                 }
             }
         }
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 5727b144d11c..8fe6b9f2bc59 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -54,7 +54,7 @@ RTFTokenizer::~RTFTokenizer() = default;
 
 RTFError RTFTokenizer::resolveParse()
 {
-    SAL_INFO("writerfilter", OSL_THIS_FUNC);
+    SAL_INFO("writerfilter.rtf", OSL_THIS_FUNC);
     char ch;
     RTFError ret;
     // for hex chars
@@ -134,7 +134,7 @@ RTFError RTFTokenizer::resolveParse()
                 }
                 else
                 {
-                    SAL_INFO("writerfilter", OSL_THIS_FUNC << ": hex internal state");
+                    SAL_INFO("writerfilter.rtf", OSL_THIS_FUNC << ": hex internal state");
                     b = b << 4;
                     sal_Int8 parsed = asHex(ch);
                     if (parsed == -1)
@@ -288,7 +288,7 @@ RTFError RTFTokenizer::dispatchKeyword(OString& rKeyword, bool bParam, int nPara
     int i = low - s_aRTFControlWords.begin();
     if (low == s_aRTFControlWords.end() || aSymbol < *low)
     {
-        SAL_INFO("writerfilter", OSL_THIS_FUNC << ": unknown keyword '\\" << rKeyword.getStr() << "'");
+        SAL_INFO("writerfilter.rtf", OSL_THIS_FUNC << ": unknown keyword '\\" << rKeyword.getStr() << "'");
         RTFSkipDestination aSkip(m_rImport);
         aSkip.setParsed(false);
         return RTFError::OK;