loplugin:constmethod in writerfilter

Change-Id: I1e1c4e574e910ef9683520ae950b14eb4ebbc63f
Reviewed-on: https://gerrit.libreoffice.org/79784
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

32 files changed, 124 insertions, 124 deletions

diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index b986b2ed997a..230cae5dcac3 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -71,7 +71,7 @@ public:
     PropertyMapPtr          getProperties();
     css::table::BorderLine2 getBorderLine();
     sal_Int32                                   getLineDistance() const { return m_nLineDistance;}
-    bool                                        getShadow() { return m_bShadow;}
+    bool                                        getShadow() const { return m_bShadow;}
     void enableInteropGrabBag(const OUString& aName);
     css::beans::PropertyValue getInteropGrabBag(const OUString& aName = OUString());
 };
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index 41248036ae40..b5889742c29a 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -324,7 +324,7 @@ void CellColorHandler::disableInteropGrabBag()
     m_aInteropGrabBag.clear();
 }
 
-bool CellColorHandler::isInteropGrabBagEnabled()
+bool CellColorHandler::isInteropGrabBagEnabled() const
 {
     return !(m_aInteropGrabBagName.isEmpty());
 }
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx
index 8e77c1c080be..3c98b8368b2c 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -62,7 +62,7 @@ public:
     void enableInteropGrabBag(const OUString& aName);
     css::beans::PropertyValue getInteropGrabBag();
     void disableInteropGrabBag();
-    bool isInteropGrabBagEnabled();
+    bool isInteropGrabBagEnabled() const;
 };
 }}
 
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f8d67f0710c1..ec8728122337 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -508,7 +508,7 @@ void DomainMapper_Impl::SetIsFirstParagraphInSection( bool bIsFirst )
     m_bIsFirstParaInSection = bIsFirst;
 }
 
-bool DomainMapper_Impl::GetIsFirstParagraphInSection()
+bool DomainMapper_Impl::GetIsFirstParagraphInSection() const
 {
     // Anchored objects may include multiple paragraphs,
     // and none of them should be considered the first para in section.
@@ -870,7 +870,7 @@ void DomainMapper_Impl::setSdtEndDeferred(bool bSdtEndDeferred)
     m_bSdtEndDeferred = bSdtEndDeferred;
 }
 
-bool DomainMapper_Impl::isSdtEndDeferred()
+bool DomainMapper_Impl::isSdtEndDeferred() const
 {
     return m_bSdtEndDeferred;
 }
@@ -880,7 +880,7 @@ void DomainMapper_Impl::setParaSdtEndDeferred(bool bParaSdtEndDeferred)
     m_bParaSdtEndDeferred = bParaSdtEndDeferred;
 }
 
-bool DomainMapper_Impl::isParaSdtEndDeferred()
+bool DomainMapper_Impl::isParaSdtEndDeferred() const
 {
     return m_bParaSdtEndDeferred;
 }
@@ -2679,7 +2679,7 @@ bool DomainMapper_Impl::IsSdtEndBefore()
     return bIsSdtEndBefore;
 }
 
-bool DomainMapper_Impl::IsDiscardHeaderFooter()
+bool DomainMapper_Impl::IsDiscardHeaderFooter() const
 {
     return m_bDiscardHeaderFooter;
 }
@@ -3326,7 +3326,7 @@ HeaderFooterContext::HeaderFooterContext(bool bTextInserted)
 {
 }
 
-bool HeaderFooterContext::getTextInserted()
+bool HeaderFooterContext::getTextInserted() const
 {
     return m_bTextInserted;
 }
@@ -5926,7 +5926,7 @@ void DomainMapper_Impl::SetCurrentRedlineIsRead()
     m_currentRedline.clear();
 }
 
-sal_Int32 DomainMapper_Impl::GetCurrentRedlineToken(  )
+sal_Int32 DomainMapper_Impl::GetCurrentRedlineToken(  ) const
 {
     sal_Int32 nToken = 0;
     assert( m_currentRedline.get());
@@ -6266,7 +6266,7 @@ void DomainMapper_Impl::disableInteropGrabBag()
     m_aSubInteropGrabBag.clear();
 }
 
-bool DomainMapper_Impl::isInteropGrabBagEnabled()
+bool DomainMapper_Impl::isInteropGrabBagEnabled() const
 {
     return !(m_aInteropGrabBagName.isEmpty());
 }
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index d4e4420506d0..55049dab7681 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -126,7 +126,7 @@ class HeaderFooterContext
     bool const m_bTextInserted;
 public:
     explicit HeaderFooterContext(bool bTextInserted);
-    bool getTextInserted();
+    bool getTextInserted() const;
 };
 
 /// field stack element
@@ -175,7 +175,7 @@ public:
     bool                    IsCommandCompleted() const { return m_bFieldCommandCompleted;    }
 
     void                    SetFieldLocked() { m_bFieldLocked = true; }
-    bool                    IsFieldLocked() { return m_bFieldLocked; }
+    bool                    IsFieldLocked() const { return m_bFieldLocked; }
 
     const css::uno::Reference<css::beans::XPropertySet>& GetCustomField() const { return m_xCustomField; }
     void SetCustomField(css::uno::Reference<css::beans::XPropertySet> const& xCustomField) { m_xCustomField = xCustomField; }
@@ -185,24 +185,24 @@ public:
     void SetFormField(css::uno::Reference<css::text::XFormField> const& xFormField) { m_xFormField = xFormField;}
 
     void SetTOC(css::uno::Reference<css::beans::XPropertySet> const& xTOC) { m_xTOC = xTOC; }
