[Libreoffice-commits] core.git: 2 commits - cppcanvas/source framework/inc framework/source include/framework
Noel Grandin
noel.grandin at collabora.co.uk
Thu Jul 20 07:20:43 UTC 2017
cppcanvas/source/inc/implrenderer.hxx | 8 +++---
cppcanvas/source/mtfrenderer/emfplus.cxx | 6 ++---
cppcanvas/source/mtfrenderer/emfppath.cxx | 2 -
cppcanvas/source/mtfrenderer/emfppath.hxx | 2 -
cppcanvas/source/mtfrenderer/textaction.cxx | 6 ++---
framework/inc/helper/vclstatusindicator.hxx | 2 -
framework/inc/uielement/comboboxtoolbarcontroller.hxx | 2 -
framework/inc/uielement/edittoolbarcontroller.hxx | 2 -
framework/inc/uielement/fontmenucontroller.hxx | 2 -
framework/inc/uielement/fontsizemenucontroller.hxx | 6 ++---
framework/inc/uielement/headermenucontroller.hxx | 2 -
framework/inc/uielement/langselectionmenucontroller.hxx | 2 -
framework/inc/uielement/macrosmenucontroller.hxx | 2 -
framework/inc/uielement/menubarmanager.hxx | 2 -
framework/inc/uielement/menubarmerger.hxx | 2 -
framework/inc/uielement/newmenucontroller.hxx | 2 -
framework/inc/uielement/notebookbarmenucontroller.hxx | 2 -
framework/inc/uielement/spinfieldtoolbarcontroller.hxx | 2 -
framework/inc/uielement/toolbarmanager.hxx | 4 +--
framework/inc/uielement/toolbarmodemenucontroller.hxx | 2 -
framework/inc/uielement/toolbarsmenucontroller.hxx | 4 +--
framework/source/fwe/classes/addonmenu.cxx | 4 +--
framework/source/fwe/helper/actiontriggerhelper.cxx | 4 +--
framework/source/fwe/xml/menuconfiguration.cxx | 6 ++---
framework/source/helper/vclstatusindicator.cxx | 2 -
framework/source/layoutmanager/helpers.cxx | 2 -
framework/source/layoutmanager/helpers.hxx | 2 -
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 6 ++---
framework/source/layoutmanager/toolbarlayoutmanager.hxx | 2 -
framework/source/services/autorecovery.cxx | 8 +++---
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 8 +++---
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 4 +--
framework/source/uiconfiguration/windowstateconfiguration.cxx | 12 +++++-----
framework/source/uielement/addonstoolbarmanager.cxx | 2 -
framework/source/uielement/comboboxtoolbarcontroller.cxx | 2 -
framework/source/uielement/controlmenucontroller.cxx | 4 +--
framework/source/uielement/edittoolbarcontroller.cxx | 2 -
framework/source/uielement/fontmenucontroller.cxx | 2 -
framework/source/uielement/fontsizemenucontroller.cxx | 6 ++---
framework/source/uielement/headermenucontroller.cxx | 2 -
framework/source/uielement/langselectionmenucontroller.cxx | 2 -
framework/source/uielement/macrosmenucontroller.cxx | 2 -
framework/source/uielement/menubarmanager.cxx | 2 -
framework/source/uielement/menubarmerger.cxx | 2 -
framework/source/uielement/newmenucontroller.cxx | 2 -
framework/source/uielement/notebookbarmenucontroller.cxx | 2 -
framework/source/uielement/objectmenucontroller.cxx | 4 +--
framework/source/uielement/recentfilesmenucontroller.cxx | 4 +--
framework/source/uielement/spinfieldtoolbarcontroller.cxx | 2 -
framework/source/uielement/toolbarmanager.cxx | 6 ++---
framework/source/uielement/toolbarmodemenucontroller.cxx | 2 -
framework/source/uielement/toolbarsmenucontroller.cxx | 4 +--
include/framework/actiontriggerhelper.hxx | 2 -
include/framework/addonmenu.hxx | 2 -
include/framework/menuconfiguration.hxx | 6 ++---
55 files changed, 94 insertions(+), 94 deletions(-)
New commits:
commit 039d9b97b720d9dc735413b292382104b63014d5
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Jul 19 17:44:29 2017 +0200
loplugin:constparams in framework
Change-Id: Iecd19a0cbb3cc78158c17bfa064cc23bafc44b18
Reviewed-on: https://gerrit.libreoffice.org/40206
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx
index c9b0bff85eaa..5665b2a394ee 100644
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -88,7 +88,7 @@ class VCLStatusIndicator : public ::cppu::WeakImplHelper< css::task::XStatusInd
private:
static void impl_recalcLayout(vcl::Window* pStatusBar ,
- vcl::Window* pParentWindow);
+ vcl::Window const * pParentWindow);
};
} // namespace framework
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index 4ffbba2af918..891e25bb05fd 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -52,7 +52,7 @@ class ComboboxToolbarController : public ComplexToolbarController
void Modify();
void GetFocus();
void LoseFocus();
- bool PreNotify( NotifyEvent& rNEvt );
+ bool PreNotify( NotifyEvent const & rNEvt );
protected:
virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override;
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index 4674b0cf0ec3..20924416c78d 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -52,7 +52,7 @@ class EditToolbarController : public ComplexToolbarController
void Modify();
void GetFocus();
void LoseFocus();
- bool PreNotify( NotifyEvent& rNEvt );
+ bool PreNotify( NotifyEvent const & rNEvt );
protected:
virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override;
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index 1a91747bc702..bbea2d450e42 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -65,7 +65,7 @@ namespace framework
private:
virtual void impl_setPopupMenu() override;
- void fillPopupMenu( const css::uno::Sequence< OUString >& rFontNameSeq, css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
+ void fillPopupMenu( const css::uno::Sequence< OUString >& rFontNameSeq, css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
OUString m_aFontFamilyName;
css::uno::Reference< css::frame::XDispatch > m_xFontListDispatch;
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index 078e4935298e..2bf35223ca84 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -66,9 +66,9 @@ namespace framework
private:
virtual void impl_setPopupMenu() override;
- void setCurHeight( long nHeight, css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
- void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
- OUString retrievePrinterName( css::uno::Reference< css::frame::XFrame >& rFrame );
+ void setCurHeight( long nHeight, css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
+ void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
+ OUString retrievePrinterName( css::uno::Reference< css::frame::XFrame > const & rFrame );
std::unique_ptr<long[]> m_pHeightArray;
css::awt::FontDescriptor m_aFontDescriptor;
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index 66fcc9b347ad..ae3e85e86ccf 100644
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
@@ -61,7 +61,7 @@ namespace framework
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
private:
- void fillPopupMenu( const css::uno::Reference< css::frame::XModel >& rModel, css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
+ void fillPopupMenu( const css::uno::Reference< css::frame::XModel >& rModel, css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
css::uno::Reference< css::frame::XModel > m_xModel;
bool m_bFooter;
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 294b913cc38a..df35610cb8b8 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -89,7 +89,7 @@ namespace framework
OUString m_aGuessedTextLang;
LanguageGuessingHelper m_aLangGuessHelper;
- void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu, const Mode rMode );
+ void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu, const Mode rMode );
};
}
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index d0893f8c5e4b..ea9a74fe5572 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -59,7 +59,7 @@ namespace framework
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
private:
- void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
+ void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
void addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId );
};
}
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index a222c5664ba7..77cb087f4f5a 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -173,7 +173,7 @@ class MenuBarManager:
void RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuShortCuts );
void CheckAndAddMenuExtension( Menu* pMenu );
static void UpdateSpecialWindowMenu( Menu* pMenu, const css::uno::Reference< css::uno::XComponentContext >& xContext );
- static void FillMenuImages( css::uno::Reference< css::frame::XFrame >& xFrame, Menu* _pMenu, bool bShowMenuImages );
+ static void FillMenuImages( css::uno::Reference< css::frame::XFrame > const & xFrame, Menu* _pMenu, bool bShowMenuImages );
static void impl_RetrieveShortcutsFromConfiguration( const css::uno::Reference< css::ui::XAcceleratorConfiguration >& rAccelCfg,
const css::uno::Sequence< OUString >& rCommands,
std::vector< MenuItemHandler* >& aMenuShortCuts );
diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx
index f5720da0c8b0..99370698fc38 100644
--- a/framework/inc/uielement/menubarmerger.hxx
+++ b/framework/inc/uielement/menubarmerger.hxx
@@ -63,7 +63,7 @@ namespace MenuBarMerger
std::vector< OUString >& aReferencePath );
ReferencePathInfo FindReferencePath( const std::vector< OUString >& aReferencePath, Menu* pMenu );
sal_uInt16 FindMenuItem( const OUString& rCmd,
- Menu* pMenu );
+ Menu const * pMenu );
void GetMenuEntry( const css::uno::Sequence< css::beans::PropertyValue >& rAddonMenuEntry,
AddonMenuItem& aAddonMenu );
void GetSubMenu( const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSubMenuEntries,
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index 5d0cb2402f99..43b0b6910bf7 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -72,7 +72,7 @@ namespace framework
private:
virtual void impl_setPopupMenu() override;
- void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
+ void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
void retrieveShortcutsFromConfiguration( const css::uno::Reference< css::ui::XAcceleratorConfiguration >& rAccelCfg,
const css::uno::Sequence< OUString >& rCommands,
std::vector< vcl::KeyCode >& aMenuShortCuts );
diff --git a/framework/inc/uielement/notebookbarmenucontroller.hxx b/framework/inc/uielement/notebookbarmenucontroller.hxx
index 2ebb4c626682..6d0f2b7c0a1b 100644
--- a/framework/inc/uielement/notebookbarmenucontroller.hxx
+++ b/framework/inc/uielement/notebookbarmenucontroller.hxx
@@ -76,7 +76,7 @@ namespace framework
DECL_STATIC_LINK( NotebookbarMenuController, ExecuteHdl_Impl, void*, void );
private:
- void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
+ void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
css::uno::Reference< css::uno::XComponentContext > m_xContext;
};
diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
index cfa073fae74f..42d121971259 100644
--- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
+++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
@@ -56,7 +56,7 @@ class SpinfieldToolbarController : public ComplexToolbarController
void Last();
void Modify();
void GetFocus();
- bool PreNotify( NotifyEvent& rNEvt );
+ bool PreNotify( NotifyEvent const & rNEvt );
protected:
virtual void executeControlCommand( const css::frame::ControlCommand& rControlCommand ) override;
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 9821c05cace3..d5f9e11f70b4 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -91,7 +91,7 @@ class ToolBarManager : public ToolbarManager_Base
void CheckAndUpdateImages();
virtual void RefreshImages();
void FillToolbar( const css::uno::Reference< css::container::XIndexAccess >& rToolBarData );
- void FillOverflowToolbar( ToolBox* pParent );
+ void FillOverflowToolbar( ToolBox const * pParent );
void notifyRegisteredControllers( const OUString& aUIElementName, const OUString& aCommand );
void Destroy();
@@ -128,7 +128,7 @@ class ToolBarManager : public ToolbarManager_Base
virtual bool MenuItemAllowed( sal_uInt16 ) const;
- void AddCustomizeMenuItems(ToolBox* pToolBar);
+ void AddCustomizeMenuItems(ToolBox const * pToolBar);
void InitImageManager();
void RemoveControllers();
void CreateControllers();
diff --git a/framework/inc/uielement/toolbarmodemenucontroller.hxx b/framework/inc/uielement/toolbarmodemenucontroller.hxx
index 40ddbae29465..a6d13f13eea6 100644
--- a/framework/inc/uielement/toolbarmodemenucontroller.hxx
+++ b/framework/inc/uielement/toolbarmodemenucontroller.hxx
@@ -76,7 +76,7 @@ namespace framework
DECL_STATIC_LINK( ToolbarModeMenuController, ExecuteHdl_Impl, void*, void );
private:
- void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
+ void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
css::uno::Reference< css::uno::XComponentContext > m_xContext;
};
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index c9a8429e479e..1745c7796259 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -83,10 +83,10 @@ namespace framework
DECL_STATIC_LINK( ToolbarsMenuController, ExecuteHdl_Impl, void*, void );
private:
- void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
+ void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > getLayoutManagerToolbars( const css::uno::Reference< css::frame::XLayoutManager >& rLayoutManager );
css::uno::Reference< css::frame::XDispatch > getDispatchFromCommandURL( const OUString& rCommandURL );
- void addCommand( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu, const OUString& rCommandURL, const OUString& aLabel );
+ void addCommand( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu, const OUString& rCommandURL, const OUString& aLabel );
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::container::XNameAccess > m_xPersistentWindowState;
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index 5a7c7344b674..90914fe2a44c 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -80,7 +80,7 @@ sal_uInt16 AddonMenuManager::GetNextPos( sal_uInt16 nPos )
return ( nPos == MENU_APPEND ) ? MENU_APPEND : ( nPos+1 );
}
-static sal_uInt16 FindMenuId( Menu* pMenu, const OUString& aCommand )
+static sal_uInt16 FindMenuId( Menu const * pMenu, const OUString& aCommand )
{
sal_uInt16 nPos = 0;
OUString aCmd;
@@ -97,7 +97,7 @@ static sal_uInt16 FindMenuId( Menu* pMenu, const OUString& aCommand )
// Merge the Add-Ons help menu items into the given menu bar at a defined pos
void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame,
- MenuBar* pMergeMenuBar )
+ MenuBar const * pMergeMenuBar )
{
if ( pMergeMenuBar )
{
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index ad67b2208900..25aa25474593 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -311,7 +311,7 @@ Reference< XIndexContainer > CreateActionTriggerContainer( const Reference< XInd
return Reference< XIndexContainer >();
}
-void FillActionTriggerContainerWithMenu( const Menu* pMenu, Reference< XIndexContainer >& rActionTriggerContainer )
+void FillActionTriggerContainerWithMenu( const Menu* pMenu, Reference< XIndexContainer > const & rActionTriggerContainer )
{
SolarMutexGuard aGuard;
@@ -368,7 +368,7 @@ void ActionTriggerHelper::CreateMenuFromActionTriggerContainer(
}
void ActionTriggerHelper::FillActionTriggerContainerFromMenu(
- Reference< XIndexContainer >& xActionTriggerContainer,
+ Reference< XIndexContainer > const & xActionTriggerContainer,
const Menu* pMenu )
{
FillActionTriggerContainerWithMenu( pMenu, xActionTriggerContainer );
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx
index 0dcbfc24ab07..d64a9793663d 100644
--- a/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/framework/source/fwe/xml/menuconfiguration.cxx
@@ -53,7 +53,7 @@ MenuConfiguration::~MenuConfiguration()
}
Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML(
- Reference< XInputStream >& rInputStream )
+ Reference< XInputStream > const & rInputStream )
{
Reference< XParser > xParser = Parser::create( m_xContext );
@@ -99,8 +99,8 @@ Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML(
}
void MenuConfiguration::StoreMenuBarConfigurationToXML(
- Reference< XIndexAccess >& rMenuBarConfiguration,
- Reference< XOutputStream >& rOutputStream, bool bIsMenuBar )
+ Reference< XIndexAccess > const & rMenuBarConfiguration,
+ Reference< XOutputStream > const & rOutputStream, bool bIsMenuBar )
{
Reference< XWriter > xWriter = Writer::create(m_xContext);
xWriter->setOutputStream( rOutputStream );
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 29401a3b8443..d8594c60c53e 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -122,7 +122,7 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue)
}
void VCLStatusIndicator::impl_recalcLayout(vcl::Window* pStatusBar ,
- vcl::Window* pParentWindow)
+ vcl::Window const * pParentWindow)
{
if (
(!pStatusBar ) ||
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index 869e7829e077..04adfdfc47d6 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -61,7 +61,7 @@ bool isReverseOrderDockingArea( const sal_Int32 nDockArea )
( eDockArea == ui::DockingArea_DOCKINGAREA_RIGHT ));
}
-bool isToolboxHorizontalAligned( ToolBox* pToolBox )
+bool isToolboxHorizontalAligned( ToolBox const * pToolBox )
{
if ( pToolBox )
return (( pToolBox->GetAlign() == WindowAlign::Top ) || ( pToolBox->GetAlign() == WindowAlign::Bottom ));
diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx
index 0e663f8caddf..200a2fc43402 100644
--- a/framework/source/layoutmanager/helpers.hxx
+++ b/framework/source/layoutmanager/helpers.hxx
@@ -46,7 +46,7 @@ namespace framework
bool hasEmptySize( const css::awt::Size& rSize );
bool hasDefaultPosValue( const css::awt::Point& rPos );
bool isDefaultPos( const css::awt::Point& rPos );
-bool isToolboxHorizontalAligned( ToolBox* pToolBox );
+bool isToolboxHorizontalAligned( ToolBox const * pToolBox );
bool isReverseOrderDockingArea( const sal_Int32 nDockArea );
bool isHorizontalDockingArea( const sal_Int32 nDockArea );
bool isHorizontalDockingArea( const css::ui::DockingArea& nDockArea );
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index be24d67a0262..d39bb3e90bac 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -912,7 +912,7 @@ bool ToolbarLayoutManager::dockAllToolbars()
return bResult;
}
-long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent )
+long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent const * pEvent )
{
// To enable toolbar controllers to change their image when a sub-toolbar function
// is activated, we need this mechanism. We have NO connection between these toolbars
@@ -923,7 +923,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent )
{
OUString aToolbarName;
OUString aCommand;
- ToolBox* pToolBox = getToolboxPtr( static_cast<VclWindowEvent*>(pEvent)->GetWindow() );
+ ToolBox* pToolBox = getToolboxPtr( static_cast<VclWindowEvent const *>(pEvent)->GetWindow() );
if ( pToolBox )
{
@@ -971,7 +971,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent )
{
if ( !implts_isToolbarCreationActive() )
{
- ToolBox* pToolBox = getToolboxPtr( static_cast<VclWindowEvent*>(pEvent)->GetWindow() );
+ ToolBox* pToolBox = getToolboxPtr( static_cast<VclWindowEvent const *>(pEvent)->GetWindow() );
if ( pToolBox )
{
OUString aToolbarName = retrieveToolbarNameFromHelpURL( pToolBox );
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 4f92f6be5029..263835428eae 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -125,7 +125,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW
css::uno::Sequence< css::uno::Reference< css::ui::XUIElement > > getToolbars();
// child window notifications
- long childWindowEvent( VclSimpleEvent* pEvent );
+ long childWindowEvent( VclSimpleEvent const * pEvent );
// XInterface
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 78237387d428..fc33349faebc 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -815,7 +815,7 @@ private:
*/
static css::frame::FeatureStateEvent implst_createFeatureStateEvent( sal_Int32 eJob ,
const OUString& sEventType,
- AutoRecovery::TDocumentInfo* pInfo );
+ AutoRecovery::TDocumentInfo const * pInfo );
class ListenerInformer
{
@@ -2742,7 +2742,7 @@ void AutoRecovery::implts_changeAllDocVisibility(bool bVisible)
/* Currently the document is not closed in case of crash,
so the lock file must be removed explicitly
*/
-void lc_removeLockFile(AutoRecovery::TDocumentInfo& rInfo)
+void lc_removeLockFile(AutoRecovery::TDocumentInfo const & rInfo)
{
#if !HAVE_FEATURE_MULTIUSER_ENVIRONMENT || HAVE_FEATURE_MACOSX_SANDBOX
(void) rInfo;
@@ -2846,7 +2846,7 @@ void AutoRecovery::implts_prepareSessionShutdown()
So we ignore such documents only...
Hopefully next time they are not inserted in our cache.
*/
-bool lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo& rInfo)
+bool lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo const & rInfo)
{
if (! rInfo.Document.is())
return true;
@@ -3609,7 +3609,7 @@ sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL)
css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent( sal_Int32 eJob ,
const OUString& sEventType,
- AutoRecovery::TDocumentInfo* pInfo )
+ AutoRecovery::TDocumentInfo const * pInfo )
{
css::frame::FeatureStateEvent aEvent;
aEvent.FeatureURL.Complete = AutoRecovery::implst_getJobDescription(eJob);
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index a4a853febd34..1bb4119e5387 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -196,8 +196,8 @@ private:
UIElementData* impl_findUIElementData( const OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true );
void impl_requestUIElementData( sal_Int16 nElementType, Layer eLayer, UIElementData& aUIElementData );
void impl_storeElementTypeData( const css::uno::Reference< css::embed::XStorage >& xStorage, UIElementType& rElementType, bool bResetModifyState = true );
- void impl_resetElementTypeData( UIElementType& rUserElementType, UIElementType& rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
- void impl_reloadElementTypeData( UIElementType& rUserElementType, UIElementType& rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
+ void impl_resetElementTypeData( UIElementType& rUserElementType, UIElementType const & rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
+ void impl_reloadElementTypeData( UIElementType& rUserElementType, UIElementType const & rDefaultElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
UIElementTypesVector m_aUIElements[LAYER_COUNT];
PresetHandler* m_pStorageHandler[css::ui::UIElementType::COUNT];
@@ -629,7 +629,7 @@ void ModuleUIConfigurationManager::impl_storeElementTypeData( const Reference< X
// This is only allowed to be called on the LAYER_USER_DEFINED!
void ModuleUIConfigurationManager::impl_resetElementTypeData(
UIElementType& rUserElementType,
- UIElementType& rDefaultElementType,
+ UIElementType const & rDefaultElementType,
ConfigEventNotifyContainer& rRemoveNotifyContainer,
ConfigEventNotifyContainer& rReplaceNotifyContainer )
{
@@ -695,7 +695,7 @@ void ModuleUIConfigurationManager::impl_resetElementTypeData(
void ModuleUIConfigurationManager::impl_reloadElementTypeData(
UIElementType& rUserElementType,
- UIElementType& rDefaultElementType,
+ UIElementType const & rDefaultElementType,
ConfigEventNotifyContainer& rRemoveNotifyContainer,
ConfigEventNotifyContainer& rReplaceNotifyContainer )
{
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index c8714f2d4275..8419dac29b02 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -175,7 +175,7 @@ private:
void impl_preloadUIElementTypeList( sal_Int16 nElementType );
UIElementData* impl_findUIElementData( const OUString& aResourceURL, sal_Int16 nElementType, bool bLoad = true );
void impl_requestUIElementData( sal_Int16 nElementType, UIElementData& aUIElementData );
- void impl_storeElementTypeData( css::uno::Reference< css::embed::XStorage >& xStorage, UIElementType& rElementType, bool bResetModifyState = true );
+ void impl_storeElementTypeData( css::uno::Reference< css::embed::XStorage > const & xStorage, UIElementType& rElementType, bool bResetModifyState = true );
void impl_resetElementTypeData( UIElementType& rDocElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer );
void impl_reloadElementTypeData( UIElementType& rDocElementType, ConfigEventNotifyContainer& rRemoveNotifyContainer, ConfigEventNotifyContainer& rReplaceNotifyContainer );
@@ -447,7 +447,7 @@ UIConfigurationManager::UIElementData* UIConfigurationManager::impl_findUIElemen
return nullptr;
}
-void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage >& xStorage, UIElementType& rElementType, bool bResetModifyState )
+void UIConfigurationManager::impl_storeElementTypeData( Reference< XStorage > const & xStorage, UIElementType& rElementType, bool bResetModifyState )
{
UIElementDataHashMap& rHashMap = rElementType.aElementsHashMap;
UIElementDataHashMap::iterator pIter = rHashMap.begin();
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index 8a71ebdf6c0d..9ce2da62bdf2 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -188,9 +188,9 @@ class ConfigurationAccess_WindowState : public ::cppu::WeakImplHelper< XNameCon
sal_uInt32 nMask; // see WindowStateMask
};
- void impl_putPropertiesFromStruct( const WindowStateInfo& rWinStateInfo, Reference< XPropertySet >& xPropSet );
- Any impl_insertCacheAndReturnSequence( const OUString& rResourceURL, Reference< XNameAccess >& rNameAccess );
- WindowStateInfo& impl_insertCacheAndReturnWinState( const OUString& rResourceURL, Reference< XNameAccess >& rNameAccess );
+ void impl_putPropertiesFromStruct( const WindowStateInfo& rWinStateInfo, Reference< XPropertySet > const & xPropSet );
+ Any impl_insertCacheAndReturnSequence( const OUString& rResourceURL, Reference< XNameAccess > const & rNameAccess );
+ WindowStateInfo& impl_insertCacheAndReturnWinState( const OUString& rResourceURL, Reference< XNameAccess > const & rNameAccess );
Any impl_getSequenceFromStruct( const WindowStateInfo& rWinStateInfo );
void impl_fillStructFromSequence( WindowStateInfo& rWinStateInfo, const Sequence< PropertyValue >& rSeq );
Any impl_getWindowStateFromResourceURL( const OUString& rResourceURL );
@@ -572,7 +572,7 @@ Any ConfigurationAccess_WindowState::impl_getSequenceFromStruct( const WindowSta
return makeAny( comphelper::containerToSequence(aPropVec) );
}
-Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OUString& rResourceURL, Reference< XNameAccess >& xNameAccess )
+Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OUString& rResourceURL, Reference< XNameAccess > const & xNameAccess )
{
sal_Int32 nMask( 0 );
sal_Int32 nCount( m_aPropArray.size() );
@@ -768,7 +768,7 @@ Any ConfigurationAccess_WindowState::impl_insertCacheAndReturnSequence( const OU
return makeAny( comphelper::containerToSequence(aPropVec) );
}
-ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowState::impl_insertCacheAndReturnWinState( const OUString& rResourceURL, Reference< XNameAccess >& rNameAccess )
+ConfigurationAccess_WindowState::WindowStateInfo& ConfigurationAccess_WindowState::impl_insertCacheAndReturnWinState( const OUString& rResourceURL, Reference< XNameAccess > const & rNameAccess )
{
sal_Int32 nMask( 0 );
sal_Int32 nCount( m_aPropArray.size() );
@@ -1125,7 +1125,7 @@ void ConfigurationAccess_WindowState::impl_fillStructFromSequence( WindowStateIn
}
}
-void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const WindowStateInfo& rWinStateInfo, Reference< XPropertySet >& xPropSet )
+void ConfigurationAccess_WindowState::impl_putPropertiesFromStruct( const WindowStateInfo& rWinStateInfo, Reference< XPropertySet > const & xPropSet )
{
sal_Int32 i( 0 );
sal_Int32 nCount( m_aPropArray.size() );
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 63b8c4729b89..f497ea01826e 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -102,7 +102,7 @@ static bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString&
return false;
}
-static Image RetrieveImage( Reference< css::frame::XFrame >& rFrame,
+static Image RetrieveImage( Reference< css::frame::XFrame > const & rFrame,
const OUString& aImageId,
const OUString& aURL,
bool bBigImage
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 8f37f6d4f690..aeb35a07d6ae 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -191,7 +191,7 @@ void ComboboxToolbarController::LoseFocus()
notifyFocusLost();
}
-bool ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt )
+bool ComboboxToolbarController::PreNotify( NotifyEvent const & rNEvt )
{
switch ( rNEvt.GetType() )
{
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index b9975db9ade3..5cd2984fad64 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -159,7 +159,7 @@ private:
};
void updateImagesPopupMenu( PopupMenu* pPopupMenu );
- void fillPopupMenu( uno::Reference< awt::XPopupMenu >& rPopupMenu );
+ void fillPopupMenu( uno::Reference< awt::XPopupMenu > const & rPopupMenu );
bool m_bShowMenuImages : 1;
std::unique_ptr<VclBuilder> m_xBuilder;
@@ -191,7 +191,7 @@ void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu )
}
// private function
-void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
+void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > const & rPopupMenu )
{
VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu ));
PopupMenu* pVCLPopupMenu = nullptr;
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 023df2c2573f..e1e610bb4b75 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -169,7 +169,7 @@ void EditToolbarController::LoseFocus()
notifyFocusLost();
}
-bool EditToolbarController::PreNotify( NotifyEvent& rNEvt )
+bool EditToolbarController::PreNotify( NotifyEvent const & rNEvt )
{
if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 056ea97277ea..c1f64b64e259 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -72,7 +72,7 @@ FontMenuController::~FontMenuController()
}
// private function
-void FontMenuController::fillPopupMenu( const Sequence< OUString >& rFontNameSeq, Reference< css::awt::XPopupMenu >& rPopupMenu )
+void FontMenuController::fillPopupMenu( const Sequence< OUString >& rFontNameSeq, Reference< css::awt::XPopupMenu > const & rPopupMenu )
{
const OUString* pFontNameArray = rFontNameSeq.getConstArray();
VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu ));
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 6977e827b3c1..53889e0785e4 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -68,7 +68,7 @@ FontSizeMenuController::~FontSizeMenuController()
}
// private function
-OUString FontSizeMenuController::retrievePrinterName( css::uno::Reference< css::frame::XFrame >& rFrame )
+OUString FontSizeMenuController::retrievePrinterName( css::uno::Reference< css::frame::XFrame > const & rFrame )
{
OUString aPrinterName;
@@ -97,7 +97,7 @@ OUString FontSizeMenuController::retrievePrinterName( css::uno::Reference< css::
}
// private function
-void FontSizeMenuController::setCurHeight( long nHeight, Reference< css::awt::XPopupMenu >& rPopupMenu )
+void FontSizeMenuController::setCurHeight( long nHeight, Reference< css::awt::XPopupMenu > const & rPopupMenu )
{
// check menu item
sal_uInt16 nChecked = 0;
@@ -121,7 +121,7 @@ void FontSizeMenuController::setCurHeight( long nHeight, Reference< css::awt::XP
}
// private function
-void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
+void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > const & rPopupMenu )
{
VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu ));
PopupMenu* pVCLPopupMenu = nullptr;
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index aa6ad944faed..41bf068c7047 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -71,7 +71,7 @@ HeaderMenuController::~HeaderMenuController()
}
// private function
-void HeaderMenuController::fillPopupMenu( const Reference< css::frame::XModel >& rModel, Reference< css::awt::XPopupMenu >& rPopupMenu )
+void HeaderMenuController::fillPopupMenu( const Reference< css::frame::XModel >& rModel, Reference< css::awt::XPopupMenu > const & rPopupMenu )
{
VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu ));
PopupMenu* pVCLPopupMenu = nullptr;
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index e8c1c11a33c8..701bdf1902da 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -154,7 +154,7 @@ void LanguageSelectionMenuController::impl_setPopupMenu()
m_xMenuDispatch_CharDlgForParagraph = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
}
-void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu , const Mode eMode )
+void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > const & rPopupMenu , const Mode eMode )
{
VCLXPopupMenu* pVCLPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu ));
PopupMenu* pPopupMenu = nullptr;
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 624b56395c00..7b54f2aaa911 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -65,7 +65,7 @@ MacrosMenuController::~MacrosMenuController()
}
// private function
-void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
+void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > const & rPopupMenu )
{
VCLXPopupMenu* pVCLPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu ));
PopupMenu* pPopupMenu = nullptr;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index ea28334b7768..0b82b567c855 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1923,7 +1923,7 @@ void MenuBarManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XComp
}
}
-void MenuBarManager::FillMenuImages(Reference< XFrame >& _xFrame, Menu* _pMenu,bool bShowMenuImages)
+void MenuBarManager::FillMenuImages(Reference< XFrame > const & _xFrame, Menu* _pMenu,bool bShowMenuImages)
{
AddonsOptions aAddonOptions;
diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx
index 7a9123cb96bb..eb478b70283a 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -142,7 +142,7 @@ ReferencePathInfo MenuBarMerger::FindReferencePath(
return aResult;
}
-sal_uInt16 MenuBarMerger::FindMenuItem( const OUString& rCmd, Menu* pCurrMenu )
+sal_uInt16 MenuBarMerger::FindMenuItem( const OUString& rCmd, Menu const * pCurrMenu )
{
for ( sal_uInt16 i = 0; i < pCurrMenu->GetItemCount(); i++ )
{
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index ddc51da96d3b..adb39d870bf6 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -300,7 +300,7 @@ NewMenuController::~NewMenuController()
}
// private function
-void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
+void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > const & rPopupMenu )
{
VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu ));
PopupMenu* pVCLPopupMenu = nullptr;
diff --git a/framework/source/uielement/notebookbarmenucontroller.cxx b/framework/source/uielement/notebookbarmenucontroller.cxx
index 70d7827dd7e2..292fd3b7beb4 100644
--- a/framework/source/uielement/notebookbarmenucontroller.cxx
+++ b/framework/source/uielement/notebookbarmenucontroller.cxx
@@ -75,7 +75,7 @@ NotebookbarMenuController::~NotebookbarMenuController()
{
}
-void NotebookbarMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
+void NotebookbarMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > const & rPopupMenu )
{
if ( SvtMiscOptions().DisableUICustomization() )
return;
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx
index 0cba9ca7f148..627ae94114c4 100644
--- a/framework/source/uielement/objectmenucontroller.cxx
+++ b/framework/source/uielement/objectmenucontroller.cxx
@@ -77,7 +77,7 @@ public:
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
private:
- void fillPopupMenu( const css::uno::Sequence< css::embed::VerbDescriptor >& rVerbCommandSeq, css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
+ void fillPopupMenu( const css::uno::Sequence< css::embed::VerbDescriptor >& rVerbCommandSeq, css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
};
ObjectMenuController::ObjectMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) :
@@ -86,7 +86,7 @@ ObjectMenuController::ObjectMenuController( const css::uno::Reference< css::uno:
}
// private function
-void ObjectMenuController::fillPopupMenu( const Sequence< css::embed::VerbDescriptor >& rVerbCommandSeq, Reference< css::awt::XPopupMenu >& rPopupMenu )
+void ObjectMenuController::fillPopupMenu( const Sequence< css::embed::VerbDescriptor >& rVerbCommandSeq, Reference< css::awt::XPopupMenu > const & rPopupMenu )
{
const css::embed::VerbDescriptor* pVerbCommandArray = rVerbCommandSeq.getConstArray();
VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu ));
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index a4d967c2bb76..6d3f2deafb5c 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -89,7 +89,7 @@ public:
private:
virtual void impl_setPopupMenu() override;
- void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
+ void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu > const & rPopupMenu );
void executeEntry( sal_Int32 nIndex );
std::vector< OUString > m_aRecentFilesItems;
@@ -116,7 +116,7 @@ RecentFilesMenuController::RecentFilesMenuController( const uno::Reference< uno:
}
// private function
-void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
+void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > const & rPopupMenu )
{
VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu ));
PopupMenu* pVCLPopupMenu = nullptr;
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 3d45fb7be8b1..f0c2d11cbddb 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -261,7 +261,7 @@ void SpinfieldToolbarController::GetFocus()
notifyFocusGet();
}
-bool SpinfieldToolbarController::PreNotify( NotifyEvent& rNEvt )
+bool SpinfieldToolbarController::PreNotify( NotifyEvent const & rNEvt )
{
if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 584aabdb7ec6..ae92672d40ec 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -93,7 +93,7 @@ static const char ITEM_DESCRIPTOR_VISIBLE[] = "IsVisible";
static const sal_uInt16 STARTID_CUSTOMIZE_POPUPMENU = 1000;
static css::uno::Reference< css::frame::XLayoutManager > getLayoutManagerFromFrame(
- css::uno::Reference< css::frame::XFrame >& rFrame )
+ css::uno::Reference< css::frame::XFrame > const & rFrame )
{
css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
@@ -1177,7 +1177,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
}
}
-void ToolBarManager::FillOverflowToolbar( ToolBox* pParent )
+void ToolBarManager::FillOverflowToolbar( ToolBox const * pParent )
{
CommandInfo aCmdInfo;
bool bInsertSeparator = false;
@@ -1401,7 +1401,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
return true;
}
-void ToolBarManager::AddCustomizeMenuItems(ToolBox* pToolBar)
+void ToolBarManager::AddCustomizeMenuItems(ToolBox const * pToolBar)
{
// No config menu entries if command ".uno:ConfigureDialog" is not enabled
Reference< XDispatch > xDisp;
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx
index 2ac7f4671df8..54d74439261b 100644
--- a/framework/source/uielement/toolbarmodemenucontroller.cxx
+++ b/framework/source/uielement/toolbarmodemenucontroller.cxx
@@ -75,7 +75,7 @@ ToolbarModeMenuController::~ToolbarModeMenuController()
{
}
-void ToolbarModeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
+void ToolbarModeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > const & rPopupMenu )
{
if ( SvtMiscOptions().DisableUICustomization() )
return;
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index c5775e88d7b6..1b5c451af138 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -136,7 +136,7 @@ ToolbarsMenuController::~ToolbarsMenuController()
}
void ToolbarsMenuController::addCommand(
- Reference< css::awt::XPopupMenu >& rPopupMenu, const OUString& rCommandURL, const OUString& rLabel )
+ Reference< css::awt::XPopupMenu > const & rPopupMenu, const OUString& rCommandURL, const OUString& rLabel )
{
sal_uInt16 nItemId = m_xPopupMenu->getItemCount()+1;
@@ -275,7 +275,7 @@ Sequence< Sequence< css::beans::PropertyValue > > ToolbarsMenuController::getLay
}
-void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
+void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > const & rPopupMenu )
{
if( SvtMiscOptions().DisableUICustomization() )
return;
diff --git a/include/framework/actiontriggerhelper.hxx b/include/framework/actiontriggerhelper.hxx
index 392e5dceae2b..986f3373a605 100644
--- a/include/framework/actiontriggerhelper.hxx
+++ b/include/framework/actiontriggerhelper.hxx
@@ -56,7 +56,7 @@ namespace framework
// @param pNewMenu = must be a valid menu
static void
FillActionTriggerContainerFromMenu(
- css::uno::Reference< css::container::XIndexContainer >& rActionTriggerContainer,
+ css::uno::Reference< css::container::XIndexContainer > const & rActionTriggerContainer,
const Menu* pMenu );
};
diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx
index 363982f777d1..1f3f8923e062 100644
--- a/include/framework/addonmenu.hxx
+++ b/include/framework/addonmenu.hxx
@@ -47,7 +47,7 @@ class FWE_DLLPUBLIC AddonMenuManager
// Merge the Add-Ons help menu items into the given menu bar at a defined pos
static void MergeAddonHelpMenu( const css::uno::Reference< css::frame::XFrame >& rFrame,
- MenuBar* pMergeMenuBar );
+ MenuBar const * pMergeMenuBar );
// Merge the addon popup menus into the given menu bar at the provided pos.
static void MergeAddonPopupMenus( const css::uno::Reference< css::frame::XFrame >& rFrame,
diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx
index 8d59b547a97a..5b0a7f25f685 100644
--- a/include/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
@@ -95,13 +95,13 @@ public:
/// @throws css::lang::WrappedTargetException
/// @throws css::uno::RuntimeException
css::uno::Reference< css::container::XIndexAccess > CreateMenuBarConfigurationFromXML(
- css::uno::Reference< css::io::XInputStream >& rInputStream );
+ css::uno::Reference< css::io::XInputStream > const & rInputStream );
/// @throws css::lang::WrappedTargetException
/// @throws css::uno::RuntimeException
void StoreMenuBarConfigurationToXML(
- css::uno::Reference< css::container::XIndexAccess >& rMenuBarConfiguration,
- css::uno::Reference< css::io::XOutputStream >& rOutputStream,
+ css::uno::Reference< css::container::XIndexAccess > const & rMenuBarConfiguration,
+ css::uno::Reference< css::io::XOutputStream > const & rOutputStream,
bool bIsMenuBar );
private:
commit c0565f7011fa6d6b295e522c023127970ccce822
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Jul 19 14:35:44 2017 +0200
loplugin:constparams in cppcanvas
Change-Id: Ic440819b5a1c71d2e4503b9a3b1e961c4ce123af
Reviewed-on: https://gerrit.libreoffice.org/40205
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 75b091d3f6c4..d8752f544139 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -220,7 +220,7 @@ static float GetSwapFloat( SvStream& rSt )
void MapToDevice (double &x, double &y);
::basegfx::B2DPoint Map (double ix, double iy);
::basegfx::B2DSize MapSize (double iwidth, double iheight);
- void GraphicStatePush (GraphicStateMap& map, sal_Int32 index, OutDevState& rState);
+ void GraphicStatePush (GraphicStateMap& map, sal_Int32 index, OutDevState const & rState);
void GraphicStatePop (GraphicStateMap& map, sal_Int32 index, OutDevState& rState);
private:
@@ -276,7 +276,7 @@ static float GetSwapFloat( SvStream& rSt )
void processObjectRecord(SvMemoryStream& rObjectStream, sal_uInt16 flags, sal_uInt32 dataSize, bool bUseWholeStream = false);
/* EMF+ */
- void processEMFPlus( MetaCommentAction* pAct, const ActionFactoryParameters& rFactoryParms, OutDevState& rState, const CanvasSharedPtr& rCanvas );
+ void processEMFPlus( MetaCommentAction const * pAct, const ActionFactoryParameters& rFactoryParms, OutDevState& rState, const CanvasSharedPtr& rCanvas );
double setFont(css::rendering::FontRequest& aFontRequest, sal_uInt8 fontObjectId, const ActionFactoryParameters& rParms, OutDevState& rState );
/// Render LineCap, like the start or end arrow of a polygon.
@@ -286,8 +286,8 @@ static float GetSwapFloat( SvStream& rSt )
const css::rendering::StrokeAttributes& rAttributes,
const ActionFactoryParameters& rParms, OutDevState& rState);
- void EMFPPlusDrawPolygon (const ::basegfx::B2DPolyPolygon& polygon, const ActionFactoryParameters& rParms, OutDevState& rState, const CanvasSharedPtr& rCanvas, sal_uInt32 penIndex);
- void EMFPPlusFillPolygon (::basegfx::B2DPolyPolygon& polygon, const ActionFactoryParameters& rParms, OutDevState& rState, const CanvasSharedPtr& rCanvas, bool isColor, sal_uInt32 brushIndexOrColor);
+ void EMFPPlusDrawPolygon (const ::basegfx::B2DPolyPolygon & polygon, const ActionFactoryParameters& rParms, OutDevState& rState, const CanvasSharedPtr& rCanvas, sal_uInt32 penIndex);
+ void EMFPPlusFillPolygon (::basegfx::B2DPolyPolygon const & polygon, const ActionFactoryParameters& rParms, OutDevState& rState, const CanvasSharedPtr& rCanvas, bool isColor, sal_uInt32 brushIndexOrColor);
ActionVector maActions;
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index c63f85928182..3550e3ace05f 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -297,7 +297,7 @@ namespace cppcanvas
x & 0xff), \
rCanvas->getUNOCanvas()->getDevice()->getDeviceColorSpace());
- void ImplRenderer::EMFPPlusFillPolygon (::basegfx::B2DPolyPolygon& polygon, const ActionFactoryParameters& rParms,
+ void ImplRenderer::EMFPPlusFillPolygon (::basegfx::B2DPolyPolygon const & polygon, const ActionFactoryParameters& rParms,
OutDevState& rState, const CanvasSharedPtr& rCanvas, bool isColor, sal_uInt32 brushIndexOrColor)
{
::basegfx::B2DPolyPolygon localPolygon (polygon);
@@ -815,7 +815,7 @@ namespace cppcanvas
return cellSize;
}
- void ImplRenderer::GraphicStatePush(GraphicStateMap& map, sal_Int32 index, OutDevState& rState)
+ void ImplRenderer::GraphicStatePush(GraphicStateMap& map, sal_Int32 index, OutDevState const & rState)
{
GraphicStateMap::iterator iter = map.find( index );
@@ -852,7 +852,7 @@ namespace cppcanvas
}
}
- void ImplRenderer::processEMFPlus( MetaCommentAction* pAct, const ActionFactoryParameters& rFactoryParms,
+ void ImplRenderer::processEMFPlus( MetaCommentAction const * pAct, const ActionFactoryParameters& rFactoryParms,
OutDevState& rState, const CanvasSharedPtr& rCanvas )
{
sal_uInt32 length = pAct->GetDataSize ();
diff --git a/cppcanvas/source/mtfrenderer/emfppath.cxx b/cppcanvas/source/mtfrenderer/emfppath.cxx
index 749bc900cc62..4a90f1e9c4c6 100644
--- a/cppcanvas/source/mtfrenderer/emfppath.cxx
+++ b/cppcanvas/source/mtfrenderer/emfppath.cxx
@@ -60,7 +60,7 @@ namespace cppcanvas
}
// TODO: remove rR argument when debug code is no longer needed
- void EMFPPath::Read (SvStream& s, sal_uInt32 pathFlags, ImplRenderer& rR)
+ void EMFPPath::Read (SvStream& s, sal_uInt32 pathFlags, ImplRenderer const & rR)
{
for (int i = 0; i < nPoints; i ++) {
if (pathFlags & 0x800) {
diff --git a/cppcanvas/source/mtfrenderer/emfppath.hxx b/cppcanvas/source/mtfrenderer/emfppath.hxx
index f4e92937e432..7f60a76f896f 100644
--- a/cppcanvas/source/mtfrenderer/emfppath.hxx
+++ b/cppcanvas/source/mtfrenderer/emfppath.hxx
@@ -38,7 +38,7 @@ namespace cppcanvas
virtual ~EMFPPath() override;
// TODO: remove rR argument when debug code is no longer needed
- void Read(SvStream& s, sal_uInt32 pathFlags, ImplRenderer& rR);
+ void Read(SvStream& s, sal_uInt32 pathFlags, ImplRenderer const & rR);
::basegfx::B2DPolyPolygon& GetPolygon(ImplRenderer& rR, bool bMapIt = true, bool bAddLineToCloseShape = false);
};
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 442a09b6170a..312550eac166 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -185,7 +185,7 @@ namespace cppcanvas
uno::Sequence< double > setupDXArray( const OUString& rText,
sal_Int32 nStartPos,
sal_Int32 nLen,
- VirtualDevice& rVDev,
+ VirtualDevice const & rVDev,
const OutDevState& rState )
{
// no external DX array given, create one from given
@@ -261,7 +261,7 @@ namespace cppcanvas
o_rTextLayout->applyLogicalAdvancements( rOffsets );
}
- double getLineWidth( ::VirtualDevice& rVDev,
+ double getLineWidth( ::VirtualDevice const & rVDev,
const OutDevState& rState,
const rendering::StringContext& rStringContext )
{
@@ -1585,7 +1585,7 @@ namespace cppcanvas
};
double calcOutlineWidth( const OutDevState& rState,
- VirtualDevice& rVDev )
+ VirtualDevice const & rVDev )
{
const ::basegfx::B2DSize aFontSize( 0,
rVDev.GetFont().GetFontHeight() / 64.0 );
More information about the Libreoffice-commits
mailing list