diff options
32 files changed, 54 insertions, 54 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 0d94f67cea11..a05da99d47a6 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -715,7 +715,7 @@ std::string extractPrivateKey(const std::string & privateKey) return privateKey.substr(pos1, pos2); } -OUString lcl_getCurrentDocumentMimeType(LibLODocument_Impl* pDocument) +OUString lcl_getCurrentDocumentMimeType(const LibLODocument_Impl* pDocument) { SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(pDocument->mxComponent.get()); if (!pBaseModel) diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index b599856e123f..df0c6693b9bd 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -27,7 +27,7 @@ namespace pcr using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; - OPropertyBrowserView::OPropertyBrowserView(css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Builder& rBuilder) + OPropertyBrowserView::OPropertyBrowserView(const css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Builder& rBuilder) : m_xPropBox(new OPropertyEditor(rContext, rBuilder)) , m_nActivePage(0) { diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index ac2042b84b10..9ac3de1480b6 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -35,7 +35,7 @@ namespace pcr Link<LinkParamNone*,void> m_aPageActivationHandler; public: - explicit OPropertyBrowserView(css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Builder& rBuilder); + explicit OPropertyBrowserView(const css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Builder& rBuilder); ~OPropertyBrowserView(); OPropertyEditor& getPropertyBox() { return *m_xPropBox; } diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 809279330ae8..1b546c40fa66 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -207,7 +207,7 @@ namespace pcr extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* extensions_propctrlr_DefaultFormComponentInspectorModel_get_implementation( - css::uno::XComponentContext* context , css::uno::Sequence<css::uno::Any> const&) + const css::uno::XComponentContext* context , css::uno::Sequence<css::uno::Any> const&) { return cppu::acquire(new pcr::DefaultFormComponentInspectorModel(context)); } diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 1fde39cedf6d..eb2d5f627d47 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -296,14 +296,14 @@ namespace pcr return std::unique_ptr<weld::Builder>(Application::CreateBuilder(rTunnel.getWidget(), rUIFile)); } - void PropertyHandlerHelper::setBuilderParent(css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Widget* pParent) + void PropertyHandlerHelper::setBuilderParent(const css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Widget* pParent) { Reference<css::container::XNameContainer> xName(rContext, UNO_QUERY_THROW); Reference<XWindow> xWindow(new weld::TransportAsXWindow(pParent)); xName->insertByName("BuilderParent", makeAny(xWindow)); } - void PropertyHandlerHelper::clearBuilderParent(css::uno::Reference<css::uno::XComponentContext>& rContext) + void PropertyHandlerHelper::clearBuilderParent(const css::uno::Reference<css::uno::XComponentContext>& rContext) { Reference<css::container::XNameContainer> xName(rContext, UNO_QUERY_THROW); xName->removeByName("BuilderParent"); diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index 127082536430..9e40dab0a79d 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -214,9 +214,9 @@ namespace pcr static std::unique_ptr<weld::Builder> makeBuilder(const OUString& rUIFile, const css::uno::Reference<css::uno::XComponentContext>& rContext); - static void setBuilderParent(css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Widget* pParent); + static void setBuilderParent(const css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Widget* pParent); - static void clearBuilderParent(css::uno::Reference<css::uno::XComponentContext>& rContext); + static void clearBuilderParent(const css::uno::Reference<css::uno::XComponentContext>& rContext); private: PropertyHandlerHelper( const PropertyHandlerHelper& ) = delete; diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 23a5d990adf2..36131848c403 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -31,7 +31,7 @@ namespace pcr using ::com::sun::star::inspection::XPropertyControl; using ::com::sun::star::uno::Reference; - OPropertyEditor::OPropertyEditor(css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Builder& rBuilder) + OPropertyEditor::OPropertyEditor(const css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Builder& rBuilder) : m_xContainer(rBuilder.weld_container("box")) , m_xTabControl(rBuilder.weld_notebook("tabcontrol")) , m_xControlHoldingParent(rBuilder.weld_container("controlparent")) // controls initially have this parent before they are moved diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 82a81ea2c7b0..6b20d6ce232e 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -66,7 +66,7 @@ namespace pcr std::map<sal_uInt16, PropertyPage> m_aHiddenPages; public: - explicit OPropertyEditor(css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Builder& rBuilder); + explicit OPropertyEditor(const css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Builder& rBuilder); ~OPropertyEditor(); void SetLineListener( IPropertyLineListener* ); diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 5790836fbb6d..7998d56754d0 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1348,7 +1348,7 @@ void SVGTextWriter::endTextPosition() mpTextPositionElem.reset(); } -bool SVGTextWriter::hasTextOpacity() { return !maTextOpacity.isEmpty(); } +bool SVGTextWriter::hasTextOpacity() const { return !maTextOpacity.isEmpty(); } void SVGTextWriter::implExportHyperlinkIds() { diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index d582a42c37af..b1c7954b7a21 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -253,7 +253,7 @@ class SVGTextWriter final void endTextParagraph(); void startTextPosition( bool bExportX = true, bool bExportY = true); void endTextPosition(); - bool hasTextOpacity(); + bool hasTextOpacity() const; void implExportHyperlinkIds(); void implWriteBulletChars(); template< typename MetaBitmapActionType > diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 6d0e900d13f2..13e5daebedec 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -136,10 +136,10 @@ class NavigatorTree : public ::cppu::BaseMutex ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pReportListener; ::rtl::Reference< comphelper::OSelectionChangeMultiplexer> m_pSelectionListener; - void insertEntry(const OUString& rName, weld::TreeIter* pParent, const OUString& rImageId, int nPosition, UserData* pData, weld::TreeIter& rRet); + void insertEntry(const OUString& rName, const weld::TreeIter* pParent, const OUString& rImageId, int nPosition, UserData* pData, weld::TreeIter& rRet); - void traverseSection(const uno::Reference<report::XSection>& xSection, weld::TreeIter* pParent, const OUString& rImageId, int nPosition = -1); - void traverseFunctions(const uno::Reference< report::XFunctions>& xFunctions, weld::TreeIter* pParent); + void traverseSection(const uno::Reference<report::XSection>& xSection, const weld::TreeIter* pParent, const OUString& rImageId, int nPosition = -1); + void traverseFunctions(const uno::Reference< report::XFunctions>& xFunctions, const weld::TreeIter* pParent); protected: // OSelectionChangeListener @@ -379,7 +379,7 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) m_pSelectionListener->unlock(); } -void NavigatorTree::insertEntry(const OUString& rName, weld::TreeIter* pParent, const OUString& rImageId, +void NavigatorTree::insertEntry(const OUString& rName, const weld::TreeIter* pParent, const OUString& rImageId, int nPosition, UserData* pData, weld::TreeIter& rRet) { OUString sId = pData ? OUString::number(reinterpret_cast<sal_Int64>(pData)) : OUString(); @@ -388,7 +388,7 @@ void NavigatorTree::insertEntry(const OUString& rName, weld::TreeIter* pParent, m_xTreeView->set_image(rRet, rImageId); } -void NavigatorTree::traverseSection(const uno::Reference<report::XSection>& xSection, weld::TreeIter* pParent, const OUString& rImageId, int nPosition) +void NavigatorTree::traverseSection(const uno::Reference<report::XSection>& xSection, const weld::TreeIter* pParent, const OUString& rImageId, int nPosition) { std::unique_ptr<weld::TreeIter> xSectionIter = m_xTreeView->make_iterator(); std::unique_ptr<weld::TreeIter> xScratch = m_xTreeView->make_iterator(); @@ -412,7 +412,7 @@ void NavigatorTree::traverseSection(const uno::Reference<report::XSection>& xSec } } -void NavigatorTree::traverseFunctions(const uno::Reference< report::XFunctions>& xFunctions, weld::TreeIter* pParent) +void NavigatorTree::traverseFunctions(const uno::Reference< report::XFunctions>& xFunctions, const weld::TreeIter* pParent) { std::unique_ptr<weld::TreeIter> xFunctionIter = m_xTreeView->make_iterator(); std::unique_ptr<weld::TreeIter> xScratch = m_xTreeView->make_iterator(); diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index d49140a6ea3f..adee254359e1 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -360,8 +360,8 @@ private: */ bool SearchAndReplaceOnce(std::vector<::sd::SearchSelection>* pSelections = nullptr); - void sendLOKSearchResultCallback(std::shared_ptr<sd::ViewShell>& pViewShell, - OutlinerView* pOutlinerView, + void sendLOKSearchResultCallback(const std::shared_ptr<sd::ViewShell>& pViewShell, + const OutlinerView* pOutlinerView, std::vector<sd::SearchSelection>* pSelections); /** Detect changes of the document or view and react accordingly. Such diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx index 5c3b876d6c66..082445e2ca28 100644 --- a/sd/inc/sddll.hxx +++ b/sd/inc/sddll.hxx @@ -40,7 +40,7 @@ class SD_DLLPUBLIC SdDLL final static void RegisterRemotes(); #endif static void RegisterFactorys(); - static void RegisterInterfaces(SdModule* pMod); + static void RegisterInterfaces(const SdModule* pMod); static void RegisterControllers(SdModule* pMod); public: diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index 7b6876af7535..bf76d1c6df49 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -103,7 +103,7 @@ static void lcl_getListOfStreams(SotStorage * pStorage, comphelper::SequenceAsHa } } -static tools::SvRef<SotStorage> lcl_DRMDecrypt(SfxMedium& rMedium, tools::SvRef<SotStorage>& rStorage, std::shared_ptr<SvStream>& rNewStorageStrm) +static tools::SvRef<SotStorage> lcl_DRMDecrypt(const SfxMedium& rMedium, const tools::SvRef<SotStorage>& rStorage, std::shared_ptr<SvStream>& rNewStorageStrm) { tools::SvRef<SotStorage> aNewStorage; diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 16788bfc9045..123582bf791d 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -220,7 +220,7 @@ public: const CustomAnimationEffectPtr& pEffect); const CustomAnimationEffectPtr& getEffect() const { return mpEffect; } - Size GetSize(vcl::RenderContext& rRenderContext); + Size GetSize(const vcl::RenderContext& rRenderContext); void Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect, bool bSelected); void PaintEffect(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect, bool bSelected); void PaintTrigger(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect); @@ -281,7 +281,7 @@ IMPL_STATIC_LINK(CustomAnimationList, CustomGetSizeHdl, weld::TreeView::get_size return pItem->GetSize(rRenderContext); } -Size CustomAnimationListEntryItem::GetSize(vcl::RenderContext& rRenderContext) +Size CustomAnimationListEntryItem::GetSize(const vcl::RenderContext& rRenderContext) { auto width = rRenderContext.GetTextWidth( msDescription ) + nIconWidth; if (width < (rRenderContext.GetTextWidth( msEffectName ) + 2*nIconWidth)) diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index bb52a9722dbd..63ab45f8b6cd 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -113,7 +113,7 @@ void SdDLL::RegisterFactorys() // Register all Interfaces -void SdDLL::RegisterInterfaces(SdModule* pMod) +void SdDLL::RegisterInterfaces(const SdModule* pMod) { // Module SdModule::RegisterInterface(pMod); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 7d7f6a26ec5b..780f8a6ce35b 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -349,7 +349,7 @@ IMPL_LINK(SdPageObjsTLV, DragBeginHdl, bool&, rUnsetDragIcon, bool) namespace { - bool CanDragSource(weld::TreeView& rTreeView) + bool CanDragSource(const weld::TreeView& rTreeView) { std::unique_ptr<weld::TreeIter> xSource(rTreeView.make_iterator()); if (!rTreeView.get_selected(xSource.get())) diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx index 528dfd7c8c46..6d4906fc3de9 100644 --- a/sd/source/ui/inc/GraphicObjectBar.hxx +++ b/sd/source/ui/inc/GraphicObjectBar.hxx @@ -34,7 +34,7 @@ class GraphicObjectBar final public: SFX_DECL_INTERFACE( SD_IF_SDDRAWGRAFOBJECTBAR ) - GraphicObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView); + GraphicObjectBar (const ViewShell* pSdViewShell, ::sd::View* pSdView); virtual ~GraphicObjectBar() override; void GetAttrState( SfxItemSet& rSet ); diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx index 7c70f340226b..ef0b12964a53 100644 --- a/sd/source/ui/inc/MediaObjectBar.hxx +++ b/sd/source/ui/inc/MediaObjectBar.hxx @@ -39,7 +39,7 @@ class MediaObjectBar final public: SFX_DECL_INTERFACE( SD_IF_SDDRAWMEDIAOBJECTBAR ) - MediaObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView); + MediaObjectBar (const ViewShell* pSdViewShell, ::sd::View* pSdView); virtual ~MediaObjectBar() override; void GetState( SfxItemSet& rSet ); diff --git a/sd/source/ui/inc/registerinterfaces.hxx b/sd/source/ui/inc/registerinterfaces.hxx index d8ebb726ee35..15120cd03e4b 100644 --- a/sd/source/ui/inc/registerinterfaces.hxx +++ b/sd/source/ui/inc/registerinterfaces.hxx @@ -25,7 +25,7 @@ namespace sd::ui::table { -void RegisterInterfaces( SfxModule* pMod ); +void RegisterInterfaces( const SfxModule* pMod ); } diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 1f49f5fc2fff..c420397e1621 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -84,7 +84,7 @@ static void apply_table_style( SdrTableObj* pObj, SdrModel const * pModel, const } } -static void InsertTableImpl(DrawViewShell* pShell, +static void InsertTableImpl(const DrawViewShell* pShell, ::sd::View* pView, sal_Int32 nColumns, sal_Int32 nRows, diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 846d5fb6bbfc..d351094eae9b 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -55,7 +55,7 @@ SfxShell* CreateTableObjectBar( ViewShell& rShell, ::sd::View* pView ) } /** registers the interfaces from the table ui */ -void RegisterInterfaces(SfxModule* pMod) +void RegisterInterfaces(const SfxModule* pMod) { TableObjectBar::RegisterInterface(pMod); } diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index 0324088fb123..cba43660e629 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -48,7 +48,7 @@ void GraphicObjectBar::InitInterface_Impl() GraphicObjectBar::GraphicObjectBar ( - ViewShell* pSdViewShell, + const ViewShell* pSdViewShell, ::sd::View* pSdView ) : SfxShell (pSdViewShell->GetViewShell()), mpView ( pSdView ) diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index 7d7549885656..b6ee505f98a5 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -48,7 +48,7 @@ void MediaObjectBar::InitInterface_Impl() { } -MediaObjectBar::MediaObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) : +MediaObjectBar::MediaObjectBar( const ViewShell* pSdViewShell, ::sd::View* pSdView ) : SfxShell( pSdViewShell->GetViewShell() ), mpView( pSdView ) { diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index b1e44ca3630b..6f8e5b76d10f 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -686,8 +686,8 @@ bool SdOutliner::SearchAndReplaceAll() namespace { -basegfx::B2DRectangle getPDFSelection(std::unique_ptr<VectorGraphicSearch> & rVectorGraphicSearch, - SdrObject* pObject) +basegfx::B2DRectangle getPDFSelection(const std::unique_ptr<VectorGraphicSearch> & rVectorGraphicSearch, + const SdrObject* pObject) { basegfx::B2DRectangle aSelection; @@ -725,8 +725,8 @@ basegfx::B2DRectangle getPDFSelection(std::unique_ptr<VectorGraphicSearch> & rVe } // end namespace -void SdOutliner::sendLOKSearchResultCallback(std::shared_ptr<sd::ViewShell> & pViewShell, - OutlinerView* pOutlinerView, +void SdOutliner::sendLOKSearchResultCallback(const std::shared_ptr<sd::ViewShell> & pViewShell, + const OutlinerView* pOutlinerView, std::vector<sd::SearchSelection>* pSelections) { std::vector<::tools::Rectangle> aLogicRects; diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 1f7148b46fee..7b7b70624583 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -69,7 +69,7 @@ namespace { - void lcl_convertStringArguments(sal_uInt16 nSlot, std::unique_ptr<SfxItemSet>& pArgs) + void lcl_convertStringArguments(sal_uInt16 nSlot, const std::unique_ptr<SfxItemSet>& pArgs) { Color aColor; OUString sColor; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index dd9eb1f75b19..8f511aab3922 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -546,7 +546,7 @@ public: } }; - void lcl_convertStringArguments(sal_uInt16 nSlot, std::unique_ptr<SfxItemSet>& pArgs) + void lcl_convertStringArguments(sal_uInt16 nSlot, const std::unique_ptr<SfxItemSet>& pArgs) { Color aColor; const SfxPoolItem* pItem = nullptr; diff --git a/slideshow/source/engine/box2dtools.cxx b/slideshow/source/engine/box2dtools.cxx index e863616b2187..db91ccbb57e7 100644 --- a/slideshow/source/engine/box2dtools.cxx +++ b/slideshow/source/engine/box2dtools.cxx @@ -443,7 +443,7 @@ void box2DWorld::initateAllShapesAsStaticBodies( } } -bool box2DWorld::hasWorldStepper() { return mbHasWorldStepper; } +bool box2DWorld::hasWorldStepper() const { return mbHasWorldStepper; } void box2DWorld::setHasWorldStepper(const bool bHasWorldStepper) { @@ -636,7 +636,7 @@ double box2DWorld::stepAmount(const double fPassedTime, const float fTimeStep, bool box2DWorld::shapesInitialized() { return mbShapesInitialized; } -bool box2DWorld::isInitialized() +bool box2DWorld::isInitialized() const { if (mpBox2DWorld) return true; @@ -777,7 +777,7 @@ box2DBody::box2DBody(std::shared_ptr<b2Body> pBox2DBody, double fScaleFactor) { } -::basegfx::B2DPoint box2DBody::getPosition() +::basegfx::B2DPoint box2DBody::getPosition() const { b2Vec2 aPosition = mpBox2DBody->GetPosition(); double fX = static_cast<double>(aPosition.x) / mfScaleFactor; @@ -849,7 +849,7 @@ void box2DBody::setCollision(const bool bCanCollide) } } -double box2DBody::getAngle() +double box2DBody::getAngle() const { double fAngle = static_cast<double>(mpBox2DBody->GetAngle()); return ::basegfx::rad2deg(-fAngle); @@ -887,7 +887,7 @@ void box2DBody::setType(box2DBodyType eType) mpBox2DBody->SetType(getBox2DInternalBodyType(eType)); } -box2DBodyType box2DBody::getType() { return getBox2DLOBodyType(mpBox2DBody->GetType()); } +box2DBodyType box2DBody::getType() const { return getBox2DLOBodyType(mpBox2DBody->GetType()); } } /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/slideshow/source/inc/box2dtools.hxx b/slideshow/source/inc/box2dtools.hxx index c17fb1648a51..53eaf0b88fad 100644 --- a/slideshow/source/inc/box2dtools.hxx +++ b/slideshow/source/inc/box2dtools.hxx @@ -261,7 +261,7 @@ public: /// @return whether shapes in the slide are initialized as Box2D bodies or not bool shapesInitialized(); /// @return whether the Box2D World is initialized or not - bool isInitialized(); + bool isInitialized() const; /** Make the shape's corresponding box2D body a dynamic one. @@ -311,7 +311,7 @@ public: initateAllShapesAsStaticBodies(const slideshow::internal::ShapeManagerSharedPtr& pShapeManager); /// @return whether the box2DWorld has a stepper or not - bool hasWorldStepper(); + bool hasWorldStepper() const; /// Set the flag for whether the box2DWorld has a stepper or not void setHasWorldStepper(const bool bHasWorldStepper); @@ -375,7 +375,7 @@ public: box2DBody(std::shared_ptr<b2Body> pBox2DBody, double fScaleFactor); /// @return current position in LO user space coordinates - ::basegfx::B2DPoint getPosition(); + ::basegfx::B2DPoint getPosition() const; /** Set the position of box2d body @@ -429,7 +429,7 @@ public: void setCollision(const bool bCanCollide); /// @return current angle of rotation of the body - double getAngle(); + double getAngle() const; /** Set angle of the box2d body @@ -459,7 +459,7 @@ public: void setType(box2DBodyType eType); /// @return type of the body - box2DBodyType getType(); + box2DBodyType getType() const; }; /** Make the Box2D body a dynamic one diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 9853bb48bb1e..ac62a161fe2a 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -449,7 +449,7 @@ GraphicImport::~GraphicImport() { } -com::sun::star::awt::Point GraphicImport::GetGraphicObjectPosition() +com::sun::star::awt::Point GraphicImport::GetGraphicObjectPosition() const { return (com::sun::star::awt::Point(m_pImpl->nLeftPosition, m_pImpl->nTopPosition)); } diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx index 2f5f6ed970b8..9ea3984db23b 100644 --- a/writerfilter/source/dmapper/GraphicImport.hxx +++ b/writerfilter/source/dmapper/GraphicImport.hxx @@ -98,7 +98,7 @@ public: bool IsGraphic() const; sal_Int32 GetLeftMarginOrig() const; - com::sun::star::awt::Point GetGraphicObjectPosition(); + com::sun::star::awt::Point GetGraphicObjectPosition() const; private: // Properties diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx index a7b68dfd8130..78ddf86ec049 100644 --- a/writerfilter/source/dmapper/TableData.hxx +++ b/writerfilter/source/dmapper/TableData.hxx @@ -99,7 +99,7 @@ public: bool isOpen() const { return mbOpen; } - sal_uInt32 getGridSpan() { return m_nGridSpan; } + sal_uInt32 getGridSpan() const { return m_nGridSpan; } void setGridSpan( sal_uInt32 nSpan ) { m_nGridSpan = nSpan; } }; @@ -241,9 +241,9 @@ public: return mpProperties; } - sal_uInt32 getGridBefore() { return m_nGridBefore; } + sal_uInt32 getGridBefore() const { return m_nGridBefore; } void setGridBefore(sal_uInt32 nSkipGrids) { m_nGridBefore = nSkipGrids; } - sal_uInt32 getGridAfter() { return m_nGridAfter; } + sal_uInt32 getGridAfter() const { return m_nGridAfter; } void setGridAfter(sal_uInt32 nSkipGrids) { m_nGridAfter = nSkipGrids; } sal_uInt32 getGridSpan(sal_uInt32 i) { return mCells[i]->getGridSpan(); } std::vector< sal_uInt32 > getGridSpans() |