summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-30 10:00:10 +0200
committerNoel Grandin <noel@peralex.com>2014-05-02 08:49:20 +0200
commita86ad4d11c7789dcf7fede31b0ff391f151dbf47 (patch)
treec0e49c4cd9e361dae1a13500b75a943588333a60
parent19d35573fa0757ecac0163e6aff8d2cad1c61264 (diff)
writerperfect: sal_Bool->bool
Change-Id: Ic51f9ed2c2c2fced13c8b279912410f9c1638ff9
-rw-r--r--writerperfect/source/impress/KeynoteImportFilter.cxx8
-rw-r--r--writerperfect/source/impress/KeynoteImportFilter.hxx2
-rw-r--r--writerperfect/source/writer/WordPerfectImportFilter.cxx12
-rw-r--r--writerperfect/source/writer/WordPerfectImportFilter.hxx6
4 files changed, 14 insertions, 14 deletions
diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx
index b1019b2c9664..0e5a6bd0c5dc 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.cxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.cxx
@@ -69,9 +69,9 @@ namespace
{
template<class T>
-sal_Bool lcl_queryIsPackage( const Sequence<T> &lComponentData )
+bool lcl_queryIsPackage( const Sequence<T> &lComponentData )
{
- sal_Bool bIsPackage = sal_False;
+ bool bIsPackage = false;
const sal_Int32 nLength = lComponentData.getLength();
const T *pValue = lComponentData.getConstArray();
@@ -87,7 +87,7 @@ sal_Bool lcl_queryIsPackage( const Sequence<T> &lComponentData )
return bIsPackage;
}
-sal_Bool lcl_isPackage( const Any &rComponentData )
+bool lcl_isPackage( const Any &rComponentData )
{
Sequence < beans::NamedValue > lComponentDataNV;
Sequence < beans::PropertyValue > lComponentDataPV;
@@ -109,7 +109,7 @@ throw (RuntimeException, std::exception)
const PropertyValue *pValue = aDescriptor.getConstArray();
Reference < XInputStream > xInputStream;
Reference < ucb::XContent > xContent;
- sal_Bool bIsPackage = sal_False;
+ bool bIsPackage = false;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
if ( pValue[i].Name == "ComponentData" )
diff --git a/writerperfect/source/impress/KeynoteImportFilter.hxx b/writerperfect/source/impress/KeynoteImportFilter.hxx
index 26315042b50c..8e4caabc3544 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.hxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.hxx
@@ -74,7 +74,7 @@ public:
OUString KeynoteImportFilter_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
-sal_Bool SAL_CALL KeynoteImportFilter_supportsService( const OUString &ServiceName )
+bool SAL_CALL KeynoteImportFilter_supportsService( const OUString &ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Sequence< OUString > SAL_CALL KeynoteImportFilter_getSupportedServiceNames( )
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index 605a1eb37040..9a268be0451f 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -85,7 +85,7 @@ static bool handleEmbeddedWPGImage(const WPXBinaryData &input, WPXBinaryData &ou
return true;
}
-sal_Bool SAL_CALL WordPerfectImportFilter::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
+bool SAL_CALL WordPerfectImportFilter::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
throw (RuntimeException)
{
SAL_INFO("writerperfect", "WordPerfectImportFilter::importImpl");
@@ -101,7 +101,7 @@ throw (RuntimeException)
if ( !xInputStream.is() )
{
OSL_ASSERT( false );
- return sal_False;
+ return false;
}
WPXSvInputStream input( xInputStream );
@@ -118,7 +118,7 @@ throw (RuntimeException)
SfxPasswordDialog aPasswdDlg( 0 );
aPasswdDlg.SetMinLen(0);
if(!aPasswdDlg.Execute())
- return sal_False;
+ return false;
OUString aPasswd = aPasswdDlg.GetPassword();
aUtf8Passwd = OUStringToOString(aPasswd, RTL_TEXTENCODING_UTF8);
if (WPD_PASSWORD_MATCH_OK == WPDocument::verifyPassword(&input, aUtf8Passwd.getStr()))
@@ -126,7 +126,7 @@ throw (RuntimeException)
else
unsuccessfulAttempts++;
if (unsuccessfulAttempts == 3) // timeout after 3 password atempts
- return sal_False;
+ return false;
}
}
@@ -148,8 +148,8 @@ throw (RuntimeException)
collector.registerEmbeddedObjectHandler("image/x-wpg", &handleEmbeddedWPGObject);
collector.registerEmbeddedImageHandler("image/x-wpg", &handleEmbeddedWPGImage);
if (WPD_OK == WPDocument::parse(&input, &collector, aUtf8Passwd.isEmpty() ? 0 : aUtf8Passwd.getStr()))
- return sal_True;
- return sal_False;
+ return true;
+ return false;
}
sal_Bool SAL_CALL WordPerfectImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx
index ab403dae9e91..0e9369bb173d 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.hxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx
@@ -41,7 +41,7 @@ protected:
OUString msFilterName;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
- sal_Bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
+ bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
throw (::com::sun::star::uno::RuntimeException);
public:
@@ -80,7 +80,7 @@ public:
OUString WordPerfectImportFilter_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
-sal_Bool SAL_CALL WordPerfectImportFilter_supportsService( const OUString &ServiceName )
+bool SAL_CALL WordPerfectImportFilter_supportsService( const OUString &ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Sequence< OUString > SAL_CALL WordPerfectImportFilter_getSupportedServiceNames( )
@@ -136,7 +136,7 @@ public:
OUString WordPerfectImportFilterDialog_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
-sal_Bool SAL_CALL WordPerfectImportFilterDialog_supportsService( const OUString &ServiceName )
+bool SAL_CALL WordPerfectImportFilterDialog_supportsService( const OUString &ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Sequence< OUString > SAL_CALL WordPerfectImportFilterDialog_getSupportedServiceNames( )