-    const css::uno::Reference<css::beans::XPropertySet>& GetTOC() { return m_xTOC; }
+    const css::uno::Reference<css::beans::XPropertySet>& GetTOC() const { return m_xTOC; }
 
     void SetTC(css::uno::Reference<css::beans::XPropertySet> const& xTC) { m_xTC = xTC; }
-    const css::uno::Reference<css::beans::XPropertySet>& GetTC() { return m_xTC; }
+    const css::uno::Reference<css::beans::XPropertySet>& GetTC() const { return m_xTC; }
 
     void  SetHyperlinkURL( const OUString& rURL ) { m_sHyperlinkURL = rURL; }
-    const OUString& GetHyperlinkURL() { return m_sHyperlinkURL; }
+    const OUString& GetHyperlinkURL() const { return m_sHyperlinkURL; }
     void SetHyperlinkTarget(const OUString& rTarget) { m_sHyperlinkTarget = rTarget; }
-    const OUString& GetHyperlinkTarget() { return m_sHyperlinkTarget; }
+    const OUString& GetHyperlinkTarget() const { return m_sHyperlinkTarget; }
     void  SetHyperlinkStyle(const OUString& rStyle) { m_sHyperlinkStyle = rStyle; }
-    const OUString& GetHyperlinkStyle() { return m_sHyperlinkStyle; }
+    const OUString& GetHyperlinkStyle() const { return m_sHyperlinkStyle; }
 
     void setFFDataHandler(FFDataHandler::Pointer_t pFFDataHandler) { m_pFFDataHandler = pFFDataHandler; }
     const FFDataHandler::Pointer_t& getFFDataHandler() const { return m_pFFDataHandler; }
 
     void setFormControlHelper(FormControlHelper::Pointer_t pFormControlHelper) { m_pFormControlHelper = pFormControlHelper; }
     const FormControlHelper::Pointer_t& getFormControlHelper() const { return m_pFormControlHelper; }
-    const PropertyMapPtr& getProperties() { return m_pProperties; }
+    const PropertyMapPtr& getProperties() const { return m_pProperties; }
 
     ::std::vector<OUString> GetCommandParts() const;
 };
@@ -593,7 +593,7 @@ public:
     void AddDummyParaForTableInSection();
     void RemoveLastParagraph( );
     void SetIsLastParagraphInSection( bool bIsLast );
