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

Tor Lillqvist tml at collabora.com
Thu Mar 2 19:13:20 UTC 2017


 oox/source/helper/propertymap.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e7e4ecf4f69967351b6b6fd5e29749fd141c95b0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Feb 28 13:42:35 2017 +0200

    Align columns in output harder
    
    If we are going to use printf anyway, why not use its field width and
    left-adjustment features and actually achieve the columnar output we
    presumably wanted?
    
    Change-Id: I95dbd2aaa01d06c69d23d74fa249fd3419afa8d6

diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index b6cde43..20e1fb7 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -369,17 +369,17 @@ static void lclDumpAnyValue( const Any& value)
         } else if( value >>= aMatrix ) {
             fprintf (stderr,"Matrix\n%f %f %f\n%f %f %f\n%f %f %f\n", aMatrix.Line1.Column1, aMatrix.Line1.Column2, aMatrix.Line1.Column3, aMatrix.Line2.Column1, aMatrix.Line2.Column2, aMatrix.Line2.Column3, aMatrix.Line3.Column1, aMatrix.Line3.Column2, aMatrix.Line3.Column3);
         } else if( value >>= intValue )
-            fprintf (stderr,"%" SAL_PRIdINT32 "            (hex: %" SAL_PRIxUINT32 ")\n", intValue, intValue);
+            fprintf (stderr,"%-10" SAL_PRIdINT32 "  (hex: %" SAL_PRIxUINT32 ")\n", intValue, intValue);
         else if( value >>= uintValue )
-            fprintf (stderr,"%" SAL_PRIuUINT32 "            (hex: %" SAL_PRIxUINT32 ")\n", uintValue, uintValue);
+            fprintf (stderr,"%-10" SAL_PRIuUINT32 "  (hex: %" SAL_PRIxUINT32 ")\n", uintValue, uintValue);
         else if( value >>= int16Value )
-            fprintf (stderr,"%d            (hex: %x)\n", int16Value, int16Value);
+            fprintf (stderr,"%-10d  (hex: %x)\n", int16Value, int16Value);
         else if( value >>= uint16Value )
-            fprintf (stderr,"%d            (hex: %x)\n", uint16Value, uint16Value);
+            fprintf (stderr,"%-10d  (hex: %x)\n", uint16Value, uint16Value);
         else if( value >>= floatValue )
             fprintf (stderr,"%f\n", floatValue);
         else if( value >>= boolValue )
-            fprintf (stderr,"%d            (bool)\n", boolValue);
+            fprintf (stderr,"%-10d  (bool)\n", boolValue);
         else if( value >>= xNumRule ) {
             fprintf (stderr, "XIndexReplace\n");
             if (xNumRule.is()) {


More information about the Libreoffice-commits mailing list