MWS_SRX644: migrate branch mws_srx644 -> HEAD

5 files changed, 21 insertions, 73 deletions

diff --git a/xmlhelp/source/com/sun/star/help/HelpIndexer.java b/xmlhelp/source/com/sun/star/help/HelpIndexer.java
index 240f08bdc8df..cbfc17877cce 100644
--- a/xmlhelp/source/com/sun/star/help/HelpIndexer.java
+++ b/xmlhelp/source/com/sun/star/help/HelpIndexer.java
@@ -205,7 +205,6 @@ public class HelpIndexer {
                 {
                       DocInfo info = ( DocInfo ) enum.nextElement();
                      String url = info.getURL();
-
                     if( url == null )
                      {
                          System.out.println( "<----------------------------------->" );
@@ -262,21 +261,13 @@ public class HelpIndexer {
                             _hashHelptext.put( tag.get_id(),text );
                            }
                     }
+                     _urlHandler.setMode( embResolved );
 
                     int idx = url.indexOf( '?' );
                     if( idx != -1 )
-                        url = url.substring( 0,idx );
-
-                    if( indexable( docResolved ) )
-                    {
-                        System.out.println( url );
-                        _urlHandler.setMode( embResolved );
-                        builder.indexDocument( new URL( url ),"" );
-                    }
-                    else
-                    {
-                        System.out.println( "excluded from indexing: " + url );
-                    }
+                         url = url.substring( 0,idx );
+                    System.out.println( url );
+                      builder.indexDocument( new URL( url ),"" );
                 }
                 catch( Exception e )
                 {
@@ -576,26 +567,6 @@ public class HelpIndexer {
     }
 
 
-    boolean indexable( Node node )
-    {
-        Node test;
-        NodeIterator it = new NodeIterator( node );
-          while( ( test=it.next() ) != null )
-        {
-            if( test.getNodeName().equals( "meta:user-defined" ) &&
-                ((Element)test).getAttribute("meta:name").equals("Info 2" ) )
-                break;
-        }
-        if( test != null )
-        {
-            NodeList list = test.getChildNodes();
-            for( int i = 0; i < list.getLength(); ++ i )
-                if( list.item(i).getNodeType() == Node.TEXT_NODE )
-                    return ! "NOINDEX".equals(((Text)list.item(i)).toString());
-        }
-        return true;
-    }
-
 
     // This is a configurable class, which capsulates the parser initialization stuff and all this things
 
@@ -740,7 +711,6 @@ public class HelpIndexer {
              // Setting the parameters
              _stuff.setParameter( "Language", _language );
              _stuff.setParameter( "Database", _module );
-             _stuff.setParameter( "System", _system );
         }
 
         // and parse
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 04e9154b9618..d997ad36aa56 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: databases.cxx,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: abi $ $Date: 2002-05-31 10:46:12 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 18:07:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,7 +60,6 @@
  ************************************************************************/
 
 
-#include <string.h>
 #include <berkeleydb/db_cxx.h>
 #ifndef _VOS_DIAGNOSE_HXX_
 #include <vos/diagnose.hxx>
@@ -534,7 +533,6 @@ Databases::getCollator( const rtl::OUString& Language,
         rtl::OUString countryStr = country(Language);
         if( !countryStr.getLength() )
         {
-            // #97229# Workaround for wrong collatorfallback
             if( langStr.compareToAscii("de") == 0 )
                 countryStr = rtl::OUString::createFromAscii("DE");
             else if( langStr.compareToAscii("en") == 0 )
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index b14d97e4cd54..b0dd7f2623ba 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: provider.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: abi $ $Date: 2002-10-30 09:59:17 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 18:07:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -290,11 +290,13 @@ void ContentProvider::init()
     try {
         // now adding as configuration change listener for the stylesheet
         Reference<XNameAccess> xAccess(xHierAccess,UNO_QUERY);
-        Any aAny =
-            xAccess->getByName(rtl::OUString::createFromAscii("Help"));
-        aAny >>= m_xContainer;
-        if(m_xContainer.is())
-            m_xContainer->addContainerListener(this);
+        if(xAccess.is()) {
+            Any aAny =
+                xAccess->getByName(rtl::OUString::createFromAscii("Help"));
+            aAny >>= m_xContainer;
+            if(m_xContainer.is())
+                m_xContainer->addContainerListener(this);
+        }
     } catch(const com::sun::star::uno::Exception&) {
     }
 
@@ -338,12 +340,6 @@ void ContentProvider::init()
                                   stylesheet,
                                   m_xSMgr );
 
-//      rtl::OUString newVal = rtl::OUString::createFromAscii("high_contrast");
-//      Any bla;
-//      bla <<= newVal;
-//      Reference<XNameReplace> rep(m_xContainer,UNO_QUERY);
-//      rep->replaceByName(rtl::OUString::createFromAscii("HelpStyleSheet"),
-//                         bla);
 }
 
 
diff --git a/xmlhelp/source/cxxhelp/qe/Query.cxx b/xmlhelp/source/cxxhelp/qe/Query.cxx
index 2e06db896ce9..4963227d0f2b 100644
--- a/xmlhelp/source/cxxhelp/qe/Query.cxx
+++ b/xmlhelp/source/cxxhelp/qe/Query.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Query.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mh $ $Date: 2001-08-01 14:35:45 $
+ *  last change: $Author: hr $ $Date: 2003-03-27 18:07:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -153,7 +153,7 @@ struct CompareQueryHit
 };
 
 
-#include <algorithm>
+#include <stl/algorithm>
 
 
 QueryHit* HitStore::firstBestQueryHit()
diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk
index 7f5bc89513c6..92f8559571b7 100644
--- a/xmlhelp/util/makefile.mk
+++ b/xmlhelp/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: svesik $ $Date: 2002-03-11 15:11:43 $
+#   last change: $Author: hr $ $Date: 2003-03-27 18:07:36 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -77,7 +77,7 @@ NO_BSYMBOLIC=TRUE
 .INCLUDE: settings.mk
 
 .IF "$(GUI)"=="WNT"
-CFLAGS+=/GR
+CFLAGS+=-GR
 .ENDIF
 .IF "$(COM)"=="GCC"
 CFLAGSCXX+=-frtti
@@ -97,24 +97,9 @@ SABLOT3RDLIB=sablot.lib
 SHL1TARGET=$(TARGET)$(UCP_VERSION)
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 SHL1IMPLIB=i$(TARGET)
-.IF "$(OS)"!="FREEBSD"
 SHL1VERSIONMAP=exports.map
-.ENDIF
 
 # Add additional libs here.
-.IF "$(OS)"=="FREEBSD" 
-SHL1STDLIBS=                     \
-      $(CPPUHELPERLIB)         \
-      $(CPPULIB)               \
-      $(SALLIB)                \
-      $(VOSLIB)                \
-      $(SABLOT3RDLIB)          \
-      $(EXPATASCII3RDLIB)      \
-      $(UCBHELPERLIB)          \
-      $(BERKELEYLIB)           \
-      $(BERKELEYCPPLIB)        \
-      -lcompat
-.ELSE
 SHL1STDLIBS=                     \
     $(CPPUHELPERLIB)         \
     $(CPPULIB)               \
@@ -125,7 +110,6 @@ SHL1STDLIBS=                     \
     $(UCBHELPERLIB)          \
     $(BERKELEYLIB)           \
     $(BERKELEYCPPLIB)
-.ENDIF
 
 SHL1LIBS =                       \
     $(SLB)$/jaqe.lib         \