-    bool GetIsLastParagraphInSection() { return m_bIsLastParaInSection;}
+    bool GetIsLastParagraphInSection() const { return m_bIsLastParaInSection;}
     void SetRubySprmId( sal_uInt32 nSprmId) { m_aRubyInfo.nSprmId = nSprmId ; }
     void SetRubyText( OUString const &sText, OUString const &sStyle) {
         m_aRubyInfo.sRubyText = sText;
@@ -603,32 +603,32 @@ public:
     void SetRubyInfo(const RubyInfo & rInfo) { m_aRubyInfo = rInfo;}
 
     void SetIsLastSectionGroup( bool bIsLast );
-    bool GetIsLastSectionGroup() { return m_bIsLastSectionGroup;}
+    bool GetIsLastSectionGroup() const { return m_bIsLastSectionGroup;}
     void SetIsFirstParagraphInSection( bool bIsFirst );
-    bool GetIsFirstParagraphInSection();
+    bool GetIsFirstParagraphInSection() const;
     void SetIsFirstParagraphInShape(bool bIsFirst);
-    bool GetIsFirstParagraphInShape() { return m_bIsFirstParaInShape; }
+    bool GetIsFirstParagraphInShape() const { return m_bIsFirstParaInShape; }
     void SetIsDummyParaAddedForTableInSection( bool bIsAdded );
-    bool GetIsDummyParaAddedForTableInSection() { return m_bDummyParaAddedForTableInSection;}
+    bool GetIsDummyParaAddedForTableInSection() const { return m_bDummyParaAddedForTableInSection;}
 
     /// Track if a textframe has been inserted into this section
     void SetIsTextFrameInserted( bool bIsInserted );
-    bool GetIsTextFrameInserted() { return m_bTextFrameInserted;}
+    bool GetIsTextFrameInserted() const { return m_bTextFrameInserted;}
 
     void SetIsPreviousParagraphFramed( bool bIsFramed ) { m_bIsPreviousParagraphFramed = bIsFramed; }
-    bool GetIsPreviousParagraphFramed() { return m_bIsPreviousParagraphFramed; }
+    bool GetIsPreviousParagraphFramed() const { return m_bIsPreviousParagraphFramed; }
     void SetParaSectpr(bool bParaSectpr);
-    bool GetParaSectpr() { return m_bParaSectpr;}
+    bool GetParaSectpr() const { return m_bParaSectpr;}
 
     void SetSymbolChar( sal_Int32 nSymbol) { m_aSymbolData.cSymbol = sal_Unicode(nSymbol); }
     void SetSymbolFont( OUString const &rName ) { m_aSymbolData.sFont = rName; }
-    const SymbolData & GetSymbolData() { return m_aSymbolData;}
+    const SymbolData & GetSymbolData() const { return m_aSymbolData;}
 
     /// Setter method for m_bSdt.
     void SetSdt(bool bSdt);
     /// Getter method for m_bSdt.
-    bool GetSdt() { return m_bSdt;}
-    bool GetParaChanged() { return m_bParaChanged;}
+    bool GetSdt() const { return m_bSdt;}
+    bool GetParaChanged() const { return m_bParaChanged;}
 
     void deferBreak( BreakType deferredBreakType );
     bool isBreakDeferred( BreakType deferredBreakType );
@@ -636,9 +636,9 @@ public:
     void clearDeferredBreak(BreakType deferredBreakType);
 
     void setSdtEndDeferred(bool bSdtEndDeferred);
-    bool isSdtEndDeferred();
+    bool isSdtEndDeferred() const;
     void setParaSdtEndDeferred(bool bParaSdtEndDeferred);
-    bool isParaSdtEndDeferred();
+    bool isParaSdtEndDeferred() const;
 
     void finishParagraph( const PropertyMapPtr& pPropertyMap, const bool bRemove = false);
     void appendTextPortion( const OUString& rString, const PropertyMapPtr& pPropertyMap );
@@ -662,7 +662,7 @@ public:
     void    PopProperties(ContextType eId);
 
     ContextType GetTopContextType() const { return m_aContextStack.top(); }
-    const PropertyMapPtr& GetTopContext()
+    const PropertyMapPtr& GetTopContext() const
     {
         return m_pTopContext;
     }
@@ -882,7 +882,7 @@ public:
 
     void AddNewRedline( sal_uInt32 sprmId );
 
-    sal_Int32 GetCurrentRedlineToken( );
+    sal_Int32 GetCurrentRedlineToken( ) const;
     void SetCurrentRedlineAuthor( const OUString& sAuthor );
     void SetCurrentRedlineDate( const OUString& sDate );
     void SetCurrentRedlineId( sal_Int32 nId );
@@ -891,9 +891,9 @@ public:
     void SetCurrentRedlineIsRead();
     void RemoveTopRedline( );
     void SetCurrentRedlineInitials( const OUString& sInitials );
-    bool IsFirstRun() { return m_bIsFirstRun;}
+    bool IsFirstRun() const { return m_bIsFirstRun;}
     void SetIsFirstRun(bool bval) { m_bIsFirstRun = bval;}
-    bool IsOutsideAParagraph() { return m_bIsOutsideAParagraph;}
+    bool IsOutsideAParagraph() const { return m_bIsOutsideAParagraph;}
     void SetIsOutsideAParagraph(bool bval) { m_bIsOutsideAParagraph = bval;}
 
     void ApplySettingsTable();
@@ -920,10 +920,10 @@ public:
     sal_Int32 getCurrentNumberingProperty(const OUString& aProp);
 
     /// If we're importing into a new document, or just pasting to an existing one.
-    bool IsNewDoc() { return m_bIsNewDoc;}
+    bool IsNewDoc() const { return m_bIsNewDoc;}
 
     /// If we're importing autotext.
-    bool IsReadGlossaries() { return m_bIsReadGlossaries;}
+    bool IsReadGlossaries() const { return m_bIsReadGlossaries;}
 
     /// If we're inside <w:rPr>, inside <w:style w:type="table">
     bool m_bInTableStyleRunProps;
@@ -969,7 +969,7 @@ public:
     /// Enable, disable and check status of grabbags
     void enableInteropGrabBag(const OUString& aName);
     void disableInteropGrabBag();
-    bool isInteropGrabBagEnabled();
+    bool isInteropGrabBagEnabled() const;
 
     /// Name of m_aInteropGrabBag.
     OUString m_aInteropGrabBagName;
@@ -986,8 +986,8 @@ public:
     std::pair<OUString, OUString> m_aAligns;
     /// ST_PositivePercentage values we received
     std::queue<OUString> m_aPositivePercentages;
-    bool isInIndexContext() { return m_bStartIndex;}
-    bool isInBibliographyContext() { return m_bStartBibliography;}
+    bool isInIndexContext() const { return m_bStartIndex;}
+    bool isInBibliographyContext() const { return m_bStartBibliography;}
     SmartTagHandler& getSmartTagHandler() { return m_aSmartTagHandler; }
 
     void substream(Id rName, ::writerfilter::Reference<Stream>::Pointer_t const& ref);
@@ -998,7 +998,7 @@ public:
     /// Check if "SdtEndBefore" property is set
     bool IsSdtEndBefore();
 
-    bool IsDiscardHeaderFooter();
+    bool IsDiscardHeaderFooter() const;
 
     void SetParaAutoBefore(bool bParaAutoBefore) { m_bParaAutoBefore = bParaAutoBefore; }
 
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 5c4fdaf1bc32..3339156ae3b2 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -223,7 +223,7 @@ void WrapHandler::lcl_sprm( Sprm& )
 {
 }
 
-text::WrapTextMode WrapHandler::getWrapMode( )
+text::WrapTextMode WrapHandler::getWrapMode( ) const
 {
     // The wrap values do not map directly to our wrap mode,
     // e.g. none in .docx actually means through in LO.
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/writerfilter/source/dmapper/GraphicHelpers.hxx
index 0cbf9e607500..dbfe9ddd9f13 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.hxx
@@ -53,7 +53,7 @@ public:
     WrapHandler( );
     virtual ~WrapHandler( ) override;
 
-    css::text::WrapTextMode getWrapMode( );
+    css::text::WrapTextMode getWrapMode( ) const;
 
  private:
     virtual void lcl_attribute( Id aName, Value& rVal ) override;
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 269a4e290ecb..70ec64cef2ea 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -166,7 +166,7 @@ struct GraphicBorderLine
         ,bHasShadow(false)
         {}
 
-    bool isEmpty()
+    bool isEmpty() const
     {
         return nLineWidth == 0 && !bHasShadow;
     }
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index ee3b5b7cdb05..591bf6bbdd38 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -95,7 +95,7 @@ public:
     virtual void data(const sal_uInt8* buffer, size_t len, writerfilter::Reference<Properties>::Pointer_t ref) override;
 
     css::uno::Reference<css::text::XTextContent> GetGraphicObject();
-    const css::uno::Reference<css::drawing::XShape>& GetXShapeObject() { return m_xShape;}
+    const css::uno::Reference<css::drawing::XShape>& GetXShapeObject() const { return m_xShape;}
     bool IsGraphic() const;
 
  private:
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 8f7d05e5f4d0..5f6bb6393f09 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -428,7 +428,7 @@ uno::Sequence<uno::Sequence<beans::PropertyValue>> AbstractListDef::GetPropertyV
     return result;
 }
 
-OUString AbstractListDef::MapListId(OUString const& rId)
+const OUString& AbstractListDef::MapListId(OUString const& rId)
 {
     if (!m_oListId)
     {
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index 0ba356f64f3c..10034229b040 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -75,8 +75,8 @@ public:
     void SetParaStyle( const tools::SvRef< StyleSheetEntry >& pStyle );
 
     // Getters
-    const OUString& GetBulletChar( ) { return m_sBulletChar; };
-    const tools::SvRef< StyleSheetEntry >& GetParaStyle( ) { return m_pParaStyle; };
+    const OUString& GetBulletChar( ) const { return m_sBulletChar; };
+    const tools::SvRef< StyleSheetEntry >& GetParaStyle( ) const { return m_pParaStyle; };
     bool isOutlineNumbering() const { return m_outline; }
     /// Determines if SetValue() was called at least once.
     bool HasValues() const;
@@ -106,9 +106,9 @@ public:
     ~NumPicBullet() override;
 
     void SetId(sal_Int32 nId);
-    sal_Int32 GetId() { return m_nId;}
+    sal_Int32 GetId() const { return m_nId;}
     void SetShape(css::uno::Reference<css::drawing::XShape> const& xShape);
-    const css::uno::Reference<css::drawing::XShape>& GetShape() { return m_xShape; }
+    const css::uno::Reference<css::drawing::XShape>& GetShape() const { return m_xShape; }
 private:
     sal_Int32 m_nId;
     css::uno::Reference<css::drawing::XShape> m_xShape;
@@ -145,20 +145,20 @@ public:
     static void SetValue( sal_uInt32 nSprmId );
 
     // Accessors
-    sal_Int32             GetId( ) { return m_nId; };
+    sal_Int32             GetId( ) const { return m_nId; };
 
     sal_Int16             Size( ) { return sal_Int16( m_aLevels.size( ) ); };
     ListLevel::Pointer    GetLevel( sal_uInt16 nLvl );
     void                  AddLevel( );
 
-    const ListLevel::Pointer&  GetCurrentLevel( ) { return m_pCurrentLevel; };
+    const ListLevel::Pointer&  GetCurrentLevel( ) const { return m_pCurrentLevel; };
 
     css::uno::Sequence< css::uno::Sequence<css::beans::PropertyValue> > GetPropertyValues(bool bDefaults);
 
     void                  SetNumStyleLink(const OUString& sValue) { m_sNumStyleLink = sValue; };
-    const OUString&       GetNumStyleLink() { return m_sNumStyleLink; };
+    const OUString&       GetNumStyleLink() const { return m_sNumStyleLink; };
 
-    OUString MapListId(OUString const& rId);
+    const OUString& MapListId(OUString const& rId);
 };
 
 class ListDef : public AbstractListDef
@@ -181,7 +181,7 @@ public:
 
     // Accessors
     void SetAbstractDefinition( AbstractListDef::Pointer pAbstract ) { m_pAbstractDef = pAbstract; };
-    const AbstractListDef::Pointer& GetAbstractDefinition( ) { return m_pAbstractDef; };
+    const AbstractListDef::Pointer& GetAbstractDefinition( ) const { return m_pAbstractDef; };
 
     // Mapping functions
     OUString GetStyleName(sal_Int32 nId,
@@ -192,7 +192,7 @@ public:
 
     void CreateNumberingRules(DomainMapper& rDMapper, css::uno::Reference<css::lang::XMultiServiceFactory> const& xFactory);
 
-    const css::uno::Reference<css::container::XIndexReplace>& GetNumberingRules() { return m_xNumRules; }
+    const css::uno::Reference<css::container::XIndexReplace>& GetNumberingRules() const { return m_xNumRules; }
 
 };
 
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx
index aba97ac52c4e..2060c8163f30 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -74,9 +74,9 @@ public:
     explicit OLEHandler(DomainMapper& rDomainMapper);
     virtual ~OLEHandler() override;
 
-    const css::uno::Reference<css::drawing::XShape>& getShape() { return m_xShape; };
+    const css::uno::Reference<css::drawing::XShape>& getShape() const { return m_xShape; };
 
-    bool isOLEObject() { return m_xInputStream.is(); }
+    bool isOLEObject() const { return m_xInputStream.is(); }
 
     /// In case of a valid CLSID, import the native data to the previously created empty OLE object.
     void importStream(const css::uno::Reference<css::uno::XComponentContext>& xComponentContext,
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 2c9b64d6e6e6..86fee3a9a193 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1101,7 +1101,7 @@ void SectionPropertyMap::HandleMarginsHeaderFooter( bool bFirstPage, DomainMappe
     PrepareHeaderFooterProperties( bFirstPage );
 }
 
-bool SectionPropertyMap::FloatingTableConversion( DomainMapper_Impl& rDM_Impl, FloatingTableInfo& rInfo )
+bool SectionPropertyMap::FloatingTableConversion( const DomainMapper_Impl& rDM_Impl, FloatingTableInfo& rInfo )
 {
     // This is OOXML version of the code deciding if the table needs to be
     // in a floating frame.
@@ -1769,7 +1769,7 @@ void SectionPropertyMap::ApplyProperties_( const uno::Reference< beans::XPropert
     }
 }
 
-sal_Int32 SectionPropertyMap::GetPageWidth()
+sal_Int32 SectionPropertyMap::GetPageWidth() const
 {
     return getProperty( PROP_WIDTH )->second.get<sal_Int32>();
 }
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 359cc665f74c..08a451ed011d 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -296,7 +296,7 @@ private:
                                    sal_uInt32 nLineWidth );
 
     // Determines if conversion of a given floating table is wanted or not.
-    bool FloatingTableConversion( DomainMapper_Impl& rDM_Impl, FloatingTableInfo& rInfo );
+    bool FloatingTableConversion( const DomainMapper_Impl& rDM_Impl, FloatingTableInfo& rInfo );
 
     /// Increases paragraph spacing according to Word 2013+ needs if necessary.
     void HandleIncreasedAnchoredObjectSpacing(DomainMapper_Impl& rDM_Impl);
@@ -311,7 +311,7 @@ public:
 
     explicit SectionPropertyMap( bool bIsFirstSection );
 
-    bool IsFirstSection() { return m_bIsFirstSection; }
+    bool IsFirstSection() const { return m_bIsFirstSection; }
 
     void SetStart( const css::uno::Reference< css::text::XTextRange >& xRange ) { m_xStartingRange = xRange; }
 
@@ -349,17 +349,17 @@ public:
     void SetPageNumberType( sal_Int32 nSet ) { m_nPageNumberType = nSet; }
     void SetBreakType( sal_Int32 nSet )      { m_nBreakType = nSet; }
     // GetBreakType returns -1 if the breakType has not yet been identified for the section
-    sal_Int32 GetBreakType()                 { return m_nBreakType; }
+    sal_Int32 GetBreakType() const           { return m_nBreakType; }
 
     void SetLeftMargin( sal_Int32 nSet )   { m_nLeftMargin = nSet; }
-    sal_Int32 GetLeftMargin()              { return m_nLeftMargin; }
+    sal_Int32 GetLeftMargin() const        { return m_nLeftMargin; }
     void SetRightMargin( sal_Int32 nSet )  { m_nRightMargin = nSet; }
-    sal_Int32 GetRightMargin()             { return m_nRightMargin; }
+    sal_Int32 GetRightMargin() const       { return m_nRightMargin; }
     void SetTopMargin( sal_Int32 nSet )    { m_nTopMargin = nSet; }
     void SetBottomMargin( sal_Int32 nSet ) { m_nBottomMargin = nSet; }
     void SetHeaderTop( sal_Int32 nSet )    { m_nHeaderTop = nSet; }
     void SetHeaderBottom( sal_Int32 nSet ) { m_nHeaderBottom = nSet; }
-    sal_Int32 GetPageWidth();
+    sal_Int32 GetPageWidth() const;
 
     void SetGridType( sal_Int32 nSet )      { m_nGridType = nSet; }
     void SetGridLinePitch( sal_Int32 nSet ) { m_nGridLinePitch = nSet; }
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index 4022f67270e5..aef7ac1e5fbd 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -197,9 +197,9 @@ uno::Sequence<beans::PropertyValue> SdtHelper::getInteropGrabBagAndClear()
     return aRet;
 }
 
-bool SdtHelper::isInteropGrabBagEmpty() { return m_aGrabBag.empty(); }
+bool SdtHelper::isInteropGrabBagEmpty() const { return m_aGrabBag.empty(); }
 
-sal_Int32 SdtHelper::getInteropGrabBagSize() { return m_aGrabBag.size(); }
+sal_Int32 SdtHelper::getInteropGrabBagSize() const { return m_aGrabBag.size(); }
 
 bool SdtHelper::containedInInteropGrabBag(const OUString& rValueName)
 {
diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx
index a91b0f2fb549..3cce8e3658af 100644
--- a/writerfilter/source/dmapper/SdtHelper.hxx
+++ b/writerfilter/source/dmapper/SdtHelper.hxx
@@ -96,14 +96,14 @@ public:
 
     OUStringBuffer& getLocale() { return m_sLocale; }
     /// If createControlShape() was ever called.
-    bool hasElements() { return m_bHasElements; }
+    bool hasElements() const { return m_bHasElements; }
 
     void setOutsideAParagraph(bool bOutsideAParagraph)
     {
         m_bOutsideAParagraph = bOutsideAParagraph;
     }
 
-    bool isOutsideAParagraph() { return m_bOutsideAParagraph; }
+    bool isOutsideAParagraph() const { return m_bOutsideAParagraph; }
 
     bool isInsideDropDownControl() const { return m_bInsideDropDownControl; }
     void setInsideDropDownControl(bool bInside) { m_bInsideDropDownControl = bInside; }
@@ -115,9 +115,9 @@ public:
 
     void appendToInteropGrabBag(const css::beans::PropertyValue& rValue);
     css::uno::Sequence<css::beans::PropertyValue> getInteropGrabBagAndClear();
-    bool isInteropGrabBagEmpty();
+    bool isInteropGrabBagEmpty() const;
     bool containedInInteropGrabBag(const OUString& rValueName);
-    sal_Int32 getInteropGrabBagSize();
+    sal_Int32 getInteropGrabBagSize() const;
 };
 
 } // namespace dmapper
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index fbe8a60680e0..5dcc856ca564 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -141,7 +141,7 @@ PropertyMapPtr TableStyleSheetEntry::GetProperties( sal_Int32 nMask )
     return pProps;
 }
 
