Kaydet (Commit) 83f3cefa authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedmethods unused return value in writerfilter/

Change-Id: I0eef0cb336a2d9450ede01c8fe1c02fbd3b2b57f
üst 5b5f3ccd
...@@ -741,7 +741,7 @@ void RTFDocumentImpl::resolve(Stream& rMapper) ...@@ -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; SvMemoryStream aStream;
SvStream* pStream = nullptr; SvStream* pStream = nullptr;
...@@ -761,7 +761,7 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing ...@@ -761,7 +761,7 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing
b = b << 4; b = b << 4;
sal_Int8 parsed = RTFTokenizer::asHex(ch); sal_Int8 parsed = RTFTokenizer::asHex(ch);
if (parsed == -1) if (parsed == -1)
return RTFError::HEX_INVALID; return;
b += parsed; b += parsed;
count--; count--;
if (!count) if (!count)
...@@ -778,7 +778,7 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing ...@@ -778,7 +778,7 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing
if (!pStream->Tell()) if (!pStream->Tell())
// No destination text? Then we'll get it later. // No destination text? Then we'll get it later.
return RTFError::OK; return;
// Store, and get its URL. // Store, and get its URL.
pStream->Seek(0); pStream->Seek(0);
...@@ -866,7 +866,7 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing ...@@ -866,7 +866,7 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing
auto pShapeValue = std::make_shared<RTFValue>(xShape); auto pShapeValue = std::make_shared<RTFValue>(xShape);
m_aObjectAttributes.set(NS_ooxml::LN_shape, pShapeValue); m_aObjectAttributes.set(NS_ooxml::LN_shape, pShapeValue);
return RTFError::OK; return;
} }
if (xPropertySet.is()) if (xPropertySet.is())
...@@ -877,7 +877,7 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing ...@@ -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. // Send the shape directly, no section is started, to additional properties will be ignored anyway.
Mapper().startShape(xShape); Mapper().startShape(xShape);
Mapper().endShape(); Mapper().endShape();
return RTFError::OK; return;
} }
// Send it to the dmapper. // Send it to the dmapper.
...@@ -1013,8 +1013,6 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing ...@@ -1013,8 +1013,6 @@ RTFError RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing
auto pValue = std::make_shared<RTFValue>(aAttributes, aSprms); auto pValue = std::make_shared<RTFValue>(aAttributes, aSprms);
m_aStates.top().pCurrentBuffer->push_back(Buf_t(BUFFER_PROPS, pValue)); m_aStates.top().pCurrentBuffer->push_back(Buf_t(BUFFER_PROPS, pValue));
} }
return RTFError::OK;
} }
RTFError RTFDocumentImpl::resolveChars(char ch) RTFError RTFDocumentImpl::resolveChars(char ch)
......
...@@ -373,7 +373,7 @@ public: ...@@ -373,7 +373,7 @@ public:
bool isInBackground(); bool isInBackground();
void setDestinationText(OUString& rString); void setDestinationText(OUString& rString);
/// Resolve a picture: If not inline, then anchored. /// 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. /// If this is the first run of the document, starts the initial paragraph.
void checkFirstRun(); void checkFirstRun();
......
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