diff options
author | Andreas Bille <abi@openoffice.org> | 2001-05-07 10:58:30 +0000 |
---|---|---|
committer | Andreas Bille <abi@openoffice.org> | 2001-05-07 10:58:30 +0000 |
commit | 65ea5b9fe0d720d511f4075b0a9cd7ff2cb7fd75 (patch) | |
tree | dd9e1269eb9254907f056f8f6f0d544734230e75 /xmlhelp | |
parent | 1657cbfb402e134e3a105992fb0714f18be206dc (diff) |
#85818#
Modified only HelpProvider, HelpDatabases and HelpURLParameter for this
bug. The error file comes now from a special file in the installation directory.
Therefore it is language dependent.
Diffstat (limited to 'xmlhelp')
-rw-r--r-- | xmlhelp/source/com/sun/star/help/HelpIndexer.java | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/xmlhelp/source/com/sun/star/help/HelpIndexer.java b/xmlhelp/source/com/sun/star/help/HelpIndexer.java index e5503503f73a..cbfc17877cce 100644 --- a/xmlhelp/source/com/sun/star/help/HelpIndexer.java +++ b/xmlhelp/source/com/sun/star/help/HelpIndexer.java @@ -199,7 +199,7 @@ public class HelpIndexer { System.out.println( "Indexing..." ); Enumeration enum = _hashDocInfo.elements(); int cut = 0; - while( enum.hasMoreElements() && cut < 10000000 ) + while( enum.hasMoreElements() && cut < 100000000 ) { try { @@ -476,7 +476,7 @@ public class HelpIndexer { table = new Db( null,0 ); String fileName = HelpDatabases.getInstallDirectory() - + _language + + _language + File.separator + _module + ".ht"; @@ -511,10 +511,18 @@ public class HelpIndexer { { if( test.getNodeName().equals( "help:key-word" ) ) { - String keyword = (( Element ) test).getAttribute( "value" ); - String getJump = (( Element ) test).getAttribute( "tag" ); - if( ! keyword.equals("") && !id.equals("") ) - _keywords.insert( keyword,id + "#" + getJump ); + Element element = ( Element ) test; + + String isEmbedded = element.getAttribute( "embedded" ); + + if( isEmbedded != null && isEmbedded.equals( "false" ) ) + { + String keyword = element.getAttribute( "value" ); + String getJump = element.getAttribute( "tag" ); + + if( ! keyword.equals("") && !id.equals("") ) + _keywords.insert( keyword,id + "#" + getJump ); + } } } } |