summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-12-14 09:49:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-12-15 06:45:14 +0000
commitd15b4e204598fc7e4c1682c4f10228e217575937 (patch)
tree1173b2725abac5f06bfd2e28965a95256283e6a4 /oox
parent14a0d26d6ae0ee59a685c254ec235fea81636475 (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 'oox')
-rw-r--r--oox/source/drawingml/diagram/diagram.cxx4
-rw-r--r--oox/source/drawingml/diagram/diagramlayoutatoms.cxx4
-rw-r--r--oox/source/drawingml/graphicshapecontext.cxx2
-rw-r--r--oox/source/drawingml/shape.cxx2
-rw-r--r--oox/source/export/chartexport.cxx4
-rw-r--r--oox/source/export/drawingml.cxx18
-rw-r--r--oox/source/export/shapes.cxx14
-rw-r--r--oox/source/ppt/slidetransition.cxx2
-rw-r--r--oox/source/ppt/timenodelistcontext.cxx8
9 files changed, 29 insertions, 29 deletions
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index c4dc45d54700..45fcc1b7c4aa 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -73,10 +73,10 @@ DiagramData::DiagramData()
void DiagramData::dump()
{
- SAL_INFO("oox", "Dgm: DiagramData # of cnx: " << maConnections.size() );
+ SAL_INFO("oox.drawingml", "Dgm: DiagramData # of cnx: " << maConnections.size() );
std::for_each( maConnections.begin(), maConnections.end(),
[] (dgm::Connection & rConnection) { rConnection.dump(); } );
- SAL_INFO("oox", "Dgm: DiagramData # of pt: " << maPoints.size() );
+ SAL_INFO("oox.drawingml", "Dgm: DiagramData # of pt: " << maPoints.size() );
std::for_each( maPoints.begin(), maPoints.end(),
[] (dgm::Point & rPoint) { rPoint.dump(); } );
}
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index d379bda4ada4..6f014090490c 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -80,7 +80,7 @@ void ConditionAttr::loadFromXAttr( const Reference< XFastAttributeList >& xAttr
void LayoutAtom::dump(int level)
{
- SAL_INFO("oox", "level = " << level << " - " << msName << " of type " << typeid(*this).name() );
+ SAL_INFO("oox.drawingml", "level = " << level << " - " << msName << " of type " << typeid(*this).name() );
const std::vector<LayoutAtomPtr>& rChildren=getChildren();
std::for_each( rChildren.begin(), rChildren.end(),
[level] (LayoutAtomPtr const& pAtom) { pAtom->dump(level + 1); } );
@@ -643,7 +643,7 @@ void ShapeCreationVisitor::visit(LayoutNode& rAtom)
}
else
{
- SAL_WARN("oox", "ShapeCreationVisitor::visit: no shape set while processing layoutnode named " << rAtom.getName() );
+ SAL_WARN("oox.drawingml", "ShapeCreationVisitor::visit: no shape set while processing layoutnode named " << rAtom.getName() );
}
// set new parent for children
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index 73c2fdc0c227..92c129faeb3d 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -157,7 +157,7 @@ ContextHandlerRef GraphicalObjectFrameContext::onCreateContext( sal_Int32 aEleme
return new table::TableContext( *this, mpShapePtr );
else
{
- SAL_WARN("oox", "OOX: Ignore graphicsData of :" << sUri );
+ SAL_WARN("oox.drawingml", "OOX: Ignore graphicsData of :" << sUri );
return nullptr;
}
}
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index cd564964af35..b65ae15dbec7 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -296,7 +296,7 @@ void Shape::setTextBox(bool bTextBox)
void Shape::applyShapeReference( const Shape& rReferencedShape, bool bUseText )
{
- SAL_INFO("oox", OSL_THIS_FUNC << "apply shape reference: " << rReferencedShape.msId << " to shape id: " << msId);
+ SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "apply shape reference: " << rReferencedShape.msId << " to shape id: " << msId);
if ( rReferencedShape.mpTextBody.get() && bUseText )
mpTextBody = std::make_shared<TextBody>( *rReferencedShape.mpTextBody.get() );
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 8bfc59690ad5..79d0699c0e54 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1016,7 +1016,7 @@ void ChartExport::exportLegend( const Reference< css::chart::XChartDocument >& x
pFS->singleElement(FSNS(XML_c, XML_y),
XML_val, IS(y),
FSEND);
- SAL_WARN_IF(aPos.Anchor != 0, "oox.chart", "unsupported anchor position");
+ SAL_WARN_IF(aPos.Anchor != 0, "oox", "unsupported anchor position");
pFS->endElement(FSNS(XML_c, XML_manualLayout));
pFS->endElement(FSNS(XML_c, XML_layout));
@@ -1357,7 +1357,7 @@ void ChartExport::exportManualLayout(const css::chart2::RelativePosition& rPos,
x -= w;
break;
default:
- SAL_WARN("oox.chart", "unhandled alignment case for manual layout export");
+ SAL_WARN("oox", "unhandled alignment case for manual layout export");
}
pFS->singleElement(FSNS(XML_c, XML_x),
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 136570ae0351..2568902aaf15 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -721,17 +721,17 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet )
}
SAL_WARN_IF(nLineWidth <= 0,
- "oox", "while writing outline - custom dash - line width was < 0 : " << nLineWidth);
+ "oox.shape", "while writing outline - custom dash - line width was < 0 : " << nLineWidth);
SAL_WARN_IF(aLineDash.Dashes < 0,
- "oox", "while writing outline - custom dash - number of dashes was < 0 : " << aLineDash.Dashes);
+ "oox.shape", "while writing outline - custom dash - number of dashes was < 0 : " << aLineDash.Dashes);
SAL_WARN_IF(aLineDash.Dashes > 0 && aLineDash.DashLen <= 0,
- "oox", "while writing outline - custom dash - dash length was < 0 : " << aLineDash.DashLen);
+ "oox.shape", "while writing outline - custom dash - dash length was < 0 : " << aLineDash.DashLen);
SAL_WARN_IF(aLineDash.Dots < 0,
- "oox", "while writing outline - custom dash - number of dots was < 0 : " << aLineDash.Dots);
+ "oox.shape", "while writing outline - custom dash - number of dots was < 0 : " << aLineDash.Dots);
SAL_WARN_IF(aLineDash.Dots > 0 && aLineDash.DotLen <= 0,
- "oox", "while writing outline - custom dash - dot length was < 0 : " << aLineDash.DotLen);
+ "oox.shape", "while writing outline - custom dash - dot length was < 0 : " << aLineDash.DotLen);
SAL_WARN_IF(aLineDash.Distance <= 0,
- "oox", "while writing outline - custom dash - distance was < 0 : " << aLineDash.Distance);
+ "oox.shape", "while writing outline - custom dash - distance was < 0 : " << aLineDash.Distance);
mpFS->endElementNS( XML_a, XML_custDash );
}
@@ -903,7 +903,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic , bool bRelPathToMedia )
}
else
{
- SAL_WARN("oox", "unhandled graphic type" );
+ SAL_WARN("oox.shape", "unhandled graphic type" );
/*Earlier, even in case of unhandled graphic types we were
proceeding to write the image, which would eventually
write an empty image with a zero size, and return a valid
@@ -2233,7 +2233,7 @@ std::map< OString, std::vector<OString> > lcl_getAdjNames()
rtl::Bootstrap::expandMacros(aPath);
SvFileStream aStream(aPath, StreamMode::READ);
if (aStream.GetError() != ERRCODE_NONE)
- SAL_WARN("oox", "failed to open oox-drawingml-adj-names");
+ SAL_WARN("oox.shape", "failed to open oox-drawingml-adj-names");
OString aLine;
bool bNotDone = aStream.ReadLine(aLine);
while (bNotDone)
@@ -2368,7 +2368,7 @@ bool DrawingML::WriteCustomGeometry( const Reference< XShape >& rXShape )
if ( nExpectedPairCount > aPairs.getLength() )
{
- SAL_WARN("oox", "Segments need " << nExpectedPairCount << " coordinates, but Coordinates have only " << aPairs.getLength() << " pairs.");
+ SAL_WARN("oox.shape", "Segments need " << nExpectedPairCount << " coordinates, but Coordinates have only " << aPairs.getLength() << " pairs.");
return false;
}
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 11b482d2a7a2..6e6fc5e0bfbd 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -258,7 +258,7 @@ static uno::Reference<io::XInputStream> lcl_StoreOwnAsOOXML(
if (!pFilterName)
{
- SAL_WARN("oox", "oox::GetOLEObjectStream: unknown ClassId " << classId.GetHexName());
+ SAL_WARN("oox.shape", "oox::GetOLEObjectStream: unknown ClassId " << classId.GetHexName());
return nullptr;
}
@@ -284,7 +284,7 @@ static uno::Reference<io::XInputStream> lcl_StoreOwnAsOOXML(
}
catch (uno::Exception const& e)
{
- SAL_WARN("oox", "oox::GetOLEObjectStream: exception: \"" << e.Message << "\"");
+ SAL_WARN("oox.shape", "oox::GetOLEObjectStream: exception: \"" << e.Message << "\"");
return nullptr;
}
xTempStream->getOutputStream()->closeOutput();
@@ -324,7 +324,7 @@ uno::Reference<io::XInputStream> GetOLEObjectStream(
}
catch (uno::Exception const& e)
{
- SAL_WARN("oox", "oox::GetOLEObjectStream: exception: " << e.Message);
+ SAL_WARN("oox.shape", "oox::GetOLEObjectStream: exception: " << e.Message);
}
return xInStream;
}
@@ -1813,7 +1813,7 @@ void ShapeExport::WriteMathShape(Reference<XShape> const& xShape)
xPropSet->getPropertyValue("Model") >>= xMathModel;
assert(xMathModel.is());
assert(GetDocumentType() != DOCUMENT_DOCX); // should be written in DocxAttributeOutput
- SAL_WARN_IF(GetDocumentType() == DOCUMENT_XLSX, "oox", "Math export to XLSX isn't tested, should it happen here?");
+ SAL_WARN_IF(GetDocumentType() == DOCUMENT_XLSX, "oox.shape", "Math export to XLSX isn't tested, should it happen here?");
// ECMA standard does not actually allow oMath outside of
// WordProcessingML so write a MCE like PPT 2010 does
@@ -1900,7 +1900,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const Reference< XShape >& xShape )
if (!xObj.is())
{
- SAL_WARN("oox", "ShapeExport::WriteOLE2Shape: no object");
+ SAL_WARN("oox.shape", "ShapeExport::WriteOLE2Shape: no object");
return *this;
}
@@ -1918,7 +1918,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const Reference< XShape >& xShape )
}
catch (uno::Exception const& e)
{
- SAL_WARN("oox", "ShapeExport::WriteOLE2Shape: exception: " << e.Message);
+ SAL_WARN("oox.shape", "ShapeExport::WriteOLE2Shape: exception: " << e.Message);
return *this;
}
@@ -1987,7 +1987,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const Reference< XShape >& xShape )
try {
::comphelper::OStorageHelper::CopyInputToOutput(xInStream, xOutStream);
} catch (uno::Exception const& e) {
- SAL_WARN("oox", "ShapeExport::WriteOLEObject: exception: " << e.Message);
+ SAL_WARN("oox.shape", "ShapeExport::WriteOLEObject: exception: " << e.Message);
}
OUString const sRelId = mpFB->addRelation(
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx
index b0b95c0ac43a..90df17fb113e 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -294,7 +294,7 @@ namespace oox { namespace ppt {
mnTransitionType = TransitionType::BARWIPE;
mnTransitionSubType = TransitionSubType::FADEOVERCOLOR;
}
- SAL_WARN("oox", "OOX: cut transition fallback." );
+ SAL_WARN("oox.ppt", "OOX: cut transition fallback." );
break;
case PPT_TOKEN( fade ):
mnTransitionType = TransitionType::FADE;
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 6d169960c59f..47cb777bda08 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -190,7 +190,7 @@ namespace oox { namespace ppt {
{
maTo = makeAny( aString == "visible" );
if( !maTo.has<sal_Bool>() )
- SAL_WARN("oox", "conversion failed" );
+ SAL_WARN("oox.ppt", "conversion failed" );
}
mpNode->setTo( maTo );
}
@@ -294,7 +294,7 @@ namespace oox { namespace ppt {
mpNode->getNodeProperties()[ NP_COMMAND ] = makeAny((sal_Int16)nCommand);
if( nCommand == EffectCommands::CUSTOM )
{
- SAL_WARN("oox", "OOX: CmdTimeNodeContext::endFastElement(), unknown command!");
+ SAL_WARN("oox.ppt", "OOX: CmdTimeNodeContext::endFastElement(), unknown command!");
aParamValue.Name = "UserDefined";
aParamValue.Value <<= msCommand;
}
@@ -306,7 +306,7 @@ namespace oox { namespace ppt {
}
catch( RuntimeException& )
{
- SAL_WARN("oox", "OOX: Exception in CmdTimeNodeContext::endFastElement()" );
+ SAL_WARN("oox.ppt", "OOX: Exception in CmdTimeNodeContext::endFastElement()" );
}
}
}
@@ -981,7 +981,7 @@ namespace oox { namespace ppt {
break;
case PPT_TOKEN( video ):
nNodeType = AnimationNodeType::AUDIO;
- SAL_WARN("oox", "OOX: video requested, gave Audio instead" );
+ SAL_WARN("oox.ppt", "OOX: video requested, gave Audio instead" );
break;
default: