diff options
Diffstat (limited to 'unoxml')
| -rw-r--r-- | unoxml/qa/complex/unoxml/RDFRepositoryTest.java | 21 | ||||
| -rw-r--r-- | unoxml/source/dom/documentbuilder.cxx | 2 | ||||
| -rw-r--r-- | unoxml/source/events/eventdispatcher.hxx | 2 | ||||
| -rw-r--r-- | unoxml/source/rdf/librdf_services.cxx | 6 | ||||
| -rw-r--r-- | unoxml/source/service/services.cxx | 6 |
5 files changed, 16 insertions, 21 deletions
diff --git a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java index ebf6af691343..7944a0edc064 100644 --- a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java +++ b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java @@ -172,14 +172,14 @@ public class RDFRepositoryTest try { xRep.createGraph(foo); - assertFalse("creating duplicate graph was allowed", false); + fail("creating duplicate graph was allowed"); } catch (ElementExistException e) { // ignore } try { xRep.createGraph(null); - assertFalse("invalid graph name was allowed", false); + fail("invalid graph name was allowed"); } catch (IllegalArgumentException e) { // ignore } @@ -296,7 +296,7 @@ public class RDFRepositoryTest xFooIn = new StreamSimulator(tempDir + "foo.rdf", true, param); try { xRep.importGraph(FileFormat.RDF_XML, xFooIn, bar, base); - assertFalse("importing existing graph did not fail", false); + fail("importing existing graph did not fail"); } catch (ElementExistException e) { // ignore } @@ -328,28 +328,28 @@ public class RDFRepositoryTest try { xBazGraph.clear(); - assertFalse("deleted graph not invalid (clear)", false); + fail("deleted graph not invalid (clear)"); } catch (NoSuchElementException e) { // ignore } try { xBazGraph.addStatement(foo, foo, foo); - assertFalse("deleted graph not invalid (add)", false); + fail("deleted graph not invalid (add)"); } catch (NoSuchElementException e) { // ignore } try { xBazGraph.removeStatements(null, null, null); - assertFalse("deleted graph not invalid (remove)", false); + fail("deleted graph not invalid (remove)"); } catch (NoSuchElementException e) { // ignore } try { xBazGraph.getStatements(null, null, null); - assertFalse("deleted graph not invalid (get)", false); + fail("deleted graph not invalid (get)"); } catch (NoSuchElementException e) { // ignore } @@ -361,8 +361,7 @@ public class RDFRepositoryTest } } - // fd#35667 disabling for now, because test fails - // @Test + @Test public void checkSPARQL() { try { @@ -475,14 +474,14 @@ public class RDFRepositoryTest try { xRep.setStatementRDFa(foo, new XURI[] {}, xM, "", null); - assertFalse("RDFa: set: no predicate", false); + fail("RDFa: set: no predicate"); } catch (IllegalArgumentException e) { // ignore } try { xRep.setStatementRDFa(foo, new XURI[] {bar}, null, "", null); - assertFalse("RDFa: set: null", false); + fail("RDFa: set: null"); } catch (IllegalArgumentException e) { // ignore } diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index 0f240399bfed..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 >(); } 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 ) |