CWS-TOOLING: integrate CWS movepsprint

2009-02-27 10:42:24 +0100 pl  r268559 : #i99633# remove X11 build for mac
2009-02-26 16:38:01 +0100 pl  r268535 : #i97898# move psprint to vcl: no more linking psprint
2009-02-26 16:36:35 +0100 pl  r268534 : #i97898# move psprint to vcl: tentative os2 changes
2009-02-26 16:20:36 +0100 pl  r268532 : #i97898# move psprint to vcl: make compile again, round 5
2009-02-26 15:53:12 +0100 pl  r268530 : #i97898# psprint removed
2009-02-26 13:43:40 +0100 pl  r268513 : #i97898# use proper X display in PrintFontManager::initialize
2009-02-26 12:39:05 +0100 pl  r268496 : #i99633# remove unsused header
2009-02-25 19:12:54 +0100 pl  r268467 : #i99633# get rid of special casing for the now discontinued Mac X11 port
2009-02-25 18:25:37 +0100 pl  r268466 : #i97898# move psprint to vcl: make compile again, round 4
2009-02-25 17:38:55 +0100 pl  r268458 : #i97898# move psprint to vcl: make compile again, round 3
2009-02-25 16:55:15 +0100 pl  r268452 : #i97898# move psprint to vcl: remove psp lib from install set
2009-02-25 16:50:25 +0100 pl  r268451 : #i97898# move psprint to vcl: make compile again, round 2
2009-02-25 16:10:50 +0100 pl  r268448 : #i97898# move psprint to vcl: make compile again, round 1
2009-02-25 14:38:12 +0100 pl  r268440 : #i97898# move psprint to vcl: remove references to psprint in solenv
2009-02-25 14:22:22 +0100 pl  r268437 : #i97898# move psprint to vcl, first step: move in svn

9 files changed, 105 insertions, 120 deletions

diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 587ddaad6595..c10be2d83fcd 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -29,15 +29,17 @@
  ************************************************************************/
 
 #include <unistd.h>
-#include <vcl/msgbox.hxx>
-#include <adddlg.hxx>
-#include <newppdlg.hxx>
-#include <cmddlg.hxx>
-#ifndef _PAD_PADIALOG_HRC_
-#include <padialog.hrc>
-#endif
-#include <psprint/strhelper.hxx>
-#include <osl/thread.h>
+
+#include "adddlg.hxx"
+#include "newppdlg.hxx"
+#include "cmddlg.hxx"
+#include "padialog.hrc"
+
+#include "vcl/msgbox.hxx"
+#include "vcl/strhelper.hxx"
+
+#include "osl/thread.h"
+
 #include <hash_set>
 
 
diff --git a/padmin/source/adddlg.hxx b/padmin/source/adddlg.hxx
index c29390994bd4..e6fe17f30188 100644
--- a/padmin/source/adddlg.hxx
+++ b/padmin/source/adddlg.hxx
@@ -31,18 +31,15 @@
 #ifndef _PAD_ADDDLG_HXX_
 #define _PAD_ADDDLG_HXX_
 
