[Libreoffice-commits] .: 2 commits - extensions/source forms/source xmlsecurity/source

[Caolán McNamara]

 extensions/source/plugin/unx/npnapi.cxx                   |    2 
 forms/source/xforms/model.cxx                             |   29 --------------
 forms/source/xforms/model.hxx                             |    4 -
 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx |    8 ---
 4 files changed, 1 insertion(+), 42 deletions(-)

New commits:
commit 94087d09d35e37a98b7bb17139ae5716e230b81d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 29 17:13:27 2011 +0000

    WaE: various new gcc 4.6.0 warnings

diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index 35c60de..ed38520 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -704,7 +704,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
                         gtk_widget_show( pInst->pGtkWidget );
                         gtk_container_add( GTK_CONTAINER(pInst->pGtkWindow), pInst->pGtkWidget );
                         gtk_widget_show_all( pInst->pGtkWindow );
-                        pInst->window.window = (void *)gtk_socket_get_id( GTK_SOCKET(pInst->pGtkWidget ) );
+                        pInst->window.window = (void *)(sal_uIntPtr)gtk_socket_get_id( GTK_SOCKET(pInst->pGtkWidget ) );
 
                         XSync( pAppDisplay, False );
 
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
index 9de4823..b310b80 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
@@ -347,23 +347,15 @@ X509Certificate_NssImpl* X509Certificate_NssImpl :: getImplementation( const Ref
     if( pCert != NULL )
     {
         unsigned char fingerprint[20];
-        //char *fpStr = NULL;
-        SECItem fpItem;
         int length = ((id == SEC_OID_MD5)?MD5_LENGTH:SHA1_LENGTH);
         
         memset(fingerprint, 0, sizeof fingerprint);
         PK11_HashBuf(id, fingerprint, pCert->derCert.data, pCert->derCert.len);
-        fpItem.data = fingerprint;
-        fpItem.len = length;
-        //fpStr = CERT_Hexify(&fpItem, 1);
     
         Sequence< sal_Int8 > thumbprint( length ) ;
         for( int i = 0 ; i < length ; i ++ )
-        {
             thumbprint[i] = fingerprint[i];
-        }
         
-        //PORT_Free(fpStr);
         return thumbprint;
     }
     else
commit a202fdfbad44088ed79936b3a206aaf06a836e73
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 29 16:13:08 2011 +0000

    remove dangerously broken >>= operator

diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 9fa6bf0..662e2bd 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -778,33 +778,4 @@ Sequence<sal_Int8> Model::getImplementationId()
     return getUnoTunnelID();
 }
 
-
-//
-// 'shift' operators for getting data into and out of Anys
-//
-
-void operator <<= ( com::sun::star::uno::Any& rAny,
-                    xforms::Model* pModel)
-{
-    Reference<XPropertySet> xPropSet( static_cast<XPropertySet*>( pModel ) );
-    rAny <<= xPropSet;
-}
-
-bool operator >>= ( xforms::Model* pModel,
-                    com::sun::star::uno::Any& rAny )
-{
-    bool bRet = false;
-
-    // acquire model pointer through XUnoTunnel
-    Reference<XUnoTunnel> xTunnel( rAny, UNO_QUERY );
-    if( xTunnel.is() )
-    {
-        pModel = reinterpret_cast<xforms::Model*>(
-            xTunnel->getSomething( xforms::Model::getUnoTunnelID() ) );
-        bRet = true;
-    }
-
-    return bRet;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index b698766..e395d72 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -428,10 +428,6 @@ public:
 
 };
 
-// finally, allow 'shifting' of Model objects into/out of Any
-void operator <<= ( com::sun::star::uno::Any&, const xforms::Model* );
-bool operator >>= ( xforms::Model*, const com::sun::star::uno::Any&  );
-
 } // namespace
 #endif