summaryrefslogtreecommitdiff
path: root/unoxml
diff options
context:
space:
mode:
Diffstat (limited to 'unoxml')
-rw-r--r--unoxml/qa/complex/unoxml/DOMTest.java3
-rw-r--r--unoxml/qa/complex/unoxml/RDFRepositoryTest.java3
-rw-r--r--unoxml/source/dom/documentbuilder.cxx3
-rw-r--r--unoxml/source/events/eventdispatcher.hxx2
-rw-r--r--unoxml/source/rdf/librdf_services.cxx6
-rw-r--r--unoxml/source/service/services.cxx6
6 files changed, 8 insertions, 15 deletions
diff --git a/unoxml/qa/complex/unoxml/DOMTest.java b/unoxml/qa/complex/unoxml/DOMTest.java
index ba276e0fc53c..d4b9a5fcf3b6 100644
--- a/unoxml/qa/complex/unoxml/DOMTest.java
+++ b/unoxml/qa/complex/unoxml/DOMTest.java
@@ -98,8 +98,7 @@ public class DOMTest
//FIXME TODO
}
- // fd#35668 disabled, this crashes LibreOffice
- //@Test
+ @Test
public void testXDocumentBuilder() throws Exception
{
XDocumentBuilder xBuilder =
diff --git a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
index 494815fdd36a..7944a0edc064 100644
--- a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
+++ b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java
@@ -361,8 +361,7 @@ public class RDFRepositoryTest
}
}
- // fd#35667 disabling for now, because test fails
- // @Test
+ @Test
public void checkSPARQL()
{
try {
diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx
index f950964320c8..b5c19d0a5a40 100644
--- a/unoxml/source/dom/documentbuilder.cxx
+++ b/unoxml/source/dom/documentbuilder.cxx
@@ -83,7 +83,7 @@ namespace DOM
Content aContent(sSystemId, aEnvironment);
is.aInputStream = aContent.openStream();
- } catch (com::sun::star::uno::Exception) {
+ } catch (const com::sun::star::uno::Exception&) {
OSL_FAIL("exception in default entity resolver");
is.aInputStream = Reference< XInputStream >();
}
@@ -316,7 +316,6 @@ namespace DOM
saxex.Message = make_error_message(ctxt);
saxex.LineNumber = static_cast<sal_Int32>(ctxt->lastError.line);
saxex.ColumnNumber = static_cast<sal_Int32>(ctxt->lastError.int2);
- xmlFreeParserCtxt(ctxt);
throw saxex;
}
diff --git a/unoxml/source/events/eventdispatcher.hxx b/unoxml/source/events/eventdispatcher.hxx
index 9fca309035dd..9f007ff25066 100644
--- a/unoxml/source/events/eventdispatcher.hxx
+++ b/unoxml/source/events/eventdispatcher.hxx
@@ -94,4 +94,4 @@ public:
#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/source/rdf/librdf_services.cxx b/unoxml/source/rdf/librdf_services.cxx
index 62201475cee3..03b2b1e39eec 100644
--- a/unoxml/source/rdf/librdf_services.cxx
+++ b/unoxml/source/rdf/librdf_services.cxx
@@ -39,8 +39,7 @@ using namespace ::com::sun::star;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void SAL_CALL
-component_getImplementationEnvironment(const sal_Char **o_ppEnvironmentTypeName,
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char **o_ppEnvironmentTypeName,
uno_Environment ** /* ppEnvironment */)
{
*o_ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -66,8 +65,7 @@ static ::cppu::ImplementationEntry const entries[] = {
{ 0, 0, 0, 0, 0, 0 }
};
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL
-component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const char * implName, void * serviceManager, void * registryKey)
{
return ::cppu::component_getFactoryHelper(
diff --git a/unoxml/source/service/services.cxx b/unoxml/source/service/services.cxx
index 44c988ede39b..b81c363931fa 100644
--- a/unoxml/source/service/services.cxx
+++ b/unoxml/source/service/services.cxx
@@ -55,14 +55,12 @@ using namespace ::com::sun::star::registry;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void SAL_CALL
-component_getImplementationEnvironment(const sal_Char **ppEnvironmentTypeName, uno_Environment ** /*ppEnvironment */)
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char **ppEnvironmentTypeName, uno_Environment ** /*ppEnvironment */)
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL
-component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void * /*pRegistryKey*/)
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void * /*pRegistryKey*/)
{
void* pReturn = NULL ;
if ( pImplementationName && pServiceManager )