[Libreoffice-commits] core.git: sw/source writerfilter/source
Miklos Vajna (via logerrit)
logerrit at kemper.freedesktop.org
Thu Nov 21 08:14:03 UTC 2019
sw/source/filter/ww8/rtfattributeoutput.cxx | 2 +-
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 +-
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 2 +-
writerfilter/source/rtftok/rtfsdrimport.cxx | 2 +-
writerfilter/source/rtftok/rtfsdrimport.hxx | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 03bf5fb87f82976635c36e8e72a160df66a5da21
Author: Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Nov 20 22:42:45 2019 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Nov 21 09:12:38 2019 +0100
writerfilter: these can be const
Change-Id: I21eadcd210aef38e7690da2492bf1dfe030427e4
Reviewed-on: https://gerrit.libreoffice.org/83356
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 6a04e707a706..0f3fbb7c91cc 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1578,7 +1578,7 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel, sal_uInt16 nStart,
m_rExport.Strm().WriteChar('}');
}
-void RtfAttributeOutput::WriteField_Impl(const SwField* const pField, ww::eField,
+void RtfAttributeOutput::WriteField_Impl(const SwField* const pField, ww::eField /*eType*/,
const OUString& rFieldCmd, FieldFlags nMode)
{
// If there are no field instructions, don't export it as a field.
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 32bbb1d7da0a..e4fdc1d755eb 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1294,7 +1294,7 @@ RTFError RTFDocumentImpl::resolveChars(char ch)
return RTFError::OK;
}
-bool RTFFrame::inFrame() { return m_nW > 0 || m_nH > 0 || m_nX > 0 || m_nY > 0; }
+bool RTFFrame::inFrame() const { return m_nW > 0 || m_nH > 0 || m_nX > 0 || m_nY > 0; }
void RTFDocumentImpl::singleChar(sal_uInt8 nValue, bool bRunProps)
{
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 360c753172b7..bf68ffb1dc08 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -391,7 +391,7 @@ public:
void setSprm(Id nId, Id nValue);
bool hasProperties() const;
/// If we got tokens indicating we're in a frame.
- bool inFrame();
+ bool inFrame() const;
};
/// State of the parser, which gets saved / restored when changing groups.
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 2545b93c552c..33d2e3a3760b 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -188,7 +188,7 @@ void RTFSdrImport::resolveFLine(uno::Reference<beans::XPropertySet> const& xProp
}
void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> const& xShape,
- const OUString& aKey, const OUString& aValue)
+ const OUString& aKey, const OUString& aValue) const
{
uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY);
sal_Int16 nHoriOrient = 0;
diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx
index 57ce69e6d2e8..474966d28a37 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.hxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.hxx
@@ -91,7 +91,7 @@ private:
void createShape(const OUString& rService, css::uno::Reference<css::drawing::XShape>& xShape,
css::uno::Reference<css::beans::XPropertySet>& xPropertySet);
void applyProperty(css::uno::Reference<css::drawing::XShape> const& xShape,
- const OUString& aKey, const OUString& aValue);
+ const OUString& aKey, const OUString& aValue) const;
int initShape(css::uno::Reference<css::drawing::XShape>& o_xShape,
css::uno::Reference<css::beans::XPropertySet>& o_xPropSet, bool& o_rIsCustomShape,
RTFShape const& rShape, bool bClose, ShapeOrPict shapeOrPict);
More information about the Libreoffice-commits
mailing list