diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-30 08:53:18 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-05-02 08:49:18 +0200 |
commit | 5371642efdca30e1428b3103b0c30b30be69d278 (patch) | |
tree | 30af786f281f56c2dd030ef53781c43aa5c89da8 /unoxml | |
parent | 417a9a4ad8cb19bc2da27d3d8c595eed6fac57fc (diff) |
unoxml: sal_Bool->bool
Change-Id: Ib0939a6285a6b4504149bb2f06cfda91938c381a
Diffstat (limited to 'unoxml')
-rw-r--r-- | unoxml/source/dom/document.cxx | 2 | ||||
-rw-r--r-- | unoxml/source/dom/elementlist.cxx | 6 | ||||
-rw-r--r-- | unoxml/source/dom/elementlist.hxx | 2 | ||||
-rw-r--r-- | unoxml/source/events/event.cxx | 8 | ||||
-rw-r--r-- | unoxml/source/events/event.hxx | 6 | ||||
-rw-r--r-- | unoxml/source/events/eventdispatcher.cxx | 4 | ||||
-rw-r--r-- | unoxml/source/events/eventdispatcher.hxx | 4 | ||||
-rw-r--r-- | unoxml/source/events/mouseevent.cxx | 8 | ||||
-rw-r--r-- | unoxml/source/events/mouseevent.hxx | 8 | ||||
-rw-r--r-- | unoxml/source/events/testlistener.cxx | 2 | ||||
-rw-r--r-- | unoxml/source/events/testlistener.hxx | 4 |
11 files changed, 27 insertions, 27 deletions
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx index dbfdf455b7b4..b0697e6f1663 100644 --- a/unoxml/source/dom/document.cxx +++ b/unoxml/source/dom/document.cxx @@ -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(); diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx index b49579cf7c53..4490ecd83b61 100644 --- a/unoxml/source/dom/elementlist.cxx +++ b/unoxml/source/dom/elementlist.cxx @@ -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 diff --git a/unoxml/source/dom/elementlist.hxx b/unoxml/source/dom/elementlist.hxx index baa7d572629e..f8be08b6c1ad 100644 --- a/unoxml/source/dom/elementlist.hxx +++ b/unoxml/source/dom/elementlist.hxx @@ -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: diff --git a/unoxml/source/events/event.cxx b/unoxml/source/events/event.cxx index cd66d0b3fd3e..6cab4eaae89a 100644 --- a/unoxml/source/events/event.cxx +++ b/unoxml/source/events/event.cxx @@ -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) diff --git a/unoxml/source/events/event.hxx b/unoxml/source/events/event.hxx index 303b2486acdd..23ed8b5686c2 100644 --- a/unoxml/source/events/event.hxx +++ b/unoxml/source/events/event.hxx @@ -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: diff --git a/unoxml/source/events/eventdispatcher.cxx b/unoxml/source/events/eventdispatcher.cxx index 1b155aa67c2d..cbb8f42fed01 100644 --- a/unoxml/source/events/eventdispatcher.cxx +++ b/unoxml/source/events/eventdispatcher.cxx @@ -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); diff --git a/unoxml/source/events/eventdispatcher.hxx b/unoxml/source/events/eventdispatcher.hxx index b5541bf0f8c9..7ec3c28e5b81 100644 --- a/unoxml/source/events/eventdispatcher.hxx +++ b/unoxml/source/events/eventdispatcher.hxx @@ -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, diff --git a/unoxml/source/events/mouseevent.cxx b/unoxml/source/events/mouseevent.cxx index 1b08b2743cc6..ca0b3d93af05 100644 --- a/unoxml/source/events/mouseevent.cxx +++ b/unoxml/source/events/mouseevent.cxx @@ -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) { } diff --git a/unoxml/source/events/mouseevent.hxx b/unoxml/source/events/mouseevent.hxx index bedb4212685b..bbbae9242e09 100644 --- a/unoxml/source/events/mouseevent.hxx +++ b/unoxml/source/events/mouseevent.hxx @@ -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; diff --git a/unoxml/source/events/testlistener.cxx b/unoxml/source/events/testlistener.cxx index 775fab492310..1e65584ffae9 100644 --- a/unoxml/source/events/testlistener.cxx +++ b/unoxml/source/events/testlistener.cxx @@ -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); diff --git a/unoxml/source/events/testlistener.hxx b/unoxml/source/events/testlistener.hxx index bfa5961b19b5..8cc977cd97ea 100644 --- a/unoxml/source/events/testlistener.hxx +++ b/unoxml/source/events/testlistener.hxx @@ -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) { } |