-beans::PropertyValues StyleSheetEntry::GetInteropGrabBagSeq()
+beans::PropertyValues StyleSheetEntry::GetInteropGrabBagSeq() const
 {
     return comphelper::containerToSequence(m_aInteropGrabBag);
 }
@@ -392,12 +392,12 @@ StyleSheetTable::~StyleSheetTable()
 {
 }
 
-PropertyMapPtr const & StyleSheetTable::GetDefaultParaProps()
+PropertyMapPtr const & StyleSheetTable::GetDefaultParaProps() const
 {
     return m_pImpl->m_pDefaultParaProps;
 }
 
-PropertyMapPtr const & StyleSheetTable::GetDefaultCharProps()
+PropertyMapPtr const & StyleSheetTable::GetDefaultCharProps() const
 {
     return m_pImpl->m_pDefaultCharProps;
 }
@@ -858,7 +858,7 @@ public:
     void Insert(const beans::PropertyValue& rVal);
     uno::Sequence< uno::Any > getValues();
     uno::Sequence< OUString > getNames();
-    std::vector<beans::PropertyValue> getProperties() { return m_aValues; };
+    const std::vector<beans::PropertyValue>& getProperties() const { return m_aValues; };
 };
 
 void PropValVector::Insert(const beans::PropertyValue& rVal)
