[Libreoffice-commits] .: 3 commits - configure.in sd/inc sd/source

[Jan Holesovsky]

 configure.in                               |   17 ++++++++---------
 sd/inc/helper/simplereferencecomponent.hxx |    3 +--
 sd/source/ui/inc/fuediglu.hxx              |    2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit afbe3ea870ca40cfc1fff67ff80533b0bd3b4bd2
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Aug 18 09:34:34 2011 +0200

    Remove SD_DLLPUBLIC, it breaks Windows build.
    
    If there is a method that needs to be public, better SD_DLLPUBLIC just that one.

diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx
index 73ae5ca..af2c496 100644
--- a/sd/source/ui/inc/fuediglu.hxx
+++ b/sd/source/ui/inc/fuediglu.hxx
@@ -39,7 +39,7 @@ namespace sd {
 |*
 \************************************************************************/
 
-class SD_DLLPUBLIC FuEditGluePoints
+class FuEditGluePoints
     : public FuDraw
 {
 public:
commit 65a03924b20852235db5f2ec68cd2d3b1042d8b3
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Aug 17 12:15:48 2011 +0200

    Check for amd64/atls.lib, and disable ActiveX 64bit component if not present.

diff --git a/configure.in b/configure.in
index 0b8e375..0fa9fbc 100755
--- a/configure.in
+++ b/configure.in
@@ -2674,9 +2674,8 @@ if test "$_os" = "WINNT"; then
         LINK_X64_BINARY=
         LIBMGR_X64_BINARY=
 
-        if test "$CL_X64" = ""; then
-            AC_MSG_CHECKING([for a x64 compiler])
-
+        AC_MSG_CHECKING([for a x64 compiler and libraries for 64bit ActiveX component])
+        if test "$CL_X64" = "" -a -f "$with_cl_home/atlmfc/lib/amd64/atls.lib"; then
             # Prefer native x64 compiler to cross-compiler, in case we are running
             # the build on a 64-bit OS.
             if "$with_cl_home/bin/amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
@@ -2692,12 +2691,12 @@ if test "$_os" = "WINNT"; then
                 LINK_X64_BINARY="$with_cl_home/bin/x86_amd64/link.exe"
                 LIBMGR_X64_BINARY="$with_cl_home/bin/x86_amd64/lib.exe"
             fi
-            if test "$BUILD_X64" = TRUE; then
-                AC_MSG_RESULT([found])
-            else
-                AC_MSG_RESULT([not found])
-                AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension])
-            fi
+        fi
+        if test "$BUILD_X64" = TRUE; then
+            AC_MSG_RESULT([found])
+        else
+            AC_MSG_RESULT([not found])
+            AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension])
         fi
         AC_SUBST(BUILD_X64)
 
commit 1641f08f1a09dbdf98d02d5573ea5ac70f508eee
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Aug 15 00:20:48 2011 +0200

    Revert "windows compiler insist to have access to delete[], no matter what"
    
    This reverts commit 0ae3794348be4520adff16eebaa9486c56de70e8.

diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx
index a6d0512..45194d8 100644
--- a/sd/inc/helper/simplereferencecomponent.hxx
+++ b/sd/inc/helper/simplereferencecomponent.hxx
@@ -98,7 +98,6 @@ private:
      */
     void operator =(SimpleReferenceComponent);
 
-#ifndef WNT
     /** not implemented (see general class documentation)
         @internal
      */
@@ -108,7 +107,7 @@ private:
         @internal
      */
     static void operator delete[](void * pPtr);
-#endif
+
     bool mbDisposed;
 };