-#include <vcl/dialog.hxx>
-#include <vcl/tabpage.hxx>
-#ifndef _SV_BUTTON_HXX
-#include <vcl/button.hxx>
-#endif
-#include <vcl/fixed.hxx>
-#include <vcl/combobox.hxx>
-#ifndef _PSP_PRINTERINFOMANAGER_HXX_
-#include <psprint/printerinfomanager.hxx>
-#endif
-#include <helper.hxx>
-#include <titlectrl.hxx>
+#include "helper.hxx"
+#include "titlectrl.hxx"
+
+#include "vcl/dialog.hxx"
+#include "vcl/tabpage.hxx"
+#include "vcl/button.hxx"
+#include "vcl/fixed.hxx"
+#include "vcl/combobox.hxx"
+#include "vcl/printerinfomanager.hxx"
 
 namespace padmin
 {
diff --git a/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx
index 29991c8193ea..d76171e704c1 100644
--- a/padmin/source/fontentry.cxx
+++ b/padmin/source/fontentry.cxx
@@ -28,25 +28,17 @@
  *
  ************************************************************************/
 
-#include <vcl/msgbox.hxx>
-#include <osl/thread.h>
-#include <psprint/fontmanager.hxx>
+#include "fontentry.hxx"
+#include "helper.hxx"
+#include "padialog.hrc"
+#include "vcl/strhelper.hxx"
 
-#ifndef _PAD_PADIALOG_HRC_
-#include <padialog.hrc>
-#endif
-#include <fontentry.hxx>
-#include <helper.hxx>
-#ifndef _CONFIG_HXX_
-#include <tools/config.hxx>
-#endif
-#include <psprint/strhelper.hxx>
+#include "vcl/msgbox.hxx"
+#include "vcl/fontmanager.hxx"
 
-#if 0
-#include <convafm.hxx>
-#include <progress.hxx>
-#include <osl/file.hxx>
-#endif
+#include "osl/thread.h"
+
+#include "tools/config.hxx"
 
 using namespace padmin;
 using namespace osl;
diff --git a/padmin/source/fontentry.hxx b/padmin/source/fontentry.hxx
index dab60c6f2d99..30f53db97051 100644
--- a/padmin/source/fontentry.hxx
+++ b/padmin/source/fontentry.hxx
@@ -31,21 +31,18 @@
 #ifndef _PAD_FONTENTRY_HXX_
 #define _PAD_FONTENTRY_HXX_
 
-#include <vcl/timer.hxx>
-#include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX
-#include <vcl/button.hxx>
-#endif
-#include <vcl/combobox.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/group.hxx>
-#include <tools/urlobj.hxx>
-#include <psprint/fontmanager.hxx>
-#ifndef _PAD_PRGRESS_HXX
-#include <progress.hxx>
-#endif
-#include <psprint/fontmanager.hxx>
-#include <helper.hxx>
+#include "progress.hxx"
+#include "helper.hxx"
+
+#include "vcl/timer.hxx"
+#include "vcl/dialog.hxx"
+#include "vcl/button.hxx"
+#include "vcl/combobox.hxx"
+#include "vcl/lstbox.hxx"
+#include "vcl/group.hxx"
+#include "vcl/fontmanager.hxx"
+
+#include "tools/urlobj.hxx"
 
 namespace padmin {
 
diff --git a/padmin/source/makefile.mk b/padmin/source/makefile.mk
index 6edae757e8f6..bcd7d0210af4 100644
--- a/padmin/source/makefile.mk
+++ b/padmin/source/makefile.mk
@@ -83,7 +83,6 @@ SHL1OBJS=$(SLOFILES)
 SHL1STDLIBS=\
     $(SVTOOLLIB)					\
     $(VCLLIB)						\
-    -lpsp$(DLLPOSTFIX)		\
     $(UNOTOOLSLIB)					\
     $(TOOLSLIB)						\
     $(COMPHELPERLIB)				\
diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx
index 957e8a062a7e..8d5414a2ceef 100644
--- a/padmin/source/newppdlg.cxx
+++ b/padmin/source/newppdlg.cxx
@@ -30,22 +30,23 @@
 
 #include <stdio.h>
 #include <unistd.h>
-#include <psprint/ppdparser.hxx>
-#include <psprint/helper.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/mnemonic.hxx>
-#include <tools/urlobj.hxx>
-#ifndef __SGI_STL_LIST
+
+#include "helper.hxx"
+#include "padialog.hrc"
+#include "newppdlg.hxx"
+#include "padialog.hxx"
+#include "progress.hxx"
+
+#include "vcl/ppdparser.hxx"
+#include "vcl/helper.hxx"
+#include "vcl/svapp.hxx"
+#include "vcl/mnemonic.hxx"
+
+#include "tools/urlobj.hxx"
+
+#include "osl/file.hxx"
+
 #include <list>
-#endif
-#include <osl/file.hxx>
-#include <helper.hxx>
-#ifndef _PAD_PADIALOG_HRC_
-#include <padialog.hrc>
-#endif
-#include <newppdlg.hxx>
-#include <padialog.hxx>
-#include <progress.hxx>
 
 #define PPDIMPORT_GROUP "PPDImport"
 
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 3e1d3496d17c..5b49409a1c8a 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -33,34 +33,33 @@
 #include <unistd.h>
 #include <string.h>
 #include <math.h>
-#include <vcl/msgbox.hxx>
-#include <vcl/print.hxx>
-#include <vcl/gradient.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/lineinfo.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/event.hxx>
-#include <tools/stream.hxx>
-#include <tools/color.hxx>
-#ifndef _PAD_PADIALOG_HRC_
-#include <padialog.hrc>
-#endif
-#include <fontentry.hxx>
-#include <helper.hxx>
-#ifndef _PSP_PRINTERINFOMANAGER_HXX_
-#include <psprint/printerinfomanager.hxx>
-#endif
-#include <padialog.hxx>
-#include <adddlg.hxx>
-#include <prtsetup.hxx>
-#include <osl/file.hxx>
-#include <unotools/localedatawrapper.hxx>
-#include <unotools/configitem.hxx>
-#include <unotools/configmgr.hxx>
-#ifndef _RTL_USTRBUF_HXX
-#include <rtl/ustrbuf.hxx>
-#endif
 
+#include "padialog.hrc"
+#include "fontentry.hxx"
+#include "helper.hxx"
+#include "padialog.hxx"
+#include "adddlg.hxx"
+#include "prtsetup.hxx"
+
+#include "vcl/msgbox.hxx"
+#include "vcl/print.hxx"
+#include "vcl/gradient.hxx"
+#include "vcl/bitmap.hxx"
+#include "vcl/lineinfo.hxx"
+#include "vcl/svapp.hxx"
+#include "vcl/event.hxx"
+#include "vcl/printerinfomanager.hxx"
+
+#include "tools/stream.hxx"
+#include "tools/color.hxx"
+
+#include "osl/file.hxx"
+
+#include "rtl/ustrbuf.hxx"
+
+#include "unotools/localedatawrapper.hxx"
+#include "unotools/configitem.hxx"
+#include "unotools/configmgr.hxx"
 using namespace psp;
 using namespace rtl;
 using namespace padmin;
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 1b363e710f7a..1a6894789bb5 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -28,14 +28,14 @@
  *
  ************************************************************************/
 
-#include <psprint/fontmanager.hxx>
-#include <prtsetup.hxx>
-#include <helper.hxx> // for PaResId
-#ifndef _PAD_RTSETUP_HRC_
-#include <rtsetup.hrc>
-#endif
-#include <cmddlg.hxx>
-#include <osl/thread.h>
+#include "prtsetup.hxx"
+#include "helper.hxx" // for PaResId
+#include "rtsetup.hrc"
+#include "cmddlg.hxx"
+
+#include "vcl/fontmanager.hxx"
+
+#include "osl/thread.h"
 
 #define LSCAPE_STRING String( RTL_CONSTASCII_USTRINGPARAM( "Landscape" ) )
 #define PORTRAIT_STRING String( RTL_CONSTASCII_USTRINGPARAM( "Portrait" ) )
diff --git a/padmin/source/prtsetup.hxx b/padmin/source/prtsetup.hxx
index 171f8bdf29f5..56e68336dfd8 100644
--- a/padmin/source/prtsetup.hxx
+++ b/padmin/source/prtsetup.hxx
@@ -31,22 +31,20 @@
 #ifndef _PAD_PRTSETUP_HXX_
 #define _PAD_PRTSETUP_HXX_
 
-#include <tools/link.hxx>
-#include <vcl/tabdlg.hxx>
-#include <vcl/tabpage.hxx>
-#include <vcl/tabctrl.hxx>
-#ifndef _SV_BUTTON_HXX
-#include <vcl/button.hxx>
-#endif
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/field.hxx>
-#include <vcl/combobox.hxx>
-#ifndef _PSPPRINT_PPDPARSER_HXX_
-#include <psprint/ppdparser.hxx>
-#endif
-#include <psprint/printerinfomanager.hxx>
-#include <helper.hxx>
+#include "helper.hxx"
+
+#include "tools/link.hxx"
+
+#include "vcl/tabdlg.hxx"
+#include "vcl/tabpage.hxx"
+#include "vcl/tabctrl.hxx"
+#include "vcl/button.hxx"
+#include "vcl/fixed.hxx"
+#include "vcl/lstbox.hxx"
+#include "vcl/field.hxx"
+#include "vcl/combobox.hxx"
+#include "vcl/ppdparser.hxx"
+#include "vcl/printerinfomanager.hxx"
 
 namespace padmin {