[Libreoffice-commits] .: 3 commits - oox/source

[Takeshi Abe]

 oox/source/export/drawingml.cxx |   35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

New commits:
commit 1f40eaf411b657d30299b0b68bd7c115819a8f5b
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Fri Mar 18 12:50:55 2011 +0900

    Use SAL_PRIdINT32/SAL_PRIxUINT32 instead of %d/%x

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 99813be..5b44b4a 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -138,7 +138,7 @@ void lcl_dump_pset(Reference< XPropertySet > rXPropSet)
         if( value >>= strValue )
             fprintf (stderr,"\"%s\"\n", USS( strValue ) );
         else if( value >>= intValue )
-            fprintf (stderr,"%d            (hex: %x)\n", intValue, intValue);
+            fprintf (stderr,"%" SAL_PRIdINT32 "            (hex: %" SAL_PRIxUINT32 ")\n", intValue, intValue);
         else if( value >>= boolValue )
             fprintf (stderr,"%d            (bool)\n", boolValue);
     else if( value >>= spacing ) {
commit 045f57cde21f9807d795ca3816318bedd53bddd0
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Fri Mar 18 12:42:03 2011 +0900

    Removed dead code

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 5263ccf..99813be 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1170,9 +1170,6 @@ void DrawingML::WriteParagraphProperties( Reference< XTextContent > rParagraph )
     if( !rXPropSet.is() || !rXPropState.is() )
         return;
 
-    //OSL_TRACE("write paragraph properties pset");
-    //DBG(lcl_dump_pset(rXPropSet));
-
     sal_Int16 nLevel = -1;
     GET( nLevel, NumberingLevel );
 
@@ -1295,7 +1292,6 @@ void DrawingML::WriteText( Reference< XShape > rXShape  )
     if( GETA( TextWordWrap ) ) {
         mAny >>= bWrap;
         bHasWrap = TRUE;
-        //DBG(printf("wrap: %d\n", bWrap));
     }
 
     mpFS->singleElementNS( XML_a, XML_bodyPr,
@@ -1308,7 +1304,6 @@ void DrawingML::WriteText( Reference< XShape > rXShape  )
                            XML_anchorCtr, bHorizontalCenter ? "1" : NULL,
                            XML_vert, sWritingMode,
                            FSEND );
-    //mpFS->singleElement( FSNS( XML_a, XML_lstStyle ), FSEND );
 
     Reference< XEnumerationAccess > access( xXText, UNO_QUERY );
     if( !access.is() )
@@ -1437,21 +1432,6 @@ void DrawingML::WritePolyPolygon( const PolyPolygon& rPolyPolygon )
                 mpFS->endElementNS( XML_a, XML_cubicBezTo );
                 mpFS->startElementNS( XML_a, XML_cubicBezTo, FSEND );
             }
-//             switch( rPoly.GetFlags(j) ) {
-//                 case POLY_NORMAL:
-//                     DBG(printf("normal\n"));
-//                     break;
-//                 case POLY_SMOOTH:
-//                     DBG(printf("smooth\n"));
-//                     break;
-//                 case POLY_CONTROL:
-//                     DBG(printf("control\n"));
-//                     break;
-//                 case POLY_SYMMTR:
-//                     DBG(printf("symmtr\n"));
-//                         break;
-//             }
-//             DBG(printf("point %ld %ld\n", rPoly[j].X() - aRect.Left(), rPoly[j].Y() - aRect.Top()));
         }
 
         mpFS->endElementNS( XML_a, XML_path );
@@ -1559,12 +1539,6 @@ void DrawingML::WriteFill( Reference< XPropertySet > xPropSet )
     FillStyle aFillStyle( FillStyle_NONE );
     xPropSet->getPropertyValue( S( "FillStyle" ) ) >>= aFillStyle;
 
-    if( aFillStyle == FillStyle_BITMAP )
-    {
-        //DBG(printf ("FillStyle_BITMAP properties\n"));
-        //DBG(dump_pset(rXPropSet));
-    }
-
     if( aFillStyle == FillStyle_NONE ||
         aFillStyle == FillStyle_HATCH )
         return;
commit 432665a878d8709f3ff8decfcfda7264a7010908
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Fri Mar 18 12:37:38 2011 +0900

    Removed an unchanged variable

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 2b60695..5263ccf 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1176,10 +1176,6 @@ void DrawingML::WriteParagraphProperties( Reference< XTextContent > rParagraph )
     sal_Int16 nLevel = -1;
     GET( nLevel, NumberingLevel );
 
-    sal_Int32 nLeftMargin = 0;
-    // fix coordinates
-    //GET( nLeftMargin, ParaLeftMargin );
-
     sal_Int16 nAlignment( style::ParagraphAdjust_LEFT );
     GET( nAlignment, ParaAdjust );
 
@@ -1189,12 +1185,11 @@ void DrawingML::WriteParagraphProperties( Reference< XTextContent > rParagraph )
         bHasLinespacing = ( mAny >>= aLineSpacing );
 
     if( nLevel != -1
-        || nLeftMargin > 0
         || nAlignment != style::ParagraphAdjust_LEFT
         || bHasLinespacing ) {
         mpFS->startElementNS( XML_a, XML_pPr,
                               XML_lvl, nLevel > 0 ? I32S( nLevel ) : NULL,
-                              XML_marL, nLeftMargin > 0 ? IS( nLeftMargin ) : NULL,
+                              XML_marL, NULL,
                               XML_algn, GetAlignment( nAlignment ),
                               FSEND );