From a6287e21f1dab6ae382c24ceeb4c0212b7cad2d7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 4 Apr 2014 15:53:21 +0200 Subject: framework: sal_Bool->bool Change-Id: Ia6e87e2b382bd4005637e14088bde9e809996a25 --- .../source/xml/acceleratorconfigurationreader.cxx | 12 ++++---- framework/source/xml/imagesconfiguration.cxx | 20 ++++++------ framework/source/xml/imagesdocumenthandler.cxx | 36 +++++++++++----------- 3 files changed, 34 insertions(+), 34 deletions(-) (limited to 'framework/source/xml') diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 74b7cf16b59a..6bfe69a8c7ec 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -56,8 +56,8 @@ namespace framework{ AcceleratorConfigurationReader::AcceleratorConfigurationReader(AcceleratorCache& rContainer) : m_rContainer (rContainer ) - , m_bInsideAcceleratorList(sal_False ) - , m_bInsideAcceleratorItem(sal_False ) + , m_bInsideAcceleratorList(false ) + , m_bInsideAcceleratorItem(false ) { } @@ -102,7 +102,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& THROW_PARSEEXCEPTION("An element \"accel:item\" must be embeded into 'accel:acceleratorlist'.") if (m_bInsideAcceleratorItem) THROW_PARSEEXCEPTION("An element \"accel:item\" is not a container.") - m_bInsideAcceleratorItem = sal_True; + m_bInsideAcceleratorItem = true; OUString sCommand; css::awt::KeyEvent aEvent; @@ -173,7 +173,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& { if (m_bInsideAcceleratorList) THROW_PARSEEXCEPTION("An element \"accel:acceleratorlist\" cannot be used recursive.") - m_bInsideAcceleratorList = sal_True; + m_bInsideAcceleratorList = true; return; } } @@ -190,14 +190,14 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElemen { if (!m_bInsideAcceleratorItem) THROW_PARSEEXCEPTION("Found end element 'accel:item', but no start element.") - m_bInsideAcceleratorItem = sal_False; + m_bInsideAcceleratorItem = false; } if (eElement == E_ELEMENT_ACCELERATORLIST) { if (!m_bInsideAcceleratorList) THROW_PARSEEXCEPTION("Found end element 'accel:acceleratorlist', but no start element.") - m_bInsideAcceleratorList = sal_False; + m_bInsideAcceleratorList = false; } } diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx index e13b7adc79c2..c8beaf3e3519 100644 --- a/framework/source/xml/imagesconfiguration.cxx +++ b/framework/source/xml/imagesconfiguration.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::io; namespace framework { -sal_Bool ImagesConfiguration::LoadImages( +bool ImagesConfiguration::LoadImages( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream, ImageListsDescriptor& rItems ) @@ -62,23 +62,23 @@ sal_Bool ImagesConfiguration::LoadImages( try { xParser->parseStream( aInputSource ); - return sal_True; + return true; } catch ( const RuntimeException& ) { - return sal_False; + return false; } catch( const SAXException& ) { - return sal_False; + return false; } catch( const ::com::sun::star::io::IOException& ) { - return sal_False; + return false; } } -sal_Bool ImagesConfiguration::StoreImages( +bool ImagesConfiguration::StoreImages( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream, const ImageListsDescriptor& rItems ) @@ -90,19 +90,19 @@ sal_Bool ImagesConfiguration::StoreImages( { OWriteImagesDocumentHandler aWriteImagesDocumentHandler( rItems, xWriter ); aWriteImagesDocumentHandler.WriteImagesDocument(); - return sal_True; + return true; } catch ( const RuntimeException& ) { - return sal_False; + return false; } catch ( const SAXException& ) { - return sal_False; + return false; } catch ( const ::com::sun::star::io::IOException& ) { - return sal_False; + return false; } } diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 245ad1e3f736..4bf44ee84c2e 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -125,14 +125,14 @@ OReadImagesDocumentHandler::OReadImagesDocumentHandler( ImageListsDescriptor& aI } // reset states - m_bImageContainerStartFound = sal_False; - m_bImageContainerEndFound = sal_False; - m_bImagesStartFound = sal_False; - m_bImagesEndFound = sal_False; - m_bImageStartFound = sal_False; - m_bExternalImagesStartFound = sal_False; - m_bExternalImagesEndFound = sal_False; - m_bExternalImageStartFound = sal_False; + m_bImageContainerStartFound = false; + m_bImageContainerEndFound = false; + m_bImagesStartFound = false; + m_bImagesEndFound = false; + m_bImageStartFound = false; + m_bExternalImagesStartFound = false; + m_bExternalImagesEndFound = false; + m_bExternalImageStartFound = false; } OReadImagesDocumentHandler::~OReadImagesDocumentHandler() @@ -182,7 +182,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - m_bImageContainerStartFound = sal_True; + m_bImageContainerStartFound = true; } break; @@ -205,7 +205,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( if ( !m_aImageList.pImageList ) m_aImageList.pImageList = new ImageListDescriptor; - m_bImagesStartFound = sal_True; + m_bImagesStartFound = true; m_pImages = new ImageListItemDescriptor; for ( sal_Int16 n = 0; n < xAttribs->getLength(); n++ ) @@ -306,7 +306,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( if ( !m_pImages->pImageItemList ) m_pImages->pImageItemList = new ImageItemListDescriptor; - m_bImageStartFound = sal_True; + m_bImageStartFound = true; // Create new image item descriptor ImageItemDescriptor* pItem = new ImageItemDescriptor; @@ -392,7 +392,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( } // Create unique external image container - m_bExternalImagesStartFound = sal_True; + m_bExternalImagesStartFound = true; m_pExternalImages = new ExternalImageItemListDescriptor; } break; @@ -423,7 +423,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - m_bExternalImageStartFound = sal_True; + m_bExternalImageStartFound = true; ExternalImageItemDescriptor* pItem = new ExternalImageItemDescriptor; @@ -508,7 +508,7 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName) { case IMG_ELEMENT_IMAGECONTAINER: { - m_bImageContainerEndFound = sal_True; + m_bImageContainerEndFound = true; } break; @@ -520,13 +520,13 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName) m_aImageList.pImageList->push_back( m_pImages ); m_pImages = NULL; } - m_bImagesStartFound = sal_False; + m_bImagesStartFound = false; } break; case IMG_ELEMENT_ENTRY: { - m_bImageStartFound = sal_False; + m_bImageStartFound = false; } break; @@ -538,14 +538,14 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName) m_aImageList.pExternalImageList = m_pExternalImages; } - m_bExternalImagesStartFound = sal_False; + m_bExternalImagesStartFound = false; m_pExternalImages = NULL; } break; case IMG_ELEMENT_EXTERNALENTRY: { - m_bExternalImageStartFound = sal_False; + m_bExternalImageStartFound = false; } break; -- cgit