rpms/openoffice.org/devel openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch, 1.5, 1.6
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sun Aug 13 14:09:26 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24963
Modified Files:
openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
Log Message:
adjust xslt patch
openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch:
config_office/configure.in | 20 ++
config_office/set_soenv.in | 1
source/cxxhelp/provider/makefile.mk | 0
source/cxxhelp/provider/urlparameter.cxx | 0
util/makefile.mk | 0
xmlhelp/source/cxxhelp/provider/makefile.mk | 6
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 219 +++++++++++++++++++----
xmlhelp/util/makefile.mk | 12 +
8 files changed, 221 insertions(+), 37 deletions(-)
Index: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch 15 Feb 2006 08:30:43 -0000 1.5
+++ openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch 13 Aug 2006 14:09:22 -0000 1.6
@@ -79,7 +79,7 @@
diff -u -p -u -r1.36 urlparameter.cxx
--- openoffice.org.orig/xmlhelp/source/cxxhelp/provider/urlparameter.cxx 30 Mar 2005 08:38:37 -0000 1.36
+++ openoffice.org/xmlhelp/source/cxxhelp/provider/urlparameter.cxx 30 Aug 2005 15:09:59 -0000
-@@ -87,6 +87,11 @@
+@@ -61,6 +61,11 @@
#ifndef _RTL_URI_HXX_
#include <rtl/uri.hxx>
#endif
@@ -91,7 +91,7 @@
#ifdef SYSTEM_SABLOT
#include <sablot.h>
#include <shandler.h>
-@@ -98,6 +103,7 @@
+@@ -72,6 +77,7 @@
#include <sablot/shandler.h>
#endif
#endif
@@ -99,7 +99,7 @@
#ifndef BERKELEYDBPROXY_DB_HXX_
#include "db.hxx"
#endif
-@@ -749,8 +755,7 @@ bool URLParameter::query()
+@@ -736,8 +742,7 @@
return ret;
}
@@ -109,7 +109,7 @@
////////////////////////////////////////////////////////////////////////////////
// InutStreamTransformerImpl //
-@@ -784,6 +789,7 @@ int schemehandlerclose( void *userData,
+@@ -771,6 +776,7 @@
SablotHandle processor_,
int handle );
@@ -117,7 +117,7 @@
struct UserData {
-@@ -801,7 +807,124 @@ struct UserData {
+@@ -788,7 +794,124 @@
URLParameter* m_pInitial;
};
@@ -242,7 +242,7 @@
InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
Databases* pDatabases,
-@@ -828,6 +951,7 @@ InputStreamTransformer::InputStreamTrans
+@@ -815,6 +938,7 @@
}
else
{
@@ -250,7 +250,7 @@
SchemeHandler schemeHandler;
schemeHandler.getAll = schemehandlergetall;
schemeHandler.freeMemory = schemehandlerfreememory;
-@@ -835,6 +959,7 @@ InputStreamTransformer::InputStreamTrans
+@@ -822,6 +946,7 @@
schemeHandler.get = schemehandlerget;
schemeHandler.put = schemehandlerput;
schemeHandler.close = schemehandlerclose;
@@ -258,7 +258,7 @@
UserData userData( this,urlParam,pDatabases );
-@@ -845,77 +970,78 @@ InputStreamTransformer::InputStreamTrans
+@@ -832,77 +957,78 @@
int last = 0;
parString[last++] = "Program";
@@ -365,39 +365,39 @@
rtl::OUString xslURL = pDatabases->getInstallPathAsURL/*WithOutEncoding*/();
rtl::OString xslURLascii(
-@@ -924,6 +1050,31 @@ InputStreamTransformer::InputStreamTrans
+@@ -910,7 +1036,31 @@
+ xslURL.getLength(),
RTL_TEXTENCODING_ASCII_US/*osl_getThreadTextEncoding()*/);
xslURLascii += "main_transform.xsl";
-
+#ifdef SYSTEM_LIBXSLT
-+ ugblData = &userData;
-+
-+ xmlRegisterInputCallbacks(pkgMatch, pkgOpen, pkgRead, uriClose);
-+ xmlRegisterInputCallbacks(helpMatch, helpOpen, helpRead, uriClose);
++ ugblData = &userData;
+
-+ xsltStylesheetPtr cur =
-+ xsltParseStylesheetFile((const xmlChar *)xslURLascii.getStr());
++ xmlRegisterInputCallbacks(pkgMatch, pkgOpen, pkgRead, uriClose);
++ xmlRegisterInputCallbacks(helpMatch, helpOpen, helpRead, uriClose);
+
-+ xmlDocPtr doc = xmlParseFile("vnd.sun.star.pkg:/");
-+
-+ xmlDocPtr res = xsltApplyStylesheet(cur, doc, parameter);
-+ if (res) {
-+ xmlChar *doc_txt_ptr=0;
-+ int doc_txt_len;
-+ int nResult = xsltSaveResultToString(&doc_txt_ptr, &doc_txt_len, res, cur);
-+ addToBuffer((const char*)doc_txt_ptr, doc_txt_len);
-+ xmlFree(doc_txt_ptr);
-+ }
-+ xmlPopInputCallbacks();
-+ xmlPopInputCallbacks();
-+ xmlFreeDoc(res);
-+ xmlFreeDoc(doc);
-+ xsltFreeStylesheet(cur);
++ xsltStylesheetPtr cur =
++ xsltParseStylesheetFile((const xmlChar *)xslURLascii.getStr());
+
++ xmlDocPtr doc = xmlParseFile("vnd.sun.star.pkg:/");
++
++ xmlDocPtr res = xsltApplyStylesheet(cur, doc, parameter);
++ if (res) {
++ xmlChar *doc_txt_ptr=0;
++ int doc_txt_len;
++ int nResult = xsltSaveResultToString(&doc_txt_ptr, &doc_txt_len, res, cur);
++ addToBuffer((const char*)doc_txt_ptr, doc_txt_len);
++ xmlFree(doc_txt_ptr);
++ }
++ xmlPopInputCallbacks();
++ xmlPopInputCallbacks();
++ xmlFreeDoc(res);
++ xmlFreeDoc(doc);
++ xsltFreeStylesheet(cur);
+#else
- #ifdef SYSTEM_SABLOT
- SablotRunProcessor( p,
- xslURLascii.getStr(),
-@@ -941,6 +1092,7 @@ InputStreamTransformer::InputStreamTrans
+ const char aVndPkgConstStr[] = "vnd.sun.star.pkg:/";
+ const char aVndResConstStr[] = "vnd.sun.star.resultat:/";
+ char aVndPkgStr[ sizeof( aVndPkgConstStr ) ];
+@@ -934,6 +1084,7 @@
#endif
SablotDestroyProcessor( p );
@@ -405,7 +405,7 @@
}
}
-@@ -1086,8 +1238,7 @@ void InputStreamTransformer::addToBuffer
+@@ -1079,8 +1230,7 @@
}
@@ -415,7 +415,7 @@
/**
* getAll: open the URI and return the whole string
-@@ -1260,7 +1411,4 @@ int schemehandlerclose( void *userData,
+@@ -1275,7 +1425,4 @@
return 0;
}
More information about the fedora-cvs-commits
mailing list