Kaydet (Commit) 17dd2662 authored tarafından Noel Grandin's avatar Noel Grandin

convert "*xxx.get()" to "*xxx"

Change-Id: Ic307226591ff9702957ccdec486ccf70357eb6d9
Reviewed-on: https://gerrit.libreoffice.org/65951
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 638be04c
......@@ -424,7 +424,7 @@ void MediaWindowImpl::onURLChanged()
if (!mpChildWindow)
return;
mpChildWindow->SetHelpId(HID_AVMEDIA_PLAYERWINDOW);
mxEvents = new MediaEventListenersImpl(*mpChildWindow.get());
mxEvents = new MediaEventListenersImpl(*mpChildWindow);
if (mxPlayer.is())
{
......
......@@ -507,7 +507,7 @@ Reference< awt::XFont > AccessibleDialogControlShape::getFont( )
else
aFont = pWindow->GetFont();
VCLXFont* pVCLXFont = new VCLXFont;
pVCLXFont->Init( *xDev.get(), aFont );
pVCLXFont->Init( *xDev, aFont );
xFont = pVCLXFont;
}
}
......
......@@ -802,7 +802,7 @@ Reference< awt::XFont > AccessibleDialogWindow::getFont( )
else
aFont = m_pDialogWindow->GetFont();
VCLXFont* pVCLXFont = new VCLXFont;
pVCLXFont->Init( *xDev.get(), aFont );
pVCLXFont->Init( *xDev, aFont );
xFont = pVCLXFont;
}
}
......
......@@ -278,10 +278,10 @@ public:
explicit ComplexEditorWindow( ModulWindow* pParent );
virtual ~ComplexEditorWindow() override;
virtual void dispose() override;
BreakPointWindow& GetBrkWindow() { return *aBrkWindow.get(); }
LineNumberWindow& GetLineNumberWindow() { return *aLineNumberWindow.get(); }
EditorWindow& GetEdtWindow() { return *aEdtWindow.get(); }
ScrollBar& GetEWVScrollBar() { return *aEWVScrollBar.get(); }
BreakPointWindow& GetBrkWindow() { return *aBrkWindow; }
LineNumberWindow& GetLineNumberWindow() { return *aLineNumberWindow; }
EditorWindow& GetEdtWindow() { return *aEdtWindow; }
ScrollBar& GetEWVScrollBar() { return *aEWVScrollBar; }
void SetLineNumberDisplay(bool b);
};
......
......@@ -166,7 +166,7 @@ VclPtr<ModulWindow> Shell::CreateBasWin( const ScriptDocument& rDocument, const
{
// new module window
if (!pModulLayout)
pModulLayout.reset(VclPtr<ModulWindowLayout>::Create(&GetViewFrame()->GetWindow(), *aObjectCatalog.get()));
pModulLayout.reset(VclPtr<ModulWindowLayout>::Create(&GetViewFrame()->GetWindow(), *aObjectCatalog));
pWin = VclPtr<ModulWindow>::Create(pModulLayout.get(), rDocument, aLibName, aModName, aModule);
nKey = InsertWindowInTable( pWin );
}
......
......@@ -79,7 +79,7 @@ VclPtr<DialogWindow> Shell::CreateDlgWin( const ScriptDocument& rDocument, const
// new dialog window
if (!pDialogLayout)
pDialogLayout.reset(VclPtr<DialogWindowLayout>::Create(&GetViewFrame()->GetWindow(), *aObjectCatalog.get()));
pDialogLayout.reset(VclPtr<DialogWindowLayout>::Create(&GetViewFrame()->GetWindow(), *aObjectCatalog));
pWin = VclPtr<DialogWindow>::Create(pDialogLayout.get(), rDocument, aLibName, aDlgName, xDialogModel);
nKey = InsertWindowInTable( pWin );
}
......
......@@ -170,7 +170,7 @@ Layout::SplittedSide::SplittedSide (Layout* pParent, Side eSide) :
nSize(0),
aSplitter(VclPtr<Splitter>::Create(pParent, bVertical ? WB_HSCROLL : WB_VSCROLL))
{
InitSplitter(*aSplitter.get());
InitSplitter(*aSplitter);
}
void Layout::SplittedSide::dispose()
......
......@@ -150,7 +150,7 @@ namespace basegfx
void SystemDependentDataHolder::addOrReplaceSystemDependentData(basegfx::SystemDependentData_SharedPtr& rData)
{
const size_t hash_code(typeid(*rData.get()).hash_code());
const size_t hash_code(typeid(*rData).hash_code());
auto result(maSystemDependentReferences.find(hash_code));
if(result != maSystemDependentReferences.end())
......
......@@ -311,7 +311,7 @@ static SbxVariableRef Element
// One copies the parameter, so that
// one have the current status (triggers also
// the call per access)
refPar->Put( new SbxVariable( *(refArg.get()) ), ++nArg );
refPar->Put( new SbxVariable( *refArg ), ++nArg );
}
p = SkipWhitespace( p );
if( *p == ',' )
......
......@@ -335,7 +335,7 @@ void SfxScriptLibraryContainer::importFromOldStorage( const OUString& aFile )
auto xStorage = tools::make_ref<SotStorage>( false, aFile );
if( xStorage->GetError() == ERRCODE_NONE )
{
std::unique_ptr<BasicManager> pBasicManager(new BasicManager( *(xStorage.get()), aFile ));
std::unique_ptr<BasicManager> pBasicManager(new BasicManager( *xStorage, aFile ));
// Set info
LibraryContainerInfo aInfo( this, nullptr, static_cast< OldBasicPassword* >( this ) );
......
......@@ -240,7 +240,7 @@ namespace cairocanvas
cairo_fill(mpCairo.get());
#endif
::Point aOutpos;
if( !setupTextOutput( *mpVirtualDevice.get(), pOwner, aOutpos, viewState, renderState, xFont ) )
if( !setupTextOutput( *mpVirtualDevice, pOwner, aOutpos, viewState, renderState, xFont ) )
return uno::Reference< rendering::XCachedPrimitive >(nullptr); // no output necessary
// change text direction and layout mode
......
......@@ -161,7 +161,7 @@ namespace cairocanvas
// relative to baseline
const ::FontMetric& aMetric( pVDev->GetFontMetric() );
setupLayoutMode( *pVDev.get(), mnTextDirection );
setupLayoutMode( *pVDev, mnTextDirection );
const sal_Int32 nAboveBaseline( -aMetric.GetAscent() );
const sal_Int32 nBelowBaseline( aMetric.GetDescent() );
......
......@@ -43,7 +43,7 @@ namespace dxcanvas
ENSURE_OR_THROW( mpDevice.is() && mpBitmap,
"CanvasBitmap::CanvasBitmap(): Invalid surface or device" );
maCanvasHelper.setDevice( *mpDevice.get() );
maCanvasHelper.setDevice( *mpDevice );
maCanvasHelper.setTarget( mpBitmap );
}
......
......@@ -55,7 +55,7 @@ namespace dxcanvas
rRenderModule,
true));
maCanvasHelper.setDevice( *rRefDevice.get() );
maCanvasHelper.setDevice( *rRefDevice );
maCanvasHelper.setTarget( mpSurface );
maSpriteHelper.init( rSpriteSize,
......
......@@ -28,7 +28,7 @@ namespace oglcanvas
ENSURE_OR_THROW( mpDevice.is(),
"CanvasBitmap::CanvasBitmap(): Invalid surface or device" );
maCanvasHelper.init( *mpDevice.get(), rDeviceHelper, rSize );
maCanvasHelper.init( *mpDevice, rDeviceHelper, rSize );
}
CanvasBitmap::CanvasBitmap( const CanvasBitmap& rSrc ) :
......
......@@ -44,7 +44,7 @@ namespace oglcanvas
"CanvasCustomSprite::CanvasCustomSprite(): Invalid sprite canvas" );
::canvas::tools::setIdentityAffineMatrix2D(maTransformation);
maCanvasHelper.init( *rRefDevice.get(),
maCanvasHelper.init( *rRefDevice,
rDeviceHelper );
}
......
......@@ -52,12 +52,12 @@ namespace vclcanvas
OutputDevice& BackBuffer::getOutDev()
{
return *maVDev.get();
return *maVDev;
}
const OutputDevice& BackBuffer::getOutDev() const
{
return *maVDev.get();
return *maVDev;
}
void BackBuffer::setSize( const ::Size& rNewSize )
......
......@@ -939,7 +939,7 @@ namespace vclcanvas
const vcl::Region aPolyClipRegion( aPolyPoly );
pVDev->SetClipRegion( aPolyClipRegion );
textureFill( *pVDev.get(),
textureFill( *pVDev,
*pGrfObj,
aOutPos,
aIntegerNextTileX,
......
......@@ -118,7 +118,7 @@ namespace vclcanvas
return uno::Reference< rendering::XBitmap >(
new CanvasBitmap( vcl::unotools::sizeFromIntegerSize2D(size),
false,
*rDevice.get(),
*rDevice,
mpOutDev ) );
}
......@@ -139,7 +139,7 @@ namespace vclcanvas
return uno::Reference< rendering::XBitmap >(
new CanvasBitmap( vcl::unotools::sizeFromIntegerSize2D(size),
true,
*rDevice.get(),
*rDevice,
mpOutDev ) );
}
......
......@@ -263,7 +263,7 @@ namespace vclcanvas
// repaint all active sprites on top of background into
// VDev.
OutputDevice& rTmpOutDev( *maVDev.get() );
OutputDevice& rTmpOutDev( *maVDev );
mpRedrawManager->forEachSprite(
[&rTmpOutDev]( const ::canvas::Sprite::Reference& rSprite )
{ spriteRedraw( rTmpOutDev, rSprite ); }
......@@ -534,7 +534,7 @@ namespace vclcanvas
rSpriteScreenPos - vcl::unotools::b2DPointFromPoint(aOutputPosition)
);
pSprite->redraw( *maVDev.get(), rSpriteRenderPos, true );
pSprite->redraw( *maVDev, rSpriteRenderPos, true );
}
}
......
......@@ -104,7 +104,7 @@ namespace vclcanvas
ScopedVclPtrInstance< VirtualDevice > pVDev( rOutDev );
pVDev->SetFont( mpFont->getVCLFont() );
setupLayoutMode( *pVDev.get(), mnTextDirection );
setupLayoutMode( *pVDev, mnTextDirection );
const rendering::ViewState aViewState(
geometry::AffineMatrix2D(1,0,0, 0,1,0),
......@@ -152,7 +152,7 @@ namespace vclcanvas
ScopedVclPtrInstance< VirtualDevice > pVDev( rOutDev );
pVDev->SetFont( mpFont->getVCLFont() );
setupLayoutMode( *pVDev.get(), mnTextDirection );
setupLayoutMode( *pVDev, mnTextDirection );
const rendering::ViewState aViewState(
geometry::AffineMatrix2D(1,0,0, 0,1,0),
......@@ -229,7 +229,7 @@ namespace vclcanvas
// relative to baseline
const ::FontMetric& aMetric( pVDev->GetFontMetric() );
setupLayoutMode( *pVDev.get(), mnTextDirection );
setupLayoutMode( *pVDev, mnTextDirection );
const sal_Int32 nAboveBaseline( -aMetric.GetAscent() );
const sal_Int32 nBelowBaseline( aMetric.GetDescent() );
......
......@@ -180,7 +180,7 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal
if( aX.isEmpty() )
{
ChartModel& rModel = dynamic_cast<ChartModel&>(*xChartModel.get());
ChartModel& rModel = dynamic_cast<ChartModel&>(*xChartModel);
aRet = ExplicitCategoriesProvider::getCategoryByIndex( xCooSys, rModel, nPointIndex );
}
else
......
......@@ -122,7 +122,7 @@ void LegendPositionResources::writeToModel( const css::uno::Reference< frame::XM
try
{
bool bShowLegend = m_xCbxShow && m_xCbxShow->get_active();
ChartModel& rModel = dynamic_cast<ChartModel&>(*xChartModel.get());
ChartModel& rModel = dynamic_cast<ChartModel&>(*xChartModel);
uno::Reference< beans::XPropertySet > xProp(LegendHelper::getLegend(rModel, m_xCC, bShowLegend), uno::UNO_QUERY);
if( xProp.is() )
{
......
......@@ -1315,7 +1315,7 @@ void ChartController::executeDispatch_SourceData()
// If there is a data table we should ask user if we really want to destroy it
// and switch to data ranges.
ChartModel& rModel = dynamic_cast<ChartModel&>(*xChartDoc.get());
ChartModel& rModel = dynamic_cast<ChartModel&>(*xChartDoc);
if ( rModel.hasInternalDataProvider() )
{
// Check if we will able to create data provider later
......
......@@ -819,7 +819,7 @@ void ChartController::executeDispatch_ToggleLegend()
Reference< frame::XModel > xModel( getModel() );
UndoGuard aUndoGuard(
SchResId( STR_ACTION_TOGGLE_LEGEND ), m_xUndoManager );
ChartModel& rModel = dynamic_cast<ChartModel&>(*xModel.get());
ChartModel& rModel = dynamic_cast<ChartModel&>(*xModel);
Reference< beans::XPropertySet > xLegendProp( LegendHelper::getLegend(rModel), uno::UNO_QUERY );
bool bChanged = false;
if( xLegendProp.is())
......
......@@ -412,7 +412,7 @@ void ModelState::update( const Reference< frame::XModel > & xModel )
bIsThreeD = (nDimensionCount == 3);
if (xChartDoc.is())
{
ChartModel& rModel = dynamic_cast<ChartModel&>(*xChartDoc.get());
ChartModel& rModel = dynamic_cast<ChartModel&>(*xChartDoc);
bHasOwnData = rModel.hasInternalDataProvider();
bHasDataFromPivotTable = !bHasOwnData && rModel.isDataFromPivotTable();
}
......@@ -551,7 +551,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
OSL_ENSURE(xChartDoc.is(), "Invalid XChartDocument");
if ( xChartDoc.is() )
{
ChartModel& rModel = dynamic_cast<ChartModel&>(*xChartDoc.get());
ChartModel& rModel = dynamic_cast<ChartModel&>(*xChartDoc);
Reference< lang::XServiceInfo > xParentServiceInfo(rModel.getParent(), uno::UNO_QUERY);
OSL_ENSURE(xParentServiceInfo.is(), "Invalid XServiceInfo");
if ( xParentServiceInfo.is() )
......
......@@ -340,7 +340,7 @@ InternalDataProvider::InternalDataProvider(
{
vector< vector< uno::Any > > aNewCategories;//inner count is level
{
ChartModel& rModel = dynamic_cast<ChartModel&>(*xChartModel.get());
ChartModel& rModel = dynamic_cast<ChartModel&>(*xChartModel);
ExplicitCategoriesProvider aExplicitCategoriesProvider(ChartModelHelper::getFirstCoordinateSystem(xChartModel), rModel);
const Sequence< Reference< chart2::data::XLabeledDataSequence> >& rSplitCategoriesList( aExplicitCategoriesProvider.getSplitCategoriesList() );
......
......@@ -102,7 +102,7 @@ void VCartesianCoordinateSystem::createVAxisList(
// note: using xChartDoc itself as XNumberFormatsSupplier would cause
// a leak from VCartesianAxis due to cyclic reference
uno::Reference<util::XNumberFormatsSupplier> const xNumberFormatsSupplier(
dynamic_cast<ChartModel&>(*xChartDoc.get()).getNumberFormatsSupplier());
dynamic_cast<ChartModel&>(*xChartDoc).getNumberFormatsSupplier());
m_aAxisMap.clear();
......
......@@ -73,7 +73,7 @@ void VPolarCoordinateSystem::createVAxisList(
// note: using xChartDoc itself as XNumberFormatsSupplier would cause
// a leak from VPolarAxis due to cyclic reference
uno::Reference<util::XNumberFormatsSupplier> const xNumberFormatsSupplier(
dynamic_cast<ChartModel&>(*xChartDoc.get()).getNumberFormatsSupplier());
dynamic_cast<ChartModel&>(*xChartDoc).getNumberFormatsSupplier());
m_aAxisMap.clear();
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
......
......@@ -2902,7 +2902,7 @@ namespace cppcanvas
sal_Int32 nCurrActions(0);
ActionFactoryParameters aParms(aStateStack,
rCanvas,
*aVDev.get(),
*aVDev,
rParams,
nCurrActions );
......@@ -2916,7 +2916,7 @@ namespace cppcanvas
1.0 / aMtfSizePix.Height() );
tools::calcLogic2PixelAffineTransform( aStateStack.getState().mapModeTransform,
*aVDev.get() );
*aVDev );
{
::cppcanvas::internal::OutDevState& rState = aStateStack.getState();
......
......@@ -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();
......
......@@ -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
......
......@@ -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 );
......
......@@ -496,7 +496,7 @@ namespace
if ( rPersistentName.isEmpty() )
{ // it's a logical sub folder used to organize the real objects
const ODefinitionContainer_Impl& rSubFoldersObjectDefinitions( dynamic_cast< const ODefinitionContainer_Impl& >( *rDefinition.get() ) );
const ODefinitionContainer_Impl& rSubFoldersObjectDefinitions( dynamic_cast< const ODefinitionContainer_Impl& >( *rDefinition ) );
bSomeDocHasMacros = lcl_hasObjectWithMacros_throw( rSubFoldersObjectDefinitions, _rxContainerStorage );
if (bSomeDocHasMacros)
break;
......
......@@ -426,7 +426,7 @@ void OGenericUnoController::ImplBroadcastFeatureState(const OUString& _rFeature,
// a special listener ?
if ( xListener.is() )
lcl_notifyMultipleStates( *xListener.get(), aEvent, aStates );
lcl_notifyMultipleStates( *xListener, aEvent, aStates );
else
{ // no -> iterate through all listeners responsible for the URL
std::set<OUString> aFeatureCommands;
......
......@@ -160,7 +160,7 @@ namespace
ScopedVclPtrInstance< OQueryTableConnection > aInfo(pTableView, aInfoData);
// Because OQueryTableConnection never takes ownership of the data passed to it, but only remembers the pointer,
// this pointer to a local variable is not critical, as aInfoData and aInfo have the same lifetime
pTableView->NotifyTabConnection( *aInfo.get() );
pTableView->NotifyTabConnection( *aInfo );
}
else
{
......
......@@ -173,7 +173,7 @@ namespace
ScopedVclPtrInstance< OQueryTableConnection > aNewConn(_pView, aNewConnData);
// referring to the local variable is not important, as NotifyQueryTabConn creates a new copy
// to add me (if not existent)
_pView->NotifyTabConnection(*aNewConn.get(), false);
_pView->NotifyTabConnection(*aNewConn, false);
// don't create an Undo-Action for the new connection : the connection is
// covered by the Undo-Action for the tabwin, as the "Undo the insert" will
// automatically remove all connections adjacent to the win.
......@@ -564,7 +564,7 @@ void OQueryTableView::AddConnection(const OJoinExchangeData& jxdSource, const OJ
pNewConnectionData->AppendConnLine( aSourceFieldName,aDestFieldName );
ScopedVclPtrInstance< OQueryTableConnection > aNewConnection(this, aNewConnectionData);
NotifyTabConnection(*aNewConnection.get());
NotifyTabConnection(*aNewConnection);
// As usual with NotifyTabConnection, using a local variable is fine because a copy is made
}
else
......
......@@ -2298,7 +2298,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(),
pBuffer);
pDoc->paintTile(*pDevice.get(), nCanvasWidth, nCanvasHeight,
pDoc->paintTile(*pDevice, nCanvasWidth, nCanvasHeight,
nTilePosX, nTilePosY, nTileWidth, nTileHeight);
static bool bDebug = getenv("LOK_DEBUG_TILES") != nullptr;
......@@ -2355,7 +2355,7 @@ static void doc_paintTileToCGContext(LibreOfficeKitDocument* pThis,
pDevice->SetOutputSizePixel(Size(nCanvasWidth, nCanvasHeight));
pDoc->paintTile(*pDevice.get(), nCanvasWidth, nCanvasHeight,
pDoc->paintTile(*pDevice, nCanvasWidth, nCanvasHeight,
nTilePosX, nTilePosY, nTileWidth, nTileHeight);
}
......
......@@ -2058,7 +2058,7 @@ namespace drawinglayer
getViewInformation2D().getViewTime(),
getViewInformation2D().getExtendedInformationSequence());
VclPixelProcessor2D aBufferProcessor(aViewInfo, *aBufferDevice.get());
VclPixelProcessor2D aBufferProcessor(aViewInfo, *aBufferDevice);
// draw content using pixel renderer
aBufferProcessor.process(rContent);
......
......@@ -81,7 +81,7 @@ namespace drawinglayer
// checking the getOptionsDrawinglayer().IsAntiAliasing() switch. If
// not wanted, change after this call as needed
std::unique_ptr<processor2d::BaseProcessor2D> pContentProcessor = processor2d::createPixelProcessor2DFromOutputDevice(
*pContent.get(),
*pContent,
rViewInformation2D);
if(pContentProcessor)
......
......@@ -417,7 +417,7 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter
{
ImplWriteProlog( ( mnPreview & EPS_PREVIEW_EPSI ) ? &rGraphic : nullptr );
mnCursorPos = 0;
ImplWriteActions( *pMTF, *pVDev.get() );
ImplWriteActions( *pMTF, *pVDev );
ImplWriteEpilog();
if ( mnPreview & EPS_PREVIEW_TIFF )
{
......
......@@ -582,7 +582,7 @@ bool TBCBSpecific::Read( SvStream &rS)
if ( bFlags & 0x10 )
{
iBtnFace.reset( new sal_uInt16 );
rS.ReadUInt16( *iBtnFace.get() );
rS.ReadUInt16( *iBtnFace );
}
// if bFlags.fAccelerator equals 1 ( 0x04 )
if ( bFlags & 0x04 )
......@@ -618,7 +618,7 @@ void TBCBSpecific::Print( FILE* fp )
}
if ( iBtnFace.get() )
{
indent_printf( fp, " iBtnFace 0x%x\n", *(iBtnFace.get()) );
indent_printf( fp, " iBtnFace 0x%x\n", *iBtnFace );
}
bResult = ( wstrAcc.get() != NULL );
indent_printf( fp, " option string present? %s ->%s<-\n", bResult ? "true" : "false", bResult ? OUStringToOString( wstrAcc->getString(), RTL_TEXTENCODING_UTF8 ).getStr() : "N/A" );
......
......@@ -237,7 +237,7 @@ void SVGFontExport::implEmbedFont( const vcl::Font& rFont )
}
for (auto const& glyph : rGlyphSet)
{
implEmbedGlyph( *pVDev.get(), glyph);
implEmbedGlyph( *pVDev, glyph);
}
}
}
......
......@@ -47,11 +47,11 @@ public:
ToolBox& GetToolBox()
{
return *maToolBox.get();
return *maToolBox;
}
const ToolBox& GetToolBox() const
{
return *maToolBox.get();
return *maToolBox;
}
protected:
......
......@@ -56,8 +56,8 @@ public:
virtual ~FileControl() override;
virtual void dispose() override;
Edit& GetEdit() { return *maEdit.get(); }
PushButton& GetButton() { return *maButton.get(); }
Edit& GetEdit() { return *maEdit; }
PushButton& GetButton() { return *maButton; }
void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override;
......
......@@ -121,7 +121,7 @@ public:
void SetCommandHdl( const Link<SvSimpleTable*,void>& rLink ) { aCommandLink = rLink; }
void SetHeaderBarClickHdl( const Link<SvSimpleTable*,void>& rLink ) { aHeaderBarClickLink = rLink; }
HeaderBar& GetTheHeaderBar() { return *aHeaderBar.get(); }
HeaderBar& GetTheHeaderBar() { return *aHeaderBar; }
};
......
......@@ -51,7 +51,7 @@ public:
const ClassificationEditEngine& getEditEngine()
{
return *pEdEngine.get();
return *pEdEngine;
}
void SetModifyHdl(const Link<LinkParamNone*,void>& rLink)
......
......@@ -159,7 +159,7 @@ public:
void CheckSelection();
// bring further settings to the outside world
Svx3DLightControl& GetSvx3DLightControl() { return *maLightControl.get(); }
Svx3DLightControl& GetSvx3DLightControl() { return *maLightControl; }
// register user callback
void SetUserInteractiveChangeCallback(Link<SvxLightCtl3D*,void> aNew) { maUserInteractiveChangeCallback = aNew; }
......
......@@ -59,7 +59,7 @@ public:
void PreparePreRenderDevice();
void OutputPreRenderDevice(const vcl::Region& rExpandedRegion);
OutputDevice& GetPreRenderDevice() { return *mpPreRenderDevice.get(); }
OutputDevice& GetPreRenderDevice() { return *mpPreRenderDevice; }
};
class SVX_DLLPUBLIC SdrPaintWindow
......@@ -96,7 +96,7 @@ public:
// data read accesses
SdrPaintView& GetPaintView() const { return mrPaintView; }
OutputDevice& GetOutputDevice() const { return *mpOutputDevice.get(); }
OutputDevice& GetOutputDevice() const { return *mpOutputDevice; }
vcl::Window* GetWindow() const { return mpWindow; }
// OVERLAYMANAGER
......@@ -135,7 +135,7 @@ public:
void setTemporaryTarget(bool bNew) { mbTemporaryTarget = bNew; }
// #i72889# get target output device, take into account output buffering
OutputDevice& GetTargetOutputDevice() { if(mpPreRenderDevice) return mpPreRenderDevice->GetPreRenderDevice(); else return *mpOutputDevice.get(); }
OutputDevice& GetTargetOutputDevice() { if(mpPreRenderDevice) return mpPreRenderDevice->GetPreRenderDevice(); else return *mpOutputDevice; }
};
#endif // INCLUDED_SVX_SDRPAINTWINDOW_HXX
......
......@@ -49,7 +49,7 @@ namespace vcl
static vcl::DeleteOnDeinit< BitmapEx > aBmp( new BitmapEx( ... ) );
if( aBmp.get() ) // check whether DeInitVCL has been called already
DrawBitmapEx( Point( 10, 10 ), *aBmp.get() );