change ...(%d)... to ...(%"SAL_PRIdINT32")... + 2 commented lines removed

1 files changed, 10 insertions, 12 deletions

diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 8f4d80a861ac..835e3fa5d4f1 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -501,7 +501,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             fprintf (stderr,"\"%s\"\n", USS( strValue ) );
         else if( value >>= strArray ) {
             printLevel (level);
-            fprintf (stderr,"Sequence< OUString > aStringSequence (%d);\n", strArray.getLength());
+            fprintf (stderr,"Sequence< OUString > aStringSequence (%"SAL_PRIdINT32");\n", strArray.getLength());
             for( int i=0; i<strArray.getLength(); i++ ) {
                 printLevel (level);
                 fprintf (stderr,"aStringSequence[%d] = CREATE_OUSTRING (\"%s\");\n", i, USS( strArray[i] ) );
@@ -509,7 +509,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             return "aStringSequence";
         } else if( value >>= propArray ) {
             printLevel (level);
-            fprintf (stderr,"Sequence< PropertyValue > aPropSequence (%d);\n", propArray.getLength());
+            fprintf (stderr,"Sequence< PropertyValue > aPropSequence (%"SAL_PRIdINT32");\n", propArray.getLength());
             for( int i=0; i<propArray.getLength(); i++ ) {
                 printLevel (level);
                 fprintf (stderr, "{\n");
@@ -524,7 +524,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             return "aPropSequence";
         } else if( value >>= propArrayArray ) {
             printLevel (level);
-            fprintf (stderr,"Sequence< Sequence < PropertyValue > > aPropSequenceSequence (%d);\n", propArrayArray.getLength());
+            fprintf (stderr,"Sequence< Sequence < PropertyValue > > aPropSequenceSequence (%"SAL_PRIdINT32");\n", propArrayArray.getLength());
             for( int i=0; i<propArrayArray.getLength(); i++ ) {
                 printLevel (level);
                 fprintf (stderr, "{\n");
@@ -543,7 +543,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             }
         } else if( value >>= adjArray ) {
             printLevel (level);
-            fprintf (stderr,"Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (%d);\n", adjArray.getLength());
+            fprintf (stderr,"Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (%"SAL_PRIdINT32");\n", adjArray.getLength());
             for( int i=0; i<adjArray.getLength(); i++ ) {
                 printLevel (level);
                 fprintf (stderr, "{\n");
@@ -556,7 +556,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             return "aAdjSequence";
         } else if( value >>= segArray ) {
             printLevel (level);
-            fprintf (stderr, "Sequence< EnhancedCustomShapeSegment > aSegmentSeq (%d);\n", segArray.getLength());
+            fprintf (stderr, "Sequence< EnhancedCustomShapeSegment > aSegmentSeq (%"SAL_PRIdINT32");\n", segArray.getLength());
             for( int i=0; i<segArray.getLength(); i++ ) {
                 printLevel (level);
                 fprintf (stderr, "{\n");
@@ -569,7 +569,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             return "aSegmentSeq";
         } else if( value >>= ppArray ) {
             printLevel (level);
-            fprintf (stderr, "Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (%d);\n", ppArray.getLength());
+            fprintf (stderr, "Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (%"SAL_PRIdINT32");\n", ppArray.getLength());
             for( int i=0; i<ppArray.getLength(); i++ ) {
                 printLevel (level);
                 fprintf (stderr, "{\n");
@@ -761,19 +761,17 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             printLevel (level);
             fprintf (stderr, "awt::Rectangle aRectangle;\n");
             printLevel (level);
-            fprintf (stderr, "aRectangle.X = %d;\n", rect.X);
+            fprintf (stderr, "aRectangle.X = %"SAL_PRIdINT32";\n", rect.X);
             printLevel (level);
-            fprintf (stderr, "aRectangle.Y = %d;\n", rect.Y);
+            fprintf (stderr, "aRectangle.Y = %"SAL_PRIdINT32";\n", rect.Y);
             printLevel (level);
-            fprintf (stderr, "aRectangle.Width = %d;\n", rect.Width);
+            fprintf (stderr, "aRectangle.Width = %"SAL_PRIdINT32";\n", rect.Width);
             printLevel (level);
-            fprintf (stderr, "aRectangle.Height = %d;\n", rect.Height);
+            fprintf (stderr, "aRectangle.Height = %"SAL_PRIdINT32";\n", rect.Height);
             return "aRectangle";
     } else if( value.isExtractableTo(::getCppuType((const sal_Int32*)0))) {
         fprintf (stderr,"is extractable to int32\n");
     }
-//         else if( value >>= pointValue )
-//             fprintf (stderr,"%d            (RectanglePoint)\n", pointValue);
         else
       fprintf (stderr,"???           <unhandled type %s>\n", USS(value.getValueTypeName()));