[Libreoffice-commits] core.git: include/sal oox/source

[Andres Gomez]

 include/sal/log-areas.dox                    |    1 
 oox/source/drawingml/graphicshapecontext.cxx |   15 ++++++------
 oox/source/drawingml/shape.cxx               |   32 +++++++++++++--------------
 3 files changed, 25 insertions(+), 23 deletions(-)

New commits:
commit d52e46c418c150b7ace2de313252120981fe0959
Author: Andres Gomez <agomez at igalia.com>
Date:   Tue Aug 20 15:50:01 2013 +0300

    oox: Enhancing the debugging output
    
    Change-Id: Ifc055befd5d7436d44e95ce105c52f3c4f061796
    Reviewed-on: https://gerrit.libreoffice.org/5768
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index c1d8cf7..3d08cf1 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -131,6 +131,7 @@ certain functionality.
 @li @c filter.ms - escher import/export
 @li @c filter.xslt - xslt import/export
 @li @c oox.cscode - see oox/source/drawingml/customshapes/README
+ at li @c oox.drawingml - DrawingML
 @li @c oox.ppt - pptx filter
 @li @c oox.storage - ZipStorage class
 @li @c oox.xmlstream - XmlStream class
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index 0def785..73882f8 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -232,13 +232,14 @@ ContextHandlerRef DiagramGraphicDataContext::onCreateContext( ::sal_Int32 aEleme
                     getFragmentPathFromRelId( msLo ),
                     getFragmentPathFromRelId( msQs ),
                     getFragmentPathFromRelId( msCs ));
-        OSL_TRACE("diagram added shape %s of type %s, size (%d,%d,%d,%d)",
-                  OUSTRING_TO_CSTR( mpShapePtr->getName() ),
-                  OUSTRING_TO_CSTR( mpShapePtr->getServiceName() ),
-                  mpShapePtr->getPosition().X,
-                  mpShapePtr->getPosition().Y,
-                  mpShapePtr->getSize().Width,
-                  mpShapePtr->getSize().Height);
+        SAL_INFO("oox.drawingml", OSL_THIS_FUNC
+                 << "diagram added shape " << mpShapePtr->getName()
+                 << " of type " << mpShapePtr->getServiceName()
+                 << ", size (" << mpShapePtr->getPosition().X
+                 << "," << mpShapePtr->getPosition().Y
+                 << "," << mpShapePtr->getSize().Width
+                 << "," << mpShapePtr->getSize().Height
+                 <<")");
         break;
     }
     default:
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index f065d1b..ee9d9de 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -200,7 +200,7 @@ void Shape::addShape(
         const awt::Rectangle* pShapeRect,
         ShapeIdMap* pShapeMap )
 {
-    SAL_INFO("oox", OSL_THIS_FUNC << " id: " << msId);
+    SAL_INFO("oox.drawingml", OSL_THIS_FUNC << " id: " << msId);
 
     try
     {
@@ -238,7 +238,7 @@ bool Shape::getLockedCanvas()
 
 void Shape::applyShapeReference( const Shape& rReferencedShape, bool bUseText )
 {
-    SAL_INFO("oox", "apply shape reference: " << rReferencedShape.msId << " to shape id: " << msId);
+    SAL_INFO("oox", OSL_THIS_FUNC << "apply shape reference: " << rReferencedShape.msId << " to shape id: " << msId);
 
     if ( rReferencedShape.mpTextBody.get() && bUseText )
         mpTextBody = TextBodyPtr( new TextBody( *rReferencedShape.mpTextBody.get() ) );
@@ -309,16 +309,16 @@ void Shape::addChildren(
     aChildTransformation.scale(1/(maChSize.Width ? maChSize.Width : 1.0), 1/(maChSize.Height ? maChSize.Height : 1.0));
     aChildTransformation *= aTransformation;
 
-    OSL_TRACE("parent matrix:\n%f %f %f\n%f %f %f\n%f %f %f",
-              aChildTransformation.get(0, 0),
-              aChildTransformation.get(0, 1),
-              aChildTransformation.get(0, 2),
-              aChildTransformation.get(1, 0),
-              aChildTransformation.get(1, 1),
-              aChildTransformation.get(1, 2),
-              aChildTransformation.get(2, 0),
-              aChildTransformation.get(2, 1),
-              aChildTransformation.get(2, 2));
+    SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "parent matrix:\n"
+             << aChildTransformation.get(0, 0)
+             << aChildTransformation.get(0, 1)
+             << aChildTransformation.get(0, 2) << "\n"
+             << aChildTransformation.get(1, 0)
+             << aChildTransformation.get(1, 1)
+             << aChildTransformation.get(1, 2)
+             << aChildTransformation.get(2, 0)
+             << aChildTransformation.get(2, 1)
+             << aChildTransformation.get(2, 2));
 
     std::vector< ShapePtr >::iterator aIter( rMaster.maChildren.begin() );
     while( aIter != rMaster.maChildren.end() ) {
@@ -339,7 +339,7 @@ Reference< XShape > Shape::createAndInsert(
         FillProperties& rShapeOrParentShapeFillProps )
 {
     bool bIsEmbMedia = false;
-    SAL_INFO("oox", OSL_THIS_FUNC << " id: " << msId);
+    SAL_INFO("oox.drawingml", OSL_THIS_FUNC << " id: " << msId);
 
     awt::Rectangle aShapeRectHmm( maPosition.X / 360, maPosition.Y / 360, maSize.Width / 360, maSize.Height / 360 );
 
@@ -477,7 +477,7 @@ Reference< XShape > Shape::createAndInsert(
 
         if ( mbHidden || mbHiddenMasterShape )
         {
-            SAL_INFO("oox", "invisible shape with id: " << msId);
+            SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "invisible shape with id: " << msId);
             const OUString sVisible( "Visible" );
             xSet->setPropertyValue( sVisible, Any( sal_False ) );
         }
@@ -613,7 +613,7 @@ Reference< XShape > Shape::createAndInsert(
                     if( pTheme )
                         if( const TextCharacterProperties* pCharProps = pTheme->getFontStyle( pFontRef->mnThemedIdx ) )
                             aCharStyleProperties.assignUsed( *pCharProps );
-                    SAL_INFO("oox", "use font color");
+                    SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "use font color");
                     aCharStyleProperties.maCharColor.assignIfUsed( pFontRef->maPhClr );
                 }
 
@@ -649,7 +649,7 @@ void Shape::moveAllToPosition( const awt::Point &rPoint )
 
 void Shape::setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle )
 {
-    SAL_INFO("oox", "set master text list style to shape id: " << msId);
+    SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "set master text list style to shape id: " << msId);
 
     mpMasterTextListStyle = pMasterTextListStyle;
 }