diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-07 13:52:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-08 10:38:35 +0100 |
| commit | 17dd2662ccfa9d04efbea74e5d7548db5b2126d4 (patch) | |
| tree | 37c0de883c43a57f54b0a483437da9de3bf4c941 /cui | |
| parent | use unique_ptr in sd::BluetoothServer::Impl (diff) | |
| download | core-17dd2662ccfa9d04efbea74e5d7548db5b2126d4.tar.gz core-17dd2662ccfa9d04efbea74e5d7548db5b2126d4.zip | |
convert "*xxx.get()" to "*xxx"
Change-Id: Ic307226591ff9702957ccdec486ccf70357eb6d9
Reviewed-on: https://gerrit.libreoffice.org/65951
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/SvxToolbarConfigPage.cxx | 12 | ||||
| -rw-r--r-- | cui/source/inc/headertablistbox.hxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/grfpage.cxx | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index 84d69f3ef0d0..306d5477c63c 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -930,16 +930,16 @@ void SvxToolbarEntriesListBox::BuildCheckBoxButtonImages( SvLBoxButtonData* pDat pVDev->SetOutputSizePixel( aSize ); - Image aImage = GetSizedImage( *pVDev.get(), aSize, + Image aImage = GetSizedImage( *pVDev, aSize, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Default )); // Fill button data struct with new images pData->SetImage(SvBmp::UNCHECKED, aImage); - pData->SetImage(SvBmp::CHECKED, GetSizedImage( *pVDev.get(), aSize, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Checked )) ); - pData->SetImage(SvBmp::HICHECKED, GetSizedImage( *pVDev.get(), aSize, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Checked | DrawButtonFlags::Pressed )) ); - pData->SetImage(SvBmp::HIUNCHECKED, GetSizedImage( *pVDev.get(), aSize, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Default | DrawButtonFlags::Pressed)) ); - pData->SetImage(SvBmp::TRISTATE, GetSizedImage( *pVDev.get(), aSize, Image() ) ); // Use tristate bitmaps to have no checkbox for separator entries - pData->SetImage(SvBmp::HITRISTATE, GetSizedImage( *pVDev.get(), aSize, Image() ) ); + pData->SetImage(SvBmp::CHECKED, GetSizedImage( *pVDev, aSize, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Checked )) ); + pData->SetImage(SvBmp::HICHECKED, GetSizedImage( *pVDev, aSize, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Checked | DrawButtonFlags::Pressed )) ); + pData->SetImage(SvBmp::HIUNCHECKED, GetSizedImage( *pVDev, aSize, CheckBox::GetCheckImage( rSettings, DrawButtonFlags::Default | DrawButtonFlags::Pressed)) ); + pData->SetImage(SvBmp::TRISTATE, GetSizedImage( *pVDev, aSize, Image() ) ); // Use tristate bitmaps to have no checkbox for separator entries + pData->SetImage(SvBmp::HITRISTATE, GetSizedImage( *pVDev, aSize, Image() ) ); // Get image size m_aCheckBoxImageSizePixel = aImage.GetSizePixel(); diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 390600c3e6dc..b3f812ee1012 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -40,12 +40,12 @@ public: SvHeaderTabListBox& GetListBox() { - return *maListBox.get(); + return *maListBox; } HeaderBar& GetHeaderBar() { - return *maHeaderBar.get(); + return *maHeaderBar; } void ConnectElements();/**< should be called after all manipulations on elements are done diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index d42f42a7f045..b62538c53941 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -630,7 +630,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound ) const FieldUnit eMetric = GetModuleFieldUnit( GetItemSet() ); ScopedVclPtrInstance< MetricField > aFld(this, WB_HIDE); - SetFieldUnit( *aFld.get(), eMetric ); + SetFieldUnit( *aFld, eMetric ); aFld->SetDecimalDigits(m_xWidthMF->get_digits()); aFld->SetMax( LONG_MAX - 1 ); |