diff options
48 files changed, 252 insertions, 223 deletions
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 18751a00490a..0f22b1e256b6 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -37,6 +37,7 @@ #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> #include <memory> +#include <utility> #include <string.h> using namespace com::sun::star; @@ -182,9 +183,9 @@ unsigned int FileEmitContext::readOrigBytes( unsigned int nOrigOffset, unsigned } -PDFDetector::PDFDetector( const uno::Reference< uno::XComponentContext >& xContext) : +PDFDetector::PDFDetector( uno::Reference< uno::XComponentContext > xContext) : PDFDetectorBase( m_aMutex ), - m_xContext( xContext ) + m_xContext(std::move( xContext )) {} // XExtendedFilterDetection diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx index 6c7d58ca048c..c5f8b0d58772 100644 --- a/sdext/source/pdfimport/filterdet.hxx +++ b/sdext/source/pdfimport/filterdet.hxx @@ -42,8 +42,8 @@ private: css::uno::XComponentContext > m_xContext; public: - explicit PDFDetector( const css::uno::Reference< - css::uno::XComponentContext >& xContext ); + explicit PDFDetector( css::uno::Reference< + css::uno::XComponentContext > xContext ); // XExtendedFilterDetection virtual OUString SAL_CALL detect( css::uno::Sequence< diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx index 9d016a7e2a3e..5f1517e8c4c2 100644 --- a/sdext/source/pdfimport/inc/contentsink.hxx +++ b/sdext/source/pdfimport/inc/contentsink.hxx @@ -48,14 +48,14 @@ namespace pdfi { struct FontAttributes { - FontAttributes( const OUString& familyName_, - const OUString& sFontWeight, + FontAttributes( OUString familyName_, + OUString sFontWeight, bool isItalic_, bool isUnderline_, double size_, double ascent_) : - familyName(familyName_), - fontWeight(sFontWeight), + familyName(std::move(familyName_)), + fontWeight(std::move(sFontWeight)), isItalic(isItalic_), isUnderline(isUnderline_), isOutline(false), diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx index 9d74085aba03..7891419471d3 100644 --- a/sdext/source/pdfimport/inc/pdfparse.hxx +++ b/sdext/source/pdfimport/inc/pdfparse.hxx @@ -26,6 +26,7 @@ #include <string_view> #include <unordered_map> +#include <utility> #include <vector> #include <memory> @@ -72,8 +73,8 @@ struct PDFComment final : public PDFEntry { OString m_aComment; - explicit PDFComment( const OString& rComment ) - : PDFEntry(), m_aComment( rComment ) {} + explicit PDFComment( OString aComment ) + : PDFEntry(), m_aComment(std::move( aComment )) {} virtual ~PDFComment() override; virtual bool emit( EmitContext& rWriteContext ) const override; virtual PDFEntry* clone() const override; @@ -90,8 +91,8 @@ struct PDFName final : public PDFValue { OString m_aName; - explicit PDFName( const OString& rName ) - : PDFValue(), m_aName( rName ) {} + explicit PDFName( OString aName ) + : PDFValue(), m_aName(std::move( aName )) {} virtual ~PDFName() override; virtual bool emit( EmitContext& rWriteContext ) const override; virtual PDFEntry* clone() const override; @@ -103,8 +104,8 @@ struct PDFString final : public PDFValue { OString m_aString; - explicit PDFString( const OString& rString ) - : PDFValue(), m_aString( rString ) {} + explicit PDFString( OString aString ) + : PDFValue(), m_aString(std::move( aString )) {} virtual ~PDFString() override; virtual bool emit( EmitContext& rWriteContext ) const override; virtual PDFEntry* clone() const override; diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx index e38e81fce917..71bc293aad23 100644 --- a/sdext/source/pdfimport/odf/odfemitter.cxx +++ b/sdext/source/pdfimport/odf/odfemitter.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <comphelper/stl_types.hxx> +#include <utility> using namespace com::sun::star; @@ -41,7 +42,7 @@ private: uno::Sequence<sal_Int8> m_aBuf; public: - explicit OdfEmitter( const uno::Reference<io::XOutputStream>& xOutput ); + explicit OdfEmitter( uno::Reference<io::XOutputStream> xOutput ); virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) override; virtual void write( const OUString& rString ) override; @@ -50,8 +51,8 @@ public: } -OdfEmitter::OdfEmitter( const uno::Reference<io::XOutputStream>& xOutput ) : - m_xOutput( xOutput ), +OdfEmitter::OdfEmitter( uno::Reference<io::XOutputStream> xOutput ) : + m_xOutput(std::move( xOutput )), m_aLineFeed{ '\n' } { OSL_PRECOND(m_xOutput.is(), "OdfEmitter(): invalid output stream"); diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index bbdb51c5ae23..7cef299e8eaa 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -40,6 +40,7 @@ #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> +#include <utility> // disable warnings again because someone along the line has enabled them // (we have included boost headers, what did you expect?) @@ -88,8 +89,8 @@ class PDFGrammar : public grammar< PDFGrammar<iteratorT> > { public: - explicit PDFGrammar( const iteratorT& first ) - : m_fDouble( 0.0 ), m_aGlobalBegin( first ) {} + explicit PDFGrammar( iteratorT first ) + : m_fDouble( 0.0 ), m_aGlobalBegin(std::move( first )) {} ~PDFGrammar() { if( !m_aObjectStack.empty() ) diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx index e26afcbc5237..19c86793d4ee 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.hxx +++ b/sdext/source/pdfimport/sax/saxattrlist.hxx @@ -22,6 +22,7 @@ #include <rtl/ustring.hxx> #include <unordered_map> +#include <utility> #include <vector> #include <cppuhelper/implbase.hxx> @@ -40,8 +41,8 @@ namespace pdfi OUString m_aName; OUString m_aValue; - AttrEntry( const OUString& i_rName, const OUString& i_rValue ) - : m_aName( i_rName ), m_aValue( i_rValue ) {} + AttrEntry( OUString i_aName, OUString i_aValue ) + : m_aName(std::move( i_aName )), m_aValue(std::move( i_aValue )) {} }; std::vector< AttrEntry > m_aAttributes; std::unordered_map< OUString, size_t > m_aIndexMap; diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index e3f49ed1dddf..396346198116 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -44,6 +44,7 @@ #include <sal/log.hxx> #include <algorithm> +#include <utility> using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; @@ -70,9 +71,9 @@ class PresenterAccessible::AccessibleObject { public: AccessibleObject ( - const css::lang::Locale& rLocale, + css::lang::Locale aLocale, const sal_Int16 nRole, - const OUString& rsName); + OUString sName); void LateInitialization(); virtual void SetWindow ( @@ -270,7 +271,7 @@ public: AccessibleParagraph ( const css::lang::Locale& rLocale, const OUString& rsName, - const SharedPresenterTextParagraph& rpParagraph, + SharedPresenterTextParagraph pParagraph, const sal_Int32 nParagraphIndex); //----- XAccessibleContext ------------------------------------------------ @@ -466,12 +467,12 @@ private: //===== PresenterAccessible =================================================== PresenterAccessible::PresenterAccessible ( - const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const ::rtl::Reference<PresenterController>& rpPresenterController, + css::uno::Reference<css::uno::XComponentContext> xContext, + ::rtl::Reference<PresenterController> xPresenterController, const Reference<drawing::framework::XPane>& rxMainPane) : PresenterAccessibleInterfaceBase(m_aMutex), - mxComponentContext(rxContext), - mpPresenterController(rpPresenterController), + mxComponentContext(std::move(xContext)), + mpPresenterController(std::move(xPresenterController)), mxMainPane(rxMainPane, UNO_QUERY) { if (mxMainPane.is()) @@ -712,12 +713,12 @@ void SAL_CALL PresenterAccessible::initialize (const css::uno::Sequence<css::uno //===== PresenterAccessible::AccessibleObject ========================================= PresenterAccessible::AccessibleObject::AccessibleObject ( - const lang::Locale& rLocale, + lang::Locale aLocale, const sal_Int16 nRole, - const OUString& rsName) + OUString sName) : PresenterAccessibleObjectInterfaceBase(m_aMutex), - msName(rsName), - maLocale(rLocale), + msName(std::move(sName)), + maLocale(std::move(aLocale)), mnRole(nRole), mnStateSet(0), mbIsFocused(false) @@ -1316,10 +1317,10 @@ AccessibleRelation SAL_CALL AccessibleRelationSet::getRelationByType (sal_Int16 PresenterAccessible::AccessibleParagraph::AccessibleParagraph ( const lang::Locale& rLocale, const OUString& rsName, - const SharedPresenterTextParagraph& rpParagraph, + SharedPresenterTextParagraph xParagraph, const sal_Int32 nParagraphIndex) : PresenterAccessibleParagraphInterfaceBase(rLocale, AccessibleRole::PARAGRAPH, rsName), - mpParagraph(rpParagraph), + mpParagraph(std::move(xParagraph)), mnParagraphIndex(nParagraphIndex) { } diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index 9789db5256ca..12015d0938d0 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -51,8 +51,8 @@ class PresenterAccessible { public: PresenterAccessible ( - const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const ::rtl::Reference<PresenterController>& rpPresenterController, + css::uno::Reference<css::uno::XComponentContext> xContext, + ::rtl::Reference<PresenterController> xPresenterController, const css::uno::Reference<css::drawing::framework::XPane>& rxMainPane); virtual ~PresenterAccessible() override; diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index 17609da85251..e435c8dbac69 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/drawing/XPresenterHelper.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> +#include <utility> #include <osl/diagnose.h> using namespace ::com::sun::star; @@ -34,13 +35,13 @@ namespace sdext::presenter { PresenterBitmapContainer::PresenterBitmapContainer ( const OUString& rsConfigurationBase, - const std::shared_ptr<PresenterBitmapContainer>& rpParentContainer, + std::shared_ptr<PresenterBitmapContainer> xParentContainer, const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, - const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, - const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper) - : mpParentContainer(rpParentContainer), - mxCanvas(rxCanvas), - mxPresenterHelper(rxPresenterHelper) + css::uno::Reference<css::rendering::XCanvas> xCanvas, + css::uno::Reference<css::drawing::XPresenterHelper> xPresenterHelper) + : mpParentContainer(std::move(xParentContainer)), + mxCanvas(std::move(xCanvas)), + mxPresenterHelper(std::move(xPresenterHelper)) { Initialize(rxComponentContext); @@ -58,13 +59,13 @@ PresenterBitmapContainer::PresenterBitmapContainer ( PresenterBitmapContainer::PresenterBitmapContainer ( const css::uno::Reference<css::container::XNameAccess>& rxRootNode, - const std::shared_ptr<PresenterBitmapContainer>& rpParentContainer, + std::shared_ptr<PresenterBitmapContainer> xParentContainer, const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, - const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, - const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper) - : mpParentContainer(rpParentContainer), - mxCanvas(rxCanvas), - mxPresenterHelper(rxPresenterHelper) + css::uno::Reference<css::rendering::XCanvas> xCanvas, + css::uno::Reference<css::drawing::XPresenterHelper> xPresenterHelper) + : mpParentContainer(std::move(xParentContainer)), + mxCanvas(std::move(xCanvas)), + mxPresenterHelper(std::move(xPresenterHelper)) { Initialize(rxComponentContext); diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx index 65f385b2b4e6..7a9de89a7f13 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.hxx +++ b/sdext/source/presenter/PresenterBitmapContainer.hxx @@ -87,16 +87,16 @@ public: */ PresenterBitmapContainer ( const OUString& rsConfigurationBase, - const std::shared_ptr<PresenterBitmapContainer>& rpParentContainer, + std::shared_ptr<PresenterBitmapContainer> xParentContainer, const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, - const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, - const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper = nullptr); + css::uno::Reference<css::rendering::XCanvas> xCanvas, + css::uno::Reference<css::drawing::XPresenterHelper> xPresenterHelper = nullptr); PresenterBitmapContainer ( const css::uno::Reference<css::container::XNameAccess>& rsRootNode, - const std::shared_ptr<PresenterBitmapContainer>& rpParentContainer, + std::shared_ptr<PresenterBitmapContainer> xParentContainer, const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, - const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, - const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper = nullptr); + css::uno::Reference<css::rendering::XCanvas> xCanvas, + css::uno::Reference<css::drawing::XPresenterHelper> xPresenterHelper = nullptr); ~PresenterBitmapContainer(); PresenterBitmapContainer(const PresenterBitmapContainer&) = delete; PresenterBitmapContainer& operator=(const PresenterBitmapContainer&) = delete; diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index 61de170c0f96..d0fa61a09c94 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/drawing/XPresenterHelper.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp> #include <com/sun/star/rendering/TextDirection.hpp> +#include <utility> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -82,20 +83,20 @@ const double gnVerticalBorder (5); PresenterButton::PresenterButton ( const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, - const ::rtl::Reference<PresenterController>& rpPresenterController, - const std::shared_ptr<PresenterTheme>& rpTheme, + ::rtl::Reference<PresenterController> xPresenterController, + std::shared_ptr<PresenterTheme> xTheme, const css::uno::Reference<css::awt::XWindow>& rxParentWindow, - const PresenterTheme::SharedFontDescriptor& rpFont, - const PresenterTheme::SharedFontDescriptor& rpMouseOverFont, - const OUString& rsText, - const OUString& rsAction) + PresenterTheme::SharedFontDescriptor xFont, + PresenterTheme::SharedFontDescriptor xMouseOverFont, + OUString sText, + OUString sAction) : PresenterButtonInterfaceBase(m_aMutex), - mpPresenterController(rpPresenterController), - mpTheme(rpTheme), - msText(rsText), - mpFont(rpFont), - mpMouseOverFont(rpMouseOverFont), - msAction(rsAction), + mpPresenterController(std::move(xPresenterController)), + mpTheme(std::move(xTheme)), + msText(std::move(sText)), + mpFont(std::move(xFont)), + mpMouseOverFont(std::move(xMouseOverFont)), + msAction(std::move(sAction)), maButtonSize(-1,-1), meState(PresenterBitmapDescriptor::Normal) { diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index f722e7da1c52..ec2f617bd64a 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -102,13 +102,13 @@ private: PresenterButton ( const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, - const ::rtl::Reference<PresenterController>& rpPresenterController, - const std::shared_ptr<PresenterTheme>& rpTheme, + ::rtl::Reference<PresenterController> xPresenterController, + std::shared_ptr<PresenterTheme> xTheme, const css::uno::Reference<css::awt::XWindow>& rxParentWindow, - const PresenterTheme::SharedFontDescriptor& rFont, - const PresenterTheme::SharedFontDescriptor& rMouseOverFont, - const OUString& rxText, - const OUString& rxAction); + PresenterTheme::SharedFontDescriptor aFont, + PresenterTheme::SharedFontDescriptor aMouseOverFont, + OUString sText, + OUString sAction); void RenderButton ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::geometry::IntegerSize2D& rSize, diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 1062d892d336..a56071f9ec3f 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -51,6 +51,7 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <rtl/ustrbuf.hxx> +#include <utility> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -82,19 +83,19 @@ PresenterController::InstanceContainer PresenterController::maInstances; } PresenterController::PresenterController ( - const css::uno::WeakReference<css::lang::XEventListener> &rxScreen, + css::uno::WeakReference<css::lang::XEventListener> xScreen, const Reference<XComponentContext>& rxContext, const Reference<frame::XController>& rxController, const Reference<presentation::XSlideShowController>& rxSlideShowController, - const rtl::Reference<PresenterPaneContainer>& rpPaneContainer, + rtl::Reference<PresenterPaneContainer> xPaneContainer, const Reference<XResourceId>& rxMainPaneId) : PresenterControllerInterfaceBase(m_aMutex), - mxScreen(rxScreen), + mxScreen(std::move(xScreen)), mxComponentContext(rxContext), mxController(rxController), mxSlideShowController(rxSlideShowController), mxMainPaneId(rxMainPaneId), - mpPaneContainer(rpPaneContainer), + mpPaneContainer(std::move(xPaneContainer)), mnCurrentSlideIndex(-1), mpWindowManager(new PresenterWindowManager(rxContext,mpPaneContainer,this)), mpCanvasHelper(std::make_shared<PresenterCanvasHelper>()), diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index 1a9d8a1aaa04..9b7062ec89f6 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -81,11 +81,11 @@ public: const css::uno::Reference<css::frame::XFrame>& rxFrame); PresenterController ( - const css::uno::WeakReference<css::lang::XEventListener> &rxScreen, + css::uno::WeakReference<css::lang::XEventListener> xScreen, const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::frame::XController>& rxController, const css::uno::Reference<css::presentation::XSlideShowController>& rxSlideShowController, - const rtl::Reference<PresenterPaneContainer>& rpPaneContainer, + rtl::Reference<PresenterPaneContainer> xPaneContainer, const css::uno::Reference<css::drawing::framework::XResourceId>& rxMainPaneId); virtual ~PresenterController() override; diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx index 0cd33d9c0beb..27e5dc7e45e4 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> + #include "PresenterCurrentSlideObserver.hxx" using namespace ::com::sun::star; @@ -27,10 +29,10 @@ namespace sdext::presenter { //===== PresenterCurrentSlideObserver ========================================= PresenterCurrentSlideObserver::PresenterCurrentSlideObserver ( - const ::rtl::Reference<PresenterController>& rxPresenterController, + ::rtl::Reference<PresenterController> xPresenterController, const Reference<presentation::XSlideShowController>& rxSlideShowController) : PresenterCurrentSlideObserverInterfaceBase(m_aMutex), - mpPresenterController(rxPresenterController), + mpPresenterController(std::move(xPresenterController)), mxSlideShowController(rxSlideShowController) { if( mpPresenterController.is() ) diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index 786744bfb8b8..6e005e4c8799 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -45,7 +45,7 @@ class PresenterCurrentSlideObserver { public: PresenterCurrentSlideObserver ( - const ::rtl::Reference<PresenterController>& rxPresenterController, + ::rtl::Reference<PresenterController> xPresenterController, const css::uno::Reference<css::presentation::XSlideShowController>& rxSlideShowController); virtual ~PresenterCurrentSlideObserver() override; diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx index 0f56da0b0566..3ca06a913775 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.cxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx @@ -19,6 +19,7 @@ #include "PresenterFrameworkObserver.hxx" #include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <utility> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -28,10 +29,10 @@ using namespace ::com::sun::star::drawing::framework; namespace sdext::presenter { PresenterFrameworkObserver::PresenterFrameworkObserver ( - const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController, + css::uno::Reference<css::drawing::framework::XConfigurationController> xController, const Action& rAction) : PresenterFrameworkObserverInterfaceBase(m_aMutex), - mxConfigurationController(rxController), + mxConfigurationController(std::move(xController)), maAction(rAction) { if ( ! mxConfigurationController.is()) diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index bc4b4bda11d3..6700ad0a2322 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -67,7 +67,7 @@ private: e.g. when some resource has been created. */ PresenterFrameworkObserver ( - const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController, + css::uno::Reference<css::drawing::framework::XConfigurationController> xController, const Action& rAction); virtual ~PresenterFrameworkObserver() override; diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index 74adeedd1a9e..39ec508ba4c8 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> #include <vcl/settings.hxx> #include "PresenterHelpView.hxx" #include "PresenterButton.hxx" @@ -66,7 +67,7 @@ namespace { { public: LineDescriptorList ( - const OUString& rsText, + OUString sText, const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, const sal_Int32 nMaximalWidth); @@ -121,11 +122,11 @@ PresenterHelpView::PresenterHelpView ( const Reference<uno::XComponentContext>& rxContext, const Reference<XResourceId>& rxViewId, const Reference<frame::XController>& rxController, - const ::rtl::Reference<PresenterController>& rpPresenterController) + ::rtl::Reference<PresenterController> xPresenterController) : PresenterHelpViewInterfaceBase(m_aMutex), mxComponentContext(rxContext), mxViewId(rxViewId), - mpPresenterController(rpPresenterController), + mpPresenterController(std::move(xPresenterController)), mnSeparatorY(0), mnMaximalWidth(0) { @@ -529,10 +530,10 @@ void LineDescriptor::CalculateSize ( namespace { LineDescriptorList::LineDescriptorList ( - const OUString& rsText, + OUString sText, const css::uno::Reference<css::rendering::XCanvasFont>& rxFont, const sal_Int32 nMaximalWidth) - : msText(rsText) + : msText(std::move(sText)) { Update(rxFont, nMaximalWidth); } diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx index 58f629a36cd2..2d147c346576 100644 --- a/sdext/source/presenter/PresenterHelpView.hxx +++ b/sdext/source/presenter/PresenterHelpView.hxx @@ -51,7 +51,7 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, const css::uno::Reference<css::frame::XController>& rxController, - const ::rtl::Reference<PresenterController>& rpPresenterController); + ::rtl::Reference<PresenterController> xPresenterController); virtual ~PresenterHelpView() override; virtual void SAL_CALL disposing() override; diff --git a/sdext/source/presenter/PresenterPaintManager.cxx b/sdext/source/presenter/PresenterPaintManager.cxx index ba1bc48defb7..f7b612d9a05a 100644 --- a/sdext/source/presenter/PresenterPaintManager.cxx +++ b/sdext/source/presenter/PresenterPaintManager.cxx @@ -22,6 +22,7 @@ #include "PresenterPaneContainer.hxx" #include <com/sun/star/awt/InvalidateStyle.hpp> #include <com/sun/star/awt/XWindowPeer.hpp> +#include <utility> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -30,12 +31,12 @@ namespace sdext::presenter { PresenterPaintManager::PresenterPaintManager ( const css::uno::Reference<css::awt::XWindow>& rxParentWindow, - const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper, - const rtl::Reference<PresenterPaneContainer>& rpPaneContainer) + css::uno::Reference<css::drawing::XPresenterHelper> xPresenterHelper, + rtl::Reference<PresenterPaneContainer> xPaneContainer) : mxParentWindow(rxParentWindow), mxParentWindowPeer(rxParentWindow, UNO_QUERY), - mxPresenterHelper(rxPresenterHelper), - mpPaneContainer(rpPaneContainer) + mxPresenterHelper(std::move(xPresenterHelper)), + mpPaneContainer(std::move(xPaneContainer)) { } diff --git a/sdext/source/presenter/PresenterPaintManager.hxx b/sdext/source/presenter/PresenterPaintManager.hxx index d3013209aeed..ad2f6b0cbf31 100644 --- a/sdext/source/presenter/PresenterPaintManager.hxx +++ b/sdext/source/presenter/PresenterPaintManager.hxx @@ -45,8 +45,8 @@ public: */ PresenterPaintManager ( const css::uno::Reference<css::awt::XWindow>& rxParentWindow, - const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper, - const rtl::Reference<PresenterPaneContainer>& rpPaneContainer); + css::uno::Reference<css::drawing::XPresenterHelper> xPresenterHelper, + rtl::Reference<PresenterPaneContainer> xPaneContainer); ::std::function<void (const css::awt::Rectangle& rRepaintBox)> GetInvalidator ( diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index aac8d082a971..33dc38a1ac12 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -22,6 +22,7 @@ #include "PresenterPaintManager.hxx" #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/XWindow2.hpp> +#include <utility> using namespace css; using namespace css::uno; @@ -33,9 +34,9 @@ namespace sdext::presenter { PresenterPaneBase::PresenterPaneBase ( const Reference<XComponentContext>& rxContext, - const ::rtl::Reference<PresenterController>& rpPresenterController) + ::rtl::Reference<PresenterController> xPresenterController) : PresenterPaneBaseInterfaceBase(m_aMutex), - mpPresenterController(rpPresenterController), + mpPresenterController(std::move(xPresenterController)), mxComponentContext(rxContext) { if (mpPresenterController) diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index 6df93af3ecae..3264797fce8d 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -56,7 +56,7 @@ class PresenterPaneBase public: PresenterPaneBase ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const ::rtl::Reference<PresenterController>& rpPresenterController); + ::rtl::Reference<PresenterController> xPresenterController); virtual ~PresenterPaneBase() override; PresenterPaneBase(const PresenterPaneBase&) = delete; PresenterPaneBase& operator=(const PresenterPaneBase&) = delete; diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 6c0198c7e76b..fac17dd9d64f 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <map> #include <memory> +#include <utility> #include <vector> using namespace ::com::sun::star; @@ -96,7 +97,7 @@ class PresenterPaneBorderPainter::Renderer public: Renderer ( const Reference<XComponentContext>& rxContext, - const std::shared_ptr<PresenterTheme>& rpTheme); + std::shared_ptr<PresenterTheme> xTheme); void SetCanvas (const Reference<rendering::XCanvas>& rxCanvas); void PaintBorder ( @@ -364,8 +365,8 @@ void PresenterPaneBorderPainter::ThrowIfDisposed() const PresenterPaneBorderPainter::Renderer::Renderer ( const Reference<XComponentContext>& rxContext, - const std::shared_ptr<PresenterTheme>& rpTheme) - : mpTheme(rpTheme), + std::shared_ptr<PresenterTheme> xTheme) + : mpTheme(std::move(xTheme)), maViewState(geometry::AffineMatrix2D(1,0,0, 0,1,0), nullptr), mbHasCallout(false) { diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index b4aadc771f2c..b779e950d478 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -25,6 +25,7 @@ #include "PresenterSpritePane.hxx" #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <utility> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -48,10 +49,10 @@ Reference<drawing::framework::XResourceFactory> PresenterPaneFactory::Create ( PresenterPaneFactory::PresenterPaneFactory ( const Reference<uno::XComponentContext>& rxContext, - const ::rtl::Reference<PresenterController>& rpPresenterController) + ::rtl::Reference<PresenterController> xPresenterController) : PresenterPaneFactoryInterfaceBase(m_aMutex), mxComponentContextWeak(rxContext), - mpPresenterController(rpPresenterController) + mpPresenterController(std::move(xPresenterController)) { } diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index 45f9541c65da..306db4a4f626 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -95,7 +95,7 @@ private: PresenterPaneFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const ::rtl::Reference<PresenterController>& rpPresenterController); + ::rtl::Reference<PresenterController> xPresenterController); void Register (const css::uno::Reference<css::frame::XController>& rxController); diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 832790737295..e3cdb67f9fea 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -27,6 +27,7 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <algorithm> +#include <utility> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -48,7 +49,7 @@ namespace { { public: explicit GotoPreviousSlideCommand ( - const rtl::Reference<PresenterController>& rpPresenterController); + rtl::Reference<PresenterController> xPresenterController); virtual void Execute() override; virtual bool IsEnabled() const override; private: @@ -59,7 +60,7 @@ namespace { { public: explicit GotoNextSlideCommand ( - const rtl::Reference<PresenterController>& rpPresenterController); + rtl::Reference<PresenterController> xPresenterController); virtual void Execute() override; // The next slide command is always enabled, even when the current slide // is the last slide: from the last slide it goes to the pause slide, @@ -73,7 +74,7 @@ namespace { { public: explicit GotoNextEffectCommand ( - const rtl::Reference<PresenterController>& rpPresenterController); + rtl::Reference<PresenterController> xPresenterController); virtual void Execute() override; virtual bool IsEnabled() const override; private: @@ -84,7 +85,7 @@ namespace { { public: explicit SwitchMonitorCommand ( - const rtl::Reference<PresenterController>& rpPresenterController); + rtl::Reference<PresenterController> xPresenterController); virtual void Execute() override; private: rtl::Reference<PresenterController> mpPresenterController; @@ -93,7 +94,7 @@ namespace { class PauseResumeCommand : public Command { public: - explicit PauseResumeCommand(const rtl::Reference<PresenterController>& rpPresenterController); + explicit PauseResumeCommand(rtl::Reference<PresenterController> xPresenterController); virtual void Execute() override; virtual Any GetState() const override; private: @@ -104,7 +105,7 @@ namespace { class RestartTimerCommand : public Command { public: - explicit RestartTimerCommand(const rtl::Reference<PresenterController>& rpPresenterController); + explicit RestartTimerCommand(rtl::Reference<PresenterController> xPresenterController); virtual void Execute() override; private: rtl::Reference<PresenterController> mpPresenterController; @@ -115,7 +116,7 @@ namespace { public: SetNotesViewCommand ( const bool bOn, - const rtl::Reference<PresenterController>& rpPresenterController); + rtl::Reference<PresenterController> xPresenterController); virtual void Execute() override; virtual Any GetState() const override; private: @@ -128,7 +129,7 @@ namespace { public: SetSlideSorterCommand ( const bool bOn, - const rtl::Reference<PresenterController>& rpPresenterController); + rtl::Reference<PresenterController> xPresenterController); virtual void Execute() override; virtual Any GetState() const override; private: @@ -141,7 +142,7 @@ namespace { public: SetHelpViewCommand ( const bool bOn, - const rtl::Reference<PresenterController>& rpPresenterController); + rtl::Reference<PresenterController> xPresenterController); virtual void Execute() override; virtual Any GetState() const override; private: @@ -153,7 +154,7 @@ namespace { { public: NotesFontSizeCommand( - const rtl::Reference<PresenterController>& rpPresenterController, + rtl::Reference<PresenterController> xPresenterController, const sal_Int32 nSizeChange); virtual void Execute() override; virtual Any GetState() const override; @@ -167,7 +168,7 @@ namespace { class ExitPresenterCommand : public Command { public: - explicit ExitPresenterCommand(const rtl::Reference<PresenterController>& rpPresenterController); + explicit ExitPresenterCommand(rtl::Reference<PresenterController> xPresenterController); virtual void Execute() override; private: rtl::Reference<PresenterController> mpPresenterController; @@ -494,8 +495,8 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::disposing (const css::lang::Ev //===== GotoPreviousSlideCommand ============================================== GotoPreviousSlideCommand::GotoPreviousSlideCommand ( - const rtl::Reference<PresenterController>& rpPresenterController) - : mpPresenterController(rpPresenterController) + rtl::Reference<PresenterController> xPresenterController) + : mpPresenterController(std::move(xPresenterController)) { } @@ -524,8 +525,8 @@ bool GotoPreviousSlideCommand::IsEnabled() const //===== GotoNextEffect ======================================================== GotoNextEffectCommand::GotoNextEffectCommand ( - const rtl::Reference<PresenterController>& rpPresenterController) - : mpPresenterController(rpPresenterController) + rtl::Reference<PresenterController> xPresenterController) + : mpPresenterController(std::move(xPresenterController)) { } @@ -555,8 +556,8 @@ bool GotoNextEffectCommand::IsEnabled() const //===== GotoNextSlide ========================================================= GotoNextSlideCommand::GotoNextSlideCommand ( - const rtl::Reference<PresenterController>& rpPresenterController) - : mpPresenterController(rpPresenterController) + rtl::Reference<PresenterController> xPresenterController) + : mpPresenterController(std::move(xPresenterController)) { } @@ -574,8 +575,8 @@ void GotoNextSlideCommand::Execute() //===== SwitchMonitorCommand ============================================== SwitchMonitorCommand::SwitchMonitorCommand ( - const rtl::Reference<PresenterController>& rpPresenterController) - : mpPresenterController(rpPresenterController) + rtl::Reference<PresenterController> xPresenterController) + : mpPresenterController(std::move(xPresenterController)) { } @@ -586,8 +587,8 @@ void SwitchMonitorCommand::Execute() //===== PauseResumeCommand ============================================== -PauseResumeCommand::PauseResumeCommand (const rtl::Reference<PresenterController>& rpPresenterController) -: mpPresenterController(rpPresenterController) +PauseResumeCommand::PauseResumeCommand (rtl::Reference<PresenterController> xPresenterController) +: mpPresenterController(std::move(xPresenterController)) { } @@ -635,8 +636,8 @@ Any PauseResumeCommand::GetState() const return Any(false); } -RestartTimerCommand::RestartTimerCommand (const rtl::Reference<PresenterController>& rpPresenterController) -: mpPresenterController(rpPresenterController) +RestartTimerCommand::RestartTimerCommand (rtl::Reference<PresenterController> xPresenterController) +: mpPresenterController(std::move(xPresenterController)) { } @@ -663,9 +664,9 @@ void RestartTimerCommand::Execute() SetNotesViewCommand::SetNotesViewCommand ( const bool bOn, - const rtl::Reference<PresenterController>& rpPresenterController) + rtl::Reference<PresenterController> xPresenterController) : mbOn(bOn), - mpPresenterController(rpPresenterController) + mpPresenterController(std::move(xPresenterController)) { } @@ -702,9 +703,9 @@ Any SetNotesViewCommand::GetState() const SetSlideSorterCommand::SetSlideSorterCommand ( const bool bOn, - const rtl::Reference<PresenterController>& rpPresenterController) + rtl::Reference<PresenterController> xPresenterController) : mbOn(bOn), - mpPresenterController(rpPresenterController) + mpPresenterController(std::move(xPresenterController)) { } @@ -738,9 +739,9 @@ Any SetSlideSorterCommand::GetState() const SetHelpViewCommand::SetHelpViewCommand ( const bool bOn, - const rtl::Reference<PresenterController>& rpPresenterController) + rtl::Reference<PresenterController> xPresenterController) : mbOn(bOn), - mpPresenterController(rpPresenterController) + mpPresenterController(std::move(xPresenterController)) { } @@ -773,9 +774,9 @@ Any SetHelpViewCommand::GetState() const //===== NotesFontSizeCommand ================================================== NotesFontSizeCommand::NotesFontSizeCommand( - const rtl::Reference<PresenterController>& rpPresenterController, + rtl::Reference<PresenterController> xPresenterController, const sal_Int32 nSizeChange) - : mpPresenterController(rpPresenterController), + : mpPresenterController(std::move(xPresenterController)), mnSizeChange(nSizeChange) { } @@ -808,8 +809,8 @@ Any NotesFontSizeCommand::GetState() const //===== ExitPresenterCommand ================================================== -ExitPresenterCommand::ExitPresenterCommand (const rtl::Reference<PresenterController>& rpPresenterController) -: mpPresenterController(rpPresenterController) +ExitPresenterCommand::ExitPresenterCommand (rtl::Reference<PresenterController> xPresenterController) +: mpPresenterController(std::move(xPresenterController)) { } diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index a53f28e868ef..993f9677803d 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -37,6 +37,7 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <sal/log.hxx> @@ -63,8 +64,8 @@ namespace { { public: PresenterScreenListener ( - const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const css::uno::Reference<css::frame::XModel2>& rxModel); + css::uno::Reference<css::uno::XComponentContext> xContext, + css::uno::Reference<css::frame::XModel2> xModel); PresenterScreenListener(const PresenterScreenListener&) = delete; PresenterScreenListener& operator=(const PresenterScreenListener&) = delete; @@ -164,11 +165,11 @@ Any SAL_CALL PresenterScreenJob::execute( namespace { PresenterScreenListener::PresenterScreenListener ( - const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const css::uno::Reference<css::frame::XModel2>& rxModel) + css::uno::Reference<css::uno::XComponentContext> xContext, + css::uno::Reference<css::frame::XModel2> xModel) : PresenterScreenListenerInterfaceBase(m_aMutex), - mxModel(rxModel), - mxComponentContext(rxContext) + mxModel(std::move(xModel)), + mxComponentContext(std::move(xContext)) { } @@ -238,9 +239,9 @@ void SAL_CALL PresenterScreenListener::disposing (const css::lang::EventObject&) PresenterScreen::PresenterScreen ( const Reference<XComponentContext>& rxContext, - const css::uno::Reference<css::frame::XModel2>& rxModel) + css::uno::Reference<css::frame::XModel2> xModel) : PresenterScreenInterfaceBase(m_aMutex), - mxModel(rxModel), + mxModel(std::move(xModel)), mxContextWeak(rxContext) { } diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index e696c0dc646e..90d23ad4b7bd 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -95,7 +95,7 @@ class PresenterScreen public: PresenterScreen ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const css::uno::Reference<css::frame::XModel2>& rxModel); + css::uno::Reference<css::frame::XModel2> xModel); virtual ~PresenterScreen() override; PresenterScreen(const PresenterScreen&) = delete; PresenterScreen& operator=(const PresenterScreen&) = delete; diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index a4db80277324..3a0891ec5d3c 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -31,6 +31,7 @@ #include <algorithm> #include <memory> +#include <utility> #include <math.h> using namespace ::com::sun::star; @@ -46,7 +47,7 @@ class PresenterScrollBar::MousePressRepeater : public std::enable_shared_from_this<MousePressRepeater> { public: - explicit MousePressRepeater (const ::rtl::Reference<PresenterScrollBar>& rpScrollBar); + explicit MousePressRepeater (::rtl::Reference<PresenterScrollBar> xScrollBar); void Dispose(); void Start (const PresenterScrollBar::Area& reArea); void Stop(); @@ -68,17 +69,17 @@ std::weak_ptr<PresenterBitmapContainer> PresenterScrollBar::mpSharedBitmaps; PresenterScrollBar::PresenterScrollBar ( const Reference<XComponentContext>& rxComponentContext, const Reference<awt::XWindow>& rxParentWindow, - const std::shared_ptr<PresenterPaintManager>& rpPaintManager, - const ::std::function<void (double)>& rThumbMotionListener) + std::shared_ptr<PresenterPaintManager> xPaintManager, + ::std::function<void (double)> aThumbMotionListener) : PresenterScrollBarInterfaceBase(m_aMutex), mxComponentContext(rxComponentContext), - mpPaintManager(rpPaintManager), + mpPaintManager(std::move(xPaintManager)), mnThumbPosition(0), mnTotalSize(0), mnThumbSize(0), mnLineHeight(10), maDragAnchor(-1,-1), - maThumbMotionListener(rThumbMotionListener), + maThumbMotionListener(std::move(aThumbMotionListener)), meButtonDownArea(None), meMouseMoveArea(None), mbIsNotificationActive(false), @@ -725,9 +726,9 @@ void PresenterVerticalScrollBar::PaintComposite( //===== PresenterScrollBar::MousePressRepeater ================================ PresenterScrollBar::MousePressRepeater::MousePressRepeater ( - const ::rtl::Reference<PresenterScrollBar>& rpScrollBar) + ::rtl::Reference<PresenterScrollBar> xScrollBar) : mnMousePressRepeaterTaskId(PresenterTimer::NotAValidTaskId), - mpScrollBar(rpScrollBar), + mpScrollBar(std::move(xScrollBar)), meMouseArea(PresenterScrollBar::None) { } diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index b131c8a43ab5..1c3bcc2fd1af 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -189,8 +189,8 @@ protected: PresenterScrollBar ( const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const css::uno::Reference<css::awt::XWindow>& rxParentWindow, - const std::shared_ptr<PresenterPaintManager>& rpPaintManager, - const ::std::function<void (double)>& rThumbMotionListener); + std::shared_ptr<PresenterPaintManager> xPaintManager, + ::std::function<void (double)> aThumbMotionListener); void Repaint ( const css::geometry::RealRectangle2D& rBox, diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index 5ca0ee630ca0..132eaf35f85e 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/rendering/TextDirection.hpp> #include <com/sun/star/rendering/TexturingMode.hpp> #include <osl/mutex.hxx> +#include <utility> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -47,14 +48,14 @@ namespace sdext::presenter { //===== PresenterSlideShowView ================================================ PresenterSlideShowView::PresenterSlideShowView ( - const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, + css::uno::Reference<css::uno::XComponentContext> xContext, + css::uno::Reference<css::drawing::framework::XResourceId> xViewId, const css::uno::Reference<css::frame::XController>& rxController, - const ::rtl::Reference<PresenterController>& rpPresenterController) + ::rtl::Reference<PresenterController> xPresenterController) : PresenterSlideShowViewInterfaceBase(m_aMutex), - mxComponentContext(rxContext), - mpPresenterController(rpPresenterController), - mxViewId(rxViewId), + mxComponentContext(std::move(xContext)), + mpPresenterController(std::move(xPresenterController)), + mxViewId(std::move(xViewId)), mxController(rxController), mxSlideShowController(PresenterHelper::GetSlideShowController(rxController)), mbIsViewAdded(false), diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index d009888f9fb8..e4466522eddf 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -59,10 +59,10 @@ class PresenterSlideShowView { public: PresenterSlideShowView ( - const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, + css::uno::Reference<css::uno::XComponentContext> xContext, + css::uno::Reference<css::drawing::framework::XResourceId> xViewId, const css::uno::Reference<css::frame::XController>& rxController, - const ::rtl::Reference<PresenterController>& rpPresenterController); + ::rtl::Reference<PresenterController> xPresenterController); virtual ~PresenterSlideShowView() override; PresenterSlideShowView(const PresenterSlideShowView&) = delete; PresenterSlideShowView& operator=(const PresenterSlideShowView&) = delete; diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index f89061ef67fb..441688fb8a6c 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> #include <vcl/settings.hxx> #include "PresenterSlideSorter.hxx" @@ -73,7 +74,7 @@ namespace { class PresenterSlideSorter::Layout { public: - explicit Layout (const ::rtl::Reference<PresenterScrollBar>& rpVerticalScrollBar); + explicit Layout (::rtl::Reference<PresenterScrollBar> xVerticalScrollBar); void Update (const geometry::RealRectangle2D& rBoundingBox, const double nSlideAspectRatio); void SetupVisibleArea(); @@ -129,7 +130,7 @@ public: const Reference<container::XIndexAccess>& rxSlides, const std::shared_ptr<PresenterTheme>& rpTheme, const Reference<awt::XWindow>& rxInvalidateTarget, - const std::shared_ptr<PresenterPaintManager>& rpPaintManager); + std::shared_ptr<PresenterPaintManager> xPaintManager); MouseOverManager(const MouseOverManager&) = delete; MouseOverManager& operator=(const MouseOverManager&) = delete; @@ -1049,7 +1050,7 @@ void PresenterSlideSorter::ThrowIfDisposed() //===== PresenterSlideSorter::Layout ========================================== PresenterSlideSorter::Layout::Layout ( - const ::rtl::Reference<PresenterScrollBar>& rpVerticalScrollBar) + ::rtl::Reference<PresenterScrollBar> xVerticalScrollBar) : mnHorizontalOffset(0), mnVerticalOffset(0), mnHorizontalGap(0), @@ -1063,7 +1064,7 @@ PresenterSlideSorter::Layout::Layout ( mnLastVisibleColumn(-1), mnFirstVisibleRow(-1), mnLastVisibleRow(-1), - mpVerticalScrollBar(rpVerticalScrollBar) + mpVerticalScrollBar(std::move(xVerticalScrollBar)) { } @@ -1403,11 +1404,11 @@ PresenterSlideSorter::MouseOverManager::MouseOverManager ( const Reference<container::XIndexAccess>& rxSlides, const std::shared_ptr<PresenterTheme>& rpTheme, const Reference<awt::XWindow>& rxInvalidateTarget, - const std::shared_ptr<PresenterPaintManager>& rpPaintManager) + std::shared_ptr<PresenterPaintManager> xPaintManager) : mxSlides(rxSlides), mnSlideIndex(-1), mxInvalidateTarget(rxInvalidateTarget), - mpPaintManager(rpPaintManager) + mpPaintManager(std::move(xPaintManager)) { if (rpTheme != nullptr) { diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index 452e633a2ec9..c90f250fb192 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "PresenterController.hxx" #include "PresenterSpritePane.hxx" #include <com/sun/star/lang/XMultiComponentFactory.hpp> diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index d83229b88e2a..ac1ea8da2b8d 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/rendering/TextDirection.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <o3tl/safeint.hxx> +#include <utility> #include <tools/diagnose_ex.h> using namespace ::com::sun::star; @@ -432,9 +433,9 @@ PresenterTextParagraph::PresenterTextParagraph ( const Reference<i18n::XBreakIterator>& rxBreakIterator, const Reference<i18n::XScriptTypeDetector>& rxScriptTypeDetector, const Reference<text::XTextRange>& rxTextRange, - const SharedPresenterTextCaret& rpCaret) + SharedPresenterTextCaret xCaret) : mnParagraphIndex(nParagraphIndex), - mpCaret(rpCaret), + mpCaret(std::move(xCaret)), mxBreakIterator(rxBreakIterator), mxScriptTypeDetector(rxScriptTypeDetector), mnVerticalOffset(0), @@ -1029,15 +1030,15 @@ void PresenterTextParagraph::SetupCellArray ( PresenterTextCaret::PresenterTextCaret ( uno::Reference<uno::XComponentContext> const& xContext, - const ::std::function<css::awt::Rectangle (const sal_Int32,const sal_Int32)>& rCharacterBoundsAccess, - const ::std::function<void (const css::awt::Rectangle&)>& rInvalidator) + ::std::function<css::awt::Rectangle (const sal_Int32,const sal_Int32)> aCharacterBoundsAccess, + ::std::function<void (const css::awt::Rectangle&)> aInvalidator) : m_xContext(xContext) , mnParagraphIndex(-1), mnCharacterIndex(-1), mnCaretBlinkTaskId(0), mbIsCaretVisible(false), - maCharacterBoundsAccess(rCharacterBoundsAccess), - maInvalidator(rInvalidator) + maCharacterBoundsAccess(std::move(aCharacterBoundsAccess)), + maInvalidator(std::move(aInvalidator)) { } diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index a732978e6113..6dd2da3b2372 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -41,10 +41,10 @@ class PresenterTextCaret public: PresenterTextCaret ( css::uno::Reference<css::uno::XComponentContext> const& xContext, - const ::std::function<css::awt::Rectangle (const sal_Int32,const sal_Int32)>& - rCharacterBoundsAccess, - const ::std::function<void (const css::awt::Rectangle&)>& - rInvalidator); + ::std::function<css::awt::Rectangle (const sal_Int32,const sal_Int32)> + aCharacterBoundsAccess, + ::std::function<void (const css::awt::Rectangle&)> + aInvalidator); ~PresenterTextCaret(); void ShowCaret(); @@ -93,7 +93,7 @@ public: const css::uno::Reference<css::i18n::XBreakIterator>& rxBreakIterator, const css::uno::Reference<css::i18n::XScriptTypeDetector>& rxScriptTypeDetector, const css::uno::Reference<css::text::XTextRange>& rxTextRange, - const SharedPresenterTextCaret& rpCaret); + SharedPresenterTextCaret xCaret); void Paint ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index c84747d0f360..59c340d8627a 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -26,6 +26,7 @@ #include <osl/diagnose.h> #include <map> #include <numeric> +#include <utility> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -212,7 +213,7 @@ class PresenterTheme::Theme public: Theme ( const Reference<container::XHierarchicalNameAccess>& rThemeRoot, - const OUString& rsNodeName); + OUString sNodeName); void Read ( PresenterConfigurationAccess& rConfiguration, @@ -241,10 +242,10 @@ private: //===== PresenterTheme ======================================================== PresenterTheme::PresenterTheme ( - const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const css::uno::Reference<css::rendering::XCanvas>& rxCanvas) - : mxContext(rxContext), - mxCanvas(rxCanvas) + css::uno::Reference<css::uno::XComponentContext> xContext, + css::uno::Reference<css::rendering::XCanvas> xCanvas) + : mxContext(std::move(xContext)), + mxCanvas(std::move(xCanvas)) { mpTheme = ReadTheme(); } @@ -553,8 +554,8 @@ double PresenterTheme::FontDescriptor::GetCellSizeForDesignSize ( PresenterTheme::Theme::Theme ( const Reference<container::XHierarchicalNameAccess>& rxThemeRoot, - const OUString& rsNodeName) - : msConfigurationNodeName(rsNodeName), + OUString sNodeName) + : msConfigurationNodeName(std::move(sNodeName)), maPaneStyles(), maViewStyles(), maStyleAssociations(), diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index 97fff4842d4f..ae92433a676c 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -57,8 +57,8 @@ class PresenterTheme { public: PresenterTheme ( - const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); + css::uno::Reference<css::uno::XComponentContext> xContext, + css::uno::Reference<css::rendering::XCanvas> xCanvas); ~PresenterTheme(); bool HasCanvas() const; diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index b03df035cd38..b9a4b62815c4 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -30,6 +30,7 @@ #include <memory> #include <mutex> #include <set> +#include <utility> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -41,7 +42,7 @@ class TimerTask { public: TimerTask ( - const PresenterTimer::Task& rTask, + PresenterTimer::Task aTask, const TimeValue& rDueTime, const sal_Int64 nRepeatInterval, const sal_Int32 nTaskId); @@ -397,11 +398,11 @@ sal_Int64 TimerScheduler::ConvertFromTimeValue ( namespace { TimerTask::TimerTask ( - const PresenterTimer::Task& rTask, + PresenterTimer::Task aTask, const TimeValue& rDueTime, const sal_Int64 nRepeatInterval, const sal_Int32 nTaskId) - : maTask(rTask), + : maTask(std::move(aTask)), maDueTime(rDueTime), mnRepeatInterval(nRepeatInterval), mnTaskId(nTaskId), diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 75a4b7500550..867459423d8e 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> #include <vcl/settings.hxx> #include "PresenterToolBar.hxx" @@ -56,8 +57,8 @@ namespace { public: Text(); Text ( - const OUString& rsText, - const PresenterTheme::SharedFontDescriptor& rpFont); + OUString sText, + PresenterTheme::SharedFontDescriptor pFont); void SetText (const OUString& rsText); const OUString& GetText() const; @@ -120,7 +121,7 @@ namespace { public ElementInterfaceBase { public: - explicit Element (const ::rtl::Reference<PresenterToolBar>& rpToolBar); + explicit Element (::rtl::Reference<PresenterToolBar> pToolBar); Element(const Element&) = delete; Element& operator=(const Element&) = delete; @@ -263,8 +264,8 @@ namespace { class Listener : public PresenterClockTimer::Listener { public: - explicit Listener (const ::rtl::Reference<TimeLabel>& rxLabel) - : mxLabel(rxLabel) {} + explicit Listener (::rtl::Reference<TimeLabel> xLabel) + : mxLabel(std::move(xLabel)) {} virtual ~Listener() {} virtual void TimeHasChanged (const oslDateTime& rCurrentTime) override { if (mxLabel.is()) mxLabel->TimeHasChanged(rCurrentTime); } @@ -349,15 +350,15 @@ namespace { PresenterToolBar::PresenterToolBar ( const Reference<XComponentContext>& rxContext, - const css::uno::Reference<css::awt::XWindow>& rxWindow, - const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, - const ::rtl::Reference<PresenterController>& rpPresenterController, + css::uno::Reference<css::awt::XWindow> xWindow, + css::uno::Reference<css::rendering::XCanvas> xCanvas, + ::rtl::Reference<PresenterController> pPresenterController, const Anchor eAnchor) : PresenterToolBarInterfaceBase(m_aMutex), mxComponentContext(rxContext), - mxWindow(rxWindow), - mxCanvas(rxCanvas), - mpPresenterController(rpPresenterController), + mxWindow(std::move(xWindow)), + mxCanvas(std::move(xCanvas)), + mpPresenterController(std::move(pPresenterController)), mbIsLayoutPending(false), meAnchor(eAnchor) { @@ -1126,9 +1127,9 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterToolBarView::getCurrentPage() namespace { Element::Element ( - const ::rtl::Reference<PresenterToolBar>& rpToolBar) + ::rtl::Reference<PresenterToolBar> pToolBar) : ElementInterfaceBase(m_aMutex), - mpToolBar(rpToolBar), + mpToolBar(std::move(pToolBar)), mbIsOver(false), mbIsPressed(false), mbIsSelected(false), @@ -1605,10 +1606,10 @@ Text::Text() } Text::Text ( - const OUString& rsText, - const PresenterTheme::SharedFontDescriptor& rpFont) - : msText(rsText), - mpFont(rpFont) + OUString sText, + PresenterTheme::SharedFontDescriptor pFont) + : msText(std::move(sText)), + mpFont(std::move(pFont)) { } diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index 90931df311a5..1b789955689c 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -70,9 +70,9 @@ public: PresenterToolBar ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const css::uno::Reference<css::awt::XWindow>& rxWindow, - const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, - const ::rtl::Reference<PresenterController>& rpPresenterController, + css::uno::Reference<css::awt::XWindow> xWindow, + css::uno::Reference<css::rendering::XCanvas> xCanvas, + ::rtl::Reference<PresenterController> pPresenterController, const Anchor eAnchor); virtual ~PresenterToolBar() override; PresenterToolBar(const PresenterToolBar&) = delete; diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 7c7f8c98bae3..06eff32f7d3f 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -26,6 +26,7 @@ #include "PresenterSlideSorter.hxx" #include "PresenterToolBar.hxx" #include <com/sun/star/drawing/framework/XControllerManager.hpp> +#include <utility> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -94,11 +95,11 @@ public: PresenterViewFactory::PresenterViewFactory ( const Reference<uno::XComponentContext>& rxContext, const Reference<frame::XController>& rxController, - const ::rtl::Reference<PresenterController>& rpPresenterController) + ::rtl::Reference<PresenterController> pPresenterController) : PresenterViewFactoryInterfaceBase(m_aMutex), mxComponentContext(rxContext), mxControllerWeak(rxController), - mpPresenterController(rpPresenterController) + mpPresenterController(std::move(pPresenterController)) { } diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index 30d488cfc0a7..fa5e888ecad2 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -123,7 +123,7 @@ private: PresenterViewFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::frame::XController>& rxController, - const ::rtl::Reference<PresenterController>& rpPresenterController); + ::rtl::Reference<PresenterController> pPresenterController); void Register (const css::uno::Reference<css::frame::XController>& rxController); diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index d1ccaadc75d6..11db88ce52b6 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <utility> #include <vcl/settings.hxx> #include "PresenterWindowManager.hxx" #include "PresenterController.hxx" @@ -48,12 +49,12 @@ namespace sdext::presenter { PresenterWindowManager::PresenterWindowManager ( const Reference<XComponentContext>& rxContext, - const ::rtl::Reference<PresenterPaneContainer>& rpPaneContainer, - const ::rtl::Reference<PresenterController>& rpPresenterController) + ::rtl::Reference<PresenterPaneContainer> pPaneContainer, + ::rtl::Reference<PresenterController> pPresenterController) : PresenterWindowManagerInterfaceBase(m_aMutex), mxComponentContext(rxContext), - mpPresenterController(rpPresenterController), - mpPaneContainer(rpPaneContainer), + mpPresenterController(std::move(pPresenterController)), + mpPaneContainer(std::move(pPaneContainer)), mbIsLayoutPending(true), mbIsLayouting(false), meLayoutMode(LM_Generic), diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index 9c032e6df433..04d164e35f8a 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -60,8 +60,8 @@ class PresenterWindowManager public: PresenterWindowManager ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, - const ::rtl::Reference<PresenterPaneContainer>& rpPaneContainer, - const ::rtl::Reference<PresenterController>& rpPresenterController); + ::rtl::Reference<PresenterPaneContainer> pPaneContainer, + ::rtl::Reference<PresenterController> pPresenterController); virtual ~PresenterWindowManager() override; PresenterWindowManager(const PresenterWindowManager&) = delete; PresenterWindowManager& operator=(const PresenterWindowManager&) = delete; |