[Libreoffice-commits] .: 2 commits - binfilter/bf_forms binfilter/bf_svtools binfilter/bf_svx binfilter/inc

[Caolán McNamara]

 binfilter/bf_forms/source/resource/forms_frm_resource.cxx   |    4 --
 binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx |    2 -
 binfilter/bf_svtools/source/misc/tl_strcvt.cxx              |    4 --
 binfilter/bf_svx/source/xml/svx_xmleohlp.cxx                |    1 
 binfilter/inc/bf_svtools/xbmread.hxx                        |    1 
 binfilter/inc/bf_tools/string.hxx                           |   23 ------------
 6 files changed, 4 insertions(+), 31 deletions(-)

New commits:
commit b2f6ea583ae50e20ee1b891a742fc920eec4e5e2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Feb 25 23:23:10 2012 +0000

    mirror in non-binfilter changes

diff --git a/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx b/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx
index 1f8846f..72c8cb4 100644
--- a/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx
@@ -49,7 +49,7 @@ XBMReader::XBMReader( SvStream& rStm ) :
             bStatus         ( TRUE )
 {
     pHexTable = new short[ 256 ];
-    maUpperName = String::CreateFromAscii( "SVIXBM", 6 );
+    maUpperName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SVIXBM"));
     InitTable();
 }
 
diff --git a/binfilter/bf_svtools/source/misc/tl_strcvt.cxx b/binfilter/bf_svtools/source/misc/tl_strcvt.cxx
index 1d52794..6368e32 100644
--- a/binfilter/bf_svtools/source/misc/tl_strcvt.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strcvt.cxx
@@ -29,8 +29,6 @@
 namespace binfilter
 {
 
-// =======================================================================
-
 ByteString::ByteString( const rtl::OString& rStr )
     : mpData(NULL)
 {
@@ -50,8 +48,6 @@ ByteString::ByteString( const rtl::OString& rStr )
     }
 }
 
-// -----------------------------------------------------------------------
-
 ByteString& ByteString::Assign( const rtl::OString& rStr )
 {
     DBG_CHKTHIS( ByteString, DbgCheckByteString );
diff --git a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
index 92b8158..0d12b29 100644
--- a/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
+++ b/binfilter/bf_svx/source/xml/svx_xmleohlp.cxx
@@ -276,6 +276,7 @@ struct OUStringLess
 /*?*/               aIter->second = 0;
 /*?*/           }
 /*N*/       }
+/*N*/       delete mpStreamMap;
 /*N*/   }
 /*N*/ }
 
diff --git a/binfilter/inc/bf_svtools/xbmread.hxx b/binfilter/inc/bf_svtools/xbmread.hxx
index 6b281fa..8fdecb7 100644
--- a/binfilter/inc/bf_svtools/xbmread.hxx
+++ b/binfilter/inc/bf_svtools/xbmread.hxx
@@ -30,6 +30,7 @@
 #define _XBMREAD_HXX
 
 #include <bf_svtools/bf_solar.h>
+#include <bf_tools/string.hxx>
 
 #include <vcl/graph.hxx>
 #include <vcl/bmpacc.hxx>
diff --git a/binfilter/inc/bf_tools/string.hxx b/binfilter/inc/bf_tools/string.hxx
index 6036737..a43f04f 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -153,21 +153,10 @@ public:
         return rtl::OString (reinterpret_cast<rtl_String*>(mpData));
     }
 
-    operator ::ByteString () const
-    {
-        return *(reinterpret_cast< const ::ByteString* >(this));
-    }
-
     ByteString&         Assign( const ByteString& rStr );
     ByteString&         Assign( const rtl::OString& rStr );
     ByteString&         Assign( const sal_Char* pCharStr );
-    ByteString&         Assign( const ::ByteString& rStr )
-    {
-        return Assign(rStr.GetBuffer(), rStr.Len());
-    }
     ByteString&         Assign( sal_Char c );
-    ByteString&         operator =( const ::ByteString& rStr )
-                            { return Assign( rStr ); }
     ByteString&         operator =( const ByteString& rStr )
                             { return Assign( rStr ); }
     ByteString&         operator =( const rtl::OString& rStr )
@@ -180,13 +169,7 @@ public:
     ByteString&         Append( const ByteString& rStr );
     ByteString&         Append( const sal_Char* pCharStr );
     ByteString&         Append( const sal_Char* pCharStr, xub_StrLen nLen );
-    ByteString&         Append( const ::ByteString& rStr )
-    {
-        return Append(rStr.GetBuffer(), rStr.Len());
-    }
     ByteString&         Append( char c );
-    ByteString&         operator +=( const ::ByteString& rStr )
-                            { return Append( rStr ); }
     ByteString&         operator +=( const ByteString& rStr )
                             { return Append( rStr ); }
     ByteString&         operator +=( const sal_Char* pCharStr )
@@ -232,10 +215,6 @@ public:
                                 xub_StrLen nIndex, xub_StrLen nLen ) const;
     sal_Bool                Equals( const sal_Char* pCharStr,
                                 xub_StrLen nIndex, xub_StrLen nLen ) const;
-    sal_Bool                Equals( const ::ByteString& rStr ) const
-    {
-        return Equals(rStr.GetBuffer(), 0, rStr.Len());
-    }
 
     xub_StrLen          Match( const ByteString& rStr ) const;
 
@@ -260,8 +239,6 @@ public:
 
     const sal_Char*     GetBuffer() const { return mpData->maStr; }
 
-    friend sal_Bool         operator == ( const ByteString& rStr1,  const ::ByteString& rStr2 )
-                            { return rStr1.Equals( rStr2 ); }
     friend sal_Bool         operator == ( const ByteString& rStr1,  const ByteString& rStr2 )
                             { return rStr1.Equals( rStr2 ); }
     friend sal_Bool         operator == ( const ByteString& rStr,   const sal_Char* pCharStr )
commit 7606c1623000b13bbb541c19981dc38efe73dbf8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 24 00:22:29 2012 +0000

    where's the point of the intermediate ByteString

diff --git a/binfilter/bf_forms/source/resource/forms_frm_resource.cxx b/binfilter/bf_forms/source/resource/forms_frm_resource.cxx
index c383b0b..bf5b223 100644
--- a/binfilter/bf_forms/source/resource/forms_frm_resource.cxx
+++ b/binfilter/bf_forms/source/resource/forms_frm_resource.cxx
@@ -58,9 +58,7 @@ namespace frm
         if (m_pImpl)
             return;
 
-        ByteString sFileName("bf_frm");
-
-        m_pImpl = SimpleResMgr::Create(sFileName.GetBuffer(), Application::GetSettings().GetUILocale());
+        m_pImpl = SimpleResMgr::Create("bf_frm", Application::GetSettings().GetUILocale());
 
         if (m_pImpl)
         {