summaryrefslogtreecommitdiff
path: root/unotools/source/misc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-19 12:30:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-19 12:47:07 +0100
commit973b47a336b239cc92f1789013d28e5bd55f859f (patch)
tree6481f2803208409896aecf6745239cf07953baab /unotools/source/misc
parent9ad3fc29dd98167c35fcb599da0b4e764ddf04dd (diff)
unotools: sal_Bool -> bool
Change-Id: I8051c0756e0474a5b4f748e0aa15a9922e82ea97
Diffstat (limited to 'unotools/source/misc')
-rw-r--r--unotools/source/misc/atom.cxx4
-rw-r--r--unotools/source/misc/datetime.cxx4
-rw-r--r--unotools/source/misc/mediadescriptor.cxx50
3 files changed, 29 insertions, 29 deletions
diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx
index c0f8dded5d03..c6b04807a216 100644
--- a/unotools/source/misc/atom.cxx
+++ b/unotools/source/misc/atom.cxx
@@ -33,7 +33,7 @@ AtomProvider::~AtomProvider()
{
}
-int AtomProvider::getAtom( const OUString& rString, sal_Bool bCreate )
+int AtomProvider::getAtom( const OUString& rString, bool bCreate )
{
::boost::unordered_map< OUString, int, OUStringHash >::iterator it = m_aAtomMap.find( rString );
if( it != m_aAtomMap.end() )
@@ -66,7 +66,7 @@ MultiAtomProvider::~MultiAtomProvider()
delete it->second;
}
-int MultiAtomProvider::getAtom( int atomClass, const OUString& rString, sal_Bool bCreate )
+int MultiAtomProvider::getAtom( int atomClass, const OUString& rString, bool bCreate )
{
::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it =
m_aAtomLists.find( atomClass );
diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx
index 4c3f6df9fb4e..af477672d1eb 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -33,7 +33,7 @@ namespace
const OUString& rString,
T /*nMin*/ = -1, T /*nMax*/ = -1)
{
- sal_Bool bNeg = sal_False;
+ bool bNeg = false;
rValue = 0;
sal_Int32 nPos = 0L;
@@ -45,7 +45,7 @@ namespace
if( nPos < nLen && '-' == rString[nPos] )
{
- bNeg = sal_True;
+ bNeg = true;
nPos++;
}
diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx
index 79502b36abb1..8014c978d82e 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -329,13 +329,13 @@ MediaDescriptor::MediaDescriptor(const css::uno::Sequence< css::beans::PropertyV
{
}
-sal_Bool MediaDescriptor::isStreamReadOnly() const
+bool MediaDescriptor::isStreamReadOnly() const
{
static OUString CONTENTSCHEME_FILE( "file" );
static OUString CONTENTPROP_ISREADONLY( "IsReadOnly" );
- static sal_Bool READONLY_FALLBACK = sal_False;
+ static bool READONLY_FALLBACK = false;
- sal_Bool bReadOnly = READONLY_FALLBACK;
+ bool bReadOnly = READONLY_FALLBACK;
// check for explicit readonly state
const_iterator pIt = find(MediaDescriptor::PROP_READONLY());
@@ -348,13 +348,13 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const
// streams based on post data are readonly by definition
pIt = find(MediaDescriptor::PROP_POSTDATA());
if (pIt != end())
- return sal_True;
+ return true;
// A XStream capsulate XInputStream and XOutputStream ...
// If it exists - the file must be open in read/write mode!
pIt = find(MediaDescriptor::PROP_STREAM());
if (pIt != end())
- return sal_False;
+ return false;
// Only file system content provider is able to provide XStream
// so for this content impossibility to create XStream triggers
@@ -370,7 +370,7 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const
aScheme = xId->getContentProviderScheme();
if (aScheme.equalsIgnoreAsciiCase(CONTENTSCHEME_FILE))
- bReadOnly = sal_True;
+ bReadOnly = true;
else
{
::ucbhelper::Content aContent(xContent, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext());
@@ -473,25 +473,25 @@ void MediaDescriptor::clearComponentDataEntry( const OUString& rName )
return aEncryptionData;
}
-sal_Bool MediaDescriptor::addInputStream()
+bool MediaDescriptor::addInputStream()
{
- return impl_addInputStream( sal_True );
+ return impl_addInputStream( true );
}
/*-----------------------------------------------*/
-sal_Bool MediaDescriptor::addInputStreamOwnLock()
+bool MediaDescriptor::addInputStreamOwnLock()
{
return impl_addInputStream(
officecfg::Office::Common::Misc::UseDocumentSystemFileLocking::get());
}
/*-----------------------------------------------*/
-sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile )
+bool MediaDescriptor::impl_addInputStream( bool bLockFile )
{
// check for an already existing stream item first
const_iterator pIt = find(MediaDescriptor::PROP_INPUTSTREAM());
if (pIt != end())
- return sal_True;
+ return true;
try
{
@@ -524,7 +524,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile )
}
}
-sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< css::io::XInputStream >& _rxPostData )
+bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< css::io::XInputStream >& _rxPostData )
throw(::com::sun::star::uno::RuntimeException)
{
if ( !_rxPostData.is() )
@@ -586,15 +586,15 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference
if ( !xResultStream.is() )
{
OSL_FAIL( "no valid reply to the HTTP-Post" );
- return sal_False;
+ return false;
}
(*this)[MediaDescriptor::PROP_INPUTSTREAM()] <<= xResultStream;
- return sal_True;
+ return true;
}
/*-----------------------------------------------*/
-sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool bLockFile )
+bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, bool bLockFile )
throw(::com::sun::star::uno::RuntimeException)
{
OUString referer(getUnpackedValueOrDefault(PROP_REFERRER(), OUString()));
@@ -631,7 +631,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
"unotools.misc",
"caught ContentCreationException \"" << e.Message
<< "\" while opening <" << sURL << ">");
- return sal_False; // TODO error handling
+ return false; // TODO error handling
}
catch(const css::uno::Exception& e)
{
@@ -639,7 +639,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
"unotools.misc",
"caught Exception \"" << e.Message << "\" while opening <"
<< sURL << ">");
- return sal_False; // TODO error handling
+ return false; // TODO error handling
}
// try to open the file in read/write mode
@@ -649,13 +649,13 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
css::uno::Reference< css::io::XStream > xStream ;
css::uno::Reference< css::io::XInputStream > xInputStream;
- sal_Bool bReadOnly = sal_False;
- sal_Bool bModeRequestedExplicitly = sal_False;
+ bool bReadOnly = false;
+ bool bModeRequestedExplicitly = false;
const_iterator pIt = find(MediaDescriptor::PROP_READONLY());
if (pIt != end())
{
pIt->second >>= bReadOnly;
- bModeRequestedExplicitly = sal_True;
+ bModeRequestedExplicitly = true;
}
if ( !bReadOnly && bLockFile )
@@ -682,7 +682,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
"unotools.misc",
"caught Exception \"" << e.Message
<< "\" while opening <" << sURL << ">");
- return sal_False;
+ return false;
}
xStream.clear();
xInputStream.clear();
@@ -707,13 +707,13 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
// so for this content impossibility to create XStream triggers
// switch to readonly mode in case of opening with locking on
if( bLockFile && aScheme.equalsIgnoreAsciiCase("file") )
- bReadOnly = sal_True;
+ bReadOnly = true;
else
{
- sal_Bool bRequestReadOnly = bReadOnly;
+ bool bRequestReadOnly = bReadOnly;
aContent.getPropertyValue("IsReadOnly") >>= bReadOnly;
if ( bReadOnly && !bRequestReadOnly && bModeRequestedExplicitly )
- return sal_False; // the document is explicitly requested with WRITEABLE mode
+ return false; // the document is explicitly requested with WRITEABLE mode
}
}
catch(const css::uno::RuntimeException&)
@@ -742,7 +742,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
"unotools.misc",
"caught Exception \"" << e.Message << "\" while opening <"
<< sURL << ">");
- return sal_False;
+ return false;
}
}