Kaydet (Commit) fe490182 authored tarafından Matteo Casalin's avatar Matteo Casalin

SetStrmStgPtr can return bool instead of sal_True/sal_False in an int

Change-Id: I5348977de17d3f916cecabe4b5c3f7630a89667e
üst 9ba8304d
...@@ -264,7 +264,7 @@ private: ...@@ -264,7 +264,7 @@ private:
// Everyone who does not need the streams / storages open // Everyone who does not need the streams / storages open
// has to overload the method (W4W!!). // has to overload the method (W4W!!).
virtual int SetStrmStgPtr(); virtual bool SetStrmStgPtr();
}; };
class AsciiReader: public Reader class AsciiReader: public Reader
......
...@@ -574,7 +574,7 @@ void Reader::MakeHTMLDummyTemplateDoc() ...@@ -574,7 +574,7 @@ void Reader::MakeHTMLDummyTemplateDoc()
// Users that do not need to open these Streams / Storages, // Users that do not need to open these Streams / Storages,
// have to overload this method // have to overload this method
int Reader::SetStrmStgPtr() bool Reader::SetStrmStgPtr()
{ {
OSL_ENSURE( pMedium, "Where is the Media??" ); OSL_ENSURE( pMedium, "Where is the Media??" );
...@@ -583,7 +583,7 @@ int Reader::SetStrmStgPtr() ...@@ -583,7 +583,7 @@ int Reader::SetStrmStgPtr()
if( SW_STORAGE_READER & GetReaderType() ) if( SW_STORAGE_READER & GetReaderType() )
{ {
xStg = pMedium->GetStorage(); xStg = pMedium->GetStorage();
return sal_True; return true;
} }
} }
else else
...@@ -597,12 +597,12 @@ int Reader::SetStrmStgPtr() ...@@ -597,12 +597,12 @@ int Reader::SetStrmStgPtr()
else if ( !(SW_STREAM_READER & GetReaderType()) ) else if ( !(SW_STREAM_READER & GetReaderType()) )
{ {
pStrm = NULL; pStrm = NULL;
return sal_False; return false;
} }
return sal_True; return true;
} }
return sal_False; return false;
} }
int Reader::GetReaderType() int Reader::GetReaderType()
......
...@@ -173,16 +173,16 @@ OUString HTMLReader::GetTemplateName() const ...@@ -173,16 +173,16 @@ OUString HTMLReader::GetTemplateName() const
return OUString(); return OUString();
} }
int HTMLReader::SetStrmStgPtr() bool HTMLReader::SetStrmStgPtr()
{ {
OSL_ENSURE( pMedium, "Wo ist das Medium??" ); OSL_ENSURE( pMedium, "Wo ist das Medium??" );
if( pMedium->IsRemote() || !pMedium->IsStorage() ) if( pMedium->IsRemote() || !pMedium->IsStorage() )
{ {
pStrm = pMedium->GetInStream(); pStrm = pMedium->GetInStream();
return sal_True; return true;
} }
return sal_False; return false;
} }
......
...@@ -32,7 +32,7 @@ class SwNodeIndex; ...@@ -32,7 +32,7 @@ class SwNodeIndex;
class HTMLReader: public Reader class HTMLReader: public Reader
{ {
// wir wollen die Streams / Storages nicht geoeffnet haben // 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 sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE;
virtual OUString GetTemplateName() const SAL_OVERRIDE; virtual OUString GetTemplateName() const SAL_OVERRIDE;
public: public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment