diff options
| author | Noel Power <noel.power@novell.com> | 2010-11-05 11:38:03 +0000 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-11-05 11:38:03 +0000 |
| commit | b75004d9b1f58612b355a5795f0013370806167e (patch) | |
| tree | 51c61d7036be1549a30906f80d5399d32d1b708c /extensions | |
| parent | 108dc662af5b281d2569a5d40ce2ad7f50b531f6 (diff) | |
| parent | 0c0e6a0d1374602c68e1dca7ab4108910123122d (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/components
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/activex/main/SOActionsApproval.cpp | 3 | ||||
| -rw-r--r-- | extensions/source/activex/main/SOComWindowPeer.cpp | 3 | ||||
| -rw-r--r-- | extensions/source/activex/main/SODispatchInterceptor.cpp | 3 | ||||
| -rw-r--r-- | extensions/source/oooimprovecore/core.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/scanner/makefile.mk | 7 |
5 files changed, 9 insertions, 9 deletions
diff --git a/extensions/source/activex/main/SOActionsApproval.cpp b/extensions/source/activex/main/SOActionsApproval.cpp index b795b92fcf76..e0ce5c5da58e 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 6ae1c805fa39..7fb56dbdfd32 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 5a4455265b97..dcddf0d86b0c 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)) diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx index 4510a8fe21af..472d844337a3 100644 --- a/extensions/source/oooimprovecore/core.cxx +++ b/extensions/source/oooimprovecore/core.cxx @@ -131,7 +131,7 @@ namespace oooimprovecore OUString::createFromAscii("HelpUrl"), ::comphelper::ConfigurationHelper::E_READONLY) >>= help_url; else - help_url = OUString::createFromAscii("http://www.openoffice.org"); + help_url = OUString::createFromAscii("http://www.libreoffice.org"); { SolarMutexGuard aGuard; SfxAllItemSet aSet( SFX_APP()->GetPool() ); diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk index 26ed6e70e6a9..baaefdf66e7d 100644 --- a/extensions/source/scanner/makefile.mk +++ b/extensions/source/scanner/makefile.mk @@ -76,13 +76,10 @@ SHL1STDLIBS=\ $(VCLLIB) \ $(SVTOOLLIB) -.IF "$(GUI)"=="UNX" -.IF "$(OS)"!="FREEBSD" -.IF "$(OS)"!="NETBSD" +.IF "$(GUI)"=="UNX" && "$(OS)"!="FREEBSD" && \ + "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" SHL1STDLIBS+=$(SVTOOLLIB) -ldl .ENDIF -.ENDIF -.ENDIF SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1IMPLIB=i$(TARGET) |