summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-09-16 14:20:49 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-09-16 14:20:49 +0100
commit7ef9ec66780483c9887753013ef4bda919497e52 (patch)
tree6d0b1f4dfb5d4af0b2dcaeb067bcfb8715fcef3c /filter
parent257bcb1a1140d3e070cfaef6fec0704740bc83b8 (diff)
WaE: remove impossible final return path
Diffstat (limited to 'filter')
-rw-r--r--filter/source/xsltfilter/OleHandler.cxx34
1 files changed, 15 insertions, 19 deletions
diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx
index 79b077365e71..6baa99a5e672 100644
--- a/filter/source/xsltfilter/OleHandler.cxx
+++ b/filter/source/xsltfilter/OleHandler.cxx
@@ -176,25 +176,21 @@ namespace XSLT
SAL_CALL OleHandler::getByName(const OUString& streamName)
{
if (streamName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("oledata.mso")))
- {
- //get the length and seek to 0
- Reference<XSeekable> xSeek (m_rootStream, UNO_QUERY);
- int oleLength = (int) xSeek->getLength();
- xSeek->seek(0);
- //read all bytes
- Reference<XInputStream> xInput = m_rootStream->getInputStream();
- Sequence<sal_Int8> oledata(oleLength);
- xInput->readBytes(oledata, oleLength);
- //return the base64 encoded string
- OUStringBuffer buf(oleLength);
- SvXMLUnitConverter::encodeBase64(buf, oledata);
- return ::rtl::OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8);
- }
- else
- {
- return encodeSubStorage(streamName);
- }
- return "";
+ {
+ //get the length and seek to 0
+ Reference<XSeekable> xSeek (m_rootStream, UNO_QUERY);
+ int oleLength = (int) xSeek->getLength();
+ xSeek->seek(0);
+ //read all bytes
+ Reference<XInputStream> xInput = m_rootStream->getInputStream();
+ Sequence<sal_Int8> oledata(oleLength);
+ xInput->readBytes(oledata, oleLength);
+ //return the base64 encoded string
+ OUStringBuffer buf(oleLength);
+ SvXMLUnitConverter::encodeBase64(buf, oledata);
+ return ::rtl::OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8);
+ }
+ return encodeSubStorage(streamName);
}
void SAL_CALL