[Libreoffice-commits] .: editeng/source oox/source sd/source

Matus Kukan mkukan at kemper.freedesktop.org
Sat Jan 14 02:36:36 PST 2012


 editeng/source/editeng/editdbg.cxx       |    2 +-
 oox/source/helper/propertymap.cxx        |   30 +++++++++++++++---------------
 sd/source/filter/eppt/pptx-epptooxml.cxx |   12 ++++++------
 3 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit fcc8db1d2be9a25f79cbcc14043b495d240bb8bf
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Jan 14 11:30:26 2012 +0100

    fix for gcc 4.7: unable to find string literal operator

diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index 9389001..fc9c562 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -454,7 +454,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool bInfoBox )
     fprintf( fp, "\n\n================================================================================" );
     fprintf( fp, "\n==================   EditEngine & Views   ======================================" );
     fprintf( fp, "\n================================================================================" );
-    fprintf( fp, "\nControl: %"SAL_PRIxUINT32, pEE->GetControlWord() );
+    fprintf( fp, "\nControl: %" SAL_PRIxUINT32, pEE->GetControlWord() );
     fprintf( fp, "\nRefMapMode: %i", pEE->pImpEditEngine->pRefDev->GetMapMode().GetMapUnit() );
     fprintf( fp, "\nPaperSize: %li x %li", pEE->GetPaperSize().Width(), pEE->GetPaperSize().Height() );
     fprintf( fp, "\nMaxAutoPaperSize: %li x %li", pEE->GetMaxAutoPaperSize().Width(), pEE->GetMaxAutoPaperSize().Height() );
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index b4094eb..af0d374 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -355,9 +355,9 @@ static void lclDumpAnyValue( 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,"%" SAL_PRIdINT32 "            (hex: %" SAL_PRIxUINT32 ")\n", intValue, intValue);
         else if( value >>= uintValue )
-            fprintf (stderr,"%"SAL_PRIdINT32"            (hex: %"SAL_PRIxUINT32")\n", uintValue, uintValue);
+            fprintf (stderr,"%" SAL_PRIdINT32 "            (hex: %" SAL_PRIxUINT32 ")\n", uintValue, uintValue);
         else if( value >>= int16Value )
             fprintf (stderr,"%d            (hex: %x)\n", int16Value, int16Value);
         else if( value >>= uint16Value )
@@ -502,7 +502,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             return "Any (str)";
     } else if( value >>= strArray ) {
             printLevel (level);
-            fprintf (stderr,"Sequence< OUString > aStringSequence (%"SAL_PRIdINT32");\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] ) );
@@ -510,7 +510,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             return "aStringSequence";
         } else if( value >>= propArray ) {
             printLevel (level);
-            fprintf (stderr,"Sequence< PropertyValue > aPropSequence (%"SAL_PRIdINT32");\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");
@@ -525,7 +525,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             return "aPropSequence";
         } else if( value >>= propArrayArray ) {
             printLevel (level);
-            fprintf (stderr,"Sequence< Sequence < PropertyValue > > aPropSequenceSequence (%"SAL_PRIdINT32");\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");
@@ -544,7 +544,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             }
         } else if( value >>= adjArray ) {
             printLevel (level);
-            fprintf (stderr,"Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (%"SAL_PRIdINT32");\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");
@@ -557,7 +557,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             return "aAdjSequence";
         } else if( value >>= segArray ) {
             printLevel (level);
-            fprintf (stderr, "Sequence< EnhancedCustomShapeSegment > aSegmentSeq (%"SAL_PRIdINT32");\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");
@@ -570,7 +570,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             return "aSegmentSeq";
         } else if( value >>= segTextFrame ) {
             printLevel (level);
-            fprintf (stderr, "Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (%"SAL_PRIdINT32");\n", segTextFrame.getLength());
+            fprintf (stderr, "Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (%" SAL_PRIdINT32 ");\n", segTextFrame.getLength());
             for( int i=0; i<segTextFrame.getLength(); i++ ) {
                 printLevel (level);
                 fprintf (stderr, "{\n");
@@ -583,7 +583,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             return "aTextFrameSeq";
         } else if( value >>= ppArray ) {
             printLevel (level);
-            fprintf (stderr, "Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (%"SAL_PRIdINT32");\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");
@@ -725,9 +725,9 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             fprintf (stderr,"Any aAny ((sal_Int32) %ld);\n", longValue);
             return "aAny";
         } else if( value >>= intValue )
-            fprintf (stderr,"%"SAL_PRIdINT32"            (hex: %"SAL_PRIxUINT32")\n", intValue, intValue);
+            fprintf (stderr,"%" SAL_PRIdINT32 "            (hex: %" SAL_PRIxUINT32 ")\n", intValue, intValue);
         else if( value >>= uintValue )
-            fprintf (stderr,"%"SAL_PRIdINT32"            (hex: %"SAL_PRIxUINT32")\n", uintValue, uintValue);
+            fprintf (stderr,"%" SAL_PRIdINT32 "            (hex: %" SAL_PRIxUINT32 ")\n", uintValue, uintValue);
         else if( value >>= int16Value )
             fprintf (stderr,"%d            (hex: %x)\n", int16Value, int16Value);
         else if( value >>= uint16Value )
@@ -799,13 +799,13 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0)
             printLevel (level);
             fprintf (stderr, "awt::Rectangle aRectangle;\n");
             printLevel (level);
