summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-01-13 12:07:48 +0200
committerNoel Grandin <noel@peralex.com>2016-01-13 12:16:24 +0200
commit83f3cefaa3ee7740ab738f394791bc505358bac3 (patch)
tree9160f34ec1a54bb5ee2063b57dc86e9f34377f86 /writerfilter
parent5b5f3ccdbb34687f85f68f9900d02432ad21f60a (diff)
loplugin:unusedmethods unused return value in writerfilter/
Change-Id: I0eef0cb336a2d9450ede01c8fe1c02fbd3b2b57f
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx12
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.hxx2
2 files changed, 6 insertions, 8 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 92ba692fa9d0..938e92aa3cd0 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -741,7 +741,7 @@ void RTFDocumentImpl::resolve(Stream& rMapper)
}
}
-RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing::XShape> const& i_xShape)
+void RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing::XShape> const& i_xShape)
{
SvMemoryStream aStream;
SvStream* pStream = nullptr;
@@ -761,7 +761,7 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing
b = b << 4;
sal_Int8 parsed = RTFTokenizer::asHex(ch);
if (parsed == -1)
- return RTFError::HEX_INVALID;
+ return;
b += parsed;
count--;
if (!count)
@@ -778,7 +778,7 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing
if (!pStream->Tell())
// No destination text? Then we'll get it later.
- return RTFError::OK;
+ return;
// Store, and get its URL.
pStream->Seek(0);
@@ -866,7 +866,7 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing
auto pShapeValue = std::make_shared<RTFValue>(xShape);
m_aObjectAttributes.set(NS_ooxml::LN_shape, pShapeValue);
- return RTFError::OK;
+ return;
}
if (xPropertySet.is())
@@ -877,7 +877,7 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing
// Send the shape directly, no section is started, to additional properties will be ignored anyway.
Mapper().startShape(xShape);
Mapper().endShape();
- return RTFError::OK;
+ return;
}
// Send it to the dmapper.
@@ -1013,8 +1013,6 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing
auto pValue = std::make_shared<RTFValue>(aAttributes, aSprms);
m_aStates.top().pCurrentBuffer->push_back(Buf_t(BUFFER_PROPS, pValue));
}
-
- return RTFError::OK;
}
RTFError RTFDocumentImpl::resolveChars(char ch)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 7ef2b4fdce70..cc658d04aa40 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -373,7 +373,7 @@ public:
bool isInBackground();
void setDestinationText(OUString& rString);
/// Resolve a picture: If not inline, then anchored.
- RTFError resolvePict(bool bInline, css::uno::Reference<css::drawing::XShape> const& xShape);
+ void resolvePict(bool bInline, css::uno::Reference<css::drawing::XShape> const& xShape);
/// If this is the first run of the document, starts the initial paragraph.
void checkFirstRun();