From 859d10e7abab03cb35f2081e979a407cfe120d20 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Sun, 10 Jul 2011 10:18:24 +0200
Subject: Bulid fix: use SAL_PRIxUINT32 format string

---
 sax/test/testcomponent.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sax/test/testcomponent.cxx')

diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx
index e395add9f662..6d7ff0f03c86 100644
--- a/sax/test/testcomponent.cxx
+++ b/sax/test/testcomponent.cxx
@@ -195,7 +195,7 @@ int main (int argc, char **argv)
         Sequence<OUString> seqWarnings = xTest->getWarnings();
         if( seqWarnings.getLength() > nWarningCount )
         {
-            printf( "Warnings during test %d!\n" , nHandle );
+            printf( "Warnings during test %" SAL_PRIxUINT32 "!\n" , nHandle );
             for( ; nWarningCount < seqWarnings.getLength() ; nWarningCount ++ )
             {
                 OString o = OUStringToOString(
@@ -206,7 +206,7 @@ int main (int argc, char **argv)
 
 
         if( seqErrors.getLength() > nErrorCount ) {
-            printf( "Errors during test %d!\n" , nHandle );
+            printf( "Errors during test %" SAL_PRIxUINT32 "!\n" , nHandle );
             for( ; nErrorCount < seqErrors.getLength() ; nErrorCount ++ ) {
                 OString o = OUStringToOString(
                     seqErrors.getArray()[nErrorCount], RTL_TEXTENCODING_ASCII_US );
-- 
cgit v1.2.3


From 188fee6957bf700c923e29d19fa79fa828b28045 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 12 Jul 2011 16:51:52 +0100
Subject: WaE: unused arguments

---
 sax/test/testcomponent.cxx | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'sax/test/testcomponent.cxx')

diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx
index 6d7ff0f03c86..c3b3e0a77423 100644
--- a/sax/test/testcomponent.cxx
+++ b/sax/test/testcomponent.cxx
@@ -82,7 +82,8 @@ int main (int argc, char **argv)
             OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration")) );
         xReg = Reference<  XImplementationRegistration > ( x , UNO_QUERY );
     }
-    catch( Exception & ) {
+    catch (const Exception&)
+    {
         printf( "Couldn't create ImplementationRegistration service\n" );
         exit(1);
     }
@@ -107,7 +108,8 @@ int main (int argc, char **argv)
                 xSimpleReg );
         }
     }
-    catch( Exception &e ) {
+    catch (const Exception &e)
+    {
         printf( "Couldn't reach dll %s\n" , szBuf );
         printf( "%s\n" , OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ).getStr() );
 
@@ -134,7 +136,7 @@ int main (int argc, char **argv)
             aDllName,
             xSimpleReg );
     }
-    catch( Exception & e )
+    catch (const Exception&)
     {
         printf( "Couldn't reach dll %s\n" , szBuf );
         exit(1);
@@ -178,12 +180,13 @@ int main (int argc, char **argv)
             nNewHandle = xTest->test(
                 OStringToOUString( argv[1] , RTL_TEXTENCODING_ASCII_US ) , x , nHandle );
         }
-        catch( Exception & e ) {
+        catch (const Exception &e)
+        {
             OString o  = OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US );
             printf( "testcomponent : uncaught exception %s\n" , o.getStr() );
             exit(1);
         }
-        catch( ... )
+        catch (...)
         {
             printf( "testcomponent : uncaught unknown exception\n"  );
             exit(1);
-- 
cgit v1.2.3