CWS-TOOLING: integrate CWS dtrans2vcl

2009-09-09 19:47:56 +0200 pl  r276016 : merge fix for #i104390# into moved code
2009-09-07 12:50:47 +0200 pl  r275891 : remove nonexistant header
2009-09-04 16:47:05 +0200 pl  r275819 : forgot calling convention for Windoze
2009-09-04 13:27:36 +0200 pl  r275800 : #150926# remove X11 dependency
2009-09-04 13:19:08 +0200 pl  r275799 : #150926# move mac dtrans service to vcl to be used in service implementation
2009-09-03 21:19:01 +0200 pl  r275774 : fix warning, adjust comment
2009-09-03 18:36:01 +0200 pl  r275768 : no more sjlib
2009-09-03 17:56:49 +0200 pl  r275767 : remove unused X11 link dependency
2009-09-03 17:43:35 +0200 pl  r275766 : headless not used in X11 case
2009-09-03 17:34:36 +0200 pl  r275765 : #150926# bye bye sj2
2009-09-03 16:19:04 +0200 pl  r275761 : #150926# bye bye sj2, x11 dependenices removed where not necessary
2009-09-01 17:22:54 +0200 pl  r275674 : #150926# step 1: move X11 code from dtrans to vcl, adapt glue code

5 files changed, 11 insertions, 5 deletions

diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index 0de2e2e208d1..03f38a27fe4f 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -485,7 +485,6 @@
 #include "sal/types.h"
 #include "setup_native/qswin32.h"
 #include "shell/systemshell.hxx"
-#include "sj2/sjapplet.hxx"
 #include "sot/clsids.hxx"
 #include "sot/exchange.hxx"
 #include "sot/factory.hxx"
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index c191f765200f..725b9034add0 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -62,7 +62,7 @@
 #include <sot/exchange.hxx>
 
 //#include <svtools/agprop.hxx>
-#include <sj2/sjapplet.hxx>
+//#include <sj2/sjapplet.hxx>
 #include <svtools/isethint.hxx>
 
 #include <unotools/configmgr.hxx>
@@ -850,6 +850,8 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     // INet Session neu aufsetzen
     if ( bResetSession )
     {
+        // no more sj2
+        #if 0
         try
         {
             SjApplet2::settingsChanged();
@@ -858,6 +860,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
         {
             DBG_ERRORFILE( "SjApplet2::settingsChanged() throws an exception" );
         }
+        #endif
     }
 
     // geaenderte Daten speichern
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 90b12b484a01..c9814eb50e6a 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -137,7 +137,7 @@ using namespace ::com::sun::star::io;
 #include "brokenpackageint.hxx"
 #include "eventsupplier.hxx"
 #include "xpackcreator.hxx"
-#include "applet.hxx"
+// #include "applet.hxx"
 #include "plugin.hxx"
 #include "iframe.hxx"
 #include <ownsubfilterservice.hxx>
@@ -2150,6 +2150,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
     xNewKey = xKey->createKey( aTempStr );
     xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.SpecialEmbeddedObject") );
 
+    #if 0
     // AppletObject
     aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     aImpl += ::sfx2::AppletObject::impl_getStaticImplementationName();
@@ -2158,6 +2159,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
     aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
     xNewKey = xKey->createKey( aTempStr );
     xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.SpecialEmbeddedObject") );
+    #endif
 
     // IFrameObject
     aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
@@ -2324,11 +2326,13 @@ SFX2_DLLPUBLIC void* SAL_CALL component_getFactory(
         IF_NAME_CREATECOMPONENTFACTORY( TestMouseClickHandler )
 #endif
         IF_NAME_CREATECOMPONENTFACTORY( OPackageStructureCreator )
+        #if 0
         if ( ::sfx2::AppletObject::impl_getStaticImplementationName().equals(
                  ::rtl::OUString::createFromAscii( pImplementationName ) ) )
         {
             xFactory = ::sfx2::AppletObject::impl_createFactory();
         }
+        #endif
         IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::PluginObject )
         IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::IFrameObject )
         IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::OwnSubFilterService )
diff --git a/sfx2/source/doc/makefile.mk b/sfx2/source/doc/makefile.mk
index 986755558cf2..1b42844491e0 100644
--- a/sfx2/source/doc/makefile.mk
+++ b/sfx2/source/doc/makefile.mk
@@ -55,7 +55,6 @@ SLOFILES =	\
         $(SLO)$/docinf.obj \
         $(SLO)$/oleprops.obj \
         $(SLO)$/iframe.obj \
-        $(SLO)$/applet.obj \
         $(SLO)$/plugin.obj \
         $(SLO)$/docfile.obj \
         $(SLO)$/objuno.obj \
@@ -90,6 +89,8 @@ SLOFILES =	\
         $(SLO)$/docstoragemodifylistener.obj \
         $(SLO)$/querytemplate.obj
 
+#                $(SLO)$/applet.obj \
+
 
 # --- Tagets -------------------------------------------------------
 
diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk
index 5ee6e64daca0..6bdb4a8122a6 100644
--- a/sfx2/util/makefile.mk
+++ b/sfx2/util/makefile.mk
@@ -98,7 +98,6 @@ SHL1STDLIBS+=\
         $(CPPULIB) \
         $(VOSLIB) \
         $(SALLIB) \
-        $(SJLIB) \
         $(LIBXML2LIB) \