-            fprintf (stderr, "aRectangle.X = %"SAL_PRIdINT32";\n", rect.X);
+            fprintf (stderr, "aRectangle.X = %" SAL_PRIdINT32 ";\n", rect.X);
             printLevel (level);
-            fprintf (stderr, "aRectangle.Y = %"SAL_PRIdINT32";\n", rect.Y);
+            fprintf (stderr, "aRectangle.Y = %" SAL_PRIdINT32 ";\n", rect.Y);
             printLevel (level);
-            fprintf (stderr, "aRectangle.Width = %"SAL_PRIdINT32";\n", rect.Width);
+            fprintf (stderr, "aRectangle.Width = %" SAL_PRIdINT32 ";\n", rect.Width);
             printLevel (level);
-            fprintf (stderr, "aRectangle.Height = %"SAL_PRIdINT32";\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");
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 9759364..4811289 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1377,7 +1377,7 @@ bool PowerPointExport::WriteComments( sal_uInt32 nPageNum )
 void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 /* nMode */,
                                        sal_Bool bHasBackground, Reference< XPropertySet > aXBackgroundPropSet )
 {
-    DBG(printf("write slide: %"SAL_PRIuUINT32"\n----------------\n", nPageNum));
+    DBG(printf("write slide: %" SAL_PRIuUINT32 "\n----------------\n", nPageNum));
 
     // slides list
     if( nPageNum == 0 )
@@ -1466,7 +1466,7 @@ void PowerPointExport::ImplWriteNotes( sal_uInt32 nPageNum )
     if( !mbCreateNotes || !ContainsOtherShapeThanPlaceholders( sal_True ) )
     return;
 
-    DBG(printf("write Notes %"SAL_PRIuUINT32"\n----------------\n", nPageNum));
+    DBG(printf("write Notes %" SAL_PRIuUINT32 "\n----------------\n", nPageNum));
 
     FSHelperPtr pFS = openFragmentStreamWithSerializer( OUStringBuffer()
                                                         .appendAscii( "ppt/notesSlides/notesSlide" )
@@ -1575,7 +1575,7 @@ void PowerPointExport::WriteTextStyles( FSHelperPtr pFS )
 
 void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertySet > aXBackgroundPropSet )
 {
-    DBG(printf("write slide master: %"SAL_PRIuUINT32"\n----------------\n", nPageNum));
+    DBG(printf("write slide master: %" SAL_PRIuUINT32 "\n----------------\n", nPageNum));
 
     // slides list
     if( nPageNum == 0 )
@@ -1669,7 +1669,7 @@ void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPr
 
 sal_Int32 PowerPointExport::GetLayoutFileId( sal_Int32 nOffset, sal_uInt32 nMasterNum )
 {
-    DBG(printf("GetLayoutFileId offset: %"SAL_PRIdINT32" master: %"SAL_PRIuUINT32"", nOffset, nMasterNum));
+    DBG(printf("GetLayoutFileId offset: %" SAL_PRIdINT32 " master: %" SAL_PRIuUINT32 "", nOffset, nMasterNum));
     if( mLayoutInfo[ nOffset ].mnFileIdArray.size() <= nMasterNum )
         return 0;
 
@@ -1684,7 +1684,7 @@ void PowerPointExport::ImplWriteLayout( sal_Int32 /*nOffset*/, sal_uInt32 /*nMas
 
 void PowerPointExport::ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum )
 {
-    DBG(printf("write layout: %"SAL_PRIdINT32"\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 );
@@ -2272,7 +2272,7 @@ void dump_pset(Reference< XPropertySet > rXPropSet)
         if( value >>= strValue )
             printf ("\"%s\"\n", USS( strValue ) );
         else if( value >>= intValue )
-            printf ("%"SAL_PRIdINT32"            (hex: %"SAL_PRIxUINT32")\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 )


More information about the Libreoffice-commits mailing list