From a86ad4d11c7789dcf7fede31b0ff391f151dbf47 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 30 Apr 2014 10:00:10 +0200 Subject: writerperfect: sal_Bool->bool Change-Id: Ic51f9ed2c2c2fced13c8b279912410f9c1638ff9 --- writerperfect/source/writer/WordPerfectImportFilter.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'writerperfect/source/writer/WordPerfectImportFilter.cxx') 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 ) -- cgit