summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorTomaž Vajngerl <quikee@gmail.com>2013-04-21 13:52:05 +0200
committerTomaž Vajngerl <quikee@gmail.com>2013-04-21 21:55:45 +0200
commit649f00008463cc271b18deac40f0aff820e64b80 (patch)
treecff195f6d14454db0e592617171e78c0ec889b03 /vcl
parent759f24152a2ab44189de0fd242c3e409c9a479a8 (diff)
sal_Bool to bool in jpeg filter
Change-Id: I9a091e9b209c443cb32983e6d35044eec8681d18
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/filter/jpeg/jpeg.cxx9
-rw-r--r--vcl/source/filter/jpeg/jpeg.hxx4
2 files changed, 7 insertions, 6 deletions
diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx
index 6687df28b762..87cde317df0c 100644
--- a/vcl/source/filter/jpeg/jpeg.cxx
+++ b/vcl/source/filter/jpeg/jpeg.cxx
@@ -25,11 +25,12 @@
#include <vcl/FilterConfigItem.hxx>
#include <vcl/graphicfilter.hxx>
-sal_Bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, void* pCallerData, sal_Int32 nImportFlags )
+bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, void* pCallerData, sal_Int32 nImportFlags )
{
- JPEGReader* pJPEGReader = (JPEGReader*) rGraphic.GetContext();
ReadState eReadState;
- sal_Bool bReturn = true;
+ bool bReturn = true;
+
+ JPEGReader* pJPEGReader = (JPEGReader*) rGraphic.GetContext();
if( !pJPEGReader )
{
@@ -65,7 +66,7 @@ sal_Bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, void* pCallerDat
return bReturn;
}
-sal_Bool ExportJPEG(SvStream& rOutputStream, const Graphic& rGraphic,
+bool ExportJPEG(SvStream& rOutputStream, const Graphic& rGraphic,
const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>* pFilterData,
bool* pExportWasGrey)
{
diff --git a/vcl/source/filter/jpeg/jpeg.hxx b/vcl/source/filter/jpeg/jpeg.hxx
index 3b9e6ae1133d..1b4ac2e028e1 100644
--- a/vcl/source/filter/jpeg/jpeg.hxx
+++ b/vcl/source/filter/jpeg/jpeg.hxx
@@ -26,9 +26,9 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
-sal_Bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, void* pCallerData, sal_Int32 nImportFlags );
+bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, void* pCallerData, sal_Int32 nImportFlags );
-sal_Bool ExportJPEG(SvStream& rOutputStream,
+bool ExportJPEG(SvStream& rOutputStream,
const Graphic& rGraphic,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData,
bool* pExportWasGrey = NULL);