diff options
Diffstat (limited to 'writerperfect/source/writer')
-rw-r--r-- | writerperfect/source/writer/WordPerfectImportFilter.cxx | 12 | ||||
-rw-r--r-- | writerperfect/source/writer/WordPerfectImportFilter.hxx | 6 |
2 files changed, 9 insertions, 9 deletions
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( ) |