@@ -1257,7 +1257,7 @@ StyleSheetEntryPtr StyleSheetTable::FindDefaultParaStyle()
     return FindStyleSheetByISTD( m_pImpl->m_sDefaultParaStyleName );
 }
 
-const StyleSheetEntryPtr & StyleSheetTable::GetCurrentEntry()
+const StyleSheetEntryPtr & StyleSheetTable::GetCurrentEntry() const
 {
     return m_pImpl->m_pCurrentEntry;
 }
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index 9cd35b48ec3c..0fa7d4883c64 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -71,7 +71,7 @@ public:
 
     void AppendInteropGrabBag(const css::beans::PropertyValue& rValue);
     css::beans::PropertyValue GetInteropGrabBag(); ///< Used for table styles, has a name.
-    css::beans::PropertyValues GetInteropGrabBagSeq(); ///< Used for existing styles, just a list of properties.
+    css::beans::PropertyValues GetInteropGrabBagSeq() const; ///< Used for existing styles, just a list of properties.
 
     // Get all properties, merged with the all of the parent's properties
     PropertyMapPtr GetMergedInheritedProperties(const StyleSheetTablePtr& pStyleSheetTable);
@@ -102,11 +102,11 @@ public:
 
     OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties, bool bAlwaysCreate );
 
