[Libreoffice-commits] core.git: fpicker/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Jul 20 07:19:58 UTC 2017
fpicker/source/office/OfficeControlAccess.cxx | 22 +++++++++++-----------
fpicker/source/office/OfficeControlAccess.hxx | 4 ++--
fpicker/source/office/iodlg.cxx | 6 +++---
fpicker/source/office/iodlg.hxx | 2 +-
4 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 3cb3a809230d1b3de22ab8addcf10e840dcde0e3
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Jul 19 14:26:15 2017 +0200
loplugin:constparams in fpicker
Change-Id: I1ef422ccd902a3bc5e4fce5ea373cfef24f8edef
Reviewed-on: https://gerrit.libreoffice.org/40204
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 9445a47feef4..6d8543044cbc 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -186,12 +186,12 @@ namespace svt
}
- OUString OControlAccess::getHelpURL( vcl::Window* _pControl, bool _bFileView )
+ OUString OControlAccess::getHelpURL( vcl::Window const * _pControl, bool _bFileView )
{
OString aHelpId = _pControl->GetHelpId();
if ( _bFileView )
// the file view "overrides" the SetHelpId
- aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( );
+ aHelpId = static_cast< SvtFileView const * >( _pControl )->GetHelpId( );
OUString sHelpURL;
OUString aTmp( OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) );
@@ -677,7 +677,7 @@ namespace svt
}
- Any OControlAccess::implGetControlProperty( Control* _pControl, PropFlags _nProperty ) const
+ Any OControlAccess::implGetControlProperty( Control const * _pControl, PropFlags _nProperty ) const
{
DBG_ASSERT( _pControl, "OControlAccess::implGetControlProperty: invalid argument, this will crash!" );
@@ -705,10 +705,10 @@ namespace svt
DBG_ASSERT( WindowType::LISTBOX == _pControl->GetType(),
"OControlAccess::implGetControlProperty: invalid control/property combination!" );
- Sequence< OUString > aItems( static_cast< ListBox* >( _pControl )->GetEntryCount() );
+ Sequence< OUString > aItems( static_cast< ListBox const * >( _pControl )->GetEntryCount() );
OUString* pItems = aItems.getArray();
- for ( sal_Int32 i=0; i<static_cast< ListBox* >( _pControl )->GetEntryCount(); ++i )
- *pItems++ = static_cast< ListBox* >( _pControl )->GetEntry( i );
+ for ( sal_Int32 i=0; i<static_cast< ListBox const * >( _pControl )->GetEntryCount(); ++i )
+ *pItems++ = static_cast< ListBox const * >( _pControl )->GetEntry( i );
aReturn <<= aItems;
}
@@ -719,10 +719,10 @@ namespace svt
DBG_ASSERT( WindowType::LISTBOX == _pControl->GetType(),
"OControlAccess::implGetControlProperty: invalid control/property combination!" );
- sal_Int32 nSelected = static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
+ sal_Int32 nSelected = static_cast< ListBox const * >( _pControl )->GetSelectEntryPos();
OUString sSelected;
if ( LISTBOX_ENTRY_NOTFOUND != nSelected )
- sSelected = static_cast< ListBox* >( _pControl )->GetSelectEntry();
+ sSelected = static_cast< ListBox const * >( _pControl )->GetSelectEntry();
aReturn <<= sSelected;
}
break;
@@ -732,9 +732,9 @@ namespace svt
DBG_ASSERT( WindowType::LISTBOX == _pControl->GetType(),
"OControlAccess::implGetControlProperty: invalid control/property combination!" );
- sal_Int32 nSelected = static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
+ sal_Int32 nSelected = static_cast< ListBox const * >( _pControl )->GetSelectEntryPos();
if ( LISTBOX_ENTRY_NOTFOUND != nSelected )
- aReturn <<= static_cast< ListBox* >( _pControl )->GetSelectEntryPos();
+ aReturn <<= static_cast< ListBox const * >( _pControl )->GetSelectEntryPos();
else
aReturn <<= (sal_Int32)-1;
}
@@ -744,7 +744,7 @@ namespace svt
DBG_ASSERT( WindowType::CHECKBOX == _pControl->GetType(),
"OControlAccess::implGetControlProperty: invalid control/property combination!" );
- aReturn <<= static_cast< CheckBox* >( _pControl )->IsChecked( );
+ aReturn <<= static_cast< CheckBox const * >( _pControl )->IsChecked( );
break;
default:
diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx
index 7c3724e6f908..34fc9a622d88 100644
--- a/fpicker/source/office/OfficeControlAccess.hxx
+++ b/fpicker/source/office/OfficeControlAccess.hxx
@@ -86,7 +86,7 @@ namespace svt
void enableControl( sal_Int16 _nId, bool _bEnable );
static void setHelpURL( vcl::Window* _pControl, const OUString& _rURL, bool _bFileView );
- static OUString getHelpURL( vcl::Window* _pControl, bool _bFileView );
+ static OUString getHelpURL( vcl::Window const * _pControl, bool _bFileView );
private:
/** implements the various methods for setting properties on controls
@@ -120,7 +120,7 @@ namespace svt
See PropFlags::*
@return
*/
- css::uno::Any implGetControlProperty( Control* _pControl, PropFlags _nProperty ) const;
+ css::uno::Any implGetControlProperty( Control const * _pControl, PropFlags _nProperty ) const;
static void implDoListboxAction( ListBox* _pListbox, sal_Int16 _nCtrlAction, const css::uno::Any& _rValue );
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 8f69f135baca..df21d5f00d7f 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -116,7 +116,7 @@ namespace
{
- OUString getMostCurrentFilter( std::unique_ptr<SvtExpFileDlg_Impl>& pImpl )
+ OUString getMostCurrentFilter( std::unique_ptr<SvtExpFileDlg_Impl> const & pImpl )
{
assert( pImpl && "invalid impl pointer" );
const SvtFileDialogFilter_Impl* pFilter = pImpl->_pUserFilter;
@@ -131,7 +131,7 @@ namespace
}
- bool restoreCurrentFilter( std::unique_ptr<SvtExpFileDlg_Impl>& pImpl )
+ bool restoreCurrentFilter( std::unique_ptr<SvtExpFileDlg_Impl> const & pImpl )
{
SAL_WARN_IF( !pImpl->GetCurFilter(), "fpicker.office", "restoreCurrentFilter: no current filter!" );
SAL_WARN_IF( pImpl->GetCurFilterDisplayName().isEmpty(), "fpicker.office", "restoreCurrentFilter: no current filter (no display name)!" );
@@ -839,7 +839,7 @@ IMPL_LINK( SvtFileDialog, OpenUrlHdl_Impl, SvtURLBox*, pVoid, void )
{
OpenHdl_Impl(pVoid);
}
-void SvtFileDialog::OpenHdl_Impl(void* pVoid)
+void SvtFileDialog::OpenHdl_Impl(void const * pVoid)
{
if ( pImpl->_bMultiSelection && _pFileView->GetSelectionCount() > 1 )
{
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 4b45f44da7f8..c5103c5b1be0 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -111,7 +111,7 @@ private:
DECL_LINK( RemovePlacePressed_Hdl, Button*, void );
DECL_LINK( Split_Hdl, Splitter*, void );
- void OpenHdl_Impl(void* pVoid);
+ void OpenHdl_Impl(void const * pVoid);
void Init_Impl( PickerFlags nBits );
/** find a filter with the given wildcard
@param _rFilter
More information about the Libreoffice-commits
mailing list