Kaydet (Commit) 5371642e authored tarafından Noel Grandin's avatar Noel Grandin

unoxml: sal_Bool->bool

Change-Id: Ib0939a6285a6b4504149bb2f06cfda91938c381a
üst 417a9a4a
......@@ -745,7 +745,7 @@ namespace DOM
static Reference< XNode >
lcl_ImportNode( Reference< XDocument > const& xDocument,
Reference< XNode > const& xImportedNode, sal_Bool deep)
Reference< XNode > const& xImportedNode, bool deep)
{
Reference< XNode > xNode;
NodeType aNodeType = xImportedNode->getNodeType();
......
......@@ -56,7 +56,7 @@ namespace DOM
try {
Reference< XEventTarget > const xTarget(
static_cast<XElement*>(& rElement), UNO_QUERY_THROW);
sal_Bool capture = sal_False;
bool capture = false;
xTarget->addEventListener("DOMSubtreeModified",
Reference< XEventListener >(this), capture);
} catch (const Exception &e){
......@@ -66,7 +66,7 @@ namespace DOM
}
}
void CElementList::buildlist(xmlNodePtr pNode, sal_Bool start)
void CElementList::buildlist(xmlNodePtr pNode, bool start)
{
// bail out if no rebuild is needed
if (start) {
......@@ -94,7 +94,7 @@ namespace DOM
}
}
}
if (pNode->children != NULL) buildlist(pNode->children, sal_False);
if (pNode->children != NULL) buildlist(pNode->children, false);
if (!start) pNode = pNode->next;
else break; // fold back
......
......@@ -61,7 +61,7 @@ namespace DOM
bool m_bRebuild;
nodevector_t m_nodevector;
void buildlist(xmlNodePtr pNode, sal_Bool start=sal_True);
void buildlist(xmlNodePtr pNode, bool start=true);
void registerListener(CElement & rElement);
public:
......
......@@ -23,10 +23,10 @@ namespace DOM { namespace events
{
CEvent::CEvent()
: m_canceled(sal_False)
: m_canceled(false)
, m_phase(PhaseType_CAPTURING_PHASE)
, m_bubbles(sal_False)
, m_cancelable(sal_True)
, m_bubbles(false)
, m_cancelable(true)
{
}
......@@ -82,7 +82,7 @@ namespace DOM { namespace events
void SAL_CALL CEvent::stopPropagation() throw (RuntimeException, std::exception)
{
::osl::MutexGuard const g(m_Mutex);
if (m_cancelable) { m_canceled = sal_True; }
if (m_cancelable) { m_canceled = true; }
}
void SAL_CALL CEvent::preventDefault() throw (RuntimeException, std::exception)
......
......@@ -45,13 +45,13 @@ friend class CEventDispatcher;
protected:
::osl::Mutex m_Mutex;
sal_Bool m_canceled;
bool m_canceled;
OUString m_eventType;
Reference< XEventTarget > m_target;
Reference< XEventTarget > m_currentTarget;
PhaseType m_phase;
sal_Bool m_bubbles;
sal_Bool m_cancelable;
bool m_bubbles;
bool m_cancelable;
com::sun::star::util::Time m_time;
public:
......
......@@ -29,7 +29,7 @@
namespace DOM { namespace events {
void CEventDispatcher::addListener(xmlNodePtr pNode, const OUString& aType, const Reference<XEventListener>& aListener, sal_Bool bCapture)
void CEventDispatcher::addListener(xmlNodePtr pNode, const OUString& aType, const Reference<XEventListener>& aListener, bool bCapture)
{
TypeListenerMap *const pTMap = (bCapture)
? (& m_CaptureListeners) : (& m_TargetListeners);
......@@ -48,7 +48,7 @@ namespace DOM { namespace events {
pMap->insert(ListenerMap::value_type(pNode, aListener));
}
void CEventDispatcher::removeListener(xmlNodePtr pNode, const OUString& aType, const Reference<XEventListener>& aListener, sal_Bool bCapture)
void CEventDispatcher::removeListener(xmlNodePtr pNode, const OUString& aType, const Reference<XEventListener>& aListener, bool bCapture)
{
TypeListenerMap *const pTMap = (bCapture)
? (& m_CaptureListeners) : (& m_TargetListeners);
......
......@@ -59,13 +59,13 @@ public:
xmlNodePtr pNode,
const OUString& aType,
const Reference<com::sun::star::xml::dom::events::XEventListener>& aListener,
sal_Bool bCapture);
bool bCapture);
void removeListener(
xmlNodePtr pNode,
const OUString& aType,
const Reference<com::sun::star::xml::dom::events::XEventListener>& aListener,
sal_Bool bCapture);
bool bCapture);
static void callListeners(
TypeListenerMap const& rTMap,
......
......@@ -27,10 +27,10 @@ namespace DOM { namespace events
, m_screenY(0)
, m_clientX(0)
, m_clientY(0)
, m_ctrlKey(sal_False)
, m_shiftKey(sal_False)
, m_altKey(sal_False)
, m_metaKey(sal_False)
, m_ctrlKey(false)
, m_shiftKey(false)
, m_altKey(false)
, m_metaKey(false)
, m_button(0)
{
}
......
......@@ -40,10 +40,10 @@ protected:
sal_Int32 m_screenY;
sal_Int32 m_clientX;
sal_Int32 m_clientY;
sal_Bool m_ctrlKey;
sal_Bool m_shiftKey;
sal_Bool m_altKey;
sal_Bool m_metaKey;
bool m_ctrlKey;
bool m_shiftKey;
bool m_altKey;
bool m_metaKey;
sal_Int16 m_button;
Reference< XEventTarget > m_relatedTarget;
......
......@@ -93,7 +93,7 @@ namespace DOM { namespace events
if (! (args[1] >>= aType))
throw IllegalArgumentException("Illegal argument 2", Reference< XInterface >(), 2);
sal_Bool bCapture = sal_False;
bool bCapture = false;
if(! (args[2] >>= bCapture)) throw IllegalArgumentException(
"Illegal argument 3", Reference< XInterface >(), 3);
......
......@@ -58,7 +58,7 @@ namespace DOM { namespace events
Reference< ::com::sun::star::lang::XMultiServiceFactory > m_factory;
Reference <XEventTarget> m_target;
OUString m_type;
sal_Bool m_capture;
bool m_capture;
OUString m_name;
public:
......@@ -76,7 +76,7 @@ namespace DOM { namespace events
const Reference< ::com::sun::star::lang::XMultiServiceFactory >&
rSMgr)
: m_factory(rSMgr)
, m_capture(sal_False)
, m_capture(false)
{
}
......
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