diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:02 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:02 +0100 |
| commit | 90087ebb40a6cf12c9464da4e4ea7cc8b5f24bc5 (patch) | |
| tree | bb3d6cb01c18dd12ae7ec77234cd43a6092d5a4b /unoxml/source/dom/notation.cxx | |
| parent | Use SAL_PRIuUINT32 instead of %d (diff) | |
| parent | masterfix DEV300: #i10000# drafts removed (diff) | |
| download | core-90087ebb40a6cf12c9464da4e4ea7cc8b5f24bc5.tar.gz core-90087ebb40a6cf12c9464da4e4ea7cc8b5f24bc5.zip | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
binfilter/bf_xmloff/source/forms/formcellbinding.hxx
binfilter/bf_xmloff/source/forms/xmloff_elementexport.cxx
binfilter/bf_xmloff/source/forms/xmloff_formcellbinding.cxx
filter/source/xsltfilter/makefile.mk
unoxml/source/dom/characterdata.cxx
unoxml/source/dom/document.cxx
unoxml/source/dom/documentbuilder.cxx
unoxml/source/dom/element.cxx
unoxml/source/dom/elementlist.cxx
unoxml/source/dom/node.cxx
unoxml/source/dom/node.hxx
unoxml/source/dom/text.cxx
unoxml/source/events/event.cxx
unoxml/source/events/event.hxx
unoxml/source/events/eventdispatcher.cxx
unoxml/source/events/eventdispatcher.hxx
unoxml/source/events/mouseevent.cxx
unoxml/source/events/mouseevent.hxx
unoxml/source/events/mutationevent.cxx
unoxml/source/events/mutationevent.hxx
unoxml/source/events/uievent.cxx
unoxml/source/events/uievent.hxx
unoxml/source/xpath/nodelist.cxx
unoxml/source/xpath/nodelist.hxx
unoxml/source/xpath/xpathobject.cxx
Diffstat (limited to 'unoxml/source/dom/notation.cxx')
| -rw-r--r-- | unoxml/source/dom/notation.cxx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/unoxml/source/dom/notation.cxx b/unoxml/source/dom/notation.cxx index c9c869b3e657..63a6d6ec869e 100644 --- a/unoxml/source/dom/notation.cxx +++ b/unoxml/source/dom/notation.cxx @@ -26,21 +26,24 @@ * ************************************************************************/ -#include "notation.hxx" +#include <notation.hxx> + #include <string.h> namespace DOM { - CNotation::CNotation(const xmlNotationPtr aNotationPtr) + CNotation::CNotation(CDocument const& rDocument, ::osl::Mutex const& rMutex, + xmlNotationPtr const pNotation) + : CNotation_Base(rDocument, rMutex, + NodeType_NOTATION_NODE, reinterpret_cast<xmlNodePtr>(pNotation)) + , m_aNotationPtr(pNotation) { - m_aNodeType = NodeType_NOTATION_NODE; - m_aNotationPtr = aNotationPtr; - init_node((xmlNodePtr)aNotationPtr); } OUString SAL_CALL CNotation::getPublicId() throw (RuntimeException) { - // XXX + OSL_ENSURE(false, + "CNotation::getPublicId: not implemented (#i113683#)"); return OUString(); } @@ -49,13 +52,16 @@ namespace DOM */ OUString SAL_CALL CNotation::getSystemId() throw (RuntimeException) { - // XXX + OSL_ENSURE(false, + "CNotation::getSystemId: not implemented (#i113683#)"); return OUString(); } OUString SAL_CALL CNotation::getNodeName()throw (RuntimeException) { + ::osl::MutexGuard const g(m_rMutex); + OUString aName; if (m_aNodePtr != NULL) { @@ -64,6 +70,7 @@ namespace DOM } return aName; } + OUString SAL_CALL CNotation::getNodeValue() throw (RuntimeException) { return OUString(); |