Kaydet (Commit) d952ba2a authored tarafından Alexander Wilms's avatar Alexander Wilms Kaydeden (comit) Caolán McNamara

Remove visual noise from unoxml

Change-Id: I405f2df6621197effd7e2b19844fe4d0bf7f58aa
Reviewed-on: https://gerrit.libreoffice.org/8335Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst d304c532
...@@ -386,7 +386,7 @@ public class DOMTest ...@@ -386,7 +386,7 @@ public class DOMTest
} }
} }
// XNode //////////////////////////////////////////////////// // XNode
{ {
XNode xDocCloneN = xDoc.cloneNode(false); XNode xDocCloneN = xDoc.cloneNode(false);
...@@ -579,7 +579,7 @@ public class DOMTest ...@@ -579,7 +579,7 @@ public class DOMTest
xDF.appendChild(xElemFoo); xDF.appendChild(xElemFoo);
// XNode //////////////////////////////////////////////////// // XNode
XText xText = xDoc.createTextNode("foo"); XText xText = xDoc.createTextNode("foo");
XComment xComment = xDoc.createComment("foo"); XComment xComment = xDoc.createComment("foo");
...@@ -933,7 +933,7 @@ public class DOMTest ...@@ -933,7 +933,7 @@ public class DOMTest
assertNull("XElement.removeAttributeNS", assertNull("XElement.removeAttributeNS",
xElemFooNs.getAttributeNodeNS(ns, "foo")); xElemFooNs.getAttributeNodeNS(ns, "foo"));
// XNode //////////////////////////////////////////////////// // XNode
XText xText = xDoc.createTextNode("foo"); XText xText = xDoc.createTextNode("foo");
XComment xComment = xDoc.createComment("foo"); XComment xComment = xDoc.createComment("foo");
...@@ -1182,7 +1182,7 @@ public class DOMTest ...@@ -1182,7 +1182,7 @@ public class DOMTest
xAttr.setValue("bar"); xAttr.setValue("bar");
assertEquals("XAttr.setValue()", "bar", xAttr.getValue()); assertEquals("XAttr.setValue()", "bar", xAttr.getValue());
// XNode //////////////////////////////////////////////////// // XNode
{ {
XNode xAttrCloneN = xAttr.cloneNode(false); XNode xAttrCloneN = xAttr.cloneNode(false);
...@@ -1438,7 +1438,7 @@ public class DOMTest ...@@ -1438,7 +1438,7 @@ public class DOMTest
} }
assertEquals("XText.subStringData", "x", xText.subStringData(3, 1)); assertEquals("XText.subStringData", "x", xText.subStringData(3, 1));
// XNode //////////////////////////////////////////////////// // XNode
{ {
XNode xTextCloneN = xText.cloneNode(false); XNode xTextCloneN = xText.cloneNode(false);
...@@ -1622,7 +1622,7 @@ public class DOMTest ...@@ -1622,7 +1622,7 @@ public class DOMTest
assertEquals("XCDATASection.subStringData", "x", assertEquals("XCDATASection.subStringData", "x",
xCDS.subStringData(3, 1)); xCDS.subStringData(3, 1));
// XNode //////////////////////////////////////////////////// // XNode
{ {
XNode xCDSCloneN = xCDS.cloneNode(false); XNode xCDSCloneN = xCDS.cloneNode(false);
...@@ -1796,7 +1796,7 @@ public class DOMTest ...@@ -1796,7 +1796,7 @@ public class DOMTest
assertEquals("XComment.subStringData", "x", assertEquals("XComment.subStringData", "x",
xComment.subStringData(3, 1)); xComment.subStringData(3, 1));
// XNode //////////////////////////////////////////////////// // XNode
{ {
XNode xCommentCloneN = xComment.cloneNode(false); XNode xCommentCloneN = xComment.cloneNode(false);
...@@ -1923,7 +1923,7 @@ public class DOMTest ...@@ -1923,7 +1923,7 @@ public class DOMTest
xER.appendChild(xERChild); xER.appendChild(xERChild);
// XNode //////////////////////////////////////////////////// // XNode
XText xText = xDoc.createTextNode("foo"); XText xText = xDoc.createTextNode("foo");
XComment xComment = xDoc.createComment("foo"); XComment xComment = xDoc.createComment("foo");
...@@ -2130,7 +2130,7 @@ public class DOMTest ...@@ -2130,7 +2130,7 @@ public class DOMTest
xPI.setData("baz"); xPI.setData("baz");
assertEquals("XProcessingInstruction.setData", "baz", xPI.getData()); assertEquals("XProcessingInstruction.setData", "baz", xPI.getData());
// XNode //////////////////////////////////////////////////// // XNode
{ {
XNode xPICloneN = xPI.cloneNode(false); XNode xPICloneN = xPI.cloneNode(false);
......
...@@ -137,7 +137,7 @@ namespace DOM ...@@ -137,7 +137,7 @@ namespace DOM
// so a new CNode is created and inserted // so a new CNode is created and inserted
// T1 calls removeCNode: i->second->second now points to a // T1 calls removeCNode: i->second->second now points to a
// different CNode instance! // different CNode instance!
//
// check that the CNode is the right one // check that the CNode is the right one
CNode *const pCurrent = i->second.second; CNode *const pCurrent = i->second.second;
if (pCurrent == pCNode) { if (pCurrent == pCNode) {
......
...@@ -92,7 +92,7 @@ typedef std::map< OUString, ::rtl::Reference<librdf_NamedGraph> > ...@@ -92,7 +92,7 @@ typedef std::map< OUString, ::rtl::Reference<librdf_NamedGraph> >
const char s_sparql [] = "sparql"; const char s_sparql [] = "sparql";
const char s_nsOOo [] = "http://openoffice.org/2004/office/rdfa/"; const char s_nsOOo [] = "http://openoffice.org/2004/office/rdfa/";
////////////////////////////////////////////////////////////////////////////
//FIXME: this approach is not ideal. can we use blank nodes instead? //FIXME: this approach is not ideal. can we use blank nodes instead?
bool isInternalContext(librdf_node *i_pNode) throw () bool isInternalContext(librdf_node *i_pNode) throw ()
...@@ -119,7 +119,7 @@ bool isInternalContext(librdf_node *i_pNode) throw () ...@@ -119,7 +119,7 @@ bool isInternalContext(librdf_node *i_pNode) throw ()
} }
////////////////////////////////////////////////////////////////////////////
// n.b.: librdf destructor functions dereference null pointers! // n.b.: librdf destructor functions dereference null pointers!
// so they need to be wrapped to be usable with boost::shared_ptr. // so they need to be wrapped to be usable with boost::shared_ptr.
...@@ -170,7 +170,7 @@ static void safe_librdf_free_uri(librdf_uri *const uri) ...@@ -170,7 +170,7 @@ static void safe_librdf_free_uri(librdf_uri *const uri)
} }
////////////////////////////////////////////////////////////////////////////
/** converts between librdf types and UNO API types. /** converts between librdf types and UNO API types.
*/ */
...@@ -266,7 +266,7 @@ private: ...@@ -266,7 +266,7 @@ private:
}; };
////////////////////////////////////////////////////////////////////////////
/** implements the repository service. /** implements the repository service.
*/ */
...@@ -450,7 +450,7 @@ private: ...@@ -450,7 +450,7 @@ private:
}; };
////////////////////////////////////////////////////////////////////////////
/** result of operations that return a graph, i.e., /** result of operations that return a graph, i.e.,
an XEnumeration of statements. an XEnumeration of statements.
...@@ -565,7 +565,7 @@ throw (uno::RuntimeException, container::NoSuchElementException, ...@@ -565,7 +565,7 @@ throw (uno::RuntimeException, container::NoSuchElementException,
} }
////////////////////////////////////////////////////////////////////////////
/** result of tuple queries ("SELECT"). /** result of tuple queries ("SELECT").
*/ */
...@@ -691,7 +691,7 @@ librdf_QuerySelectResult::getBindingNames() throw (uno::RuntimeException) ...@@ -691,7 +691,7 @@ librdf_QuerySelectResult::getBindingNames() throw (uno::RuntimeException)
} }
////////////////////////////////////////////////////////////////////////////
/** represents a named graph, and forwards all the work to repository. /** represents a named graph, and forwards all the work to repository.
*/ */
...@@ -848,7 +848,7 @@ throw (uno::RuntimeException, ...@@ -848,7 +848,7 @@ throw (uno::RuntimeException,
} }
////////////////////////////////////////////////////////////////////////////
boost::shared_ptr<librdf_world> librdf_Repository::m_pWorld; boost::shared_ptr<librdf_world> librdf_Repository::m_pWorld;
sal_uInt32 librdf_Repository::m_NumInstances = 0; sal_uInt32 librdf_Repository::m_NumInstances = 0;
...@@ -994,7 +994,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, ...@@ -994,7 +994,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
// exceptions are propagated // exceptions are propagated
i_xInStream->readBytes( buf, static_cast<sal_Int32>( sz ) ); i_xInStream->readBytes( buf, static_cast<sal_Int32>( sz ) );
::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked ////// ::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked
if (m_NamedGraphs.find(contextU) != m_NamedGraphs.end()) { if (m_NamedGraphs.find(contextU) != m_NamedGraphs.end()) {
throw container::ElementExistException( throw container::ElementExistException(
...@@ -1242,7 +1242,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, ...@@ -1242,7 +1242,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
*this); *this);
} }
g.clear(); // release Mutex before calling i_xOutStream methods ////////// g.clear(); // release Mutex before calling i_xOutStream methods
addChaffWhenEncryptedStorage(i_xOutStream, pBuf.get(), length); addChaffWhenEncryptedStorage(i_xOutStream, pBuf.get(), length);
} }
...@@ -1297,7 +1297,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, ...@@ -1297,7 +1297,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
"librdf_Repository::createGraph: URI is reserved", *this, 0); "librdf_Repository::createGraph: URI is reserved", *this, 0);
} }
::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked ////// ::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked
// NB: librdf does not have a concept of graphs as such; // NB: librdf does not have a concept of graphs as such;
// a librdf named graph exists iff the model contains a statement with // a librdf named graph exists iff the model contains a statement with
...@@ -1325,7 +1325,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, ...@@ -1325,7 +1325,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
} }
const OUString contextU( i_xGraphName->getStringValue() ); const OUString contextU( i_xGraphName->getStringValue() );
::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked ////// ::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked
const NamedGraphMap_t::iterator iter( clearGraph_Lock(contextU, false) ); const NamedGraphMap_t::iterator iter( clearGraph_Lock(contextU, false) );
m_NamedGraphs.erase(iter); m_NamedGraphs.erase(iter);
...@@ -1358,7 +1358,7 @@ throw (uno::RuntimeException, rdf::RepositoryException) ...@@ -1358,7 +1358,7 @@ throw (uno::RuntimeException, rdf::RepositoryException)
m_TypeConverter.extractStatement_NoLock( m_TypeConverter.extractStatement_NoLock(
i_xSubject, i_xPredicate, i_xObject)); i_xSubject, i_xPredicate, i_xObject));
::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked ////// ::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked
const boost::shared_ptr<librdf_statement> pStatement( const boost::shared_ptr<librdf_statement> pStatement(
m_TypeConverter.mkStatement_Lock(m_pWorld.get(), stmt), m_TypeConverter.mkStatement_Lock(m_pWorld.get(), stmt),
...@@ -1593,7 +1593,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, ...@@ -1593,7 +1593,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
removeStatementRDFa(i_xObject); // not atomic with insertion? removeStatementRDFa(i_xObject); // not atomic with insertion?
::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked ////// ::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked
if (i_rRDFaContent.isEmpty()) { if (i_rRDFaContent.isEmpty()) {
m_RDFaXHTMLContentSet.erase(sXmlId); m_RDFaXHTMLContentSet.erase(sXmlId);
...@@ -1674,7 +1674,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, ...@@ -1674,7 +1674,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
} }
} }
::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked ////// ::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked
return beans::Pair< uno::Sequence<rdf::Statement>, sal_Bool >( return beans::Pair< uno::Sequence<rdf::Statement>, sal_Bool >(
ret.getAsConstList(), 0 != m_RDFaXHTMLContentSet.count(sXmlId)); ret.getAsConstList(), 0 != m_RDFaXHTMLContentSet.count(sXmlId));
...@@ -1720,7 +1720,7 @@ throw (uno::RuntimeException, rdf::RepositoryException) ...@@ -1720,7 +1720,7 @@ throw (uno::RuntimeException, rdf::RepositoryException)
m_TypeConverter.extractStatement_NoLock( m_TypeConverter.extractStatement_NoLock(
i_xSubject, i_xPredicate, i_xObject)); i_xSubject, i_xPredicate, i_xObject));
::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked ////// ::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked
const boost::shared_ptr<librdf_statement> pStatement( const boost::shared_ptr<librdf_statement> pStatement(
m_TypeConverter.mkStatement_Lock(m_pWorld.get(), stmt), m_TypeConverter.mkStatement_Lock(m_pWorld.get(), stmt),
...@@ -1833,7 +1833,7 @@ void librdf_Repository::addStatementGraph_NoLock( ...@@ -1833,7 +1833,7 @@ void librdf_Repository::addStatementGraph_NoLock(
const OUString contextU( i_xGraphName->getStringValue() ); const OUString contextU( i_xGraphName->getStringValue() );
::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked ////// ::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked
addStatementGraph_Lock(stmt, contextU, i_Internal); addStatementGraph_Lock(stmt, contextU, i_Internal);
} }
...@@ -1907,7 +1907,7 @@ void librdf_Repository::removeStatementsGraph_NoLock( ...@@ -1907,7 +1907,7 @@ void librdf_Repository::removeStatementsGraph_NoLock(
i_xSubject, i_xPredicate, i_xObject)); i_xSubject, i_xPredicate, i_xObject));
const OUString contextU( i_xGraphName->getStringValue() ); const OUString contextU( i_xGraphName->getStringValue() );
::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked ////// ::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked
if (m_NamedGraphs.find(contextU) == m_NamedGraphs.end()) { if (m_NamedGraphs.find(contextU) == m_NamedGraphs.end()) {
throw container::NoSuchElementException( throw container::NoSuchElementException(
...@@ -1987,7 +1987,7 @@ librdf_Repository::getStatementsGraph_NoLock( ...@@ -1987,7 +1987,7 @@ librdf_Repository::getStatementsGraph_NoLock(
i_xSubject, i_xPredicate, i_xObject)); i_xSubject, i_xPredicate, i_xObject));
const OUString contextU( i_xGraphName->getStringValue() ); const OUString contextU( i_xGraphName->getStringValue() );
::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked ////// ::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked
if (!i_Internal && (m_NamedGraphs.find(contextU) == m_NamedGraphs.end())) { if (!i_Internal && (m_NamedGraphs.find(contextU) == m_NamedGraphs.end())) {
throw container::NoSuchElementException( throw container::NoSuchElementException(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment