[Libreoffice-commits] .: sd/source

[Julien Nabet]

 sd/source/filter/eppt/pptx-epptbase.cxx  |    6 +++---
 sd/source/filter/eppt/pptx-epptooxml.cxx |   12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 72123b727993d33a4fcca92d7da7480ba0ab58e7
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Apr 19 10:39:02 2011 +0200

    Replace %d, %x by SAL_PRIdINT32, SAL_PRIuUINT32 and SAL_PRIxUINT32

diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 0556dd7..3307f33 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -235,7 +235,7 @@ void PPTWriterBase::exportPPT()
                                                     // searching, all entrys are sorted#
     for ( i = 0; i < mnPages; i++ )
     {
-        DBG(printf( "call ImplCreateSlide( %d )\n", i));
+        DBG(printf( "call ImplCreateSlide( %"SAL_PRIuUINT32" )\n", i));
         if ( !CreateSlide( i ) )
             return;
     }
@@ -453,7 +453,7 @@ sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference
     if ( GetPropertyValue( aAny, rXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Layout" ) ) ), sal_True )
         aAny >>= nLayout;
 
-    DBG(printf("GetLayoutOffset %d\n", nLayout));
+    DBG(printf("GetLayoutOffset %"SAL_PRIdINT32"\n", nLayout));
 
     return nLayout;
 }
@@ -484,7 +484,7 @@ PHLayout& PPTWriterBase::GetLayout( sal_Int32 nOffset ) const
     if( nOffset >= 0 && nOffset < EPP_LAYOUT_SIZE )
         return pPHLayout[ nOffset ];
 
-    DBG(printf("asked %d for layout outside of 0,%d array scope\n", nOffset, EPP_LAYOUT_SIZE ));
+    DBG(printf("asked %"SAL_PRIdINT32" for layout outside of 0,%d array scope\n", nOffset, EPP_LAYOUT_SIZE ));
 
     return pPHLayout[ 0 ];
 }
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 4b7c191..24e5b4d 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1235,7 +1235,7 @@ void PowerPointExport::WriteAnimations( FSHelperPtr pFS )
 void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 /* nMode */,
                                        sal_Bool bHasBackground, Reference< XPropertySet > aXBackgroundPropSet )
 {
-    DBG(printf("write slide: %d\n----------------\n", nPageNum));
+    DBG(printf("write slide: %"SAL_PRIuUINT32"\n----------------\n", nPageNum));
 
     // slides list
     if( nPageNum == 0 )
@@ -1314,7 +1314,7 @@ void PowerPointExport::ImplWriteNotes( sal_uInt32 nPageNum )
     if( !mbCreateNotes || !ContainsOtherShapeThanPlaceholders( sal_True ) )
     return;
 
-    DBG(printf("write Notes %d\n----------------\n", nPageNum));
+    DBG(printf("write Notes %"SAL_PRIuUINT32"\n----------------\n", nPageNum));
 
     FSHelperPtr pFS = openFragmentStreamWithSerializer( OUStringBuffer()
                                                         .appendAscii( "ppt/notesSlides/notesSlide" )
@@ -1423,7 +1423,7 @@ void PowerPointExport::WriteTextStyles( FSHelperPtr pFS )
 
 void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertySet > aXBackgroundPropSet )
 {
-    DBG(printf("write slide master: %d\n----------------\n", nPageNum));
+    DBG(printf("write slide master: %"SAL_PRIuUINT32"\n----------------\n", nPageNum));
 
     // slides list
     if( nPageNum == 0 )
@@ -1517,7 +1517,7 @@ void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPr
 
 sal_Int32 PowerPointExport::GetLayoutFileId( sal_Int32 nOffset, sal_uInt32 nMasterNum )
 {
-    DBG(printf("GetLayoutFileId offset: %d master: %d", nOffset, nMasterNum));
+    DBG(printf("GetLayoutFileId offset: %"SAL_PRIdINT32" master: %"SAL_PRIuUINT32"", nOffset, nMasterNum));
     if( mLayoutInfo[ nOffset ].mnFileIdArray.size() <= nMasterNum )
         return 0;
 
@@ -1532,7 +1532,7 @@ void PowerPointExport::ImplWriteLayout( sal_Int32 /*nOffset*/, sal_uInt32 /*nMas
 
 void PowerPointExport::ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum )
 {
-    DBG(printf("write layout: %d\n", nOffset));
+    DBG(printf("write layout: %"SAL_PRIdINT32"\n", nOffset));
 
     Reference< drawing::XDrawPagesSupplier > xDPS( getModel(), uno::UNO_QUERY );
     Reference< drawing::XDrawPages > xDrawPages( xDPS->getDrawPages(), uno::UNO_QUERY );
@@ -2132,7 +2132,7 @@ void dump_pset(Reference< XPropertySet > rXPropSet)
         if( value >>= strValue )
             printf ("\"%s\"\n", USS( strValue ) );
         else if( value >>= intValue )
-            printf ("%d            (hex: %x)\n", intValue, intValue);
+            printf ("%"SAL_PRIdINT32"            (hex: %"SAL_PRIxUINT32")\n", intValue, intValue);
         else if( value >>= boolValue )
             printf ("%d            (bool)\n", boolValue);
         else if( value >>= pointValue )