-    PropertyMapPtr const & GetDefaultParaProps();
+    PropertyMapPtr const & GetDefaultParaProps() const;
     /// Returns the default character properties.
-    PropertyMapPtr const & GetDefaultCharProps();
+    PropertyMapPtr const & GetDefaultCharProps() const;
 
-    const StyleSheetEntryPtr & GetCurrentEntry();
+    const StyleSheetEntryPtr & GetCurrentEntry() const;
 
 private:
     // Properties
diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx
index 8381a9899125..8489254f4ab8 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -83,17 +83,17 @@ public:
     /**
        Return start handle of the cell.
      */
-    const css::uno::Reference<css::text::XTextRange>& getStart() { return mStart; }
+    const css::uno::Reference<css::text::XTextRange>& getStart() const { return mStart; }
 
     /**
        Return end handle of the cell.
     */
-    const css::uno::Reference<css::text::XTextRange>& getEnd() { return mEnd; }
+    const css::uno::Reference<css::text::XTextRange>& getEnd() const { return mEnd; }
 
     /**
        Return properties of the cell.
      */
-    const TablePropertyMapPtr& getProperties() { return mpProps; }
+    const TablePropertyMapPtr& getProperties() const { return mpProps; }
 
     bool isOpen() const { return mbOpen; }
 };
@@ -177,7 +177,7 @@ public:
     /**
        Return number of cells in the row.
     */
-    unsigned int getCellCount()
+    unsigned int getCellCount() const
     {
         return mCells.size();
     }
@@ -215,7 +215,7 @@ public:
     /**
        Return properties of the row.
      */
-    const TablePropertyMapPtr& getProperties()
+    const TablePropertyMapPtr& getProperties() const
     {
         return mpProperties;
     }
@@ -312,7 +312,7 @@ public:
     /**
        Return number of rows in the table.
      */
-    unsigned int getRowCount()
+    unsigned int getRowCount() const
     {
         return mRows.size();
     }
@@ -320,7 +320,7 @@ public:
     /**
        Return depth of table in surrounding table hierarchy.
     */
-    unsigned int getDepth()
+    unsigned int getDepth() const
     {
         return mnDepth;
     }
diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx
index 09a93efc44a1..6c7a9ea1e21e 100644
--- a/writerfilter/source/dmapper/TableManager.hxx
+++ b/writerfilter/source/dmapper/TableManager.hxx
@@ -115,7 +115,7 @@ class TableManager : public virtual SvRefBase
             mpCellProps = pProps;
         }
 
-        const TablePropertyMapPtr& getCellProps()
+        const TablePropertyMapPtr& getCellProps() const
         {
             return mpCellProps;
         }
@@ -130,7 +130,7 @@ class TableManager : public virtual SvRefBase
             mpRowProps = pProps;
         }
 
-        const TablePropertyMapPtr& getRowProps()
+        const TablePropertyMapPtr& getRowProps() const
         {
             return mpRowProps;
         }
@@ -196,13 +196,13 @@ class TableManager : public virtual SvRefBase
     TableManagerState mState;
 
 protected:
-    TablePropertyMapPtr const & getCellProps()
+    TablePropertyMapPtr const & getCellProps() const
     {
         return mState.getCellProps();
     }
 
 public:
-    TablePropertyMapPtr const & getRowProps()
+    TablePropertyMapPtr const & getRowProps() const
     {
         return mState.getRowProps();
     }
@@ -238,7 +238,7 @@ protected:
         return mState.getTableProps();
     }
 
-    const css::uno::Reference<css::text::XTextRange>& getHandle()
+    const css::uno::Reference<css::text::XTextRange>& getHandle() const
     {
         return mCurHandle;
     }
@@ -326,7 +326,7 @@ protected:
     /**
        Return the current table difference, i.e. 1 if we are in the first cell of a new table, etc.
      */
