[Libreoffice-commits] .: extensions/source

[Caolán McNamara]

 extensions/source/plugin/base/makefile.mk           |    4 ----
 extensions/source/plugin/inc/plugin/unx/plugcon.hxx |    6 +-----
 extensions/source/plugin/unx/makefile.mk            |    7 -------
 extensions/source/plugin/unx/npwrap.cxx             |    4 ----
 4 files changed, 1 insertion(+), 20 deletions(-)

New commits:
commit e1249b49f21d2eda47cbda63754bd0ba14be0a5c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 12 13:14:27 2011 +0100

    get rid of legacy libXaw usage

diff --git a/extensions/source/plugin/base/makefile.mk b/extensions/source/plugin/base/makefile.mk
index 35390c6..3049d9e 100644
--- a/extensions/source/plugin/base/makefile.mk
+++ b/extensions/source/plugin/base/makefile.mk
@@ -40,10 +40,6 @@ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
 CDEFS+=-DOJI
 .ENDIF
 
-.IF "$(DISABLE_XAW)" != ""
-CDEFS+=-DDISABLE_XAW
-.ENDIF
-
 .IF "$(WITH_MOZILLA)" != "NO"
 
 .IF "$(GUIBASE)"=="aqua"
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 1242608..0821591 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -58,11 +58,7 @@ extern "C" {
 #if defined USE_MOTIF
 #include <Xm/DrawingA.h>
 #else
-#  if defined DISABLE_XAW
-#     include <X11/Composite.h>
-#  else
-#     include <X11/Xaw/Label.h>
-#  endif
+#include <X11/Composite.h>
 #endif
 #include <X11/Xatom.h>
 #ifndef XP_UNIX
diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk
index 7ed18c2..9dcdf1a 100644
--- a/extensions/source/plugin/unx/makefile.mk
+++ b/extensions/source/plugin/unx/makefile.mk
@@ -50,10 +50,6 @@ CDEFS+=-DOJI
 
 .IF "$(WITH_MOZILLA)" != "NO"
 
-.IF "$(DISABLE_XAW)" == "TRUE"
-CDEFS+=-DDISABLE_XAW
-.ENDIF
-
 SLOFILES=\
     $(SLO)$/nppapi.obj		\
     $(SLO)$/sysplug.obj		\
@@ -74,9 +70,6 @@ APP1STDLIBS= $(SALLIB)
 .IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO"
 APP1STDLIBS+=-lXm -lXt $(X11LINK_DYNAMIC) -ldl
 .ELSE
-.IF "$(DISABLE_XAW)" != "TRUE"
-APP1STDLIBS+=-lXaw 
-.ENDIF
 .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD" || "$(OS)"=="DRAGONFLY"
 APP1STDLIBS+= -lXt -lXext -lX11
 .ELIF "$(OS)"=="AIX"
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index 7527d73..668239f 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -125,11 +125,7 @@ Widget createSubWidget( char* /*pPluginText*/, Widget shell, XLIB_Window aParent
         xmDrawingAreaWidgetClass,
 #else
         "",
-#  if defined DISABLE_XAW
         compositeWidgetClass,
-#  else
-        labelWidgetClass,
-#  endif
 #endif
           shell,
         XtNwidth, 200,