[Libreoffice-commits] core.git: 2 commits - cppuhelper/source registry/tools vcl/inc vcl/source

[Stephan Bergmann]

 cppuhelper/source/typedescriptionprovider.cxx |    8 ++------
 registry/tools/reg2bin.cxx                    |    9 +++------
 vcl/inc/vcl/msgbox.hxx                        |    2 +-
 vcl/source/window/msgbox.cxx                  |    2 +-
 4 files changed, 7 insertions(+), 14 deletions(-)

New commits:
commit e2c343df8ca0a344d6e9c789c60c5b8dc7416b51
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 14 16:51:29 2013 +0100

    Avoid ambiguities after string clean-up of InfoBox users
    
    Change-Id: Icbce1220df0a08b32f78b863a15daf34522d1671

diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index 8f0336d..594d248 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.hxx
@@ -106,7 +106,7 @@ private:
     SAL_DLLPRIVATE void ImplInitInfoBoxData();
 
 public:
-                        InfoBox( Window* pParent, const XubString& rMessage );
+                        InfoBox( Window* pParent, const OUString& rMessage );
                         InfoBox( Window* pParent, const ResId & rResId );
 
     static Image        GetStandardImage();
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index c7d0e36..baf8370 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -445,7 +445,7 @@ void InfoBox::ImplInitInfoBoxData()
 
 // -----------------------------------------------------------------------
 
-InfoBox::InfoBox( Window* pParent, const XubString& rMessage ) :
+InfoBox::InfoBox( Window* pParent, const OUString& rMessage ) :
     MessBox( pParent, WB_OK | WB_DEF_OK, ImplGetSVEmptyStr(), rMessage )
 {
     ImplInitInfoBoxData();
commit 973160bb4853f2913024c7ef4bf9f5e638e93c5a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 13 10:09:05 2013 +0100

    Comment clean-up
    
    Change-Id: I7696dde7337531629d29cce7eb3f882cb4bfad0d

diff --git a/cppuhelper/source/typedescriptionprovider.cxx b/cppuhelper/source/typedescriptionprovider.cxx
index e0d51a1..97a1788 100644
--- a/cppuhelper/source/typedescriptionprovider.cxx
+++ b/cppuhelper/source/typedescriptionprovider.cxx
@@ -259,10 +259,9 @@ struct Memory32 {
     }
 
     float getIso60599Binary32() const {
-        // Create a copy in either case, for alignment:
         union {
             unsigned char buf[4];
-            float f;
+            float f; // assuming float is ISO 60599 binary32
         } sa;
 #if defined OSL_LITENDIAN
         sa.buf[0] = byte[0];
@@ -276,7 +275,6 @@ struct Memory32 {
         sa.buf[3] = byte[0];
 #endif
         return sa.f;
-            // assuming float is ISO 60599 binary32
     }
 };
 
@@ -296,10 +294,9 @@ struct Memory64 {
         }
 
     double getIso60599Binary64() const {
-        // Create a copy in either case, for alignment:
         union {
             unsigned char buf[8];
-            double d;
+            double d; // assuming double is ISO 60599 binary64
         } sa;
 #if defined OSL_LITENDIAN
         sa.buf[0] = byte[0];
@@ -321,7 +318,6 @@ struct Memory64 {
         sa.buf[7] = byte[0];
 #endif
         return sa.d;
-            // assuming double is ISO 60599 binary64
     }
 };
 
diff --git a/registry/tools/reg2bin.cxx b/registry/tools/reg2bin.cxx
index 3f42f28..18976a0 100644
--- a/registry/tools/reg2bin.cxx
+++ b/registry/tools/reg2bin.cxx
@@ -958,10 +958,9 @@ void write64(osl::File & file, sal_uInt64 value) {
 void writeIso60599Binary32(osl::File & file, float value) {
     union {
         unsigned char buf[4];
-        float f;
+        float f; // assuming float is ISO 60599 binary32
     } sa;
     sa.f = value;
-        // assuming float is ISO 60599 binary32
 #if defined OSL_BIGENDIAN
     std::swap(sa.buf[0], sa.buf[3]);
     std::swap(sa.buf[1], sa.buf[2]);
@@ -970,13 +969,11 @@ void writeIso60599Binary32(osl::File & file, float value) {
 }
 
 void writeIso60599Binary64(osl::File & file, double value) {
-    union
-    {
+    union {
         unsigned char buf[8];
-        float d;
+        float d; // assuming double is ISO 60599 binary64
     } sa;
     sa.d = value;
-        // assuming double is ISO 60599 binary64
 #if defined OSL_BIGENDIAN
     std::swap(sa.buf[0], sa.buf[7]);
     std::swap(sa.buf[1], sa.buf[6]);