[Libreoffice-commits] .: svl/source

[Caolán McNamara]

 svl/source/svdde/ddecli.cxx |    2 +-
 svl/source/svdde/ddesvr.cxx |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit acddd09bc2e635a63c3d924eec6026c5254cd576
Author: Caolán McNamara <caol...@redhat.com>
Date:   Mon Feb 13 15:53:52 2012 +0000

    WaE: NULL vs 0 with mingw

diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index fba0c25..fd7b09c 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -211,7 +211,7 @@ DdeConnection::~DdeConnection()
     {
         if( DdeUninitialize( pInst->hDdeInstCli ) )
         {
-            pInst->hDdeInstCli = NULL;
+            pInst->hDdeInstCli = 0;
             if( pInst->nRefCount == 0 )
                 ImpDeinitInstData();
         }
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 916823c..d47a6c0 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -290,7 +290,7 @@ found:
                 else
                     bRes = pTopic->Put( &d );
             }
-            pInst->hCurConvSvr = NULL;
+            pInst->hCurConvSvr = 0;
             if ( bRes )
                 return (HDDEDATA)DDE_FACK;
             else
@@ -332,7 +332,7 @@ found:
                 if (pItem)
                 {
                     pItem->IncMonitor( (long)hConv );
-                    pInst->hCurConvSvr = NULL;
+                    pInst->hCurConvSvr = 0;
                 }
             }
             return (HDDEDATA)sal_True;
@@ -341,7 +341,7 @@ found:
             pItem->DecMonitor( (long)hConv );
             if( !pItem->pImpData )
                 pTopic->StopAdviseLoop();
-            pInst->hCurConvSvr = NULL;
+            pInst->hCurConvSvr = 0;
             return (HDDEDATA)sal_True;
 
         case XTYP_EXECUTE:
@@ -359,7 +359,7 @@ found:
                 else
                     bRes = pTopic->Execute( &aName );
             }
-            pInst->hCurConvSvr = NULL;
+            pInst->hCurConvSvr = 0;
             if ( bRes )
                 return (HDDEDATA)DDE_FACK;
             else
@@ -513,7 +513,7 @@ DdeService::~DdeService()
     {
         if( DdeUninitialize( pInst->hDdeInstSvr ) )
         {
-            pInst->hDdeInstSvr = NULL;
+            pInst->hDdeInstSvr = 0;
             delete pInst->pServicesSvr;
             pInst->pServicesSvr = NULL;
             if( pInst->nRefCount == 0)

_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits