[Libreoffice-commits] core.git: sd/inc sd/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sun Sep 29 06:26:13 UTC 2019
sd/inc/Outliner.hxx | 2 -
sd/inc/anminfo.hxx | 2 -
sd/inc/drawdoc.hxx | 14 ++++----
sd/inc/sdpage.hxx | 2 -
sd/inc/textapi.hxx | 2 -
sd/source/core/PageListWatcher.cxx | 2 -
sd/source/core/PageListWatcher.hxx | 2 -
sd/source/core/anminfo.cxx | 2 -
sd/source/core/drawdoc.cxx | 2 -
sd/source/core/drawdoc2.cxx | 2 -
sd/source/core/text/textapi.cxx | 6 +--
sd/source/filter/eppt/epptbase.hxx | 2 -
sd/source/filter/eppt/pptx-animations.cxx | 10 +++---
sd/source/filter/eppt/pptx-text.cxx | 2 -
sd/source/filter/eppt/text.hxx | 2 -
sd/source/filter/html/pubdlg.cxx | 4 +-
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 2 -
sd/source/ui/animations/CustomAnimationPane.cxx | 2 -
sd/source/ui/animations/CustomAnimationPane.hxx | 2 -
sd/source/ui/annotations/annotationwindow.hxx | 2 -
sd/source/ui/dlg/BulletAndPositionDlg.cxx | 6 +--
sd/source/ui/dlg/dlgfield.cxx | 2 -
sd/source/ui/dlg/filedlg.cxx | 2 -
sd/source/ui/dlg/inspagob.cxx | 2 -
sd/source/ui/dlg/navigatr.cxx | 2 -
sd/source/ui/dlg/sdtreelb.cxx | 4 +-
sd/source/ui/framework/configuration/ConfigurationUpdater.cxx | 2 -
sd/source/ui/framework/configuration/ConfigurationUpdater.hxx | 2 -
sd/source/ui/framework/tools/FrameworkHelper.cxx | 2 -
sd/source/ui/func/fuconbez.cxx | 2 -
sd/source/ui/func/fuconrec.cxx | 2 -
sd/source/ui/func/fudraw.cxx | 4 +-
sd/source/ui/func/fupage.cxx | 2 -
sd/source/ui/func/fusel.cxx | 2 -
sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 2 -
sd/source/ui/inc/BulletAndPositionDlg.hxx | 6 +--
sd/source/ui/inc/DrawViewShell.hxx | 14 ++++----
sd/source/ui/inc/FrameView.hxx | 16 +++++-----
sd/source/ui/inc/OutlineView.hxx | 2 -
sd/source/ui/inc/SdUnoDrawView.hxx | 2 -
sd/source/ui/inc/View.hxx | 2 -
sd/source/ui/inc/ViewShell.hxx | 6 +--
sd/source/ui/inc/ViewShellBase.hxx | 4 +-
sd/source/ui/inc/ViewShellImplementation.hxx | 2 -
sd/source/ui/inc/ViewTabBar.hxx | 2 -
sd/source/ui/inc/Window.hxx | 16 +++++-----
sd/source/ui/inc/dlgfield.hxx | 2 -
sd/source/ui/inc/drawview.hxx | 2 -
sd/source/ui/inc/filedlg.hxx | 2 -
sd/source/ui/inc/framework/FrameworkHelper.hxx | 2 -
sd/source/ui/inc/framework/ViewShellWrapper.hxx | 2 -
sd/source/ui/inc/fuconbez.hxx | 2 -
sd/source/ui/inc/fudraw.hxx | 4 +-
sd/source/ui/inc/fupage.hxx | 2 -
sd/source/ui/inc/fusel.hxx | 4 +-
sd/source/ui/inc/inspagob.hxx | 2 -
sd/source/ui/inc/navigatr.hxx | 6 +--
sd/source/ui/inc/sdtreelb.hxx | 6 +--
sd/source/ui/inc/slideshow.hxx | 6 +--
sd/source/ui/inc/unopage.hxx | 2 -
sd/source/ui/sidebar/LayoutMenu.cxx | 2 -
sd/source/ui/sidebar/LayoutMenu.hxx | 2 -
sd/source/ui/slideshow/slideshow.cxx | 6 +--
sd/source/ui/slideshow/slideshowimpl.cxx | 2 -
sd/source/ui/slideshow/slideshowimpl.hxx | 2 -
sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx | 2 -
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 2 -
sd/source/ui/slidesorter/controller/SlsAnimator.cxx | 2 -
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2 -
sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 2 -
sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx | 2 -
sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx | 2 -
sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx | 2 -
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 2 -
sd/source/ui/unoidl/SdUnoDrawView.cxx | 2 -
sd/source/ui/view/DocumentRenderer.cxx | 4 +-
sd/source/ui/view/Outliner.cxx | 2 -
sd/source/ui/view/ViewShellBase.cxx | 6 +--
sd/source/ui/view/ViewShellImplementation.cxx | 2 -
sd/source/ui/view/ViewTabBar.cxx | 2 -
sd/source/ui/view/drawview.cxx | 2 -
sd/source/ui/view/drviews2.cxx | 2 -
sd/source/ui/view/frmview.cxx | 2 -
sd/source/ui/view/sdwindow.cxx | 16 +++++-----
sd/source/ui/view/viewshel.cxx | 2 -
85 files changed, 147 insertions(+), 147 deletions(-)
New commits:
commit 1902f1e4c787293559378f3d8cb9c10c369f8ae4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sat Sep 28 14:21:57 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Sep 29 08:25:32 2019 +0200
loplugin:constmethod in sd
Change-Id: I063194abe47d8c1d3d9202bbe4b01d79c36ceda3
Reviewed-on: https://gerrit.libreoffice.org/79790
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 47c3b5d95784..27ec4d80127d 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -458,7 +458,7 @@ private:
The position mentioned above in form of a selection with start
equals end.
*/
- ESelection GetSearchStartPosition();
+ ESelection GetSearchStartPosition() const;
/** Detect whether there exists a previous match. Note that only the
absence of such a match can be detected reliably. An existing match
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index d6810db45091..dbd13720ec29 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -56,7 +56,7 @@ public:
SdrObject& mrObject;
void SetBookmark( const OUString& rBookmark );
- OUString GetBookmark();
+ OUString GetBookmark() const;
public:
SAL_DLLPRIVATE SdAnimationInfo(SdrObject& rObject);
SAL_DLLPRIVATE SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rObject);
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index a9d2172ca0f6..e0deb23993ac 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -436,7 +436,7 @@ public:
scope="css::document::PrinterIndependentLayout">DISABLED</const>
when formatting depends on the current printer metrics.
*/
- SAL_DLLPRIVATE sal_Int32 GetPrinterIndependentLayout() { return mnPrinterIndependentLayout;}
+ SAL_DLLPRIVATE sal_Int32 GetPrinterIndependentLayout() const { return mnPrinterIndependentLayout;}
SAL_DLLPRIVATE void SetOnlineSpell( bool bIn );
SAL_DLLPRIVATE bool GetOnlineSpell() const { return mbOnlineSpell; }
@@ -448,7 +448,7 @@ public:
SAL_DLLPRIVATE void InsertObject(SdrObject* pObj);
SAL_DLLPRIVATE void RemoveObject(SdrObject* pObj);
- SAL_DLLPRIVATE sal_uLong GetLinkCount();
+ SAL_DLLPRIVATE sal_uLong GetLinkCount() const;
SAL_DLLPRIVATE std::vector<std::unique_ptr<sd::FrameView>>& GetFrameViewList() { return maFrameViewList; }
SdCustomShowList* GetCustomShowList(bool bCreate = false);
@@ -616,11 +616,11 @@ public:
SAL_DLLPRIVATE sal_uInt16 GetAnnotationAuthorIndex( const OUString& rAuthor );
- SAL_DLLPRIVATE bool IsEmbedFonts() { return mbEmbedFonts; }
- SAL_DLLPRIVATE bool IsEmbedUsedFontsOnly() { return mbEmbedUsedFontsOnly; }
- SAL_DLLPRIVATE bool IsEmbedFontScriptLatin() { return mbEmbedFontScriptLatin; }
- SAL_DLLPRIVATE bool IsEmbedFontScriptAsian() { return mbEmbedFontScriptAsian; }
- SAL_DLLPRIVATE bool IsEmbedFontScriptComplex() { return mbEmbedFontScriptComplex; }
+ SAL_DLLPRIVATE bool IsEmbedFonts() const { return mbEmbedFonts; }
+ SAL_DLLPRIVATE bool IsEmbedUsedFontsOnly() const { return mbEmbedUsedFontsOnly; }
+ SAL_DLLPRIVATE bool IsEmbedFontScriptLatin() const { return mbEmbedFontScriptLatin; }
+ SAL_DLLPRIVATE bool IsEmbedFontScriptAsian() const { return mbEmbedFontScriptAsian; }
+ SAL_DLLPRIVATE bool IsEmbedFontScriptComplex() const { return mbEmbedFontScriptComplex; }
SAL_DLLPRIVATE void SetEmbedFonts(bool bUse) { mbEmbedFonts = bUse; }
SAL_DLLPRIVATE void SetEmbedUsedFontsOnly(bool bUse) { mbEmbedUsedFontsOnly = bUse; }
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 0f755def4d72..d9d43ec61aee 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -375,7 +375,7 @@ public:
const sd::AnnotationVector& getAnnotations() const { return maAnnotations; }
bool Equals(const SdPage&) const;
virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override;
- sal_uInt16 getPageId() { return mnPageId; }
+ sal_uInt16 getPageId() const { return mnPageId; }
static sal_uInt16 mnLastPageId;
diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx
index 05cc7ee27e41..2141c3bfc6ff 100644
--- a/sd/inc/textapi.hxx
+++ b/sd/inc/textapi.hxx
@@ -42,7 +42,7 @@ public:
std::unique_ptr<OutlinerParaObject> CreateText();
void SetText( OutlinerParaObject const & rText );
- OUString GetText();
+ OUString GetText() const;
static TextApiObject* getImplementation( const css::uno::Reference< css::text::XText >& );
diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx
index b8479161c54a..322d592f2b2d 100644
--- a/sd/source/core/PageListWatcher.cxx
+++ b/sd/source/core/PageListWatcher.cxx
@@ -161,7 +161,7 @@ sal_uInt32 ImpPageListWatcher::GetSdPageCount(PageKind ePgKind)
return nRetval;
}
-sal_uInt32 ImpPageListWatcher::GetVisibleSdPageCount()
+sal_uInt32 ImpPageListWatcher::GetVisibleSdPageCount() const
{
sal_uInt32 nVisiblePageCount = 0;
diff --git a/sd/source/core/PageListWatcher.hxx b/sd/source/core/PageListWatcher.hxx
index ff61a5747d7e..11ab612e6067 100644
--- a/sd/source/core/PageListWatcher.hxx
+++ b/sd/source/core/PageListWatcher.hxx
@@ -60,7 +60,7 @@ public:
void Invalidate() { mbPageListValid = false; }
SdPage* GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum);
sal_uInt32 GetSdPageCount(PageKind ePgKind);
- sal_uInt32 GetVisibleSdPageCount();
+ sal_uInt32 GetVisibleSdPageCount() const;
};
class ImpDrawPageListWatcher : public ImpPageListWatcher
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx
index 6f86ba054a7d..f2159cd0307a 100644
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
@@ -108,7 +108,7 @@ void SdAnimationInfo::SetBookmark( const OUString& rBookmark )
}
}
-OUString SdAnimationInfo::GetBookmark()
+OUString SdAnimationInfo::GetBookmark() const
{
OUString sBookmark;
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index b80423fca738..fb040971caba 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -549,7 +549,7 @@ namespace
{
/// Copies all user-defined properties from pSource to pDestination.
-void lcl_copyUserDefinedProperties(SfxObjectShell* pSource, SfxObjectShell* pDestination)
+void lcl_copyUserDefinedProperties(const SfxObjectShell* pSource, const SfxObjectShell* pDestination)
{
if (!pSource || !pDestination)
return;
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 3aefb50e8e0a..d50e9ad56457 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -838,7 +838,7 @@ bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
}
// Return number of links in sfx2::LinkManager
-sal_uLong SdDrawDocument::GetLinkCount()
+sal_uLong SdDrawDocument::GetLinkCount() const
{
return pLinkManager->GetLinks().size();
}
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 9ee84929196f..8689e154a614 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -102,7 +102,7 @@ public:
void Dispose();
void SetText( OutlinerParaObject const & rText );
std::unique_ptr<OutlinerParaObject> CreateText();
- OUString GetText();
+ OUString GetText() const;
SdDrawDocument* GetDoc() { return m_xImpl->mpDoc; }
};
@@ -167,7 +167,7 @@ void TextApiObject::SetText( OutlinerParaObject const & rText )
maSelection.nStartPara = EE_PARA_MAX_COUNT;
}
-OUString TextApiObject::GetText()
+OUString TextApiObject::GetText() const
{
return mpSource->GetText();
}
@@ -257,7 +257,7 @@ std::unique_ptr<OutlinerParaObject> TextAPIEditSource::CreateText()
return nullptr;
}
-OUString TextAPIEditSource::GetText()
+OUString TextAPIEditSource::GetText() const
{
if (m_xImpl->mpDoc && m_xImpl->mpOutliner)
return m_xImpl->mpOutliner->GetEditEngine().GetText();
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index 349db840e633..17fa61dd9e66 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -395,7 +395,7 @@ public:
sal_uInt32 GetMasterIndex( PageType ePageType );
void SetCurrentStyleSheet( sal_uInt32 nPageNum );
- bool GetPresObj() { return mbPresObj; }
+ bool GetPresObj() const { return mbPresObj; }
static PHLayout const & GetLayout( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet );
static PHLayout const & GetLayout( sal_Int32 nOffset );
diff --git a/sd/source/filter/eppt/pptx-animations.cxx b/sd/source/filter/eppt/pptx-animations.cxx
index 77c02e015bad..f533534f1abb 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -573,7 +573,7 @@ struct Cond
Cond(const Any& rAny, bool bIsMainSeqChild);
- bool isValid() { return msDelay.getLength() || mpEvent; }
+ bool isValid() const { return msDelay.getLength() || mpEvent; }
const char* getDelay() const { return msDelay.getLength() ? msDelay.getStr() : nullptr; }
};
@@ -627,8 +627,8 @@ class PPTXAnimationExport
void WriteAnimationTarget(const Any& rTarget);
void WriteAnimationCondList(const Any& rAny, sal_Int32 nToken);
void WriteAnimationCond(const Cond& rCond);
- bool isMainSeqChild();
- const Reference<XAnimationNode>& getCurrentNode();
+ bool isMainSeqChild() const;
+ const Reference<XAnimationNode>& getCurrentNode() const;
PowerPointExport& mrPowerPointExport;
const FSHelperPtr& mpFS;
@@ -664,13 +664,13 @@ PPTXAnimationExport::PPTXAnimationExport(PowerPointExport& rExport, const FSHelp
{
}
-bool PPTXAnimationExport::isMainSeqChild()
+bool PPTXAnimationExport::isMainSeqChild() const
{
assert(mpContext);
return mpContext->isMainSeqChild();
}
-const Reference<XAnimationNode>& PPTXAnimationExport::getCurrentNode()
+const Reference<XAnimationNode>& PPTXAnimationExport::getCurrentNode() const
{
assert(mpContext);
return mpContext->getNode();
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 342f577f081c..e7def2808185 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -1325,7 +1325,7 @@ int TextObj::GetInstance() const
return mpImplTextObj->mnInstance;
}
-bool TextObj::HasExtendedBullets()
+bool TextObj::HasExtendedBullets() const
{
return mpImplTextObj->mbHasExtendedBullets;
}
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index 7de5741c87ec..3ea830c0c5ce 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -249,7 +249,7 @@ public:
sal_uInt32 ParagraphCount() const;
sal_uInt32 Count() const;
int GetInstance() const;
- bool HasExtendedBullets();
+ bool HasExtendedBullets() const;
};
#endif
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index fe4dee296273..7623d34a115d 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -344,7 +344,7 @@ private:
public:
SdDesignNameDlg(weld::Window* pWindow, const OUString& aName );
- OUString GetDesignName();
+ OUString GetDesignName() const;
DECL_LINK(ModifyHdl, weld::Entry&, void);
};
@@ -1483,7 +1483,7 @@ SdDesignNameDlg::SdDesignNameDlg(weld::Window* pWindow, const OUString& rName)
m_xBtnOK->set_sensitive(!rName.isEmpty());
}
-OUString SdDesignNameDlg::GetDesignName()
+OUString SdDesignNameDlg::GetDesignName() const
{
return m_xEdit->get_text();
}
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 9411b429c414..e2c3816daa1b 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -412,7 +412,7 @@ void AccessibleSlideSorterObject::ThrowIfDisposed()
}
}
-bool AccessibleSlideSorterObject::IsDisposed()
+bool AccessibleSlideSorterObject::IsDisposed() const
{
return (rBHelper.bDisposed || rBHelper.bInDispose);
}
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 5791772c1b31..c63e4d0e8712 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1956,7 +1956,7 @@ void CustomAnimationPane::onChangeSpeed()
}
}
-double CustomAnimationPane::getDuration()
+double CustomAnimationPane::getDuration() const
{
double fDuration = 0;
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index 17642516f3df..a9452a9587e1 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -90,7 +90,7 @@ public:
void addUndo();
- double getDuration();
+ double getDuration() const;
void updatePathFromMotionPathTag( const rtl::Reference< MotionPathTag >& xTag );
private:
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index 94bf1184ee22..9b95dcc34039 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -113,7 +113,7 @@ class AnnotationWindow : public FloatingWindow
void Rescale();
- bool IsProtected() { return mbProtected; }
+ bool IsProtected() const { return mbProtected; }
void SetLanguage(const SvxLanguageItem &aNewItem);
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 91552fd39816..e1daf7661942 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -74,7 +74,7 @@ static const vcl::Font& lcl_GetDefaultBulletFont()
class SdDrawDocument;
SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const SfxItemSet& rSet,
- ::sd::View* pView)
+ const ::sd::View* pView)
: GenericDialogController(pWindow, "cui/ui/bulletandposition.ui", "BulletAndPosition")
, rFirstStateSet(rSet)
, bLastWidthModified(false)
@@ -278,8 +278,8 @@ SfxItemSet* SvxBulletAndPositionDlg::GetOutputItemSet(SfxItemSet* pSet)
return pSet;
};
-bool SvxBulletAndPositionDlg::IsApplyToMaster() { return bApplyToMaster; }
-bool SvxBulletAndPositionDlg::IsSlideScope() { return m_xSlideRB->get_active(); }
+bool SvxBulletAndPositionDlg::IsApplyToMaster() const { return bApplyToMaster; }
+bool SvxBulletAndPositionDlg::IsSlideScope() const { return m_xSlideRB->get_active(); }
void SvxBulletAndPositionDlg::Reset(const SfxItemSet* rSet)
{
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 39d45022cca0..50d394c3eb10 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -302,7 +302,7 @@ IMPL_LINK_NOARG(SdModifyFieldDlg, LanguageChangeHdl, weld::ComboBox&, void)
FillFormatList();
}
-SfxItemSet SdModifyFieldDlg::GetItemSet()
+SfxItemSet SdModifyFieldDlg::GetItemSet() const
{
SfxItemSet aOutput( *m_aInputSet.GetPool(), svl::Items<EE_CHAR_LANGUAGE, EE_CHAR_LANGUAGE_CTL>{} );
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 9c8d072e61ea..443d46f1652c 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -262,7 +262,7 @@ void SdOpenSoundFileDialog::SetPath( const OUString& rPath )
}
// WIP, please don't remove, dear Clang plugins
-bool SdOpenSoundFileDialog::IsInsertAsLinkSelected()
+bool SdOpenSoundFileDialog::IsInsertAsLinkSelected() const
{
bool bInsertAsLinkSelected = false;
css::uno::Reference<css::ui::dialogs::XFilePicker3> const xFilePicker(mpImpl->GetFilePicker());
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index 162e2841ebc5..bab9494acb3e 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -101,7 +101,7 @@ std::vector<OUString> SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType )
/**
* is link checked
*/
-bool SdInsertPagesObjsDlg::IsLink()
+bool SdInsertPagesObjsDlg::IsLink() const
{
return m_xCbxLink->get_active();
}
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 8bc734417e63..f457d8e945df 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -207,7 +207,7 @@ NavigatorDragType SdNavigatorWin::GetNavigatorDragType()
return eDT;
}
-VclPtr<SdPageObjsTLB> const & SdNavigatorWin::GetObjects()
+VclPtr<SdPageObjsTLB> const & SdNavigatorWin::GetObjects() const
{
return maTlbObjects;
}
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 3fbb1a7f1969..101dc46a5c15 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -701,7 +701,7 @@ bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc )
/**
* @return selected string
*/
-OUString SdPageObjsTLB::GetSelectedEntry()
+OUString SdPageObjsTLB::GetSelectedEntry() const
{
return GetEntryText( GetCurEntry() );
}
@@ -1622,7 +1622,7 @@ void SdPageObjsTLV::AddShapeList (
SdrObject* pShape,
const OUString& rsName,
const bool bIsExcluded,
- weld::TreeIter* pParentEntry)
+ const weld::TreeIter* pParentEntry)
{
OUString aIcon(BMP_PAGE);
if (bIsExcluded)
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index bb490c9b91df..c1b3d92e465b 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -115,7 +115,7 @@ void ConfigurationUpdater::RequestUpdate (
}
}
-bool ConfigurationUpdater::IsUpdatePossible()
+bool ConfigurationUpdater::IsUpdatePossible() const
{
return ! mbUpdateBeingProcessed
&& mxControllerManager.is()
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index 682f07b17dfb..c43f9179d604 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -181,7 +181,7 @@ private:
executed, the lock count, and whether the configuration controller
is still valid.
*/
- bool IsUpdatePossible();
+ bool IsUpdatePossible() const;
/** Lock updates of the current configuration. For intermediate requests
for updates mbUpdatePending is set to <TRUE/>.
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index d3687cb33f27..cfa6db43d316 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -391,7 +391,7 @@ void FrameworkHelper::Dispose()
mxConfigurationController = nullptr;
}
-bool FrameworkHelper::IsValid()
+bool FrameworkHelper::IsValid() const
{
return mxConfigurationController.is();
}
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index b95d2c2bb704..072d743fb843 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -74,7 +74,7 @@ namespace{
/// Checks to see if the request has a parameter of IsSticky:bool=true
/// It means that the selected command/button will stay selected after use
-bool isSticky(SfxRequest& rReq)
+bool isSticky(const SfxRequest& rReq)
{
const SfxItemSet *pArgs = rReq.GetArgs ();
if (pArgs)
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 05035cd03252..3fd7a099ab07 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -87,7 +87,7 @@ namespace{
/// Checks to see if the request has a parameter of IsSticky:bool=true
/// It means that the selected command/button will stay selected after use
-bool isSticky(SfxRequest& rReq)
+bool isSticky(const SfxRequest& rReq)
{
const SfxItemSet *pArgs = rReq.GetArgs ();
if (pArgs)
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index d6a85af98141..b06f63fc7765 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -582,7 +582,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
*
* @return True when pointer was set
*/
-bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
+bool FuDraw::SetPointer(const SdrObject* pObj, const Point& rPos)
{
bool bImageMapInfo = SvxIMapInfo::GetIMapInfo(pObj) != nullptr;
@@ -728,7 +728,7 @@ bool FuDraw::RequestHelp(const HelpEvent& rHEvt)
return bReturn;
}
-bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewEvent& rVEvt)
+bool FuDraw::SetHelpText(const SdrObject* pObj, const Point& rPosPixel, const SdrViewEvent& rVEvt)
{
OUString aHelpText;
Point aPos(mpWindow->PixelToLogic(mpWindow->ScreenToOutputPixel(rPosPixel)));
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index ae543ff9464f..22db66ea7189 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -193,7 +193,7 @@ void MergePageBackgroundFilling(SdPage *pPage, SdStyleSheet *pStyleSheet, bool b
}
}
-const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, SfxRequest& rReq)
+const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& rReq)
{
if (!mpDrawViewShell)
return nullptr;
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index a61e21a04d79..b425727b67af 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1193,7 +1193,7 @@ void FuSelection::SetEditMode(sal_uInt16 nMode)
/**
* Execute ImageMap interaction
*/
-bool FuSelection::HandleImageMapClick(SdrObject* pObj, const Point& rPos)
+bool FuSelection::HandleImageMapClick(const SdrObject* pObj, const Point& rPos)
{
bool bClosed = pObj->IsClosedObj();
bool bFilled = false;
diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
index a1c221c0c369..17ad513fe782 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
@@ -187,7 +187,7 @@ private:
@return sal_True, if the object is disposed or in the course
of being disposed. Otherwise, sal_False is returned.
*/
- bool IsDisposed();
+ bool IsDisposed() const;
};
} // end of namespace ::accessibility
diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx b/sd/source/ui/inc/BulletAndPositionDlg.hxx
index d6c38825111d..c3af3b08de85 100644
--- a/sd/source/ui/inc/BulletAndPositionDlg.hxx
+++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx
@@ -143,12 +143,12 @@ class SvxBulletAndPositionDlg : public weld::GenericDialogController
void SetAlignmentHdl_Impl(SvxAdjust);
public:
- SvxBulletAndPositionDlg(weld::Window* pWindow, const SfxItemSet& rSet, ::sd::View* pView);
+ SvxBulletAndPositionDlg(weld::Window* pWindow, const SfxItemSet& rSet, const ::sd::View* pView);
virtual ~SvxBulletAndPositionDlg() override;
SfxItemSet* GetOutputItemSet(SfxItemSet* rSet);
- bool IsApplyToMaster();
- bool IsSlideScope();
+ bool IsApplyToMaster() const;
+ bool IsSlideScope() const;
void Reset(const SfxItemSet* rSet);
void SetCharFmts(const OUString& rNumName, const OUString& rBulletName)
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index a6ea91272d1a..a96f3ec15e22 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -116,8 +116,8 @@ public:
virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) override;
virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin) override;
virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin) override;
- bool IsMouseButtonDown() { return mbMouseButtonDown; }
- bool IsMouseSelecting() { return mbMouseSelecting; }
+ bool IsMouseButtonDown() const { return mbMouseButtonDown; }
+ bool IsMouseSelecting() const { return mbMouseSelecting; }
virtual void Resize() override;
@@ -231,9 +231,9 @@ public:
virtual bool PrepareClose( bool bUI = true ) override;
- PageKind GetPageKind() { return mePageKind; }
+ PageKind GetPageKind() const { return mePageKind; }
void SetPageKind( PageKind ePageKind ) { mePageKind = ePageKind; }
- const Point& GetMousePos() { return maMousePos; }
+ const Point& GetMousePos() const { return maMousePos; }
void SetMousePosFreezed( bool bIn ) { mbMousePosFreezed = bIn; }
EditMode GetEditMode() const { return meEditMode; }
@@ -270,7 +270,7 @@ public:
virtual bool ActivateObject(SdrOle2Obj* pObj, long nVerb) override;
void SetZoomOnPage( bool bZoom ) { mbZoomOnPage = bZoom; }
- bool IsZoomOnPage() { return mbZoomOnPage; }
+ bool IsZoomOnPage() const { return mbZoomOnPage; }
static void CheckLineTo (SfxRequest& rReq);
void SetChildWindowState( SfxItemSet& rSet );
@@ -280,7 +280,7 @@ public:
void UnlockInput();
bool IsInputLocked() const { return mnLockCount > 0; }
- sal_uInt16 GetCurPagePos() { return maTabControl->GetCurPagePos(); }
+ sal_uInt16 GetCurPagePos() const { return maTabControl->GetCurPagePos(); }
/** Show controls of the UI or hide them, depending on the given flag.
Do not call this method directly. Call the method at ViewShellBase
@@ -374,7 +374,7 @@ public:
OUString const & GetSidebarContextName() const;
- bool IsInSwitchPage() { return mbIsInSwitchPage; }
+ bool IsInSwitchPage() const { return mbIsInSwitchPage; }
//move this method to ViewShell.
//void NotifyAccUpdate();
diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx
index 582be882d613..0f45db761a74 100644
--- a/sd/source/ui/inc/FrameView.hxx
+++ b/sd/source/ui/inc/FrameView.hxx
@@ -47,25 +47,25 @@ public:
void SetStandardHelpLines(const SdrHelpLineList& rHelpLines)
{ maStandardHelpLines = rHelpLines; }
- const SdrHelpLineList& GetStandardHelpLines() { return maStandardHelpLines; }
+ const SdrHelpLineList& GetStandardHelpLines() const { return maStandardHelpLines; }
void SetNotesHelpLines(const SdrHelpLineList& rHelpLines)
{ maNotesHelpLines = rHelpLines; }
- const SdrHelpLineList& GetNotesHelpLines() { return maNotesHelpLines; }
+ const SdrHelpLineList& GetNotesHelpLines() const { return maNotesHelpLines; }
void SetHandoutHelpLines(const SdrHelpLineList& rHelpLines)
{ maHandoutHelpLines = rHelpLines; }
- const SdrHelpLineList& GetHandoutHelpLines() { return maHandoutHelpLines; }
+ const SdrHelpLineList& GetHandoutHelpLines() const { return maHandoutHelpLines; }
void SetVisibleLayers(const SdrLayerIDSet& rVisibleLayers)
{ maVisibleLayers = rVisibleLayers; }
- const SdrLayerIDSet& GetVisibleLayers() { return maVisibleLayers; }
+ const SdrLayerIDSet& GetVisibleLayers() const { return maVisibleLayers; }
void SetLockedLayers(const SdrLayerIDSet& rLockedLayers)
{ maLockedLayers = rLockedLayers; }
- const SdrLayerIDSet& GetLockedLayers() { return maLockedLayers; }
+ const SdrLayerIDSet& GetLockedLayers() const { return maLockedLayers; }
void SetPrintableLayers(const SdrLayerIDSet& rPrintableLayers)
{ maPrintableLayers = rPrintableLayers; }
- const SdrLayerIDSet& GetPrintableLayers() { return maPrintableLayers; }
+ const SdrLayerIDSet& GetPrintableLayers() const { return maPrintableLayers; }
void SetRuler(const bool bRulerOn)
{ mbRuler = bRulerOn; }
@@ -81,7 +81,7 @@ public:
void SetVisArea(const ::tools::Rectangle& rVisArea)
{ maVisArea = rVisArea; }
- const ::tools::Rectangle& GetVisArea() { return maVisArea; }
+ const ::tools::Rectangle& GetVisArea() const { return maVisArea; }
void SetPageKind(PageKind eKind) { mePageKind = eKind; }
PageKind GetPageKind() const { return mePageKind; }
@@ -104,7 +104,7 @@ public:
sal_uInt16 GetSelectedPageOnLoad () const { return mnSelectedPageOnLoad; }
void SetViewShEditMode(EditMode eMode);
- EditMode GetViewShEditMode ();
+ EditMode GetViewShEditMode () const;
/** Remember the edit mode of the main view shell at the time when the
document is loaded.
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index c9151846efcf..67d7647b8d5e 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -105,7 +105,7 @@ public:
DECL_LINK( EndDropHdl, EditView*, void );
DECL_LINK( PaintingFirstLineHdl, PaintFirstLineInfo*, void );
- sal_uLong GetPaperWidth() { return mnPaperWidth;}
+ sal_uLong GetPaperWidth() const { return mnPaperWidth;}
void PrepareClose();
diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx
index d06519a40d00..414febe61ef8 100644
--- a/sd/source/ui/inc/SdUnoDrawView.hxx
+++ b/sd/source/ui/inc/SdUnoDrawView.hxx
@@ -85,7 +85,7 @@ public:
The returned value may be empty when the internal state of this
view is not valid (like during destruction.)
*/
- css::uno::Reference< css::drawing::XLayer> getActiveLayer();
+ css::uno::Reference< css::drawing::XLayer> getActiveLayer() const;
private:
bool getMasterPageMode() const throw();
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 029a23f07d2c..119c7848424c 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -217,7 +217,7 @@ public:
SdPage* GetPage();
SdrObject* GetSelectedSingleObject(SdPage const * pPage);
void SetAuthor(const OUString& rAuthor) { m_sAuthor = rAuthor; }
- const OUString& GetAuthor() { return m_sAuthor; }
+ const OUString& GetAuthor() const { return m_sAuthor; }
protected:
DECL_LINK( OnParagraphInsertedHdl, ::Outliner::ParagraphHdlParam, void );
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 70f650a5355a..d446cef7996c 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -187,7 +187,7 @@ public:
const SfxPoolItem* GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& nNumItemId);
- bool HasRuler() { return mbHasRulers;}
+ bool HasRuler() const { return mbHasRulers;}
void SetRuler(bool bRuler);
// Hides horizontal, vertical scrollbar as well as scrollbox
void SetScrollBarsVisible(bool bVisible);
@@ -248,7 +248,7 @@ public:
bool HasOldFunction() const { return mxOldFunction.is(); }
const rtl::Reference<FuPoor>& GetCurrentFunction() const { return mxCurrentFunction; }
bool HasCurrentFunction( sal_uInt16 nSID ) { return mxCurrentFunction.is() && (mxCurrentFunction->GetSlotID() == nSID ); }
- bool HasCurrentFunction() { return mxCurrentFunction.is(); }
+ bool HasCurrentFunction() const { return mxCurrentFunction.is(); }
void SetCurrentFunction(const rtl::Reference<FuPoor>& xFunction);
void SetOldFunction(const rtl::Reference<FuPoor>& xFunction);
@@ -413,7 +413,7 @@ public:
/// Allows adjusting the point or mark of the selection to a document coordinate.
void SetCursorMm100Position(const Point& rPosition, bool bPoint, bool bClearMark);
/// Gets the current selection
- css::uno::Reference<css::datatransfer::XTransferable> GetSelectionTransferrable();
+ css::uno::Reference<css::datatransfer::XTransferable> GetSelectionTransferrable() const;
/// Allows starting or ending a graphic move or resize action.
void SetGraphicMm100Position(bool bStart, const Point& rPosition);
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 478d28231a50..4e4871186d3c 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -189,7 +189,7 @@ public:
events from various sources. This method must not be called before
LateInit() has terminated.
*/
- std::shared_ptr<tools::EventMultiplexer> const & GetEventMultiplexer();
+ std::shared_ptr<tools::EventMultiplexer> const & GetEventMultiplexer() const;
/** returns the complete area of the current view relative to the frame
window
@@ -235,7 +235,7 @@ private:
we check that the right type is active and change again if that is
not the case because something went wrong.
*/
- OUString GetInitialViewShellType();
+ OUString GetInitialViewShellType() const;
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx
index 77dfc3ea0ded..89fbe2ddf87e 100644
--- a/sd/source/ui/inc/ViewShellImplementation.hxx
+++ b/sd/source/ui/inc/ViewShellImplementation.hxx
@@ -133,7 +133,7 @@ public:
configuration that has in the center pane a view shell of the same
type as mrViewShell.
*/
- SfxInterfaceId GetViewId();
+ SfxInterfaceId GetViewId() const;
/** Return a pointer to the image map dialog that is displayed in some
child window.
diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx
index 4d205fb88dc0..92b8296a208f 100644
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@@ -123,7 +123,7 @@ public:
To be on the safe side wait for this control to become visible and
the call this method again.
*/
- int GetHeight();
+ int GetHeight() const;
void AddTabBarButton (
const css::drawing::framework::TabBarButton& rButton,
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 67251c2bae54..f7439d7336e0 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -126,16 +126,16 @@ public:
void UpdateMapMode();
- double GetVisibleX(); // interface for ScrollBars
- double GetVisibleY();
+ double GetVisibleX() const; // interface for ScrollBars
+ double GetVisibleY() const;
void SetVisibleXY(double fX, double fY);
- double GetVisibleWidth();
- double GetVisibleHeight();
+ double GetVisibleWidth() const;
+ double GetVisibleHeight() const;
Point GetVisibleCenter();
- double GetScrlLineWidth();
- double GetScrlLineHeight();
- double GetScrlPageWidth();
- double GetScrlPageHeight();
+ double GetScrlLineWidth() const;
+ double GetScrlLineHeight() const;
+ double GetScrlPageWidth() const;
+ double GetScrlPageHeight() const;
void GrabFocus();
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx
index c8bc7c526945..b15b0f864cfa 100644
--- a/sd/source/ui/inc/dlgfield.hxx
+++ b/sd/source/ui/inc/dlgfield.hxx
@@ -51,7 +51,7 @@ public:
virtual ~SdModifyFieldDlg() override;
SvxFieldData* GetField();
- SfxItemSet GetItemSet();
+ SfxItemSet GetItemSet() const;
};
#endif // INCLUDED_SD_SOURCE_UI_INC_DLGFIELD_HXX
diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx
index 3e410c1422c0..2d41de1af250 100644
--- a/sd/source/ui/inc/drawview.hxx
+++ b/sd/source/ui/inc/drawview.hxx
@@ -44,7 +44,7 @@ public:
void CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr) override;
virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false, bool bSlide = false, bool bMaster = false) override;
- void SetMasterAttributes(SdrObject* pObject, SdPage& rPage, SfxItemSet rSet, SfxStyleSheetBasePool* pStShPool, bool& bOk, bool bMaster, bool bSlide);
+ void SetMasterAttributes(SdrObject* pObject, const SdPage& rPage, SfxItemSet rSet, SfxStyleSheetBasePool* pStShPool, bool& bOk, bool bMaster, bool bSlide);
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
diff --git a/sd/source/ui/inc/filedlg.hxx b/sd/source/ui/inc/filedlg.hxx
index 84f284a2e7e8..48c89e95cf6e 100644
--- a/sd/source/ui/inc/filedlg.hxx
+++ b/sd/source/ui/inc/filedlg.hxx
@@ -52,7 +52,7 @@ public:
OUString GetPath() const;
void SetPath( const OUString& rPath );
// WIP, please don't remove, dear Clang plugins
- bool IsInsertAsLinkSelected();
+ bool IsInsertAsLinkSelected() const;
};
#endif // INCLUDED_SD_SOURCE_UI_INC_FILEDLG_HXX
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 20d7d0c9149a..ece9b4c35511 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -157,7 +157,7 @@ public:
@return
When the object has already been disposed then <FALSE/> is returned.
*/
- bool IsValid();
+ bool IsValid() const;
/** Return a pointer to the view shell that is displayed in the
specified pane. See GetView() for a variant that returns a
diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
index cea58ad4d9df..8e8c5bd3ec37 100644
--- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx
+++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
@@ -77,7 +77,7 @@ public:
to obtain a pointer to the wrapped ViewShell object for a given
XView object.
*/
- const ::std::shared_ptr<ViewShell>& GetViewShell() { return mpViewShell;}
+ const ::std::shared_ptr<ViewShell>& GetViewShell() const { return mpViewShell;}
// XUnoTunnel
diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx
index 907ebebfa930..36bd2c1b95ea 100644
--- a/sd/source/ui/inc/fuconbez.hxx
+++ b/sd/source/ui/inc/fuconbez.hxx
@@ -45,7 +45,7 @@ public:
virtual void SelectionHasChanged() override;
void SetEditMode(sal_uInt16 nMode);
- sal_uInt16 GetEditMode() { return nEditMode; }
+ sal_uInt16 GetEditMode() const { return nEditMode; }
/**
* set attribute for the object to be created
diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx
index be03ee4fc04b..8f99a84f290b 100644
--- a/sd/source/ui/inc/fudraw.hxx
+++ b/sd/source/ui/inc/fudraw.hxx
@@ -47,8 +47,8 @@ public:
virtual void DoubleClick(const MouseEvent& rMEvt);
- bool SetPointer(SdrObject* pObj, const Point& rPos);
- bool SetHelpText(SdrObject* pObj, const Point& rPos, const SdrViewEvent& rVEvt);
+ bool SetPointer(const SdrObject* pObj, const Point& rPos);
+ bool SetHelpText(const SdrObject* pObj, const Point& rPos, const SdrViewEvent& rVEvt);
void SetPermanent(bool bSet) { bPermanent = bSet; }
diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx
index a17ce7b1adc5..ba64d65d46be 100644
--- a/sd/source/ui/inc/fupage.hxx
+++ b/sd/source/ui/inc/fupage.hxx
@@ -42,7 +42,7 @@ class FuPage
virtual void Activate() override;
virtual void Deactivate() override;
- const SfxItemSet* ExecuteDialog(weld::Window* pParent, SfxRequest& rReq);
+ const SfxItemSet* ExecuteDialog(weld::Window* pParent, const SfxRequest& rReq);
protected:
virtual ~FuPage() override;
diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx
index 02922b0deaad..0a1ffc073137 100644
--- a/sd/source/ui/inc/fusel.hxx
+++ b/sd/source/ui/inc/fusel.hxx
@@ -48,9 +48,9 @@ public:
virtual void SelectionHasChanged() override;
void SetEditMode(sal_uInt16 nMode);
- sal_uInt16 GetEditMode() { return nEditMode; }
+ sal_uInt16 GetEditMode() const { return nEditMode; }
- bool HandleImageMapClick(SdrObject* pObj, const Point& rPos);
+ bool HandleImageMapClick(const SdrObject* pObj, const Point& rPos);
/** is called when the current function should be aborted. <p>
This is used when a function gets a KEY_ESCAPE but can also
diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx
index 425980093027..8c96a47821b6 100644
--- a/sd/source/ui/inc/inspagob.hxx
+++ b/sd/source/ui/inc/inspagob.hxx
@@ -51,7 +51,7 @@ public:
std::vector<OUString> GetList ( const sal_uInt16 nType ) ;
- bool IsLink();
+ bool IsLink() const;
bool IsRemoveUnnessesaryMasterPages() const;
};
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 3febf4d9eaed..b01bbe12aa9f 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -64,8 +64,8 @@ public:
{
}
- bool HasName() { return bName; }
- bool IsActive() { return bActive; }
+ bool HasName() const { return bName; }
+ bool IsActive() const { return bActive; }
void SetName( bool bOn ) { bName = bOn; }
void SetActive( bool bOn ) { bActive = bOn; }
@@ -102,7 +102,7 @@ public:
bool InsertFile(const OUString& rFileName);
NavigatorDragType GetNavigatorDragType();
- VclPtr<SdPageObjsTLB> const & GetObjects();
+ VclPtr<SdPageObjsTLB> const & GetObjects() const;
protected:
virtual bool EventNotify(NotifyEvent& rNEvt) override;
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index f4c62ba1f207..f6e8b9681ec7 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -203,7 +203,7 @@ public:
const OUString& rListName);
bool HasSelectedChildren( const OUString& rName );
bool SelectEntry( const OUString& rName );
- OUString GetSelectedEntry();
+ OUString GetSelectedEntry() const;
//Mark Current Entry
void SetSdNavigator(SdNavigatorWin* pNavigator);
@@ -434,7 +434,7 @@ public:
SdrObject* pShape,
const OUString& rsName,
const bool bIsExcluded,
- weld::TreeIter* pParentEntry);
+ const weld::TreeIter* pParentEntry);
/** return selected entries
nDepth == 0 -> pages
@@ -451,7 +451,7 @@ public:
m_xTreeView->insert(nullptr, -1, &rName, nullptr, nullptr, nullptr, &rExpander, false, nullptr);
}
- void InsertEntry(weld::TreeIter* pParent, const OUString& rId, const OUString &rName, const OUString &rExpander, weld::TreeIter* pEntry = nullptr)
+ void InsertEntry(const weld::TreeIter* pParent, const OUString& rId, const OUString &rName, const OUString &rExpander, weld::TreeIter* pEntry = nullptr)
{
m_xTreeView->insert(pParent, -1, &rName, &rId, nullptr, nullptr, &rExpander, false, pEntry);
}
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 8cb23749ec2e..588e6e20b23f 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -152,10 +152,10 @@ public:
bool longpress(const CommandLongPressData& rLongPressData);
// settings
- bool isFullScreen(); // a.k.a. FuSlideShow::IsFullScreen()
+ bool isFullScreen() const; // a.k.a. FuSlideShow::IsFullScreen()
OutputDevice* getShowWindow(); // a.k.a. FuSlideShow::GetShowWindow()
- int getAnimationMode(); // a.k.a. FuSlideShow::GetAnimationMode()
- sal_Int32 getCurrentPageNumber(); // a.k.a. FuSlideShow::GetCurrentPage()
+ int getAnimationMode() const; // a.k.a. FuSlideShow::GetAnimationMode()
+ sal_Int32 getCurrentPageNumber() const; // a.k.a. FuSlideShow::GetCurrentPage()
// events
void resize( const Size &rSize );
diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx
index c0fdbb6453f4..1607e3779ead 100644
--- a/sd/source/ui/inc/unopage.hxx
+++ b/sd/source/ui/inc/unopage.hxx
@@ -96,7 +96,7 @@ public:
virtual ~SdGenericDrawPage() throw() override;
// intern
- bool isValid() { return (SvxDrawPage::mpPage != nullptr) && (mpModel != nullptr); }
+ bool isValid() const { return (SvxDrawPage::mpPage != nullptr) && (mpModel != nullptr); }
SdPage* GetPage() const { return static_cast<SdPage*>(SvxDrawPage::mpPage); }
SdXImpressDocument* GetModel() const;
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 6bd9b5b97b09..17f7c2655e60 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -217,7 +217,7 @@ void LayoutMenu::Dispose()
GetParent()->RemoveEventListener(aWindowEventHandlerLink);
}
-AutoLayout LayoutMenu::GetSelectedAutoLayout()
+AutoLayout LayoutMenu::GetSelectedAutoLayout() const
{
AutoLayout aResult = AUTOLAYOUT_NONE;
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index bdd8217663db..fabf89b6664e 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -69,7 +69,7 @@ public:
/** Return a numerical value representing the currently selected
layout.
*/
- AutoLayout GetSelectedAutoLayout();
+ AutoLayout GetSelectedAutoLayout() const;
// From ILayoutableWindow
virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) override;
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 59aa218d1c6c..1076cb88ac07 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -908,7 +908,7 @@ OutputDevice* SlideShow::getShowWindow()
return mxController.is() ? mxController->mpShowWindow.get() : nullptr;
}
-int SlideShow::getAnimationMode()
+int SlideShow::getAnimationMode() const
{
return mxController.is() ? mxController->meAnimationMode : ANIMATIONMODE_SHOW;
}
@@ -925,7 +925,7 @@ void SlideShow::jumpToPageNumber( sal_Int32 nPageNumber )
mxController->displaySlideNumber( nPageNumber );
}
-sal_Int32 SlideShow::getCurrentPageNumber()
+sal_Int32 SlideShow::getCurrentPageNumber() const
{
return mxController.is() ? mxController->getCurrentSlideNumber() : 0;
}
@@ -936,7 +936,7 @@ void SlideShow::jumpToBookmark( const OUString& sBookmark )
mxController->jumpToBookmark( sBookmark );
}
-bool SlideShow::isFullScreen()
+bool SlideShow::isFullScreen() const
{
return mxController.is() && mxController->maPresSettings.mbFullScreen;
}
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 1a58f304c20d..13904969f8e8 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1617,7 +1617,7 @@ void SlideshowImpl::jumpToBookmark( const OUString& sBookmark )
displaySlideNumber( nSlideNumber );
}
-sal_Int32 SlideshowImpl::getCurrentSlideNumber()
+sal_Int32 SlideshowImpl::getCurrentSlideNumber() const
{
return mpSlideController.get() ? mpSlideController->getCurrentSlideNumber() : -1;
}
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index a696064c6836..43a3823f7897 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -230,7 +230,7 @@ private:
void displaySlideNumber( sal_Int32 nSlide );
void displaySlideIndex( sal_Int32 nIndex );
- sal_Int32 getCurrentSlideNumber();
+ sal_Int32 getCurrentSlideNumber() const;
bool isInputFreezed() const { return mbInputFreeze; }
void jumpToBookmark( const OUString& sBookmark );
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
index 5d52bb245d51..e1a2554b4c26 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
@@ -80,7 +80,7 @@ public:
/** Return the memory size that is occupied by all non-precious bitmaps
in the cache.
*/
- sal_Int32 GetSize() { return mnNormalCacheSize;}
+ sal_Int32 GetSize() const { return mnNormalCacheSize;}
/** Return <TRUE/> when a preview bitmap exists for the given key.
*/
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index b466c86f2e71..0d1c019229e9 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -708,7 +708,7 @@ rtl::Reference<FuPoor> SlideSorterController::CreateSelectionFunction (SfxReques
return xFunc;
}
-::rtl::Reference<SelectionFunction> SlideSorterController::GetCurrentSelectionFunction()
+::rtl::Reference<SelectionFunction> SlideSorterController::GetCurrentSelectionFunction() const
{
rtl::Reference<FuPoor> pFunction (mrSlideSorter.GetViewShell()->GetCurrentFunction());
return ::rtl::Reference<SelectionFunction>(dynamic_cast<SelectionFunction*>(pFunction.get()));
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index 3c716795817b..d6ed54ad5d33 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -45,7 +45,7 @@ public:
animation is marked as expired to prevent another run.
*/
void Expire();
- bool IsExpired() { return mbIsExpired;}
+ bool IsExpired() const { return mbIsExpired;}
Animator::AnimationFunctor const maAnimation;
Animator::FinishFunctor const maFinishFunctor;
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index a12bcca4961a..cd43dd1b467f 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1178,7 +1178,7 @@ void SlotManager::ChangeSlideExclusionState (
mrSlideSorter.GetModel().GetDocument()->SetChanged();
}
-sal_Int32 SlotManager::GetInsertionPosition()
+sal_Int32 SlotManager::GetInsertionPosition() const
{
PageSelector& rSelector (mrSlideSorter.GetController().GetPageSelector());
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index bd23def8abd5..18cdb920ba39 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -188,7 +188,7 @@ public:
selection function then return a reference to it. Otherwise return
an empty reference.
*/
- ::rtl::Reference<SelectionFunction> GetCurrentSelectionFunction();
+ ::rtl::Reference<SelectionFunction> GetCurrentSelectionFunction() const;
/** Prepare for a change of the edit mode. Depending on the current
edit mode we may save the selection so that it can be restored when
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
index 58d25f017984..f2b2cdc9258e 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
@@ -72,7 +72,7 @@ public:
/** Return the page descriptor for the current slide. Note, that when
there is no current slide then the returned pointer is empty.
*/
- const model::SharedPageDescriptor& GetCurrentSlide() { return mpCurrentSlide;}
+ const model::SharedPageDescriptor& GetCurrentSlide() const { return mpCurrentSlide;}
/** Release all references to model data.
*/
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
index c2e58ce62e12..d5078bcfbedc 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
@@ -92,7 +92,7 @@ private:
/** Use one of several ways to determine where to insert a new page.
This can be the current selection or the insertion indicator.
*/
- sal_Int32 GetInsertionPosition();
+ sal_Int32 GetInsertionPosition() const;
};
} } } // end of namespace ::sd::slidesorter::controller
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index e1444a586831..26b61e12e5c2 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -79,7 +79,7 @@ public:
void RequestRepaint (const ::tools::Rectangle& rRepaintBox);
void RequestRepaint (const vcl::Region& rRepaintRegion);
- ::tools::Rectangle GetModelArea();
+ ::tools::Rectangle GetModelArea() const;
/** Return the index of the page that is rendered at the given position.
@param rPosition
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 3b9298f9d803..32a8e8c2bc6b 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -547,7 +547,7 @@ void SlideSorterView::RequestRepaint (const vcl::Region& rRepaintRegion)
}
}
-::tools::Rectangle SlideSorterView::GetModelArea()
+::tools::Rectangle SlideSorterView::GetModelArea() const
{
return mpLayouter->GetTotalBoundingBox();
}
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index 46b9c4876a9f..c880b0b4d1df 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -92,7 +92,7 @@ void SdUnoDrawView::setLayerMode (bool bLayerMode) throw()
}
}
-Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer()
+Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer() const
{
Reference<drawing::XLayer> xCurrentLayer;
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 55328b79d051..30fe413e5d83 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1231,7 +1231,7 @@ public:
/** Return the number of pages that are to be printed.
*/
- sal_Int32 GetPrintPageCount()
+ sal_Int32 GetPrintPageCount() const
{
OSL_ASSERT(!mbIsDisposed);
if (mbIsDisposed)
@@ -1243,7 +1243,7 @@ public:
/** Return a sequence of properties that can be returned by the
XRenderable::getRenderer() method.
*/
- css::uno::Sequence<css::beans::PropertyValue> GetProperties ()
+ css::uno::Sequence<css::beans::PropertyValue> GetProperties () const
{
css::uno::Sequence<css::beans::PropertyValue> aProperties (3);
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 04a239c0d270..56e0a89a9c6d 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1427,7 +1427,7 @@ void SdOutliner::EnterEditMode (bool bGrabFocus)
mbFoundObject = true;
}
-ESelection SdOutliner::GetSearchStartPosition()
+ESelection SdOutliner::GetSearchStartPosition() const
{
ESelection aPosition;
if (mbDirectionIsForward)
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 5da8d9c9219d..89ee4c17138e 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -147,7 +147,7 @@ public:
void ShowViewTabBar (bool bShow);
void SetUserWantsTabBar(bool inValue);
- bool GetUserWantsTabBar() { return mbUserWantsTabBar; }
+ bool GetUserWantsTabBar() const { return mbUserWantsTabBar; }
/** Common code of ViewShellBase::OuterResizePixel() and
ViewShellBase::InnerResizePixel().
@@ -851,7 +851,7 @@ void ViewShellBase::ShowUIControls (bool bVisible)
Rearrange();
}
-OUString ViewShellBase::GetInitialViewShellType()
+OUString ViewShellBase::GetInitialViewShellType() const
{
OUString sRequestedView (FrameworkHelper::msImpressViewURL);
@@ -910,7 +910,7 @@ OUString ViewShellBase::GetInitialViewShellType()
return sRequestedView;
}
-std::shared_ptr<tools::EventMultiplexer> const & ViewShellBase::GetEventMultiplexer()
+std::shared_ptr<tools::EventMultiplexer> const & ViewShellBase::GetEventMultiplexer() const
{
OSL_ASSERT(mpImpl != nullptr);
OSL_ASSERT(mpImpl->mpEventMultiplexer != nullptr);
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 284c71b94ac2..a8f3be88994a 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -273,7 +273,7 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest const & rRequest, Page
ProcessModifyPageSlot( aRequest, pPage, pPage->GetPageKind());
}
-SfxInterfaceId ViewShell::Implementation::GetViewId()
+SfxInterfaceId ViewShell::Implementation::GetViewId() const
{
switch (mrViewShell.GetShellType())
{
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 36e10e6ce37a..0a8fc750510b 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -372,7 +372,7 @@ bool ViewTabBar::ActivatePage()
return false;
}
-int ViewTabBar::GetHeight()
+int ViewTabBar::GetHeight() const
{
int nHeight (0);
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 7956b6241ed1..2c1a4e676c33 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -292,7 +292,7 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
return bOk;
}
-void DrawView::SetMasterAttributes( SdrObject* pObject, SdPage& rPage, SfxItemSet rSet, SfxStyleSheetBasePool* pStShPool, bool& bOk, bool bMaster, bool bSlide )
+void DrawView::SetMasterAttributes( SdrObject* pObject, const SdPage& rPage, SfxItemSet rSet, SfxStyleSheetBasePool* pStShPool, bool& bOk, bool bMaster, bool bSlide )
{
SdrInventor nInv = pObject->GetObjInventor();
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index ea2a4147d533..0928056174de 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -297,7 +297,7 @@ public:
: ClassificationCommon(rDrawViewShell)
{}
- std::vector<svx::ClassificationResult> const & getResults()
+ std::vector<svx::ClassificationResult> const & getResults() const
{
return m_aResults;
}
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 2e1d5b755883..e78fcbda7a6f 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -329,7 +329,7 @@ void FrameView::SetViewShEditMode(EditMode eMode)
/**
* Return EditMode (Page or MasterPage) of working mode
*/
-EditMode FrameView::GetViewShEditMode()
+EditMode FrameView::GetViewShEditMode() const
{
return mePageEditMode;
}
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 35448c4a623e..118f1545b186 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -624,7 +624,7 @@ void Window::UpdateMapMode()
* @returns X position of the visible area as fraction (< 1) of the whole
* working area.
*/
-double Window::GetVisibleX()
+double Window::GetVisibleX() const
{
return (static_cast<double>(maWinPos.X()) / maViewSize.Width());
}
@@ -633,7 +633,7 @@ double Window::GetVisibleX()
* @returns Y position of the visible area as fraction (< 1) of the whole
* working area.
*/
-double Window::GetVisibleY()
+double Window::GetVisibleY() const
{
return (static_cast<double>(maWinPos.Y()) / maViewSize.Height());
}
@@ -660,7 +660,7 @@ void Window::SetVisibleXY(double fX, double fY)
* @returns width of the visible area in proportion to the width of the whole
* working area.
*/
-double Window::GetVisibleWidth()
+double Window::GetVisibleWidth() const
{
Size aWinSize = PixelToLogic(GetOutputSizePixel());
if ( aWinSize.Width() > maViewSize.Width() )
@@ -672,7 +672,7 @@ double Window::GetVisibleWidth()
* @returns height of the visible area in proportion to the height of the whole
* working area.
*/
-double Window::GetVisibleHeight()
+double Window::GetVisibleHeight() const
{
Size aWinSize = PixelToLogic(GetOutputSizePixel());
if ( aWinSize.Height() > maViewSize.Height() )
@@ -697,7 +697,7 @@ Point Window::GetVisibleCenter()
* @returns width of a scroll column in proportion to the width of the whole
* working area.
*/
-double Window::GetScrlLineWidth()
+double Window::GetScrlLineWidth() const
{
return (GetVisibleWidth() * SCROLL_LINE_FACT);
}
@@ -706,7 +706,7 @@ double Window::GetScrlLineWidth()
* @returns height of a scroll column in proportion to the height of the whole
* working area.
*/
-double Window::GetScrlLineHeight()
+double Window::GetScrlLineHeight() const
{
return (GetVisibleHeight() * SCROLL_LINE_FACT);
}
@@ -715,7 +715,7 @@ double Window::GetScrlLineHeight()
* @returns width of a scroll page in proportion to the width of the whole
* working area.
*/
-double Window::GetScrlPageWidth()
+double Window::GetScrlPageWidth() const
{
return (GetVisibleWidth() * SCROLL_PAGE_FACT);
}
@@ -724,7 +724,7 @@ double Window::GetScrlPageWidth()
* @returns height of a scroll page in proportion to the height of the whole
* working area.
*/
-double Window::GetScrlPageHeight()
+double Window::GetScrlPageHeight() const
{
return (GetVisibleHeight() * SCROLL_PAGE_FACT);
}
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index d2101ec67f3e..45a775aa3375 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -518,7 +518,7 @@ void ViewShell::SetCursorMm100Position(const Point& rPosition, bool bPoint, bool
}
}
-uno::Reference<datatransfer::XTransferable> ViewShell::GetSelectionTransferrable()
+uno::Reference<datatransfer::XTransferable> ViewShell::GetSelectionTransferrable() const
{
SdrView* pSdrView = GetView();
if (!pSdrView)
More information about the Libreoffice-commits
mailing list