Date: prev next · Thread: first prev next last
2010 Archives by date, by thread · List index


Hello,

Here is a patch for clone/components (i think there's no more in it).

(LGPLv3+ / MPL)

Julien.
diff --git a/extensions/source/activex/main/SOActionsApproval.cpp 
b/extensions/source/activex/main/SOActionsApproval.cpp
index fd4abb1..c0da27f 100644
--- a/extensions/source/activex/main/SOActionsApproval.cpp
+++ b/extensions/source/activex/main/SOActionsApproval.cpp
@@ -5,6 +5,7 @@
 
 #include "so_activex.h"
 #include "SOActionsApproval.h"
+#include <sal/macros.h>
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -16,7 +17,7 @@ STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid)
         &IID_ISOActionsApproval,
     };
 
-    for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+    for (int i=0;i<SAL_N_ELEMENTS(arr);i++)
     {
 #if defined(_MSC_VER) && (_MSC_VER >= 1300)
         if (InlineIsEqualGUID(*arr[i],riid))
diff --git a/extensions/source/activex/main/SOComWindowPeer.cpp 
b/extensions/source/activex/main/SOComWindowPeer.cpp
index b6c0986..bf631a4 100644
--- a/extensions/source/activex/main/SOComWindowPeer.cpp
+++ b/extensions/source/activex/main/SOComWindowPeer.cpp
@@ -4,6 +4,7 @@
 #include "stdafx2.h"
 #include "so_activex.h"
 #include "SOComWindowPeer.h"
+#include <sal/macros.h>
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -15,7 +16,7 @@ STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid)
         &IID_ISOComWindowPeer,
     };
 
-    for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+    for (int i=0;i<SAL_N_ELEMENTS(arr);i++)
     {
 #if defined(_MSC_VER) && (_MSC_VER >= 1300)
         if (InlineIsEqualGUID(*arr[i],riid))
diff --git a/extensions/source/activex/main/SODispatchInterceptor.cpp 
b/extensions/source/activex/main/SODispatchInterceptor.cpp
index eadce51..704d2cd 100644
--- a/extensions/source/activex/main/SODispatchInterceptor.cpp
+++ b/extensions/source/activex/main/SODispatchInterceptor.cpp
@@ -7,6 +7,7 @@
 #include "SOActiveX.h"
 #include "SODispatchInterceptor.h"
 #include "com_uno_helper.h"
+#include <sal/macros.h>
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -18,7 +19,7 @@ STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid)
         &IID_ISODispatchInterceptor,
     };
 
-    for (int i=0;i<sizeof(arr)/sizeof(arr[0]);i++)
+    for (int i=0;i< SAL_N_ELEMENTS(arr);i++)
     {
 #if defined(_MSC_VER) && (_MSC_VER >= 1300)
         if (InlineIsEqualGUID(*arr[i],riid))

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.