Kaydet (Commit) df044af5 authored tarafından Miklos Vajna's avatar Miklos Vajna

writerfilter: remove redundant virtual keywords in dmapper

Also use default member initializers where possible.

Change-Id: I641ea8e81506d826d4d81e9be21a1a0c8d6160e9
Reviewed-on: https://gerrit.libreoffice.org/39555Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst d3067c9d
......@@ -570,14 +570,14 @@ sal_Int32 RtfSdrExport::StartShape()
lcl_AppendSP(m_rAttrOutput.RunText(), "gtextUNICODE",
msfilter::rtfutil::OutString(rEditObj.GetText(0), m_rExport.m_eCurrentEncoding));
const SvxFontItem* pFontFamily = static_cast<const SvxFontItem*>(rItemSet.GetItem(SID_ATTR_CHAR_FONT));
auto pFontFamily = static_cast<const SvxFontItem*>(rItemSet.GetItem(SID_ATTR_CHAR_FONT));
if (pFontFamily)
{
lcl_AppendSP(m_rAttrOutput.RunText(), "gtextFont",
msfilter::rtfutil::OutString(pFontFamily->GetFamilyName(), m_rExport.m_eCurrentEncoding));
}
const SvxFontHeightItem* pFontHeight = static_cast<const SvxFontHeightItem*>(rItemSet.GetItem(SID_ATTR_CHAR_FONTHEIGHT));
auto pFontHeight = static_cast<const SvxFontHeightItem*>(rItemSet.GetItem(SID_ATTR_CHAR_FONTHEIGHT));
if (pFontHeight)
{
long nFontHeight = TransformMetric(pFontHeight->GetHeight(), FUNIT_TWIP, FUNIT_POINT);
......
......@@ -26,12 +26,12 @@ class LatentStyleHandler
std::vector<css::beans::PropertyValue> m_aAttributes;
// Properties
virtual void lcl_attribute(Id Name, Value& val) override;
virtual void lcl_sprm(Sprm& sprm) override;
void lcl_attribute(Id Name, Value& val) override;
void lcl_sprm(Sprm& sprm) override;
public:
LatentStyleHandler();
virtual ~LatentStyleHandler() override;
~LatentStyleHandler() override;
const std::vector<css::beans::PropertyValue>& getAttributes() const;
};
......
......@@ -35,10 +35,10 @@ class SmartTagHandler
public:
SmartTagHandler(css::uno::Reference<css::uno::XComponentContext> xComponentContext, const css::uno::Reference<css::text::XTextDocument>& xTextDocument);
virtual ~SmartTagHandler() override;
~SmartTagHandler() override;
virtual void lcl_attribute(Id Name, Value& val) override;
virtual void lcl_sprm(Sprm& sprm) override;
void lcl_attribute(Id Name, Value& val) override;
void lcl_sprm(Sprm& sprm) override;
void setURI(const OUString& rURI);
void setElement(const OUString& rElement);
......
......@@ -24,13 +24,7 @@ using namespace ::com::sun::star;
TablePositionHandler::TablePositionHandler() :
LoggedProperties("TablePositionHandler"),
m_aVertAnchor("margin"),
m_aHorzAnchor("text"),
m_nY(0),
m_nX(0),
m_nLeftFromText(0),
m_nRightFromText(0),
m_nTopFromText(0),
m_nBottomFromText(0)
m_aHorzAnchor("text")
{
}
......
......@@ -26,16 +26,16 @@ class TablePositionHandler
OUString m_aYSpec;
OUString m_aHorzAnchor;
OUString m_aXSpec;
sal_Int32 m_nY;
sal_Int32 m_nX;
sal_Int32 m_nLeftFromText;
sal_Int32 m_nRightFromText;
sal_Int32 m_nTopFromText;
sal_Int32 m_nBottomFromText;
sal_Int32 m_nY = 0;
sal_Int32 m_nX = 0;
sal_Int32 m_nLeftFromText = 0;
sal_Int32 m_nRightFromText = 0;
sal_Int32 m_nTopFromText = 0;
sal_Int32 m_nBottomFromText = 0;
// Properties
virtual void lcl_attribute(Id Name, Value& val) override;
virtual void lcl_sprm(Sprm& sprm) override;
void lcl_attribute(Id Name, Value& val) override;
void lcl_sprm(Sprm& sprm) override;
public:
sal_Int32 getY()
......@@ -81,7 +81,7 @@ public:
}
TablePositionHandler();
virtual ~TablePositionHandler() override;
~TablePositionHandler() override;
/** Compute the UNO properties for the frame containing the table based
on the received tokens.
......
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