summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2014-11-09 20:00:53 +0100
committerMatteo Casalin <matteo.casalin@yahoo.com>2014-11-16 16:54:39 +0100
commitfe4901829f7e1ff397945a7abd5af977a80978e9 (patch)
tree6fa06ca9452b648458b40a86b94441de7f2ae8da /sw/source/filter
parent9ba8304dad9473410fe5b30699fd4389e6a174aa (diff)
SetStrmStgPtr can return bool instead of sal_True/sal_False in an int
Change-Id: I5348977de17d3f916cecabe4b5c3f7630a89667e
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/basflt/shellio.cxx10
-rw-r--r--sw/source/filter/html/swhtml.cxx6
-rw-r--r--sw/source/filter/inc/fltini.hxx2
3 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 497d11c3015f..052c607e98d5 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -574,7 +574,7 @@ void Reader::MakeHTMLDummyTemplateDoc()
// Users that do not need to open these Streams / Storages,
// have to overload this method
-int Reader::SetStrmStgPtr()
+bool Reader::SetStrmStgPtr()
{
OSL_ENSURE( pMedium, "Where is the Media??" );
@@ -583,7 +583,7 @@ int Reader::SetStrmStgPtr()
if( SW_STORAGE_READER & GetReaderType() )
{
xStg = pMedium->GetStorage();
- return sal_True;
+ return true;
}
}
else
@@ -597,12 +597,12 @@ int Reader::SetStrmStgPtr()
else if ( !(SW_STREAM_READER & GetReaderType()) )
{
pStrm = NULL;
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
int Reader::GetReaderType()
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index ce2e33627809..b47a601baf6f 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -173,16 +173,16 @@ OUString HTMLReader::GetTemplateName() const
return OUString();
}
-int HTMLReader::SetStrmStgPtr()
+bool HTMLReader::SetStrmStgPtr()
{
OSL_ENSURE( pMedium, "Wo ist das Medium??" );
if( pMedium->IsRemote() || !pMedium->IsStorage() )
{
pStrm = pMedium->GetInStream();
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index 480794b891bd..287615410fda 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -32,7 +32,7 @@ class SwNodeIndex;
class HTMLReader: public Reader
{
// wir wollen die Streams / Storages nicht geoeffnet haben
- virtual int SetStrmStgPtr() SAL_OVERRIDE;
+ virtual bool SetStrmStgPtr() SAL_OVERRIDE;
virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE;
virtual OUString GetTemplateName() const SAL_OVERRIDE;
public: