Bug fixes

3 files changed, 15 insertions, 69 deletions

diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 650aeb0c3ea9..ebeebde96d28 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: content.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: abi $ $Date: 2001-05-17 15:46:30 $
+ *  last change: $Author: abi $ $Date: 2001-05-22 07:29:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -414,8 +414,15 @@ Any SAL_CALL Content::execute( const Command& aCommand,
 
         Reference< XActiveDataSink > xActiveDataSink( aOpenCommand.Sink,UNO_QUERY );
         if( xActiveDataSink.is() )
+        {
             m_aURLParameter.open( m_xSMgr,aCommand,CommandId,Environment );
+            Reference< XInputStream > xUntransformed = xActiveDataSink->getInputStream();
+            Reference< XInputStream > xTransformed( new Transformer( m_xProvider.getBodyPtr(),
+                                                                     xUntransformed,
+                                                                     m_aURLParameter ) );
 
+            xActiveDataSink->setInputStream( xTransformed );
+        }
 
         if( m_aURLParameter.isRoot() )
         {
diff --git a/xmlhelp/source/cxxhelp/provider/makefile.mk b/xmlhelp/source/cxxhelp/provider/makefile.mk
index 2cea4edc3d3f..d11e2449142b 100644
--- a/xmlhelp/source/cxxhelp/provider/makefile.mk
+++ b/xmlhelp/source/cxxhelp/provider/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: abi $ $Date: 2001-05-17 09:58:55 $
+#   last change: $Author: abi $ $Date: 2001-05-22 07:29:14 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -60,24 +60,15 @@
 #
 #*************************************************************************
 
-# @@@ UCP Version - Increase, if your UCP libraray becomes incompatible.
-UCP_VERSION=1
-
-# @@@ Name for your UCP. Will become part of the library name (See below).
-UCP_NAME=chelp
-
-# @@@ Relative path to project root.
 PRJ=..$/..$/..
-
-# @@@ Name of the project your UCP code recides it.
 PRJNAME=xmlhelp
-
-TARGET=ucp$(UCP_NAME)
+TARGET=chelp
 
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 NO_BSYMBOLIC=TRUE
 
+
 # --- Settings ---------------------------------------------------------
 
 .INCLUDE: settings.mk
@@ -88,7 +79,6 @@ CFLAGS+=/GR
 
 # --- General -----------------------------------------------------
 
-# @@@ Adjust template file names. Add own files here.
 SLOFILES=\
     $(SLO)$/services.obj    	   \
     $(SLO)$/provider.obj    	   \
@@ -101,43 +91,6 @@ SLOFILES=\
     $(SLO)$/urlparameter.obj       \
     $(SLO)$/databases.obj
 
-# You need these only if you implement a folder content,
-# which supports the command "open" returning a result set.
-#	$(SLO)$/myucp_resultset.obj
-#	$(SLO)$/myucp_datasupplier.obj
-
-LIB1TARGET=$(SLB)$/_$(TARGET).lib
-LIB1OBJFILES=$(SLOFILES)
-
-# --- Shared-Library ---------------------------------------------------
-
-SHL1TARGET=$(TARGET)$(UCP_VERSION)
-SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=exports.map
-
-# @@@ Add additional libs here.
-SHL1STDLIBS=                 \
-    $(CPPUHELPERLIB)         \
-    $(CPPULIB)               \
-    $(SALLIB)                \
-    $(VOSLIB)                \
-    $(UCBHELPERLIB)          \
-    libdb32.lib              \
-    $(SLB)$/jaqe.lib         \
-    $(SLB)$/jautil.lib       \
-    $(SLB)$/jadb.lib
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(LIB1TARGET)
-
-# --- Def-File ---------------------------------------------------------
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-# @@@ A description string for you UCP.
-DEF1DES=UCB Help Content Provider
-
 # --- Targets ----------------------------------------------------------
 
 .INCLUDE: target.mk
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index c611bb1a68fc..965bf7a3338c 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: urlparameter.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: abi $ $Date: 2001-05-17 15:46:30 $
+ *  last change: $Author: abi $ $Date: 2001-05-22 07:29:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -445,20 +445,6 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
         processor->execute( command,
                             CommandId,
                              Environment );
-//          OpenCommandArgument2 aOpenCommand;
-
-//          if ( !( command.Argument >>= aOpenCommand ) )
-//          {
-//              VOS_ENSURE( sal_False,
-//                          "Content::execute - invalid parameter!" );
-//          }
-
-//          Reference< XActiveDataSink > xActiveDataSink( aOpenCommand.Sink,UNO_QUERY );
-//          Reference< XInputStream> ref = xActiveDataSink->getInputStream();
-//          Sequence< sal_Int8 > aD;
-//          sal_Int32 du = ref->readBytes( aD,
-//                                         1000000 );
-//          rtl::OUString bla( reinterpret_cast< const char* >(aD.getConstArray()),du,RTL_TEXTENCODING_UTF8 );
     }
 }