-    sal_uInt32 getTableDepthDifference() { return mnTableDepthNew - mnTableDepth; }
+    sal_uInt32 getTableDepthDifference() const { return mnTableDepthNew - mnTableDepth; }
 
     /**
        Action to be carried out at the end of the last paragraph of a
@@ -468,7 +468,7 @@ public:
 
     void setTableStartsAtCellStart(bool bTableStartsAtCellStart);
     void setCellLastParaAfterAutospacing(bool bIsAfterAutospacing);
-    bool isCellLastParaAfterAutospacing() {return m_bCellLastParaAfterAutospacing;}
+    bool isCellLastParaAfterAutospacing() const {return m_bCellLastParaAfterAutospacing;}
 };
 
 }
diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx
index 86e1666cc187..a11f10364195 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.hxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.hxx
@@ -50,44 +50,44 @@ class TablePositionHandler
     void lcl_sprm(Sprm& sprm) override;
 
 public:
-    sal_Int32 getY()
+    sal_Int32 getY() const
     {
         return m_nY;
     }
-    sal_Int32 getX()
+    sal_Int32 getX() const
     {
         return m_nX;
     }
-    sal_Int32 getLeftFromText()
+    sal_Int32 getLeftFromText() const
     {
         return m_nLeftFromText;
     }
-    sal_Int32 getRightFromText()
+    sal_Int32 getRightFromText() const
     {
         return m_nRightFromText;
     }
-    sal_Int32 getTopFromText()
+    sal_Int32 getTopFromText() const
     {
         return m_nTopFromText;
     }
-    sal_Int32 getBottomFromText()
+    sal_Int32 getBottomFromText() const
     {
         return m_nBottomFromText;
     }
 
-    const OUString& getVertAnchor()
+    const OUString& getVertAnchor() const
     {
         return m_aVertAnchor;
     }
-    const OUString& getYSpec()
+    const OUString& getYSpec() const
     {
         return m_aYSpec;
     }
-    const OUString& getHorzAnchor()
+    const OUString& getHorzAnchor() const
     {
         return m_aHorzAnchor;
     }
-    const OUString& getXSpec()
+    const OUString& getXSpec() const
     {
         return m_aXSpec;
     }
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index f36624965e66..92b5e53cc7ee 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -41,7 +41,7 @@ TblStylePrHandler::~TblStylePrHandler( )
 {
 }
 
-OUString TblStylePrHandler::getTypeString()
+OUString TblStylePrHandler::getTypeString() const
 {
     switch (m_nType)
     {
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index 06325f06b1ae..ab31e8855cc1 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -68,9 +68,9 @@ public:
     explicit TblStylePrHandler( DomainMapper & rDMapper );
     virtual ~TblStylePrHandler( ) override;
 
-    const PropertyMapPtr&       getProperties() { return m_pProperties; };
-    TblStyleType         getType() { return m_nType; };
-    OUString getTypeString();
+    const PropertyMapPtr&       getProperties() const { return m_pProperties; };
+    TblStyleType         getType() const { return m_nType; };
+    OUString getTypeString() const;
     void appendInteropGrabBag(const OUString& aKey, const OUString& aValue);
     css::beans::PropertyValue getInteropGrabBag(const OUString& aName);
 
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index d09504cbceb7..6a40ed67a0db 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -45,7 +45,7 @@ public:
     explicit TextEffectsHandler(sal_uInt32 aElementId);
     virtual ~TextEffectsHandler() override;
 
-    const boost::optional<PropertyIds>& getGrabBagPropertyId() { return maPropertyId;}
+    const boost::optional<PropertyIds>& getGrabBagPropertyId() const { return maPropertyId;}
 
     css::beans::PropertyValue getInteropGrabBag();
 
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index d1e274ca9304..807e78362924 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -60,7 +60,7 @@ public:
     WrapPolygonHandler();
     virtual ~WrapPolygonHandler() override;
 
-    const WrapPolygon::Pointer_t& getPolygon() { return mpPolygon;}
+    const WrapPolygon::Pointer_t& getPolygon() const { return mpPolygon;}
 
 private:
     WrapPolygon::Pointer_t mpPolygon;
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 61fb31e96621..888f69a2320d 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -828,7 +828,7 @@ uno::Reference<drawing::XDrawPage> OOXMLDocumentImpl::getDrawPage()
     return mxDrawPage;
 }
 
-const uno::Sequence<beans::PropertyValue>& OOXMLDocumentImpl::getMediaDescriptor()
+const uno::Sequence<beans::PropertyValue>& OOXMLDocumentImpl::getMediaDescriptor() const
 {
     return maMediaDescriptor;
 }
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index 1ad317a204d3..059ac1cea601 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -136,9 +136,9 @@ public:
     virtual css::uno::Sequence<css::beans::PropertyValue >  getEmbeddingsList() override;
 
     void incrementProgress();
-    bool IsSkipImages() { return mbSkipImages; };
-    OUString const& GetDocumentBaseURL() { return m_rBaseURL; };
-    const css::uno::Sequence<css::beans::PropertyValue>& getMediaDescriptor();
+    bool IsSkipImages() const { return mbSkipImages; };
+    OUString const& GetDocumentBaseURL() const { return m_rBaseURL; };
+    const css::uno::Sequence<css::beans::PropertyValue>& getMediaDescriptor() const;
 };
 }}
 #endif // OOXML_DOCUMENT_IMPL_HXX
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 978e8e5afc22..078377620b47 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -224,7 +224,7 @@ protected:
     void startAction();
     void endAction();
 
-    const css::uno::Reference< css::uno::XComponentContext >& getComponentContext() { return m_xContext;}
+    const css::uno::Reference< css::uno::XComponentContext >& getComponentContext() const { return m_xContext;}
 
     bool inPositionV;
     OOXMLValue::Pointer_t mpGridAfter;
@@ -458,7 +458,7 @@ public:
     virtual ResourceEnum_t getResource() const override { return SHAPE; }
 
     void sendShape( Token_t Element );
-    bool isShapeSent( ) { return m_bShapeSent; }
+    bool isShapeSent( ) const { return m_bShapeSent; }
 
 protected:
     virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 0c69cc9a4563..5ee84d791e5c 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -709,7 +709,7 @@ public:
 
     Stream& Mapper() { return *m_pMapperStream; }
     void setSuperstream(RTFDocumentImpl* pSuperstream);
-    const css::uno::Reference<css::lang::XMultiServiceFactory>& getModelFactory()
+    const css::uno::Reference<css::lang::XMultiServiceFactory>& getModelFactory() const
     {
         return m_xModelFactory;
     }
@@ -723,7 +723,7 @@ public:
     /// Send NS_ooxml::LN_settings_settings to dmapper.
     void outputSettingsTable();
     /// If the initial paragraph is started.
-    bool getFirstRun() { return m_bFirstRun; }
+    bool getFirstRun() const { return m_bFirstRun; }
     /// If we need to add a dummy paragraph before a section break.
     void setNeedPar(bool bNeedPar);
     /// Return the dmapper index of an RTF index for fonts.
diff --git a/writerfilter/source/rtftok/rtflookahead.hxx b/writerfilter/source/rtftok/rtflookahead.hxx
index 5d9bbab16173..52a4b3b14a5e 100644
--- a/writerfilter/source/rtftok/rtflookahead.hxx
+++ b/writerfilter/source/rtftok/rtflookahead.hxx
@@ -46,8 +46,8 @@ public:
     void setSkipUnknown(bool bSkipUnknown) override;
     void finishSubstream() override;
     bool isSubstream() const override;
-    bool hasTable() { return m_bHasTable; }
-    bool hasColumns() { return m_bHasColumns; }
+    bool hasTable() const { return m_bHasTable; }
+    bool hasColumns() const { return m_bHasColumns; }
 
 private:
     tools::SvRef<RTFTokenizer> m_pTokenizer;
diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx
index cdf088857466..57ce69e6d2e8 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.hxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.hxx
@@ -84,8 +84,8 @@ public:
     void pushParent(css::uno::Reference<css::drawing::XShapes> const& xParent);
     /// Pop the current group shape from the parent stack.
     void popParent();
-    css::uno::Reference<css::drawing::XShape> const& getCurrentShape() { return m_xShape; }
-    bool isFakePict() { return m_bFakePict; }
+    css::uno::Reference<css::drawing::XShape> const& getCurrentShape() const { return m_xShape; }
+    bool isFakePict() const { return m_bFakePict; }
 
 private:
     void createShape(const OUString& rService, css::uno::Reference<css::drawing::XShape>& xShape,
diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx
index e2feb0499019..5c1cd1949328 100644
--- a/writerfilter/source/rtftok/rtftokenizer.hxx
+++ b/writerfilter/source/rtftok/rtftokenizer.hxx
@@ -55,7 +55,7 @@ public:
     /// To be invoked by the popState() callback to signal when the importer leaves a group.
     void popGroup();
     OUString getPosition();
-    std::size_t getGroupStart() { return m_nGroupStart; }
+    std::size_t getGroupStart() const { return m_nGroupStart; }
     /// To look up additional properties of a math symbol.
     static bool lookupMathKeyword(RTFMathSymbol& rSymbol);