summaryrefslogtreecommitdiff
path: root/xmlhelp
diff options
context:
space:
mode:
authorAndreas Bille <abi@openoffice.org>2001-06-13 12:16:11 +0000
committerAndreas Bille <abi@openoffice.org>2001-06-13 12:16:11 +0000
commitc58e07256325e89bf9896e138e69a1ad30cc64fa (patch)
treefe06b9855b815162711d66f4ea510f7720d16ef4 /xmlhelp
parente319f460b4fed656697077a9c996b86ebe427ad6 (diff)
#87493#
Fixed: Solaris bug
Diffstat (limited to 'xmlhelp')
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx16
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.cxx12
2 files changed, 19 insertions, 9 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index c2ae09a6efbf..22420c9b2907 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.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: abi $ $Date: 2001-06-13 10:12:40 $
+ * last change: $Author: abi $ $Date: 2001-06-13 13:16:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -657,9 +657,15 @@ void Databases::errorDocument( const rtl::OUString& Language,
else
{
// the error file does not exist
- m_nErrorDocLength = strlen( m_pErrorDoc = "<html><body>"
- "The requested document does not exist in the database !!"
- "</body></html>" );
+ const char* errorText =
+ "<html><body>"
+ "The requested document does not exist in the database !!"
+ "</body></html>";
+
+ m_nErrorDocLength = strlen( errorText );
+ m_pErrorDoc = new char[ 1 + m_nErrorDocLength ];
+ m_pErrorDoc[ m_nErrorDocLength ] = 0;
+ rtl_copyMemory( m_pErrorDoc,errorText,m_nErrorDocLength );
}
}
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 34a830c64473..071770a6c7a1 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.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: abi $ $Date: 2001-06-13 10:12:40 $
+ * last change: $Author: abi $ $Date: 2001-06-13 13:16:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -718,8 +718,12 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
SablotRegHandler( p,HLR_SCHEME,&schemeHandler,(void*)(&userData) );
rtl::OUString xslURL = pDatabases->getInstallPathAsURL();
- rtl::OString xslURLascii = "file:";
- xslURLascii += rtl::OString( xslURL.getStr()+6,xslURL.getLength()-6,RTL_TEXTENCODING_UTF8 );
+ rtl::OString xslURLascii = "file:";
+#define OFFSET 5
+ xslURLascii += rtl::OString( xslURL.getStr()+OFFSET,
+ xslURL.getLength()-OFFSET,
+ RTL_TEXTENCODING_UTF8 );
+#undef OFFSET
xslURLascii += "main_transform.xsl";
SablotRunProcessor( p,