summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx2
-rw-r--r--basctl/source/accessibility/accessibledialogcontrolshape.cxx2
-rw-r--r--basctl/source/accessibility/accessibledialogwindow.cxx2
-rw-r--r--basctl/source/basicide/baside2.hxx8
-rw-r--r--basctl/source/basicide/basides2.cxx2
-rw-r--r--basctl/source/basicide/basides3.cxx2
-rw-r--r--basctl/source/basicide/layout.cxx2
-rw-r--r--basegfx/source/tools/systemdependentdata.cxx2
-rw-r--r--basic/source/sbx/sbxexec.cxx2
-rw-r--r--basic/source/uno/scriptcont.cxx2
-rw-r--r--canvas/source/cairo/cairo_canvashelper_text.cxx2
-rw-r--r--canvas/source/cairo/cairo_textlayout.cxx2
-rw-r--r--canvas/source/directx/dx_canvasbitmap.cxx2
-rw-r--r--canvas/source/directx/dx_canvascustomsprite.cxx2
-rw-r--r--canvas/source/opengl/ogl_canvasbitmap.cxx2
-rw-r--r--canvas/source/opengl/ogl_canvascustomsprite.cxx2
-rw-r--r--canvas/source/vcl/backbuffer.cxx4
-rw-r--r--canvas/source/vcl/canvashelper_texturefill.cxx2
-rw-r--r--canvas/source/vcl/devicehelper.cxx4
-rw-r--r--canvas/source/vcl/spritecanvashelper.cxx4
-rw-r--r--canvas/source/vcl/textlayout.cxx6
-rw-r--r--chart2/source/controller/dialogs/ObjectNameProvider.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_LegendPosition.cxx2
-rw-r--r--chart2/source/controller/main/ChartController.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx2
-rw-r--r--chart2/source/controller/main/ControllerCommandDispatch.cxx4
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx2
-rw-r--r--chart2/source/view/axes/VCartesianCoordinateSystem.cxx2
-rw-r--r--chart2/source/view/axes/VPolarCoordinateSystem.cxx2
-rw-r--r--cppcanvas/source/mtfrenderer/implrenderer.cxx4
-rw-r--r--cui/source/customize/SvxToolbarConfigPage.cxx12
-rw-r--r--cui/source/inc/headertablistbox.hxx4
-rw-r--r--cui/source/tabpages/grfpage.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.cxx2
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryTableView.cxx4
-rw-r--r--desktop/source/lib/init.cxx4
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx2
-rw-r--r--drawinglayer/source/tools/converters.cxx2
-rw-r--r--filter/source/graphicfilter/eps/eps.cxx2
-rw-r--r--filter/source/msfilter/mstoolbar.cxx4
-rw-r--r--filter/source/svg/svgfontexport.cxx2
-rw-r--r--include/sfx2/sidebar/TitleBar.hxx4
-rw-r--r--include/svtools/filectrl.hxx4
-rw-r--r--include/svtools/simptabl.hxx2
-rw-r--r--include/svx/ClassificationEditView.hxx2
-rw-r--r--include/svx/dlgctl3d.hxx2
-rw-r--r--include/svx/sdrpaintwindow.hxx6
-rw-r--r--include/vcl/lazydelete.hxx2
-rw-r--r--include/xmloff/xmlexp.hxx2
-rw-r--r--oox/source/ppt/pptgraphicshapecontext.cxx2
-rw-r--r--oox/source/ppt/pptshape.cxx4
-rw-r--r--oox/source/ppt/pptshapecontext.cxx2
-rw-r--r--oox/source/shape/ShapeContextHandler.cxx8
-rw-r--r--sc/qa/unit/tiledrendering/tiledrendering.cxx6
-rw-r--r--sc/source/core/tool/compiler.cxx2
-rw-r--r--sc/source/core/tool/interpr1.cxx4
-rw-r--r--sc/source/filter/excel/xecontent.cxx2
-rw-r--r--sc/source/filter/oox/workbookhelper.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx2
-rw-r--r--sc/source/ui/condformat/colorformat.cxx4
-rw-r--r--sc/source/ui/condformat/condformatdlgentry.cxx84
-rw-r--r--sc/source/ui/dbgui/csvgrid.cxx18
-rw-r--r--sc/source/ui/dbgui/csvruler.cxx8
-rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx4
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx2
-rw-r--r--sc/source/ui/inc/inputwin.hxx2
-rw-r--r--sc/source/ui/miscdlgs/autofmt.cxx4
-rw-r--r--sc/source/ui/miscdlgs/crnrdlg.cxx6
-rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx12
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx2
-rw-r--r--sc/source/ui/unoobj/fielduno.cxx2
-rw-r--r--sc/source/ui/view/tabview.cxx30
-rw-r--r--sc/source/ui/view/tabview4.cxx16
-rw-r--r--sc/source/ui/view/tabview5.cxx8
-rw-r--r--sd/source/ui/animations/motionpathtag.cxx2
-rw-r--r--sd/source/ui/annotations/annotationtag.cxx2
-rw-r--r--sd/source/ui/dlg/animobjs.cxx2
-rw-r--r--sd/source/ui/func/fuformatpaintbrush.cxx2
-rw-r--r--sd/source/ui/func/fupage.cxx4
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx2
-rw-r--r--sd/source/ui/slideshow/showwin.cxx2
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx2
-rw-r--r--sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx4
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx2
-rw-r--r--sfx2/source/appl/newhelp.hxx2
-rw-r--r--sfx2/source/dialog/backingwindow.cxx2
-rw-r--r--sfx2/source/doc/Metadatable.cxx2
-rw-r--r--shell/qa/zip/testzipimpl.cxx2
-rw-r--r--slideshow/source/engine/rehearsetimingsactivity.cxx2
-rw-r--r--slideshow/source/engine/shapes/viewbackgroundshape.cxx2
-rw-r--r--slideshow/source/engine/shapes/viewshape.cxx2
-rw-r--r--starmath/inc/view.hxx6
-rw-r--r--starmath/source/view.cxx4
-rw-r--r--svtools/source/contnr/imivctl1.cxx2
-rw-r--r--svtools/source/control/ctrlbox.cxx8
-rw-r--r--svtools/source/control/filectrl.cxx2
-rw-r--r--svtools/source/control/ruler.cxx34
-rw-r--r--svtools/source/control/valueset.cxx2
-rw-r--r--svtools/source/misc/sampletext.cxx2
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx2
-rw-r--r--svx/source/dialog/framelinkarray.cxx8
-rw-r--r--svx/source/dialog/frmsel.cxx2
-rw-r--r--svx/source/dialog/svxruler.cxx4
-rw-r--r--svx/source/fmcomp/gridctrl.cxx4
-rw-r--r--svx/source/sdr/attribute/sdrallfillattributeshelper.cxx8
-rw-r--r--svx/source/sdr/overlay/overlaymanagerbuffered.cxx8
-rw-r--r--svx/source/svdraw/sdrpaintwindow.cxx2
-rw-r--r--svx/source/svdraw/svddrgv.cxx2
-rw-r--r--svx/source/svdraw/svdhdl.cxx24
-rw-r--r--svx/source/svdraw/svdograf.cxx2
-rw-r--r--svx/source/svdraw/svdxcgv.cxx4
-rw-r--r--svx/source/table/tablehandles.cxx6
-rw-r--r--svx/source/table/tableundo.cxx4
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx2
-rw-r--r--svx/source/unodraw/unoshape.cxx2
-rw-r--r--svx/source/xoutdev/xtabdash.cxx2
-rw-r--r--svx/source/xoutdev/xtabgrdt.cxx2
-rw-r--r--svx/source/xoutdev/xtabhtch.cxx2
-rw-r--r--svx/source/xoutdev/xtablend.cxx2
-rw-r--r--sw/inc/doc.hxx4
-rw-r--r--sw/qa/extras/tiledrendering/tiledrendering.cxx2
-rw-r--r--sw/source/core/doc/DocumentDeviceManager.cxx2
-rw-r--r--sw/source/core/unocore/unochart.cxx2
-rw-r--r--sw/source/core/unocore/unostyle.cxx4
-rw-r--r--sw/source/core/unocore/unotbl.cxx8
-rw-r--r--sw/source/core/unocore/unotext.cxx4
-rw-r--r--sw/source/filter/html/htmlatr.cxx2
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx2
-rw-r--r--sw/source/ui/envelp/label1.cxx6
-rw-r--r--sw/source/ui/vba/vbafield.cxx2
-rw-r--r--sw/source/ui/vba/vbalistformat.cxx2
-rw-r--r--sw/source/uibase/app/docst.cxx2
-rw-r--r--sw/source/uibase/app/docstyle.cxx3
-rw-r--r--sw/source/uibase/misc/swruler.cxx4
-rw-r--r--sw/source/uibase/sidebar/PageSizeControl.cxx2
-rw-r--r--sw/source/uibase/sidebar/StylePresetsPanel.cxx6
-rw-r--r--toolkit/source/awt/vclxaccessiblecomponent.cxx2
-rw-r--r--ucb/source/ucp/webdav/webdavcontent.cxx40
-rw-r--r--vcl/backendtest/VisualBackendTest.cxx2
-rw-r--r--vcl/backendtest/outputdevice/outputdevice.cxx2
-rw-r--r--vcl/qa/cppunit/svm/svmtest.cxx48
-rw-r--r--vcl/source/gdi/gdimtf.cxx4
-rw-r--r--vcl/source/gdi/impanmvw.cxx2
-rw-r--r--vcl/source/gdi/impgraph.cxx2
-rw-r--r--vcl/source/gdi/print2.cxx18
-rw-r--r--vcl/source/graphic/GraphicObject2.cxx4
-rw-r--r--vcl/source/graphic/Manager.cxx2
-rw-r--r--vcl/source/image/ImplImageTree.cxx2
-rw-r--r--vcl/source/uitest/uiobject.cxx2
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx2
-rw-r--r--vcl/win/gdi/gdiimpl.cxx4
-rw-r--r--vcl/win/gdi/salgdi2.cxx10
-rw-r--r--vcl/workben/vcldemo.cxx2
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.cxx8
-rw-r--r--writerfilter/source/ooxml/OOXMLDocumentImpl.cxx6
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx4
-rw-r--r--xmloff/source/draw/ximpshap.cxx4
-rw-r--r--xmloff/source/style/impastpl.cxx2
161 files changed, 402 insertions, 403 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 49c3a88b41fa..434e8b42faa7 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -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())
{
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index ffd5fde88332..0eac8917ed00 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -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;
}
}
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 234e30853ddc..3cd6f788d309 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -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;
}
}
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index e0fcac4fa8af..a42f88514baf 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -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);
};
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index c58ba4520fe0..55c830fac4b6 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -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 );
}
diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx
index 6788cdb31b0f..8e4d1e67d30e 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -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 );
}
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index cb301d684fa7..3fd4f98a6d57 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -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()
diff --git a/basegfx/source/tools/systemdependentdata.cxx b/basegfx/source/tools/systemdependentdata.cxx
index a2ebcdf23b8a..61fa9dfe7826 100644
--- a/basegfx/source/tools/systemdependentdata.cxx
+++ b/basegfx/source/tools/systemdependentdata.cxx
@@ -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())
diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx
index f2f23049dcb6..ae1d35671a36 100644
--- a/basic/source/sbx/sbxexec.cxx
+++ b/basic/source/sbx/sbxexec.cxx
@@ -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 == ',' )
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index e31b7ee27550..f9b2b424e07a 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -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 ) );
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index d0704e877677..85f68d8915be 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -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
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 087f0479bf05..f24405f73cfe 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -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() );
diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx
index 49c4160dbe22..e7a89ae888e4 100644
--- a/canvas/source/directx/dx_canvasbitmap.cxx
+++ b/canvas/source/directx/dx_canvasbitmap.cxx
@@ -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 );
}
diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx
index b1b0d58e102d..018723d6b692 100644
--- a/canvas/source/directx/dx_canvascustomsprite.cxx
+++ b/canvas/source/directx/dx_canvascustomsprite.cxx
@@ -55,7 +55,7 @@ namespace dxcanvas
rRenderModule,
true));
- maCanvasHelper.setDevice( *rRefDevice.get() );
+ maCanvasHelper.setDevice( *rRefDevice );
maCanvasHelper.setTarget( mpSurface );
maSpriteHelper.init( rSpriteSize,
diff --git a/canvas/source/opengl/ogl_canvasbitmap.cxx b/canvas/source/opengl/ogl_canvasbitmap.cxx
index 69d049f0c391..63f10d313288 100644
--- a/canvas/source/opengl/ogl_canvasbitmap.cxx
+++ b/canvas/source/opengl/ogl_canvasbitmap.cxx
@@ -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 ) :
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index 3cb5ec9fe217..75c1dda8dfa0 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -44,7 +44,7 @@ namespace oglcanvas
"CanvasCustomSprite::CanvasCustomSprite(): Invalid sprite canvas" );
::canvas::tools::setIdentityAffineMatrix2D(maTransformation);
- maCanvasHelper.init( *rRefDevice.get(),
+ maCanvasHelper.init( *rRefDevice,
rDeviceHelper );
}
diff --git a/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx
index 143f7a2212e8..739583a14bdc 100644
--- a/canvas/source/vcl/backbuffer.cxx
+++ b/canvas/source/vcl/backbuffer.cxx
@@ -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 )
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index cdbceba7cff2..ddedf22ce205 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -939,7 +939,7 @@ namespace vclcanvas
const vcl::Region aPolyClipRegion( aPolyPoly );
pVDev->SetClipRegion( aPolyClipRegion );
- textureFill( *pVDev.get(),
+ textureFill( *pVDev,
*pGrfObj,
aOutPos,
aIntegerNextTileX,
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index b1a9f61275f9..d5961df2b777 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -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 ) );
}
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 2365023f52a8..98f40a5087a7 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -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 );
}
}
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 18307fce9c0a..0585a38c41f8 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -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() );
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index df7aee8ba8de..682b0ca96783 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -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
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index abe3f2688cec..494538ab4ede 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -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() )
{
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 07eb6692a5d6..8484fa347bff 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -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
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 7cfc51c83bc0..23eb9ab0b349 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -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())
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 07e99c5c6477..4b97e5bbdc47 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -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() )
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 72ebb2b8d059..a919375a7a85 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -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() );
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index c46d8d0b44ad..f8cfe828d0ae 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -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();
diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
index e5ab2b50eb6c..1fee84175444 100644
--- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
@@ -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();
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 551fa731b794..e4b94d86cd1b 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -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();
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 );
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index acdeae0d8d4d..cfa8998244bd 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -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;
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 2e660ccb204d..f990224b11c4 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -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;
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 23dac75ffab3..5587a613fadb 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -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
{
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 808e768ece00..d5c4a63c70bf 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -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
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d407b2a80736..7b3a8a81c945 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -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);
}
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 7f0c2e37f844..c8cb3734a376 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -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);
diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx
index c34dc03e9039..a993c1884a0c 100644
--- a/drawinglayer/source/tools/converters.cxx
+++ b/drawinglayer/source/tools/converters.cxx
@@ -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)
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 54fc2540f1f1..b5e953fd7da8 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -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 )
{
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index e6e085a06dce..66c4a40387ae 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -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" );
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index 31f898f13f4e..ebadd052a8d6 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -237,7 +237,7 @@ void SVGFontExport::implEmbedFont( const vcl::Font& rFont )
}
for (auto const& glyph : rGlyphSet)
{
- implEmbedGlyph( *pVDev.get(), glyph);
+ implEmbedGlyph( *pVDev, glyph);
}
}
}
diff --git a/include/sfx2/sidebar/TitleBar.hxx b/include/sfx2/sidebar/TitleBar.hxx
index 35c37fc11424..1812503732fb 100644
--- a/include/sfx2/sidebar/TitleBar.hxx
+++ b/include/sfx2/sidebar/TitleBar.hxx
@@ -47,11 +47,11 @@ public:
ToolBox& GetToolBox()
{
- return *maToolBox.get();
+ return *maToolBox;
}
const ToolBox& GetToolBox() const
{
- return *maToolBox.get();
+ return *maToolBox;
}
protected:
diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx
index 3e620e2350be..280b76ffd127 100644
--- a/include/svtools/filectrl.hxx
+++ b/include/svtools/filectrl.hxx
@@ -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;
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index e4a15e02e8bd..7f999a809623 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -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; }
};
diff --git a/include/svx/ClassificationEditView.hxx b/include/svx/ClassificationEditView.hxx
index 89f4a7f90c11..4f421b400243 100644
--- a/include/svx/ClassificationEditView.hxx
+++ b/include/svx/ClassificationEditView.hxx
@@ -51,7 +51,7 @@ public:
const ClassificationEditEngine& getEditEngine()
{
- return *pEdEngine.get();
+ return *pEdEngine;
}
void SetModifyHdl(const Link<LinkParamNone*,void>& rLink)
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index 84e9d855ef33..82f544031a55 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -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; }
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index 8c833d85926c..dda0185f9e9d 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -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
diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx
index 013205b3a64e..dd50f7f13092 100644
--- a/include/vcl/lazydelete.hxx
+++ b/include/vcl/lazydelete.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() );
+ DrawBitmapEx( Point( 10, 10 ), *aBmp );
}
*/
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index a2759c86c9cc..89ebac095657 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -385,7 +385,7 @@ public:
css::xml::sax::XAttributeList >& xAttrList );
// Get common attribute list as implementation or interface.
- SvXMLAttributeList &GetAttrList() { return *mxAttrList.get(); }
+ SvXMLAttributeList &GetAttrList() { return *mxAttrList; }
css::uno::Reference< css::xml::sax::XAttributeList > GetXAttrList() { return mxAttrList.get(); }
// Get document handler. This methods are not const, because the
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx
index 5c29417140f9..f40e6468ba9c 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -164,7 +164,7 @@ ContextHandlerRef PPTGraphicShapeContext::onCreateContext( sal_Int32 aElementTok
case XML_pic :
bUseText = false;
}
- mpShapePtr->applyShapeReference( *pPlaceholder.get(), bUseText );
+ mpShapePtr->applyShapeReference( *pPlaceholder, bUseText );
PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() );
if ( pPPTShape )
pPPTShape->setReferenced( true );
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 92c573b6f5ea..362801b8c438 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -328,7 +328,7 @@ void PPTShape::addShape(
{
aMasterTextListStyle = isOther ? rSlidePersist.getMasterPersist()->getOtherTextStyle() : rSlidePersist.getMasterPersist()->getDefaultTextStyle();
if (aSlideStyle.get())
- aMasterTextListStyle->apply( *aSlideStyle.get() );
+ aMasterTextListStyle->apply( *aSlideStyle );
}
else
{
@@ -339,7 +339,7 @@ void PPTShape::addShape(
if( aMasterTextListStyle.get() && getTextBody().get() ) {
TextListStylePtr aCombinedTextListStyle (new TextListStyle());
- aCombinedTextListStyle->apply( *aMasterTextListStyle.get() );
+ aCombinedTextListStyle->apply( *aMasterTextListStyle );
if( mpPlaceholder.get() && mpPlaceholder->getTextBody().get() )
aCombinedTextListStyle->apply( mpPlaceholder->getTextBody()->getTextListStyle() );
diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx
index 0699923610b1..caec14ffe1ba 100644
--- a/oox/source/ppt/pptshapecontext.cxx
+++ b/oox/source/ppt/pptshapecontext.cxx
@@ -148,7 +148,7 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32 aElementToken, con
{
SAL_INFO("oox.ppt","shape " << mpShapePtr->getId() <<
" will get shape reference " << pPlaceholder->getId() << " applied");
- mpShapePtr->applyShapeReference( *pPlaceholder.get() );
+ mpShapePtr->applyShapeReference( *pPlaceholder );
PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() );
if ( pPPTShape )
pPPTShape->setReferenced( true );
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 2d2894e6e4a7..4abd405c234e 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -198,7 +198,7 @@ ShapeContextHandler::getDrawingShapeContext()
else
{
// Reset the handler if fragment path has changed
- OUString sHandlerFragmentPath = dynamic_cast<ContextHandler&>(*mxDrawingFragmentHandler.get()).getFragmentPath();
+ OUString sHandlerFragmentPath = dynamic_cast<ContextHandler&>(*mxDrawingFragmentHandler).getFragmentPath();
if ( msRelationFragmentPath != sHandlerFragmentPath )
{
mxDrawingFragmentHandler.clear();
@@ -458,7 +458,7 @@ ShapeContextHandler::getShape()
}
else if (mxLockedCanvasContext.is())
{
- ShapePtr pShape = dynamic_cast<LockedCanvasContext&>(*mxLockedCanvasContext.get()).getShape();
+ ShapePtr pShape = dynamic_cast<LockedCanvasContext&>(*mxLockedCanvasContext).getShape();
if (pShape)
{
basegfx::B2DHomMatrix aMatrix;
@@ -486,7 +486,7 @@ ShapeContextHandler::getShape()
}
else if (mxWpsContext.is())
{
- ShapePtr pShape = dynamic_cast<WpsContext&>(*mxWpsContext.get()).getShape();
+ ShapePtr pShape = dynamic_cast<WpsContext&>(*mxWpsContext).getShape();
if (pShape)
{
basegfx::B2DHomMatrix aMatrix;
@@ -499,7 +499,7 @@ ShapeContextHandler::getShape()
}
else if (mxWpgContext.is())
{
- ShapePtr pShape = dynamic_cast<WpgContext&>(*mxWpgContext.get()).getShape();
+ ShapePtr pShape = dynamic_cast<WpgContext&>(*mxWpgContext).getShape();
if (pShape)
{
basegfx::B2DHomMatrix aMatrix;
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 2d76108571d2..5525e558e7a2 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1301,7 +1301,7 @@ void ScTiledRenderingTest::testInsertGraphicInvalidations()
std::vector<unsigned char> aBuffer(nCanvasWidth * nCanvasHeight * 4);
ScopedVclPtrInstance<VirtualDevice> pDevice(nullptr, Size(1, 1), DeviceFormat::DEFAULT);
pDevice->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(), aBuffer.data());
- pModelObj->paintTile(*pDevice.get(), nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/0, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
+ pModelObj->paintTile(*pDevice, nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/0, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
Scheduler::ProcessEventsToIdle();
// insert an image in view and see if both views are invalidated
@@ -1343,7 +1343,7 @@ void ScTiledRenderingTest::testDocumentSizeWithTwoViews()
std::vector<unsigned char> aBuffer1(nCanvasWidth * nCanvasHeight * 4);
ScopedVclPtrInstance<VirtualDevice> pDevice1(nullptr, Size(1, 1), DeviceFormat::DEFAULT);
pDevice1->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(), aBuffer1.data());
- pModelObj->paintTile(*pDevice1.get(), nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/291840, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
+ pModelObj->paintTile(*pDevice1, nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/291840, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
Scheduler::ProcessEventsToIdle();
// Create a new view
@@ -1352,7 +1352,7 @@ void ScTiledRenderingTest::testDocumentSizeWithTwoViews()
std::vector<unsigned char> aBuffer2(nCanvasWidth * nCanvasHeight * 4);
ScopedVclPtrInstance<VirtualDevice> pDevice2(nullptr, Size(1, 1), DeviceFormat::DEFAULT);
pDevice2->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(), aBuffer2.data());
- pModelObj->paintTile(*pDevice2.get(), nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/291840, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
+ pModelObj->paintTile(*pDevice2, nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/291840, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
Scheduler::ProcessEventsToIdle();
// Check that the tiles actually have the same content
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 63eaf937e2e4..58cdd1b7ad92 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5251,7 +5251,7 @@ void ScCompiler::fillAddInToken(::std::vector< css::sheet::FormulaOpCodeMapEntry
bool ScCompiler::HandleColRowName()
{
- ScSingleRefData& rRef = *mpToken.get()->GetSingleRef();
+ ScSingleRefData& rRef = *mpToken->GetSingleRef();
const ScAddress aAbs = rRef.toAbs(aPos);
if (!ValidAddress(aAbs))
{
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 127a8c622a4c..e249229dca85 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8687,14 +8687,14 @@ void ScInterpreter::ScAreas()
case svSingleRef:
{
FormulaConstTokenRef xT = PopToken();
- ValidateRef( *xT.get()->GetSingleRef());
+ ValidateRef( *xT->GetSingleRef());
++nCount;
}
break;
case svDoubleRef:
{
FormulaConstTokenRef xT = PopToken();
- ValidateRef( *xT.get()->GetDoubleRef());
+ ValidateRef( *xT->GetDoubleRef());
++nCount;
}
break;
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 266461d4426d..b58231634526 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1350,7 +1350,7 @@ XclExpCondfmt::XclExpCondfmt( const XclExpRoot& rRoot, const ScConditionalFormat
XclExpExtRef pParent = xExtLst->GetItem( XclExpExtDataBarType );
if( !pParent.get() )
{
- xExtLst->AddRecord( XclExpExtRef(new XclExpExtCondFormat( *xExtLst.get() )) );
+ xExtLst->AddRecord( XclExpExtRef(new XclExpExtCondFormat( *xExtLst )) );
pParent = xExtLst->GetItem( XclExpExtDataBarType );
}
static_cast<XclExpExtCondFormat*>(xExtLst->GetItem( XclExpExtDataBarType ).get())->AddRecord(
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 798e24a36d3f..87b5fe016e39 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -131,7 +131,7 @@ public:
ScEditEngineDefaulter& getEditEngine() const
{
- return *mxEditEngine.get();
+ return *mxEditEngine;
}
ScDocument& getScDocument() { return *mpDoc; }
diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index 845677c0522d..14d198bdde5f 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -129,7 +129,7 @@ void ScRandomNumberGeneratorDialog::Init()
mpEnableSeed->SetToggleHdl( LINK( this, ScRandomNumberGeneratorDialog, CheckChanged ));
mpEnableRounding->SetToggleHdl( LINK( this, ScRandomNumberGeneratorDialog, CheckChanged ));
- DistributionChanged(*mpDistributionCombo.get());
+ DistributionChanged(*mpDistributionCombo);
CheckChanged(*mpEnableSeed);
}
diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx
index 290bcbad4d40..67e1f9be5eb3 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -121,8 +121,8 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(vcl::Window* pWindow, const ScDataBar
mpLbAxisCol->SelectEntry(rData.maAxisColor);
mpCbOnlyBar->Check(rData.mbOnlyBar);
- TypeSelectHdl(*mpLbTypeMin.get());
- PosSelectHdl(*mpLbTypeMin.get());
+ TypeSelectHdl(*mpLbTypeMin);
+ PosSelectHdl(*mpLbTypeMin);
}
ScDataBarSettingsDlg::~ScDataBarSettingsDlg()
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 2478dfc6323d..47870c52f257 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -214,7 +214,7 @@ ScConditionFrmtEntry::ScConditionFrmtEntry(vcl::Window* pParent, ScDocument* pDo
if(pFormatEntry)
{
maLbStyle->SelectEntry(pFormatEntry->GetStyle());
- StyleSelectHdl(*maLbStyle.get());
+ StyleSelectHdl(*maLbStyle);
ScConditionMode eMode = pFormatEntry->GetOperation();
maLbCondType->SelectEntryPos(ConditionModeToEntryPos(eMode));
@@ -277,7 +277,7 @@ void ScConditionFrmtEntry::Init(ScCondFormatDlg* pDialogParent)
maEdVal1->SetModifyHdl( LINK( this, ScConditionFrmtEntry, OnEdChanged ) );
maEdVal2->SetModifyHdl( LINK( this, ScConditionFrmtEntry, OnEdChanged ) );
- FillStyleListBox( mpDoc, *maLbStyle.get() );
+ FillStyleListBox( mpDoc, *maLbStyle );
maLbStyle->SetSelectHdl( LINK( this, ScConditionFrmtEntry, StyleSelectHdl ) );
maLbCondType->SetSelectHdl( LINK( this, ScConditionFrmtEntry, ConditionTypeSelectHdl ) );
@@ -470,7 +470,7 @@ void ScConditionFrmtEntry::Notify(SfxBroadcaster&, const SfxHint& rHint)
if(rHint.GetId() == SfxHintId::StyleSheetModified)
{
if(!mbIsInStyleCreate)
- UpdateStyleList(*maLbStyle.get(), mpDoc);
+ UpdateStyleList(*maLbStyle, mpDoc);
}
}
@@ -543,7 +543,7 @@ void StyleSelect( ListBox& rLbStyle, const ScDocument* pDoc, SvxFontPrevWindow&
IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl, ListBox&, void)
{
mbIsInStyleCreate = true;
- StyleSelect( *maLbStyle.get(), mpDoc, *maWdPreview.get() );
+ StyleSelect( *maLbStyle, mpDoc, *maWdPreview );
mbIsInStyleCreate = false;
}
@@ -572,7 +572,7 @@ ScFormulaFrmtEntry::ScFormulaFrmtEntry( vcl::Window* pParent, ScDocument* pDoc,
maLbStyle->SelectEntryPos(1);
}
- StyleSelectHdl(*maLbStyle.get());
+ StyleSelectHdl(*maLbStyle);
}
ScFormulaFrmtEntry::~ScFormulaFrmtEntry()
@@ -593,13 +593,13 @@ void ScFormulaFrmtEntry::Init(ScCondFormatDlg* pDialogParent)
{
maEdFormula->SetGetFocusHdl( LINK( pDialogParent, ScCondFormatDlg, RangeGetFocusHdl ) );
- FillStyleListBox( mpDoc, *maLbStyle.get() );
+ FillStyleListBox( mpDoc, *maLbStyle );
maLbStyle->SetSelectHdl( LINK( this, ScFormulaFrmtEntry, StyleSelectHdl ) );
}
IMPL_LINK_NOARG(ScFormulaFrmtEntry, StyleSelectHdl, ListBox&, void)
{
- StyleSelect( *maLbStyle.get(), mpDoc, *maWdPreview.get() );
+ StyleSelect( *maLbStyle, mpDoc, *maWdPreview );
}
ScFormatEntry* ScFormulaFrmtEntry::createFormulaEntry() const
@@ -820,9 +820,9 @@ ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( vcl::Window* pParent, ScDocument
if(pFormat)
{
ScColorScaleEntries::const_iterator itr = pFormat->begin();
- SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMin.get(), *maEdMin.get(), *maLbColMin.get(), pDoc);
+ SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMin, *maEdMin, *maLbColMin, pDoc);
++itr;
- SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMax.get(), *maEdMax.get(), *maLbColMax.get(), pDoc);
+ SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMax, *maEdMax, *maLbColMax, pDoc);
}
else
{
@@ -832,8 +832,8 @@ ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( vcl::Window* pParent, ScDocument
maLbColorFormat->SetSelectHdl( LINK( pParent, ScCondFormatList, ColFormatTypeHdl ) );
- EntryTypeHdl(*maLbEntryTypeMin.get());
- EntryTypeHdl(*maLbEntryTypeMax.get());
+ EntryTypeHdl(*maLbEntryTypeMin);
+ EntryTypeHdl(*maLbEntryTypeMax);
}
ScColorScale2FrmtEntry::~ScColorScale2FrmtEntry()
@@ -866,8 +866,8 @@ void ScColorScale2FrmtEntry::Init()
ScFormatEntry* ScColorScale2FrmtEntry::createColorscaleEntry() const
{
ScColorScaleFormat* pColorScale = new ScColorScaleFormat(mpDoc);
- pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMin.get(), *maLbColMin.get(), *maEdMin.get(), mpDoc, maPos));
- pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMax.get(), *maLbColMax.get(), *maEdMax.get(), mpDoc, maPos));
+ pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMin, *maLbColMin, *maEdMin, mpDoc, maPos));
+ pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMax, *maLbColMax, *maEdMax, mpDoc, maPos));
return pColorScale;
}
@@ -969,12 +969,12 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( vcl::Window* pParent, ScDocument
if(pFormat)
{
ScColorScaleEntries::const_iterator itr = pFormat->begin();
- SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMin.get(), *maEdMin.get(), *maLbColMin.get(), pDoc);
+ SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMin, *maEdMin, *maLbColMin, pDoc);
assert(pFormat->size() == 3);
++itr;
- SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMiddle.get(), *maEdMiddle.get(), *maLbColMiddle.get(), pDoc);
+ SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMiddle, *maEdMiddle, *maLbColMiddle, pDoc);
++itr;
- SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMax.get(), *maEdMax.get(), *maLbColMax.get(), pDoc);
+ SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMax, *maEdMax, *maLbColMax, pDoc);
}
else
{
@@ -986,9 +986,9 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( vcl::Window* pParent, ScDocument
}
maLbColorFormat->SetSelectHdl( LINK( pParent, ScCondFormatList, ColFormatTypeHdl ) );
- EntryTypeHdl(*maLbEntryTypeMin.get());
- EntryTypeHdl(*maLbEntryTypeMiddle.get());
- EntryTypeHdl(*maLbEntryTypeMax.get());
+ EntryTypeHdl(*maLbEntryTypeMin);
+ EntryTypeHdl(*maLbEntryTypeMiddle);
+ EntryTypeHdl(*maLbEntryTypeMax);
}
ScColorScale3FrmtEntry::~ScColorScale3FrmtEntry()
@@ -1026,10 +1026,10 @@ void ScColorScale3FrmtEntry::Init()
ScFormatEntry* ScColorScale3FrmtEntry::createColorscaleEntry() const
{
ScColorScaleFormat* pColorScale = new ScColorScaleFormat(mpDoc);
- pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMin.get(), *maLbColMin.get(), *maEdMin.get(), mpDoc, maPos));
+ pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMin, *maLbColMin, *maEdMin, mpDoc, maPos));
if(maLbColorFormat->GetSelectedEntryPos() == 1)
- pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMiddle.get(), *maLbColMiddle.get(), *maEdMiddle.get(), mpDoc, maPos));
- pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMax.get(), *maLbColMax.get(), *maEdMax.get(), mpDoc, maPos));
+ pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMiddle, *maLbColMiddle, *maEdMiddle, mpDoc, maPos));
+ pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMax, *maLbColMax, *maEdMax, mpDoc, maPos));
return pColorScale;
}
@@ -1185,15 +1185,15 @@ ScDataBarFrmtEntry::ScDataBarFrmtEntry( vcl::Window* pParent, ScDocument* pDoc,
if(pFormat)
{
mpDataBarData.reset(new ScDataBarFormatData(*pFormat->GetDataBarData()));
- SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, *maLbDataBarMinType.get(), *maEdDataBarMin.get(), pDoc);
- SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, *maLbDataBarMaxType.get(), *maEdDataBarMax.get(), pDoc);
- DataBarTypeSelectHdl(*maLbDataBarMinType.get());
+ SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, *maLbDataBarMinType, *maEdDataBarMin, pDoc);
+ SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, *maLbDataBarMaxType, *maEdDataBarMax, pDoc);
+ DataBarTypeSelectHdl(*maLbDataBarMinType);
}
else
{
selectType(*maLbDataBarMinType, COLORSCALE_AUTO);
selectType(*maLbDataBarMaxType, COLORSCALE_AUTO);
- DataBarTypeSelectHdl(*maLbDataBarMinType.get());
+ DataBarTypeSelectHdl(*maLbDataBarMinType);
}
Init();
@@ -1243,10 +1243,10 @@ void ScDataBarFrmtEntry::Init()
ScFormatEntry* ScDataBarFrmtEntry::createDatabarEntry() const
{
- SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), *maLbDataBarMinType.get(),
- *maEdDataBarMin.get(), mpDoc, maPos);
- SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), *maLbDataBarMaxType.get(),
- *maEdDataBarMax.get(), mpDoc, maPos);
+ SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), *maLbDataBarMinType,
+ *maEdDataBarMin, mpDoc, maPos);
+ SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), *maLbDataBarMaxType,
+ *maEdDataBarMax, mpDoc, maPos);
ScDataBarFormat* pDataBar = new ScDataBarFormat(mpDoc);
pDataBar->SetDataBarData(new ScDataBarFormatData(*mpDataBarData));
return pDataBar;
@@ -1298,17 +1298,17 @@ IMPL_LINK_NOARG( ScDataBarFrmtEntry, DataBarTypeSelectHdl, ListBox&, void )
IMPL_LINK_NOARG( ScDataBarFrmtEntry, OptionBtnHdl, Button*, void )
{
- SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), *maLbDataBarMinType.get(),
- *maEdDataBarMin.get(), mpDoc, maPos);
- SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), *maLbDataBarMaxType.get(),
- *maEdDataBarMax.get(), mpDoc, maPos);
+ SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), *maLbDataBarMinType,
+ *maEdDataBarMin, mpDoc, maPos);
+ SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), *maLbDataBarMaxType,
+ *maEdDataBarMax, mpDoc, maPos);
ScopedVclPtrInstance<ScDataBarSettingsDlg> pDlg(this, *mpDataBarData, mpDoc, maPos);
if( pDlg->Execute() == RET_OK)
{
mpDataBarData.reset(pDlg->GetData());
- SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, *maLbDataBarMinType, *maEdDataBarMin.get(), mpDoc);
- SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, *maLbDataBarMaxType.get(), *maEdDataBarMax.get(), mpDoc);
- DataBarTypeSelectHdl(*maLbDataBarMinType.get());
+ SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, *maLbDataBarMinType, *maEdDataBarMin, mpDoc);
+ SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, *maLbDataBarMaxType, *maEdDataBarMax, mpDoc);
+ DataBarTypeSelectHdl(*maLbDataBarMinType);
}
}
@@ -1334,7 +1334,7 @@ ScDateFrmtEntry::ScDateFrmtEntry(vcl::Window* pParent, ScDocument* pDoc, const S
maLbStyle->SelectEntry(pFormat->GetStyleName());
}
- StyleSelectHdl(*maLbStyle.get());
+ StyleSelectHdl(*maLbStyle);
}
ScDateFrmtEntry::~ScDateFrmtEntry()
@@ -1356,7 +1356,7 @@ void ScDateFrmtEntry::Init()
maLbDateEntry->SelectEntryPos(0);
maLbType->SelectEntryPos(3);
- FillStyleListBox( mpDoc, *maLbStyle.get() );
+ FillStyleListBox( mpDoc, *maLbStyle );
maLbStyle->SetSelectHdl( LINK( this, ScDateFrmtEntry, StyleSelectHdl ) );
maLbStyle->SelectEntryPos(1);
}
@@ -1386,7 +1386,7 @@ void ScDateFrmtEntry::Notify( SfxBroadcaster&, const SfxHint& rHint )
if(rHint.GetId() == SfxHintId::StyleSheetModified)
{
if(!mbIsInStyleCreate)
- UpdateStyleList(*maLbStyle.get(), mpDoc);
+ UpdateStyleList(*maLbStyle, mpDoc);
}
}
@@ -1407,7 +1407,7 @@ OUString ScDateFrmtEntry::GetExpressionString()
IMPL_LINK_NOARG( ScDateFrmtEntry, StyleSelectHdl, ListBox&, void )
{
mbIsInStyleCreate = true;
- StyleSelect( *maLbStyle.get(), mpDoc, *maWdPreview.get() );
+ StyleSelect( *maLbStyle, mpDoc, *maWdPreview );
mbIsInStyleCreate = false;
}
@@ -1574,7 +1574,7 @@ ScIconSetFrmtEntry::ScIconSetFrmtEntry(vcl::Window* pParent, ScDocument* pDoc, c
maEntries[0]->SetFirstEntry();
}
else
- IconSetTypeHdl(*maLbIconSetType.get());
+ IconSetTypeHdl(*maLbIconSetType);
}
ScIconSetFrmtEntry::~ScIconSetFrmtEntry()
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index c49eb3a0c79e..e16b7f8b8b96 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -1037,7 +1037,7 @@ void ScCsvGrid::ImplRedraw()
ImplDrawBackgrDev();
ImplDrawGridDev();
}
- DrawOutDev( Point(), maWinSize, Point(), maWinSize, *mpGridDev.get() );
+ DrawOutDev( Point(), maWinSize, Point(), maWinSize, *mpGridDev );
ImplDrawTrackingRect( GetFocusColumn() );
}
}
@@ -1142,7 +1142,7 @@ void ScCsvGrid::ImplDrawColumnBackgr( sal_uInt32 nColIndex )
if( !IsVisibleColumn( nColIndex ) )
return;
- ImplSetColumnClipRegion( *mpBackgrDev.get(), nColIndex );
+ ImplSetColumnClipRegion( *mpBackgrDev, nColIndex );
// grid
mpBackgrDev->SetLineColor();
@@ -1179,7 +1179,7 @@ void ScCsvGrid::ImplDrawColumnBackgr( sal_uInt32 nColIndex )
}
// header
- ImplDrawColumnHeader( *mpBackgrDev.get(), nColIndex, maHeaderBackColor );
+ ImplDrawColumnHeader( *mpBackgrDev, nColIndex, maHeaderBackColor );
mpBackgrDev->SetClipRegion();
}
@@ -1240,8 +1240,8 @@ void ScCsvGrid::ImplDrawBackgrDev()
void ScCsvGrid::ImplDrawColumnSelection( sal_uInt32 nColIndex )
{
ImplInvertCursor( GetRulerCursorPos() );
- ImplSetColumnClipRegion( *mpGridDev.get(), nColIndex );
- mpGridDev->DrawOutDev( Point(), maWinSize, Point(), maWinSize, *mpBackgrDev.get() );
+ ImplSetColumnClipRegion( *mpGridDev, nColIndex );
+ mpGridDev->DrawOutDev( Point(), maWinSize, Point(), maWinSize, *mpBackgrDev );
if( IsSelected( nColIndex ) )
{
@@ -1253,7 +1253,7 @@ void ScCsvGrid::ImplDrawColumnSelection( sal_uInt32 nColIndex )
mpGridDev->SetLineColor();
if( maHeaderBackColor.IsDark() )
// redraw with light gray background in dark mode
- ImplDrawColumnHeader( *mpGridDev.get(), nColIndex, COL_LIGHTGRAY );
+ ImplDrawColumnHeader( *mpGridDev, nColIndex, COL_LIGHTGRAY );
else
{
// use transparent active color
@@ -1263,7 +1263,7 @@ void ScCsvGrid::ImplDrawColumnSelection( sal_uInt32 nColIndex )
// column selection
aRect = tools::Rectangle( nX1, GetHdrHeight() + 1, nX2, GetY( GetLastVisLine() + 1 ) - 1 );
- ImplInvertRect( *mpGridDev.get(), aRect );
+ ImplInvertRect( *mpGridDev, aRect );
}
mpGridDev->SetClipRegion();
@@ -1348,10 +1348,10 @@ void ScCsvGrid::ImplInvertCursor( sal_Int32 nPos )
{
sal_Int32 nX = GetX( nPos ) - 1;
tools::Rectangle aRect( Point( nX, 0 ), Size( 3, GetHdrHeight() ) );
- ImplInvertRect( *mpGridDev.get(), aRect );
+ ImplInvertRect( *mpGridDev, aRect );
aRect.SetTop( GetHdrHeight() + 1 );
aRect.SetBottom( GetY( GetLastVisLine() + 1 ) );
- ImplInvertRect( *mpGridDev.get(), aRect );
+ ImplInvertRect( *mpGridDev, aRect );
}
}
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index a9904be48f88..2046a770d7c1 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -536,7 +536,7 @@ void ScCsvRuler::ImplRedraw()
ImplDrawBackgrDev();
ImplDrawRulerDev();
}
- DrawOutDev( Point(), maWinSize, Point(), maWinSize, *maRulerDev.get() );
+ DrawOutDev( Point(), maWinSize, Point(), maWinSize, *maRulerDev );
/* Draws directly tracking rectangle to the column with the specified index. */
if( HasFocus() )
InvertTracking( tools::Rectangle( 0, 0, GetWidth() - 1, GetHeight() - 2 ),
@@ -619,14 +619,14 @@ void ScCsvRuler::ImplEraseSplit( sal_Int32 nPos )
ImplInvertCursor( GetRulerCursorPos() );
Point aPos( GetX( nPos ) - mnSplitSize / 2, 0 );
Size aSize( mnSplitSize, GetHeight() );
- maRulerDev->DrawOutDev( aPos, aSize, aPos, aSize, *maBackgrDev.get() );
+ maRulerDev->DrawOutDev( aPos, aSize, aPos, aSize, *maBackgrDev );
ImplInvertCursor( GetRulerCursorPos() );
}
}
void ScCsvRuler::ImplDrawRulerDev()
{
- maRulerDev->DrawOutDev( Point(), maWinSize, Point(), maWinSize, *maBackgrDev.get() );
+ maRulerDev->DrawOutDev( Point(), maWinSize, Point(), maWinSize, *maBackgrDev );
ImplInvertCursor( GetRulerCursorPos() );
sal_uInt32 nFirst = maSplits.LowerBound( GetFirstVisPos() );
@@ -640,7 +640,7 @@ void ScCsvRuler::ImplInvertCursor( sal_Int32 nPos )
{
if( IsVisibleSplitPos( nPos ) )
{
- ImplInvertRect( *maRulerDev.get(), tools::Rectangle( Point( GetX( nPos ) - 1, 0 ), Size( 3, GetHeight() - 1 ) ) );
+ ImplInvertRect( *maRulerDev, tools::Rectangle( Point( GetX( nPos ) - 1, 0 ), Size( 3, GetHeight() - 1 ) ) );
if( HasSplit( nPos ) )
ImplDrawSplit( nPos );
}
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 41af9f861003..c6998ce26b31 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -284,13 +284,13 @@ void ScDPFunctionDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncDa
// select field reference type
mxLbTypeWrp->SetControlValue( rFuncData.maFieldRef.ReferenceType );
- SelectHdl( *mpLbType.get() ); // enables base field/item list boxes
+ SelectHdl( *mpLbType ); // enables base field/item list boxes
// select base field
mpLbBaseField->SelectEntry(aSelectedEntry);
if( mpLbBaseField->GetSelectedEntryPos() >= mpLbBaseField->GetEntryCount() )
mpLbBaseField->SelectEntryPos( 0 );
- SelectHdl( *mpLbBaseField.get() ); // fills base item list, selects base item
+ SelectHdl( *mpLbBaseField ); // fills base item list, selects base item
// select base item
switch( rFuncData.maFieldRef.ReferenceItemType )
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index c9879e60b515..980fd83b70de 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -84,7 +84,7 @@ ScFunctionWin::ScFunctionWin(vcl::Window* pParent, const css::uno::Reference<css
aCatBox->SelectEntryPos(0);
- SelHdl(*aCatBox.get());
+ SelHdl(*aCatBox);
}
/*************************************************************************
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 14ccb55dd4f3..01b9390d4d55 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -200,7 +200,7 @@ public:
void SetFormulaMode( bool bSet ) override;
void MakeDialogEditView() override;
bool IsInputActive() override;
- ScrollBar& GetScrollBar() { return *maScrollbar.get(); }
+ ScrollBar& GetScrollBar() { return *maScrollbar; }
void IncrementVerticalSize();
void DecrementVerticalSize();
long GetNumLines() { return maTextWnd->GetNumLines(); }
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 4d7209ab2fca..ae3978f70f07 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -517,7 +517,7 @@ void ScAutoFmtPreview::DoPaint(vcl::RenderContext& rRenderContext)
aVD->SetOutputSize(aWndSize);
aVD->DrawRect(aRect);
- PaintCells(*aVD.get());
+ PaintCells(*aVD);
rRenderContext.SetLineColor();
rRenderContext.SetFillColor(aBackCol);
@@ -526,7 +526,7 @@ void ScAutoFmtPreview::DoPaint(vcl::RenderContext& rRenderContext)
Point aPos((aWndSize.Width() - aPrvSize.Width()) / 2, (aWndSize.Height() - aPrvSize.Height()) / 2);
if (AllSettings::GetLayoutRTL())
aPos.setX( -aPos.X() );
- rRenderContext.DrawOutDev(aPos, aWndSize, Point(), aWndSize, *aVD.get());
+ rRenderContext.DrawOutDev(aPos, aWndSize, Point(), aWndSize, *aVD);
aVD->SetDrawMode(nOldDrawMode);
}
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 12a02e4ecf8f..3f9a5f68e2f7 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -171,7 +171,7 @@ void ScColRowNameRangesDlg::Init()
pEdAssign->GrabFocus();
pRbAssign->Enable();
- Range1SelectHdl( *pLbRange.get() );
+ Range1SelectHdl( *pLbRange );
}
// set data range of a labeled range to default values and set the
@@ -577,7 +577,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl, Button*, void)
pEdAssign2->SetText( EMPTY_OUSTRING );
theCurArea = ScRange();
theCurData = theCurArea;
- Range1SelectHdl( *pLbRange.get() );
+ Range1SelectHdl( *pLbRange );
}
else
{
@@ -643,7 +643,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void)
pBtnColHead->Check();
pBtnRowHead->Check( false );
pEdAssign2->SetText( EMPTY_OUSTRING );
- Range1SelectHdl( *pLbRange.get() );
+ Range1SelectHdl( *pLbRange );
}
}
}
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index b1bcaaba9246..5ede955f67b4 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -509,7 +509,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
if ( mpLbLists->GetEntryCount() > 0 )
{
mpLbLists->SelectEntryPos( nCancelPos );
- LbSelectHdl( *mpLbLists.get() );
+ LbSelectHdl( *mpLbLists );
mpFtLists->Enable();
mpLbLists->Enable();
}
@@ -546,7 +546,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
AddNewList( theEntriesStr );
UpdateUserListBox();
mpLbLists->SelectEntryPos( mpLbLists->GetEntryCount()-1 );
- LbSelectHdl( *mpLbLists.get() );
+ LbSelectHdl( *mpLbLists );
mpFtLists->Enable();
mpLbLists->Enable();
}
@@ -555,7 +555,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
if ( mpLbLists->GetEntryCount() > 0 )
{
mpLbLists->SelectEntryPos( nCancelPos );
- LbSelectHdl( *mpLbLists.get() );
+ LbSelectHdl( *mpLbLists );
mpLbLists->Enable();
mpLbLists->Enable();
}
@@ -583,7 +583,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
else
{
mpLbLists->SelectEntryPos( 0 );
- LbSelectHdl( *mpLbLists.get() );
+ LbSelectHdl( *mpLbLists );
}
mpBtnNew->Show();
@@ -631,7 +631,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
( nRemovePos >= mpLbLists->GetEntryCount() )
? mpLbLists->GetEntryCount()-1
: nRemovePos );
- LbSelectHdl( *mpLbLists.get() );
+ LbSelectHdl( *mpLbLists );
}
else
{
@@ -688,7 +688,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
CopyListFromArea( theStartPos, theEndPos );
UpdateUserListBox();
mpLbLists->SelectEntryPos( mpLbLists->GetEntryCount()-1 );
- LbSelectHdl( *mpLbLists.get() );
+ LbSelectHdl( *mpLbLists );
mpEdCopyFrom->SetText( theAreaStr );
mpEdCopyFrom->Disable();
mpBtnCopy->Disable();
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 191c22cfc3bf..998e4c968d58 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -5538,7 +5538,7 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe
uno::Reference<beans::XPropertySet> xPropSet( xDescriptor, uno::UNO_QUERY );
if (xPropSet.is())
- lcl_CopyProperties(*xImpl, *xPropSet.get());
+ lcl_CopyProperties(*xImpl, *xPropSet);
if (pDocSh)
{
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index e1e6ce3dfc27..99a6c2395174 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -617,7 +617,7 @@ SvxFieldData& ScEditFieldObj::getData()
mpData.reset(new SvxFieldData);
}
}
- return *mpData.get();
+ return *mpData;
}
void ScEditFieldObj::setPropertyValueURL(const OUString& rName, const css::uno::Any& rVal)
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 32e443bc914d..d61b42d00812 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -400,7 +400,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
}
// window at the bottom right
- lcl_SetPosSize( *aScrollBarBox.get(), Point( nPosX+nSizeX, nPosY+nSizeY ), Size( nBarX, nBarY ),
+ lcl_SetPosSize( *aScrollBarBox, Point( nPosX+nSizeX, nPosY+nSizeY ), Size( nBarX, nBarY ),
nTotalWidth, bLayoutRTL );
if (bHScroll) // Scrollbars horizontal
@@ -464,39 +464,39 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
{
Point aTabPoint(nPosX, nPosY + nSizeY);
Size aTabSize(nTabSize, nBarY);
- lcl_SetPosSize(*pTabControl.get(), aTabPoint, aTabSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*pTabControl, aTabPoint, aTabSize, nTotalWidth, bLayoutRTL);
pTabControl->SetSheetLayoutRTL(bLayoutRTL);
Point aHScrollLeftPoint(nPosX + nTabSize, nPosY + nSizeY);
Size aHScrollLeftSize(nSizeLt, nBarY);
- lcl_SetPosSize(*aHScrollLeft.get(), aHScrollLeftPoint, aHScrollLeftSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*aHScrollLeft, aHScrollLeftPoint, aHScrollLeftSize, nTotalWidth, bLayoutRTL);
Point aHSplitterPoint(nPosX + nTabSize + nSizeLt, nPosY + nSizeY);
Size aHSplitterSize(nSizeSp, nBarY);
- lcl_SetPosSize(*pHSplitter.get(), aHSplitterPoint, aHSplitterSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*pHSplitter, aHSplitterPoint, aHSplitterSize, nTotalWidth, bLayoutRTL);
Point aHScrollRightPoint(nPosX + nTabSize + nSizeLt + nSizeSp, nPosY + nSizeY);
Size aHScrollRightSize(nSizeRt, nBarY);
- lcl_SetPosSize(*aHScrollRight.get(), aHScrollRightPoint, aHScrollRightSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*aHScrollRight, aHScrollRightPoint, aHScrollRightSize, nTotalWidth, bLayoutRTL);
}
else
{
Point aTabPoint(nPosX, nPosY + nSizeY + nScrollBarSize);
Size aTabSize(nSizeX, nTabWidth);
- lcl_SetPosSize(*pTabControl.get(), aTabPoint, aTabSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*pTabControl, aTabPoint, aTabSize, nTotalWidth, bLayoutRTL);
pTabControl->SetSheetLayoutRTL(bLayoutRTL);
Point aHScrollLeftPoint(nPosX, nPosY + nSizeY);
Size aHScrollLeftSize(nSizeLt, nScrollBarSize);
- lcl_SetPosSize(*aHScrollLeft.get(), aHScrollLeftPoint, aHScrollLeftSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*aHScrollLeft, aHScrollLeftPoint, aHScrollLeftSize, nTotalWidth, bLayoutRTL);
Point aHSplitterPoint(nPosX + nSizeLt, nPosY + nSizeY);
Size aHSplitterSize(nSizeSp, nScrollBarSize);
- lcl_SetPosSize(*pHSplitter.get(), aHSplitterPoint, aHSplitterSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*pHSplitter, aHSplitterPoint, aHSplitterSize, nTotalWidth, bLayoutRTL);
Point aHScrollRightPoint(nPosX + nSizeLt + nSizeSp, nPosY + nSizeY);
Size aHScrollRightSize(nSizeRt, nScrollBarSize);
- lcl_SetPosSize(*aHScrollRight.get(), aHScrollRightPoint, aHScrollRightSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*aHScrollRight, aHScrollRightPoint, aHScrollRightSize, nTotalWidth, bLayoutRTL);
}
// SetDragRectPixel is done below
}
@@ -524,11 +524,11 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
}
nSizeDn = nSizeY - nSizeUp - nSizeSp;
- lcl_SetPosSize( *aVScrollTop.get(), Point(nPosX + nSizeX, nPosY),
+ lcl_SetPosSize( *aVScrollTop, Point(nPosX + nSizeX, nPosY),
Size(nBarX, nSizeUp), nTotalWidth, bLayoutRTL );
lcl_SetPosSize( *pVSplitter, Point( nPosX + nSizeX, nPosY+nSizeUp ),
Size( nBarX, nSizeSp ), nTotalWidth, bLayoutRTL );
- lcl_SetPosSize( *aVScrollBottom.get(), Point(nPosX + nSizeX,
+ lcl_SetPosSize( *aVScrollBottom, Point(nPosX + nSizeX,
nPosY + nSizeUp + nSizeSp),
Size(nBarX, nSizeDn), nTotalWidth, bLayoutRTL );
@@ -554,10 +554,10 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
long nTabSize = nSize1;
if (nTabSize < 0) nTabSize = 0;
- lcl_SetPosSize( *pTabControl.get(), Point(nPosX, nPosY+nSizeY-nBarY),
+ lcl_SetPosSize( *pTabControl, Point(nPosX, nPosY+nSizeY-nBarY),
Size(nTabSize, nBarY), nTotalWidth, bLayoutRTL );
nSizeY -= nBarY;
- lcl_SetPosSize( *aScrollBarBox.get(), Point( nPosX+nSizeX, nPosY+nSizeY ), Size( nBarX, nBarY ),
+ lcl_SetPosSize( *aScrollBarBox, Point( nPosX+nSizeX, nPosY+nSizeY ), Size( nBarX, nBarY ),
nTotalWidth, bLayoutRTL );
if( bVScroll )
@@ -678,7 +678,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
}
if (bHOutline && bVOutline)
{
- lcl_SetPosSize( *aTopButton.get(), Point(nOutPosX,nOutPosY), Size(nOutlineX,nOutlineY), nTotalWidth, bLayoutRTL );
+ lcl_SetPosSize( *aTopButton, Point(nOutPosX,nOutPosY), Size(nOutlineX,nOutlineY), nTotalWidth, bLayoutRTL );
aTopButton->Show();
}
else
@@ -698,7 +698,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
lcl_SetPosSize( *pRowBar[SC_SPLIT_BOTTOM],
Point(nPosX-nBarX,nSplitPosY), Size(nBarX,nBottomSize), nTotalWidth, bLayoutRTL );
- lcl_SetPosSize( *aCornerButton.get(), Point(nPosX-nBarX,nPosY-nBarY), Size(nBarX,nBarY), nTotalWidth, bLayoutRTL );
+ lcl_SetPosSize( *aCornerButton, Point(nPosX-nBarX,nPosY-nBarY), Size(nBarX,nBarY), nTotalWidth, bLayoutRTL );
aCornerButton->Show();
pColBar[SC_SPLIT_LEFT]->Show();
pRowBar[SC_SPLIT_BOTTOM]->Show();
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 250f71b32b3a..ba390881d6f6 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -405,41 +405,41 @@ void ScTabView::UpdateScrollBars( HeaderType eHeaderType )
nVisXL = aViewData.VisibleCellsX( SC_SPLIT_LEFT );
long nMaxXL = lcl_GetScrollRange( nUsedX, aViewData.GetPosX(SC_SPLIT_LEFT), nVisXL, MAXCOL, 0 );
- SetScrollBar( *aHScrollLeft.get(), nMaxXL, nVisXL, aViewData.GetPosX( SC_SPLIT_LEFT ), bLayoutRTL );
+ SetScrollBar( *aHScrollLeft, nMaxXL, nVisXL, aViewData.GetPosX( SC_SPLIT_LEFT ), bLayoutRTL );
nVisYB = aViewData.VisibleCellsY( SC_SPLIT_BOTTOM );
long nMaxYB = lcl_GetScrollRange( nUsedY, aViewData.GetPosY(SC_SPLIT_BOTTOM), nVisYB, MAXROW, nStartY );
- SetScrollBar( *aVScrollBottom.get(), nMaxYB, nVisYB, aViewData.GetPosY( SC_SPLIT_BOTTOM ) - nStartY, bLayoutRTL );
+ SetScrollBar( *aVScrollBottom, nMaxYB, nVisYB, aViewData.GetPosY( SC_SPLIT_BOTTOM ) - nStartY, bLayoutRTL );
if (bRight)
{
nVisXR = aViewData.VisibleCellsX( SC_SPLIT_RIGHT );
long nMaxXR = lcl_GetScrollRange( nUsedX, aViewData.GetPosX(SC_SPLIT_RIGHT), nVisXR, MAXCOL, nStartX );
- SetScrollBar( *aHScrollRight.get(), nMaxXR, nVisXR, aViewData.GetPosX( SC_SPLIT_RIGHT ) - nStartX, bLayoutRTL );
+ SetScrollBar( *aHScrollRight, nMaxXR, nVisXR, aViewData.GetPosX( SC_SPLIT_RIGHT ) - nStartX, bLayoutRTL );
}
if (bTop)
{
nVisYT = aViewData.VisibleCellsY( SC_SPLIT_TOP );
long nMaxYT = lcl_GetScrollRange( nUsedY, aViewData.GetPosY(SC_SPLIT_TOP), nVisYT, MAXROW, 0 );
- SetScrollBar( *aVScrollTop.get(), nMaxYT, nVisYT, aViewData.GetPosY( SC_SPLIT_TOP ), bLayoutRTL );
+ SetScrollBar( *aVScrollTop, nMaxYT, nVisYT, aViewData.GetPosY( SC_SPLIT_TOP ), bLayoutRTL );
}
// test the range
- nDiff = lcl_UpdateBar( *aHScrollLeft.get(), nVisXL );
+ nDiff = lcl_UpdateBar( *aHScrollLeft, nVisXL );
if (nDiff) ScrollX( nDiff, SC_SPLIT_LEFT );
if (bRight)
{
- nDiff = lcl_UpdateBar( *aHScrollRight.get(), nVisXR );
+ nDiff = lcl_UpdateBar( *aHScrollRight, nVisXR );
if (nDiff) ScrollX( nDiff, SC_SPLIT_RIGHT );
}
- nDiff = lcl_UpdateBar( *aVScrollBottom.get(), nVisYB );
+ nDiff = lcl_UpdateBar( *aVScrollBottom, nVisYB );
if (nDiff) ScrollY( nDiff, SC_SPLIT_BOTTOM );
if (bTop)
{
- nDiff = lcl_UpdateBar( *aVScrollTop.get(), nVisYT );
+ nDiff = lcl_UpdateBar( *aVScrollTop, nVisYT );
if (nDiff) ScrollY( nDiff, SC_SPLIT_TOP );
}
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 4262c03a1e17..f1ca737b3f1c 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -111,10 +111,10 @@ void ScTabView::Init()
explicitly because the parent frame window is already RTL disabled. */
pTabControl->EnableRTL( AllSettings::GetLayoutRTL() );
- InitScrollBar( *aHScrollLeft.get(), MAXCOL+1 );
- InitScrollBar( *aHScrollRight.get(), MAXCOL+1 );
- InitScrollBar( *aVScrollTop.get(), MAXROW+1 );
- InitScrollBar( *aVScrollBottom.get(), MAXROW+1 );
+ InitScrollBar( *aHScrollLeft, MAXCOL+1 );
+ InitScrollBar( *aHScrollRight, MAXCOL+1 );
+ InitScrollBar( *aVScrollTop, MAXROW+1 );
+ InitScrollBar( *aVScrollBottom, MAXROW+1 );
/* #i97900# scrollbars remain in correct RTL mode, needed mirroring etc.
is now handled correctly at the respective places. */
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index f9c82c78a505..6049a27f3c40 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -295,7 +295,7 @@ void SdPathHdl::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pNew),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 9a58a17baeb9..663c2360618d 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -229,7 +229,7 @@ void AnnotationHdl::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index feda5d5b99d2..ace194fa00aa 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -529,7 +529,7 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls)
? sd::OUTPUT_DRAWMODE_CONTRAST
: sd::OUTPUT_DRAWMODE_COLOR );
pVD->Erase();
- pObject->SingleObjectPainter( *pVD.get() );
+ pObject->SingleObjectPainter( *pVD );
rBmp = pVD->GetBitmapEx( aObjRect.TopLeft(), aObjSize );
}
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index c0da5576d66a..3781cf0322de 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -256,7 +256,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma
mpDoc->AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, false, true ) );
}
- mpView->ApplyFormatPaintBrush( *mxItemSet.get(), bNoCharacterFormats, bNoParagraphFormats );
+ mpView->ApplyFormatPaintBrush( *mxItemSet, bNoCharacterFormats, bNoParagraphFormats );
if( pObj )
{
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 93a0727b4365..ac82d7e13332 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -390,7 +390,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent)
{
mpDocSh->GetUndoManager()->AddUndoAction(o3tl::make_unique<StyleSheetUndoAction>(
mpDoc, static_cast<SfxStyleSheet*>(pStyleSheet), &(*pTempSet)));
- pStyleSheet->GetItemSet().Put( *(pTempSet.get()) );
+ pStyleSheet->GetItemSet().Put( *pTempSet );
sdr::properties::CleanupFillProperties( pStyleSheet->GetItemSet() );
pStyleSheet->Broadcast(SfxHint(SfxHintId::DataChanged));
}
@@ -422,7 +422,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent)
"MasterPage without StyleSheet detected (!)");
}
- aNewAttr.Put(*(pTempSet.get()));
+ aNewAttr.Put(*pTempSet);
mrReq.Done( aNewAttr );
return mrReq.GetArgs();
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 9ec9d86ff9e4..df5590cfebd3 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -335,7 +335,7 @@ public:
/** Return a pointer to the tab control for pages.
*/
- TabControl& GetPageTabControl() { return *maTabControl.get(); }
+ TabControl& GetPageTabControl() { return *maTabControl; }
/** Return a pointer to the tab control for layers.
*/
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index e7c72e29af2e..69c6141ac805 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -508,7 +508,7 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly )
aText += aLocaleData.getDuration( ::tools::Time( 0, 0, mnPauseTimeout ) );
aText += " )";
pVDev->DrawText( Point( aOffset.Width(), 0 ), aText );
- DrawOutDev( Point( aOutOrg.X(), aOffset.Height() ), aVDevSize, Point(), aVDevSize, *pVDev.get() );
+ DrawOutDev( Point( aOutOrg.X(), aOffset.Height() ), aVDevSize, Point(), aVDevSize, *pVDev );
bDrawn = true;
}
}
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 16ff14db9f2f..ad6d84131933 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -254,7 +254,7 @@ css::uno::Reference<css::accessibility::XAccessible>
::accessibility::AccessibleSlideSorterView *pAccessibleView =
new ::accessibility::AccessibleSlideSorterView(
- *mpSlideSorter.get(),
+ *mpSlideSorter,
pWindow);
css::uno::Reference< css::accessibility::XAccessible> xRet(pAccessibleView);
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index 8819704796b2..c0b1bfa16c8e 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -140,9 +140,9 @@ void InsertionIndicatorOverlay::Create (
pContent->SetFillColor();
pContent->SetLineColor(pTheme->GetColor(Theme::Color_PreviewBorder));
- const Point aOffset = PaintRepresentatives(*pContent.get(), aPreviewSize, nOffset, rRepresentatives);
+ const Point aOffset = PaintRepresentatives(*pContent, aPreviewSize, nOffset, rRepresentatives);
- PaintPageCount(*pContent.get(), nSelectionCount, aPreviewSize, aOffset);
+ PaintPageCount(*pContent, nSelectionCount, aPreviewSize, aOffset);
maIcon = pContent->GetBitmapEx(Point(0,0), aIconSize);
maIcon.Scale(aIconSize);
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index fac12ad627b2..5cf0f42fc5f0 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -254,7 +254,7 @@ void ImageButtonHdl::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index ddea348f807f..c6cf38de4c8a 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -479,7 +479,7 @@ public:
void ToggleIndex( bool bOn );
void SelectSearchText( const OUString& rSearchText, bool _bIsFullWordSearch );
void SetPageStyleHeaderOff() const;
- ToolBox& GetToolBox() { return *aToolBox.get(); }
+ ToolBox& GetToolBox() { return *aToolBox; }
void CloseFrame();
void DoSearch();
};
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 664e609ca7fd..8faffab94069 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -386,7 +386,7 @@ void BackingWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Recta
rRenderContext.DrawOutDev(maStartCentButtons.TopLeft(), maStartCentButtons.GetSize(),
Point(0, 0), maStartCentButtons.GetSize(),
- *pVDev.get());
+ *pVDev);
}
bool BackingWindow::PreNotify(NotifyEvent& rNEvt)
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 4b1713ba76d2..ca27a7701a8b 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -1218,7 +1218,7 @@ XmlIdRegistryClipboard::RegisterCopyClipboard(Metadatable & i_rCopy,
CreateClipboard( isContentFile(i_rReference.First)) );
m_pImpl->m_XmlIdReverseMap.insert(::std::make_pair(&i_rCopy,
RMapEntry(i_rReference.First, i_rReference.Second, xLink)));
- return *xLink.get();
+ return *xLink;
}
MetadatableClipboard const*
diff --git a/shell/qa/zip/testzipimpl.cxx b/shell/qa/zip/testzipimpl.cxx
index b2bec74a8230..8fe27d9caffb 100644
--- a/shell/qa/zip/testzipimpl.cxx
+++ b/shell/qa/zip/testzipimpl.cxx
@@ -49,7 +49,7 @@ TestZipImpl::~TestZipImpl()
bool TestZipImpl::test_directory()
{
ZipFile::DirectoryPtr_t contents = zipFile.GetDirectory();
- vector<string> &stringVector = *contents.get();
+ vector<string> &stringVector = *contents;
sort(stringVector.begin(), stringVector.end());
return expectedContents == stringVector;
}
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 6285f73557e7..c1682a628ed4 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -192,7 +192,7 @@ std::shared_ptr<RehearseTimingsActivity> RehearseTimingsActivity::create(
new RehearseTimingsActivity( rContext ));
pActivity->mpMouseHandler.reset(
- new MouseHandler(*pActivity.get()) );
+ new MouseHandler(*pActivity) );
pActivity->mpWakeUpEvent.reset(
new WakeupEvent( rContext.mrEventQueue.getTimer(),
pActivity,
diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
index 029c2a52fbc2..e2fa6f3afc6b 100644
--- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx
+++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
@@ -113,7 +113,7 @@ namespace slideshow
::cppcanvas::RendererSharedPtr pRenderer(
::cppcanvas::VCLFactory::createRenderer(
pBitmapCanvas,
- *rMtf.get(),
+ *rMtf,
::cppcanvas::Renderer::Parameters() ) );
ENSURE_OR_RETURN_FALSE( pRenderer,
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index 2462ae35aff9..2ab95b9267c0 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -155,7 +155,7 @@ namespace slideshow
}
io_rCacheEntry.mpRenderer = ::cppcanvas::VCLFactory::createRenderer( rDestinationCanvas,
- *rMtf.get(),
+ *rMtf,
aParms );
io_rCacheEntry.mpMtf = rMtf;
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index fab51dd8affb..2b1692e8d9df 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -187,7 +187,7 @@ public:
SmEditWindow& GetEditWindow()
{
- return *aEdit.get();
+ return *aEdit;
}
SmViewShell* GetView();
};
@@ -273,11 +273,11 @@ public:
SmGraphicWindow& GetGraphicWindow()
{
- return *mpGraphic.get();
+ return *mpGraphic;
}
const SmGraphicWindow& GetGraphicWindow() const
{
- return *mpGraphic.get();
+ return *mpGraphic;
}
void SetStatusText(const OUString& rText);
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 0a582fe5cd4c..c506d0715b1b 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -663,7 +663,7 @@ SmCmdBoxWindow::SmCmdBoxWindow(SfxBindings *pBindings_, SfxChildWindow *pChildWi
vcl::Window *pParent) :
SfxDockingWindow(pBindings_, pChildWindow, pParent, WB_MOVEABLE|WB_CLOSEABLE|WB_SIZEABLE|WB_DOCKABLE),
aEdit (VclPtr<SmEditWindow>::Create(*this)),
- aController (*(aEdit.get()), SID_TEXT, *pBindings_),
+ aController (*aEdit, SID_TEXT, *pBindings_),
bExiting (false)
{
SetHelpId( HID_SMA_COMMAND_WIN );
@@ -1907,7 +1907,7 @@ SmViewShell::SmViewShell(SfxViewFrame *pFrame_, SfxViewShell *)
: SfxViewShell(pFrame_, SfxViewShellFlags::HAS_PRINTOPTIONS)
, mpImpl(new SmViewShell_Impl)
, mpGraphic(VclPtr<SmGraphicWindow>::Create(this))
- , maGraphicController(*mpGraphic.get(), SID_GAPHIC_SM, pFrame_->GetBindings())
+ , maGraphicController(*mpGraphic, SID_GAPHIC_SM, pFrame_->GetBindings())
, mbPasteState(false)
, mbInsertIntoEditWindow(false)
{
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 86a72f6ddb67..becd6476ef44 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -1525,7 +1525,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po
PaintEmphasis(aTextRect, bSelected, rRenderContext);
if ( bShowSelection )
- vcl::RenderTools::DrawSelectionBackground(rRenderContext, *pView.get(), CalcFocusRect(pEntry),
+ vcl::RenderTools::DrawSelectionBackground(rRenderContext, *pView, CalcFocusRect(pEntry),
bActiveSelection ? 1 : 2, false, true, false);
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index be3c00c7b860..dea1fd973289 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -466,13 +466,13 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
aVirDev->SetFillColor( aColor1 );
double y1 = double( n1 ) / 2;
- svtools::DrawLine( *aVirDev.get(), basegfx::B2DPoint( 0, y1 ), basegfx::B2DPoint( aSize.Width( ), y1 ), n1, nStyle );
+ svtools::DrawLine( *aVirDev, basegfx::B2DPoint( 0, y1 ), basegfx::B2DPoint( aSize.Width( ), y1 ), n1, nStyle );
if ( n2 )
{
double y2 = n1 + nDist + double( n2 ) / 2;
aVirDev->SetFillColor( aColor2 );
- svtools::DrawLine( *aVirDev.get(), basegfx::B2DPoint( 0, y2 ), basegfx::B2DPoint( aSize.Width(), y2 ), n2, SvxBorderLineStyle::SOLID );
+ svtools::DrawLine( *aVirDev, basegfx::B2DPoint( 0, y2 ), basegfx::B2DPoint( aSize.Width(), y2 ), n2, SvxBorderLineStyle::SOLID );
}
rBmp = aVirDev->GetBitmapEx( Point(), Size( aSize.Width(), n1+nDist+n2 ) );
}
@@ -1789,13 +1789,13 @@ void SvtLineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
aVirDev->SetFillColor( aColor1 );
double y1 = double( n1 ) / 2;
- svtools::DrawLine( *aVirDev.get(), basegfx::B2DPoint( 0, y1 ), basegfx::B2DPoint( aSize.Width( ), y1 ), n1, nStyle );
+ svtools::DrawLine( *aVirDev, basegfx::B2DPoint( 0, y1 ), basegfx::B2DPoint( aSize.Width( ), y1 ), n1, nStyle );
if ( n2 )
{
double y2 = n1 + nDist + double( n2 ) / 2;
aVirDev->SetFillColor( aColor2 );
- svtools::DrawLine( *aVirDev.get(), basegfx::B2DPoint( 0, y2 ), basegfx::B2DPoint( aSize.Width(), y2 ), n2, SvxBorderLineStyle::SOLID );
+ svtools::DrawLine( *aVirDev, basegfx::B2DPoint( 0, y2 ), basegfx::B2DPoint( aSize.Width(), y2 ), n2, SvxBorderLineStyle::SOLID );
}
rBmp = aVirDev->GetBitmapEx( Point(), Size( aSize.Width(), n1+nDist+n2 ) );
}
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 5a7b353e8d34..81ba9557a79f 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -228,7 +228,7 @@ IMPL_LINK_NOARG(FileControl, ButtonHdl, Button*, void)
if ( aObj.GetProtocol() == INetProtocol::File )
aNewText = aObj.PathToFileName();
SetText( aNewText );
- maEdit->GetModifyHdl().Call( *maEdit.get() );
+ maEdit->GetModifyHdl().Call( *maEdit );
}
}
}
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 33330e425d32..3d2047a60de2 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -1178,8 +1178,8 @@ void Ruler::ImplFormat(vcl::RenderContext const & rRenderContext)
// top/bottom border
maVirDev->SetLineColor(rStyleSettings.GetShadowColor());
- ImplVDrawLine(*maVirDev.get(), nVirLeft, nVirTop + 1, nM1, nVirTop + 1); //top left line
- ImplVDrawLine(*maVirDev.get(), nM2, nVirTop + 1, nP2 - 1, nVirTop + 1); //top right line
+ ImplVDrawLine(*maVirDev, nVirLeft, nVirTop + 1, nM1, nVirTop + 1); //top left line
+ ImplVDrawLine(*maVirDev, nM2, nVirTop + 1, nP2 - 1, nVirTop + 1); //top right line
nVirTop++;
nVirBottom--;
@@ -1188,31 +1188,31 @@ void Ruler::ImplFormat(vcl::RenderContext const & rRenderContext)
maVirDev->SetLineColor();
maVirDev->SetFillColor(rStyleSettings.GetDialogColor());
if (nM1 > nVirLeft)
- ImplVDrawRect(*maVirDev.get(), nP1, nVirTop + 1, nM1, nVirBottom); //left gray rectangle
+ ImplVDrawRect(*maVirDev, nP1, nVirTop + 1, nM1, nVirBottom); //left gray rectangle
if (nM2 < nP2)
- ImplVDrawRect(*maVirDev.get(), nM2, nVirTop + 1, nP2, nVirBottom); //right gray rectangle
+ ImplVDrawRect(*maVirDev, nM2, nVirTop + 1, nP2, nVirBottom); //right gray rectangle
if (nM2 - nM1 > 0)
{
maVirDev->SetFillColor(rStyleSettings.GetWindowColor());
- ImplVDrawRect(*maVirDev.get(), nM1 + 1, nVirTop, nM2 - 1, nVirBottom); //center rectangle
+ ImplVDrawRect(*maVirDev, nM1 + 1, nVirTop, nM2 - 1, nVirBottom); //center rectangle
}
maVirDev->SetLineColor(rStyleSettings.GetShadowColor());
if (nM1 > nVirLeft)
{
- ImplVDrawLine(*maVirDev.get(), nM1, nVirTop + 1, nM1, nVirBottom); //right line of the left rectangle
- ImplVDrawLine(*maVirDev.get(), nP1, nVirBottom, nM1, nVirBottom); //bottom line of the left rectangle
+ ImplVDrawLine(*maVirDev, nM1, nVirTop + 1, nM1, nVirBottom); //right line of the left rectangle
+ ImplVDrawLine(*maVirDev, nP1, nVirBottom, nM1, nVirBottom); //bottom line of the left rectangle
if (nP1 >= nVirLeft)
{
- ImplVDrawLine(*maVirDev.get(), nP1, nVirTop + 1, nP1, nVirBottom); //left line of the left rectangle
- ImplVDrawLine(*maVirDev.get(), nP1, nVirBottom, nP1 + 1, nVirBottom); //?
+ ImplVDrawLine(*maVirDev, nP1, nVirTop + 1, nP1, nVirBottom); //left line of the left rectangle
+ ImplVDrawLine(*maVirDev, nP1, nVirBottom, nP1 + 1, nVirBottom); //?
}
}
if (nM2 < nP2)
{
- ImplVDrawLine(*maVirDev.get(), nM2, nVirBottom, nP2 - 1, nVirBottom); //bottom line of the right rectangle
- ImplVDrawLine(*maVirDev.get(), nM2, nVirTop + 1, nM2, nVirBottom); //left line of the right rectangle
+ ImplVDrawLine(*maVirDev, nM2, nVirBottom, nP2 - 1, nVirBottom); //bottom line of the right rectangle
+ ImplVDrawLine(*maVirDev, nM2, nVirTop + 1, nM2, nVirBottom); //left line of the right rectangle
if (nP2 <= nVirRight + 1)
- ImplVDrawLine(*maVirDev.get(), nP2 - 1, nVirTop + 1, nP2 - 1, nVirBottom); //right line of the right rectangle
+ ImplVDrawLine(*maVirDev, nP2 - 1, nVirTop + 1, nP2 - 1, nVirBottom); //right line of the right rectangle
}
long nMin = nVirLeft;
@@ -1231,19 +1231,19 @@ void Ruler::ImplFormat(vcl::RenderContext const & rRenderContext)
nMax--;
// Draw captions
- ImplDrawTicks(*maVirDev.get(), nMin, nMax, nStart, nVirTop, nVirBottom);
+ ImplDrawTicks(*maVirDev, nMin, nMax, nStart, nVirTop, nVirBottom);
// Draw borders
if (!mpData->pBorders.empty())
- ImplDrawBorders(*maVirDev.get(), nVirLeft, nP2, nVirTop, nVirBottom);
+ ImplDrawBorders(*maVirDev, nVirLeft, nP2, nVirTop, nVirBottom);
// Draw indents
if (!mpData->pIndents.empty())
- ImplDrawIndents(*maVirDev.get(), nVirLeft, nP2, nVirTop - 1, nVirBottom + 1);
+ ImplDrawIndents(*maVirDev, nVirLeft, nP2, nVirTop - 1, nVirBottom + 1);
// Tabs
if (!mpData->pTabs.empty())
- ImplDrawTabs(*maVirDev.get(), nVirLeft, nP2, nVirTop-1, nVirBottom + 1);
+ ImplDrawTabs(*maVirDev, nVirLeft, nP2, nVirTop-1, nVirBottom + 1);
mbFormat = false;
}
@@ -1325,7 +1325,7 @@ void Ruler::ImplDraw(vcl::RenderContext& rRenderContext)
aOffPos.setX( RULER_OFF );
aOffPos.setY( mnVirOff );
}
- rRenderContext.DrawOutDev(aOffPos, aVirDevSize, Point(), aVirDevSize, *maVirDev.get());
+ rRenderContext.DrawOutDev(aOffPos, aVirDevSize, Point(), aVirDevSize, *maVirDev);
// redraw positionlines
ImplInvertLines(rRenderContext);
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index d0793aa997cc..a422048583c4 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -2745,7 +2745,7 @@ void SvtValueSet::ImplDraw(vcl::RenderContext& rRenderContext)
Point aDefPos;
Size aSize = maVirDev->GetOutputSizePixel();
- rRenderContext.DrawOutDev(aDefPos, aSize, aDefPos, aSize, *maVirDev.get());
+ rRenderContext.DrawOutDev(aDefPos, aSize, aDefPos, aSize, *maVirDev);
// draw parting line to the Namefield
if (GetStyle() & WB_NAMEFIELD)
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index 530e2d27979b..4086fc477f79 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -1650,7 +1650,7 @@ OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const vcl::Font &r
UScriptCode eScript = getScript(aFontCapabilities);
if (nScriptType == css::i18n::ScriptType::ASIAN)
- eScript = attemptToDisambiguateHan(eScript, *aDevice.get());
+ eScript = attemptToDisambiguateHan(eScript, *aDevice);
sRet = makeRepresentativeTextForScript(eScript);
}
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 8a03b91a935a..66db23d76fa4 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -1129,7 +1129,7 @@ namespace accessibility
::std::unique_ptr< SfxHint > pHint( maEventQueue.PopFront() );
if (pHint)
{
- const SfxHint& rHint = *(pHint.get());
+ const SfxHint& rHint = *pHint;
// determine hint type
const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>( &rHint );
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index 3d61a9d1810d..996c7d162692 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -1094,7 +1094,7 @@ drawinglayer::primitive2d::Primitive2DContainer Array::CreateB2DPrimitiveRange(
if(rTop.IsUsed())
{
- HelperCreateHorizontalEntry(*this, rTop, nCol, nRow, aOrigin, aX, aY, *aData.get(), true, pForceColor);
+ HelperCreateHorizontalEntry(*this, rTop, nCol, nRow, aOrigin, aX, aY, *aData, true, pForceColor);
}
}
@@ -1106,7 +1106,7 @@ drawinglayer::primitive2d::Primitive2DContainer Array::CreateB2DPrimitiveRange(
if(rBottom.IsUsed())
{
- HelperCreateHorizontalEntry(*this, rBottom, nCol, nRow + 1, aOrigin, aX, aY, *aData.get(), false, pForceColor);
+ HelperCreateHorizontalEntry(*this, rBottom, nCol, nRow + 1, aOrigin, aX, aY, *aData, false, pForceColor);
}
}
@@ -1119,7 +1119,7 @@ drawinglayer::primitive2d::Primitive2DContainer Array::CreateB2DPrimitiveRange(
if(rLeft.IsUsed())
{
- HelperCreateVerticalEntry(*this, rLeft, nCol, nRow, aOrigin, aX, aY, *aData.get(), true, pForceColor);
+ HelperCreateVerticalEntry(*this, rLeft, nCol, nRow, aOrigin, aX, aY, *aData, true, pForceColor);
}
}
@@ -1131,7 +1131,7 @@ drawinglayer::primitive2d::Primitive2DContainer Array::CreateB2DPrimitiveRange(
if(rRight.IsUsed())
{
- HelperCreateVerticalEntry(*this, rRight, nCol + 1, nRow, aOrigin, aX, aY, *aData.get(), false, pForceColor);
+ HelperCreateVerticalEntry(*this, rRight, nCol + 1, nRow, aOrigin, aX, aY, *aData, false, pForceColor);
}
}
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index c33336b07605..7e94afe8816a 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -682,7 +682,7 @@ void FrameSelectorImpl::DrawAllFrameBorders()
const drawinglayer::geometry::ViewInformation2D aNewViewInformation2D;
std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(
drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice(
- *mpVirDev.get(),
+ *mpVirDev,
aNewViewInformation2D));
if (pProcessor2D)
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 22c4ea7c25ec..96c17edfbd12 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -2036,7 +2036,7 @@ void SvxRuler::ApplyMargins()
nId = SID_ATTR_LONG_ULSPACE;
#ifdef DEBUGLIN
- Debug_Impl(pEditWin,*mxULSpaceItem.get());
+ Debug_Impl(pEditWin,*mxULSpaceItem);
#endif // DEBUGLIN
}
@@ -2290,7 +2290,7 @@ void SvxRuler::ApplyBorders()
}
#ifdef DEBUGLIN
- Debug_Impl(pEditWin,*mxColumnItem.get());
+ Debug_Impl(pEditWin,*mxColumnItem);
#endif // DEBUGLIN
SfxBoolItem aFlag(SID_RULER_ACT_LINE_ONLY,
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 10b8de7b4d1b..4e37902b3f3c 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2791,9 +2791,9 @@ void DbGridControl::executeRowContextMenu( long _nRow, const Point& _rPreferredP
VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "svx/ui/rowsmenu.ui", "");
VclPtr<PopupMenu> aContextMenu(aBuilder.get_menu("menu"));
- PreExecuteRowContextMenu( static_cast<sal_uInt16>(_nRow), *aContextMenu.get() );
+ PreExecuteRowContextMenu( static_cast<sal_uInt16>(_nRow), *aContextMenu );
aContextMenu->RemoveDisabledEntries( true, true );
- PostExecuteRowContextMenu( static_cast<sal_uInt16>(_nRow), *aContextMenu.get(), aContextMenu->Execute( this, _rPreferredPos ) );
+ PostExecuteRowContextMenu( static_cast<sal_uInt16>(_nRow), *aContextMenu, aContextMenu->Execute( this, _rPreferredPos ) );
}
void DbGridControl::Command(const CommandEvent& rEvt)
diff --git a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
index 78e136b652ae..696f94c1df87 100644
--- a/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
+++ b/svx/source/sdr/attribute/sdrallfillattributeshelper.cxx
@@ -49,8 +49,8 @@ namespace drawinglayer
basegfx::utils::createPolygonFromRect(
maLastPaintRange)),
maLastDefineRange,
- maFillAttribute.get() ? *maFillAttribute.get() : drawinglayer::attribute::SdrFillAttribute(),
- maFillGradientAttribute.get() ? *maFillGradientAttribute.get() : drawinglayer::attribute::FillGradientAttribute());
+ maFillAttribute.get() ? *maFillAttribute : drawinglayer::attribute::SdrFillAttribute(),
+ maFillGradientAttribute.get() ? *maFillGradientAttribute : drawinglayer::attribute::FillGradientAttribute());
}
}
@@ -122,7 +122,7 @@ namespace drawinglayer
const_cast< SdrAllFillAttributesHelper* >(this)->maFillAttribute.reset(new drawinglayer::attribute::SdrFillAttribute());
}
- return *maFillAttribute.get();
+ return *maFillAttribute;
}
const drawinglayer::attribute::FillGradientAttribute& SdrAllFillAttributesHelper::getFillGradientAttribute() const
@@ -132,7 +132,7 @@ namespace drawinglayer
const_cast< SdrAllFillAttributesHelper* >(this)->maFillGradientAttribute.reset(new drawinglayer::attribute::FillGradientAttribute());
}
- return *maFillGradientAttribute.get();
+ return *maFillGradientAttribute;
}
const drawinglayer::primitive2d::Primitive2DContainer& SdrAllFillAttributesHelper::getPrimitive2DSequence(
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 6a88e7633944..f551bb559385 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -142,7 +142,7 @@ namespace sdr
getOutputDevice().DrawOutDev(
aTopLeft, aSize, // destination
aTopLeft, aSize, // source
- *mpBufferDevice.get());
+ *mpBufferDevice);
}
// restore MapModes
@@ -294,7 +294,7 @@ namespace sdr
mpOutputBufferDevice->DrawOutDev(
aTopLeft, aSize, // destination
aTopLeft, aSize, // source
- *mpBufferDevice.get());
+ *mpBufferDevice);
// restore MapModes
mpBufferDevice->EnableMapMode(bMapModeWasEnabledDest);
@@ -303,7 +303,7 @@ namespace sdr
// paint overlay content for remembered region, use
// method from base class directly
mpOutputBufferDevice->EnableMapMode();
- OverlayManager::ImpDrawMembers(aBufferRememberedRangeLogic, *mpOutputBufferDevice.get());
+ OverlayManager::ImpDrawMembers(aBufferRememberedRangeLogic, *mpOutputBufferDevice);
mpOutputBufferDevice->EnableMapMode(false);
// copy to output
@@ -314,7 +314,7 @@ namespace sdr
getOutputDevice().DrawOutDev(
aTopLeft, aSize, // destination
aTopLeft, aSize, // source
- *mpOutputBufferDevice.get());
+ *mpOutputBufferDevice);
// debug
/*getOutputDevice().SetLineCOL_RED);
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index e6ee0bf0f289..80116583feb8 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -161,7 +161,7 @@ void SdrPreRenderDevice::OutputPreRenderDevice(const vcl::Region& rExpandedRegio
mpOutputDevice->DrawOutDev(
aTopLeft, aSize,
aTopLeft, aSize,
- *mpPreRenderDevice.get());
+ *mpPreRenderDevice);
#ifdef DBG_UTIL
// #i74769#
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 31132a5bbdef..96f92d652cba 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -829,7 +829,7 @@ void SdrDragView::ShowDragObj()
if(xOverlayManager.is())
{
mpCurrentSdrDragMethod->CreateOverlayGeometry(
- *xOverlayManager.get(),
+ *xOverlayManager,
rPageWindow.GetObjectContact());
// #i101679# Force changed overlay to be shown
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 4e0854ceac8d..edf120b58ab1 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -619,7 +619,7 @@ void SdrHdl::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pNewOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
@@ -1159,7 +1159,7 @@ void SdrHdlColor::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pNewOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
@@ -1322,7 +1322,7 @@ void SdrHdlGradient::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pNewOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
// arrowhead
Point aLeft(aMidPoint.X() + static_cast<sal_Int32>(aPerpend.getX() * fHalfArrowWidth),
@@ -1346,7 +1346,7 @@ void SdrHdlGradient::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pNewOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
@@ -1476,7 +1476,7 @@ void SdrHdlLine::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pNewOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
@@ -1539,7 +1539,7 @@ void SdrHdlBezWgt::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pNewOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
@@ -1587,7 +1587,7 @@ void E3dVolumeMarker::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pNewOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
@@ -1651,7 +1651,7 @@ void ImpEdgeHdl::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pNewOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
@@ -1766,7 +1766,7 @@ void ImpMeasureHdl::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pNewOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
@@ -1839,7 +1839,7 @@ void ImpTextframeHdl::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pNewOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
@@ -2450,7 +2450,7 @@ void SdrCropHdl::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
@@ -2666,7 +2666,7 @@ void SdrCropViewHdl::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pNew),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 1bf7cbfbbfa2..5a77bb8eab31 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -855,7 +855,7 @@ GDIMetaFile SdrGrafObj::getMetafileFromEmbeddedVectorGraphicData() const
pOut->EnableOutput(false);
pOut->SetMapMode(aMap);
aRetval.Record(pOut);
- SingleObjectPainter(*pOut.get());
+ SingleObjectPainter(*pOut);
aRetval.Stop();
aRetval.WindStart();
aRetval.Move(-aBoundRect.Left(), -aBoundRect.Top());
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 0fb1e31b8d95..4b6f00928075 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -545,7 +545,7 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile(bool bNoVDevIfOneMtfMarked) co
aMtf.Clear();
aMtf.Record(pOut);
- DrawMarkedObj(*pOut.get());
+ DrawMarkedObj(*pOut);
aMtf.Stop();
aMtf.WindStart();
@@ -632,7 +632,7 @@ Graphic SdrExchangeView::GetObjGraphic(const SdrObject& rSdrObject)
pOut->EnableOutput(false);
pOut->SetMapMode(aMap);
aMtf.Record(pOut);
- rSdrObject.SingleObjectPainter(*pOut.get());
+ rSdrObject.SingleObjectPainter(*pOut);
aMtf.Stop();
aMtf.WindStart();
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index 650180b23d3f..fb1bd0d930b3 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -177,7 +177,7 @@ void TableEdgeHdl::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
if(aInvisible.count())
@@ -191,7 +191,7 @@ void TableEdgeHdl::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
@@ -302,7 +302,7 @@ void TableBorderHdl::CreateB2dIAObject()
insertNewlyCreatedOverlayObjectForSdrHdl(
std::move(pOverlayObject),
rPageWindow.GetObjectContact(),
- *xManager.get());
+ *xManager);
}
}
}
diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx
index c7f53e7c0306..663c56a42c9c 100644
--- a/svx/source/table/tableundo.cxx
+++ b/svx/source/table/tableundo.cxx
@@ -103,7 +103,7 @@ bool CellUndo::Merge( SfxUndoAction *pNextAction )
void CellUndo::setDataToCell( const Data& rData )
{
if( rData.mpProperties )
- mxCell->mpProperties.reset(Cell::CloneProperties( rData.mpProperties, *mxObjRef.get(), *mxCell.get() ));
+ mxCell->mpProperties.reset(Cell::CloneProperties( rData.mpProperties, *mxObjRef.get(), *mxCell ));
else
mxCell->mpProperties.reset();
@@ -133,7 +133,7 @@ void CellUndo::getDataFromCell( Data& rData )
if( mxObjRef.is() && mxCell.is() )
{
if( mxCell->mpProperties )
- rData.mpProperties = mxCell->CloneProperties( *mxObjRef.get(), *mxCell.get());
+ rData.mpProperties = mxCell->CloneProperties( *mxObjRef.get(), *mxCell);
if( mxCell->GetOutlinerParaObject() )
rData.mpOutlinerParaObject = new OutlinerParaObject(*mxCell->GetOutlinerParaObject());
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index eba66ba8af83..56e3f75fd7c0 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -945,7 +945,7 @@ bool GraphicExporter::GetGraphic( ExportSettings const & rSettings, Graphic& aGr
{
// more effective way to paint a vector of SdrObjects. Hand over the processed page
// to have it in the
- sdr::contact::ObjectContactOfObjListPainter aMultiObjectPainter(*aOut.get(), aShapes, mpCurrentPage);
+ sdr::contact::ObjectContactOfObjListPainter aMultiObjectPainter(*aOut, aShapes, mpCurrentPage);
ImplExportCheckVisisbilityRedirector aCheckVisibilityRedirector(mpCurrentPage);
aMultiObjectPainter.SetViewObjectContactRedirector(&aCheckVisibilityRedirector);
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 27c6ab6d0f86..33a9b8ca0723 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -720,7 +720,7 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const
pVDev->SetMapMode(MapMode(MapUnit::Map100thMM));
pVDev->EnableOutput(false);
aMtf.Record(pVDev);
- GetSdrObject()->SingleObjectPainter(*pVDev.get());
+ GetSdrObject()->SingleObjectPainter(*pVDev);
aMtf.Stop();
aMtf.WindStart();
aMtf.Move(-aBoundRect.Left(), -aBoundRect.Top());
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 9efd16a141fd..b4161521693d 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -156,7 +156,7 @@ BitmapEx XDashList::ImpCreateBitmapForXDash(const XDash* pDash)
// create processor and draw primitives
std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice(
- *pVirtualDevice.get(),
+ *pVirtualDevice,
aNewViewInformation2D));
if(pProcessor2D)
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index a640d9a61055..c882f3ff959e 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -185,7 +185,7 @@ BitmapEx XGradientList::CreateBitmap( long nIndex, const Size& rSize ) const
// create processor and draw primitives
std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice(
- *pVirtualDevice.get(),
+ *pVirtualDevice,
aNewViewInformation2D));
if(pProcessor2D)
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index fe4e48362a84..d7e7944bf60c 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -161,7 +161,7 @@ BitmapEx XHatchList::CreateBitmap( long nIndex, const Size& rSize) const
// create processor and draw primitives
std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice(
- *pVirtualDevice.get(),
+ *pVirtualDevice,
aNewViewInformation2D));
if(pProcessor2D)
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index bc254322ce06..f10883f4b784 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -145,7 +145,7 @@ BitmapEx XLineEndList::CreateBitmapForUI( long nIndex )
// create processor and draw primitives
std::unique_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor2D(drawinglayer::processor2d::createPixelProcessor2DFromOutputDevice(
- *pVirtualDevice.get(),
+ *pVirtualDevice,
aNewViewInformation2D));
if(pProcessor2D)
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 452a7aa214de..3878c4299b89 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1225,8 +1225,8 @@ public:
// Change (replace) a table style named rName. Tracked by undo.
void ChgTableStyle(const OUString& rName, const SwTableAutoFormat& rNewFormat);
- const SwCellStyleTable& GetCellStyles() const { return *mpCellStyles.get(); }
- SwCellStyleTable& GetCellStyles() { return *mpCellStyles.get(); }
+ const SwCellStyleTable& GetCellStyles() const { return *mpCellStyles; }
+ SwCellStyleTable& GetCellStyles() { return *mpCellStyles; }
void AppendUndoForInsertFromDB( const SwPaM& rPam, bool bIsTable );
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 06cd6bfa48b2..44489a1494ec 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1712,7 +1712,7 @@ void SwTiledRenderingTest::testPaintCallbacks()
// Make sure that painting a tile in the second view doesn't invoke
// callbacks on the first view.
aView1.m_bCalled = false;
- pXTextDocument->paintTile(*pDevice.get(), nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/0, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
+ pXTextDocument->paintTile(*pDevice, nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/0, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
CPPUNIT_ASSERT(!aView1.m_bCalled);
mxComponent->dispose();
diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx
index ae4083e59820..048b53825509 100644
--- a/sw/source/core/doc/DocumentDeviceManager.cxx
+++ b/sw/source/core/doc/DocumentDeviceManager.cxx
@@ -302,7 +302,7 @@ SfxPrinter& DocumentDeviceManager::CreatePrinter_() const
VclPtr<SfxPrinter> pNewPrt = VclPtr<SfxPrinter>::Create( std::move(pSet) );
const_cast<DocumentDeviceManager*>(this)->setPrinter( pNewPrt, true, true );
- return *mpPrt.get();
+ return *mpPrt;
}
void DocumentDeviceManager::PrtDataChanged()
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 0b2064cfa53b..ab597d0ae587 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -408,7 +408,7 @@ static void GetFormatAndCreateCursorFromRangeRep(
pUnoCursor->GetPoint()->nNode = *pBRBox->GetSttNd();
pUnoCursor->Move( fnMoveForward, GoInNode );
SwUnoTableCursor& rCursor =
- dynamic_cast<SwUnoTableCursor&>(*pUnoCursor.get());
+ dynamic_cast<SwUnoTableCursor&>(*pUnoCursor);
// HACK: remove pending actions for old style tables
UnoActionRemoveContext aRemoveContext(rCursor);
rCursor.MakeBoxSels();
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 8ce993467596..68d323c5f611 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -4239,7 +4239,7 @@ uno::Sequence< beans::PropertyValue > SwXAutoStyle::getProperties()
const SfxItemPropertyMap &rMap = pPropSet->getPropertyMap();
PropertyEntryVector_t aPropVector = rMap.getPropertyEntries();
- SfxItemSet& rSet = *mpSet.get();
+ SfxItemSet& rSet = *mpSet;
SfxItemIter aIter(rSet);
const SfxPoolItem* pItem = aIter.FirstItem();
@@ -4391,7 +4391,7 @@ void SwXTextTableStyle::SetPhysical()
uno::Reference<style::XStyle> xCellStyle(pOldBoxFormat->GetXObject(), uno::UNO_QUERY);
if (!xCellStyle.is())
continue;
- SwXTextCellStyle& rStyle = dynamic_cast<SwXTextCellStyle&>(*xCellStyle.get());
+ SwXTextCellStyle& rStyle = dynamic_cast<SwXTextCellStyle&>(*xCellStyle);
SwBoxAutoFormat& rNewBoxFormat = pTableAutoFormat->GetBoxFormat(aTableTemplateMap[i]);
rStyle.SetBoxFormat(&rNewBoxFormat);
rNewBoxFormat.SetXObject(xCellStyle);
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index f88e1389bcf8..4f2606c17fd5 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -2282,7 +2282,7 @@ uno::Reference<table::XCellRange> GetRangeByName(
pUnoCursor->SetMark();
pUnoCursor->GetPoint()->nNode = *pBRBox->GetSttNd();
pUnoCursor->Move( fnMoveForward, GoInNode );
- SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor.get());
+ SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor);
// HACK: remove pending actions for selecting old style tables
UnoActionRemoveContext aRemoveContext(rCursor);
rCursor.MakeBoxSels();
@@ -3359,7 +3359,7 @@ SwXCellRange::getCellRangeByPosition(
pUnoCursor->SetMark();
pUnoCursor->GetPoint()->nNode = *pBRBox->GetSttNd();
pUnoCursor->Move( fnMoveForward, GoInNode );
- SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor.get());
+ SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor);
// HACK: remove pending actions for selecting old style tables
UnoActionRemoveContext aRemoveContext(rCursor);
rCursor.MakeBoxSels();
@@ -4048,7 +4048,7 @@ void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
pUnoCursor->SetMark();
pUnoCursor->GetPoint()->nNode = *pBLBox->GetSttNd();
pUnoCursor->Move(fnMoveForward, GoInNode);
- SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor.get());
+ SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor);
{
// HACK: remove pending actions for selecting old style tables
UnoActionRemoveContext aRemoveContext(rCursor);
@@ -4205,7 +4205,7 @@ void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
pUnoCursor->SetMark();
pUnoCursor->GetPoint()->nNode = *pTRBox->GetSttNd();
pUnoCursor->Move(fnMoveForward, GoInNode);
- SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor.get());
+ SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor);
{
// HACK: remove pending actions for selecting old style tables
UnoActionRemoveContext aRemoveContext(rCursor);
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index e73c74e332c2..68d78213fb48 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1670,7 +1670,7 @@ SwXText::convertToTextFrame(
const uno::Reference<text::XTextFrame> xNewFrame(
SwXTextFrame::CreateXTextFrame(*m_pImpl->m_pDoc, nullptr));
- SwXTextFrame& rNewFrame = dynamic_cast<SwXTextFrame&>(*xNewFrame.get());
+ SwXTextFrame& rNewFrame = dynamic_cast<SwXTextFrame&>(*xNewFrame);
rNewFrame.SetSelection( aStartPam );
try
{
@@ -2207,7 +2207,7 @@ SwXText::convertToTable(
assert(SwTable::FindTable(pTable->GetFrameFormat()) == pTable);
assert(pTable->GetFrameFormat() ==
- dynamic_cast<SwXTextTable&>(*xRet.get()).GetFrameFormat());
+ dynamic_cast<SwXTextTable&>(*xRet).GetFrameFormat());
return xRet;
}
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index f3c55482777a..e9153a61b691 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -1669,7 +1669,7 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
const SwFormatAutoFormat& rAutoFormat = static_cast<const SwFormatAutoFormat&>(rItem);
const std::shared_ptr<SfxItemSet>& pSet = rAutoFormat.GetStyleHandle();
if( pSet.get() )
- Insert( *pSet.get(), nStart, nEnd, rFormatInfos, true, bParaAttrs );
+ Insert( *pSet, nStart, nEnd, rFormatInfos, true, bParaAttrs );
}
break;
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index eeb6f4212601..ff3c874f7b75 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -517,7 +517,7 @@ SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference<
sal_Int16 cmdId = 0;
if ( cid.get() )
{
- const sal_uInt32 nCid = ( *( cid.get() ) & 0xFFFF );
+ const sal_uInt32 nCid = ( *cid & 0xFFFF );
const sal_uInt8 cmt = static_cast<sal_uInt8>( nCid & 0x7 );
const sal_Int16 arg2 = static_cast<sal_Int16>( nCid >> 3 );
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 7569bfa57e92..a2e1691a5aec 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -395,18 +395,18 @@ void SwLabPage::DisplayFormat()
{
ScopedVclPtrInstance< MetricField > aField(this, WinBits(0));
FieldUnit aMetric = ::GetDfltMetric(false);
- SetMetric(*aField.get(), aMetric);
+ SetMetric(*aField, aMetric);
aField->SetDecimalDigits(2);
aField->SetMin (0);
aField->SetMax (LONG_MAX);
SwLabRec* pRec = GetSelectedEntryPos();
aItem.m_aLstType = pRec->m_aType;
- SETFLDVAL(*aField.get(), pRec->m_nWidth);
+ SETFLDVAL(*aField, pRec->m_nWidth);
aField->Reformat();
const OUString aWString = aField->GetText();
- SETFLDVAL(*aField.get(), pRec->m_nHeight);
+ SETFLDVAL(*aField, pRec->m_nHeight);
aField->Reformat();
OUString aText = pRec->m_aType + ": " + aWString +
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index 14d5e5769a57..cb423ad07769 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -332,7 +332,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range,
throw uno::RuntimeException("Not implemented" );
}
- SwVbaRange& rVbaRange = dynamic_cast<SwVbaRange&>(*Range.get());
+ SwVbaRange& rVbaRange = dynamic_cast<SwVbaRange&>(*Range);
uno::Reference< text::XTextRange > xTextRange = rVbaRange.getXTextRange();
uno::Reference< text::XText > xText = xTextRange->getText();
xText->insertTextContent( xTextRange, xTextField, true );
diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx
index 8fb67d9dda76..edecccf159a2 100644
--- a/sw/source/ui/vba/vbalistformat.cxx
+++ b/sw/source/ui/vba/vbalistformat.cxx
@@ -62,7 +62,7 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor
if (!xEnum->hasMoreElements())
return;
- SwVbaListTemplate& rListTemplate = dynamic_cast<SwVbaListTemplate&>(*ListTemplate.get());
+ SwVbaListTemplate& rListTemplate = dynamic_cast<SwVbaListTemplate&>(*ListTemplate);
bool isFirstElement = true;
do
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index 9d77fed807e8..089b4aa99c20 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -819,7 +819,7 @@ void SwDocShell::Edit(
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)));
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
ScopedVclPtr<SfxAbstractApplyTabDialog> pDlg(pFact->CreateTemplateDialog(GetView()->GetViewFrame()->GetWindow().GetFrameWeld(),
- *(xTmp.get()), nFamily, sPage, pCurrShell, bNew));
+ *xTmp, nFamily, sPage, pCurrShell, bNew));
std::shared_ptr<ApplyStyle> pApplyStyleHelper(new ApplyStyle(*this, bNew, xTmp, nFamily, pDlg.get(), m_xBasePool, bModified));
pDlg->SetApplyHdl(LINK(pApplyStyleHelper.get(), ApplyStyle, ApplyHdl));
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index f7b254c42635..5979314905c8 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -2553,8 +2553,7 @@ bool SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam,
else
mxStyleSheet->PresetFollow( OUString() );
- Broadcast( SfxStyleSheetHint( SfxHintId::StyleSheetModified,
- *(mxStyleSheet.get()) ) );
+ Broadcast( SfxStyleSheetHint( SfxHintId::StyleSheetModified, *mxStyleSheet ) );
}
}
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index 1784ac20dbcd..03acdf57c3ca 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -186,10 +186,10 @@ void SwCommentRuler::DrawCommentControl(vcl::RenderContext& rRenderContext)
// Draw arrow
// FIXME consistence of button colors. https://opengrok.libreoffice.org/xref/core/vcl/source/control/button.cxx#785
Color aArrowColor = GetFadedColor(COL_BLACK, rStyleSettings.GetShadowColor());
- ImplDrawArrow(*maVirDev.get(), aArrowPos.X(), aArrowPos.Y(), aArrowColor, bArrowToRight);
+ ImplDrawArrow(*maVirDev, aArrowPos.X(), aArrowPos.Y(), aArrowColor, bArrowToRight);
// Blit comment control
- rRenderContext.DrawOutDev(aControlRect.TopLeft(), aControlRect.GetSize(), Point(), aControlRect.GetSize(), *maVirDev.get());
+ rRenderContext.DrawOutDev(aControlRect.TopLeft(), aControlRect.GetSize(), Point(), aControlRect.GetSize(), *maVirDev);
}
// Just accept double-click outside comment control
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 404640def978..48a668f25f0d 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -80,7 +80,7 @@ PageSizeControl::PageSizeControl( sal_uInt16 nId, vcl::Window* pParent )
maWidthHeightField->SetDecimalDigits(2);
maWidthHeightField->SetSpinSize(10);
maWidthHeightField->SetLast(9999);
- SetFieldUnit( *maWidthHeightField.get(), lcl_GetFieldUnit() );
+ SetFieldUnit( *maWidthHeightField, lcl_GetFieldUnit() );
maPaperList.push_back( PAPER_A3 );
maPaperList.push_back( PAPER_A4 );
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index 0a663a365194..05bfa2be8356 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -107,18 +107,18 @@ BitmapEx GenerateStylePreview(SfxObjectShell& rSource, OUString const & aName)
{
tools::Rectangle aRenderRect(Point(nMargin, y), aSize);
- renderPreview(pStyleManager, *pVirtualDev.get(), "Title", nTitleHeight, aRenderRect);
+ renderPreview(pStyleManager, *pVirtualDev, "Title", nTitleHeight, aRenderRect);
y += nTitleHeight;
}
{
tools::Rectangle aRenderRect(Point(nMargin, y), aSize);
- renderPreview(pStyleManager, *pVirtualDev.get(), "Heading 1", nHeadingHeight, aRenderRect);
+ renderPreview(pStyleManager, *pVirtualDev, "Heading 1", nHeadingHeight, aRenderRect);
y += nHeadingHeight;
}
{
tools::Rectangle aRenderRect(Point(nMargin, y), aSize);
- renderPreview(pStyleManager, *pVirtualDev.get(), "Text Body", nTextBodyHeight, aRenderRect);
+ renderPreview(pStyleManager, *pVirtualDev, "Text Body", nTextBodyHeight, aRenderRect);
}
return pVirtualDev->GetBitmapEx(Point(), aSize);
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 7257c6167e16..d2adad11d884 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -782,7 +782,7 @@ uno::Reference< awt::XFont > SAL_CALL VCLXAccessibleComponent::getFont( )
else
aFont = pWindow->GetFont();
VCLXFont* pVCLXFont = new VCLXFont;
- pVCLXFont->Init( *xDev.get(), aFont );
+ pVCLXFont->Init( *xDev, aFont );
xFont = pVCLXFont;
}
}
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 2e70cef80bc8..eb522416545f 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -580,7 +580,7 @@ uno::Any SAL_CALL Content::execute(
xResAccess->DESTROY( Environment );
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
+ m_xResAccess.reset( new DAVResourceAccess( *xResAccess ) );
}
}
catch ( DAVException const & e )
@@ -768,7 +768,7 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
DAVResourceAccess::abort();
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
+ m_xResAccess.reset( new DAVResourceAccess( *xResAccess ) );
}
}
catch ( DAVException const & )
@@ -846,7 +846,7 @@ void Content::addProperty( const css::ucb::PropertyCommandArgument &aCmdArg,
xResAccess->PROPPATCH( aProppatchValues, xEnv );
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
+ m_xResAccess.reset( new DAVResourceAccess( *xResAccess ) );
}
// Notify propertyset info change listeners.
@@ -952,7 +952,7 @@ void Content::removeProperty( const OUString& Name,
xResAccess->PROPPATCH( aProppatchValues, xEnv );
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
+ m_xResAccess.reset( new DAVResourceAccess( *xResAccess ) );
}
// Notify propertyset info change listeners.
@@ -1274,7 +1274,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
}
// use the cached ContentProperties instance
- xProps.reset( new ContentProperties( *xCachedProps.get() ) );
+ xProps.reset( new ContentProperties( *xCachedProps ) );
}
}
@@ -1306,7 +1306,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
}
// use the cached ContentProperties instance
- xProps.reset( new ContentProperties( *xCachedProps.get() ) );
+ xProps.reset( new ContentProperties( *xCachedProps ) );
}
if ( !bHasAll )
@@ -1554,11 +1554,11 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
osl::Guard< osl::Mutex > aGuard( m_aMutex );
if ( !m_xCachedProps.get() )
- m_xCachedProps.reset( new CachableContentProperties( *xProps.get() ) );
+ m_xCachedProps.reset( new CachableContentProperties( *xProps ) );
else
- m_xCachedProps->addProperties( *xProps.get() );
+ m_xCachedProps->addProperties( *xProps );
- m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
+ m_xResAccess.reset( new DAVResourceAccess( *xResAccess ) );
m_aEscapedTitle = SerfUri::escapeSegment( aUnescapedTitle );
}
@@ -1961,7 +1961,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
+ m_xResAccess.reset( new DAVResourceAccess( *xResAccess ) );
}
return aRet;
@@ -2055,7 +2055,7 @@ uno::Any Content::open(
m_xCachedProps->addProperties( ContentProperties( aResource ) );
m_xResAccess.reset(
- new DAVResourceAccess( *xResAccess.get() ) );
+ new DAVResourceAccess( *xResAccess ) );
}
}
catch ( DAVException const & e )
@@ -2100,7 +2100,7 @@ uno::Any Content::open(
aResource.properties );
m_xResAccess.reset(
- new DAVResourceAccess( *xResAccess.get() ) );
+ new DAVResourceAccess( *xResAccess ) );
}
xDataSink->setInputStream( xIn );
@@ -2157,7 +2157,7 @@ void Content::post(
{
osl::MutexGuard aGuard( m_aMutex );
m_xResAccess.reset(
- new DAVResourceAccess( *xResAccess.get() ) );
+ new DAVResourceAccess( *xResAccess ) );
}
xSink->setInputStream( xResult );
@@ -2191,7 +2191,7 @@ void Content::post(
{
osl::MutexGuard aGuard( m_aMutex );
m_xResAccess.reset(
- new DAVResourceAccess( *xResAccess.get() ) );
+ new DAVResourceAccess( *xResAccess ) );
}
}
catch ( DAVException const & e )
@@ -2426,7 +2426,7 @@ void Content::insert(
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
m_xResAccess.reset(
- new DAVResourceAccess( *xResAccess.get() ) );
+ new DAVResourceAccess( *xResAccess ) );
}
// Success!
@@ -2500,7 +2500,7 @@ void Content::insert(
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
+ m_xResAccess.reset( new DAVResourceAccess( *xResAccess ) );
}
}
@@ -2752,7 +2752,7 @@ void Content::transfer(
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
+ m_xResAccess.reset( new DAVResourceAccess( *xResAccess ) );
}
}
@@ -2833,7 +2833,7 @@ void Content::lock(
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
+ m_xResAccess.reset( new DAVResourceAccess( *xResAccess ) );
}
}
catch ( DAVException const & e )
@@ -2860,7 +2860,7 @@ void Content::unlock(
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
+ m_xResAccess.reset( new DAVResourceAccess( *xResAccess ) );
}
}
catch ( DAVException const & e )
@@ -3288,7 +3288,7 @@ Content::ResourceType Content::getResourceType(
const Content::ResourceType & ret = getResourceType( xEnv, xResAccess );
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) );
+ m_xResAccess.reset( new DAVResourceAccess( *xResAccess ) );
}
return ret;
}
diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx
index 07aa218cf137..366005a5b198 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -432,7 +432,7 @@ public:
rRenderContext.DrawOutDev(Point(), mpVDev->GetOutputSizePixel(),
Point(), mpVDev->GetOutputSizePixel(),
- *mpVDev.get());
+ *mpVDev);
rRenderContext.SetTextColor(COL_LIGHTRED);
rRenderContext.DrawText(Point(10, 10), "FPS: " + OUString::number(int(fps)));
return;
diff --git a/vcl/backendtest/outputdevice/outputdevice.cxx b/vcl/backendtest/outputdevice/outputdevice.cxx
index 1b2bc1a1bf59..408ce09551f7 100644
--- a/vcl/backendtest/outputdevice/outputdevice.cxx
+++ b/vcl/backendtest/outputdevice/outputdevice.cxx
@@ -23,7 +23,7 @@ Bitmap OutputDeviceTestAnotherOutDev::setupDrawOutDev()
initialSetup(13, 13, constBackgroundColor);
- mpVirtualDevice->DrawOutDev(Point(2, 2), aSourceSize, Point(), aSourceSize, *pSourceDev.get());
+ mpVirtualDevice->DrawOutDev(Point(2, 2), aSourceSize, Point(), aSourceSize, *pSourceDev);
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
}
diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index 163522634781..3de88cec4a18 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -241,7 +241,7 @@ void SvmTest::testPixel()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->DrawPixel(Point(8, 1), COL_GREEN);
pVirtualDev->DrawPixel(Point(1, 8), COL_BLUE);
@@ -262,7 +262,7 @@ void SvmTest::testPoint()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->DrawPixel(Point(4, 4));
@@ -304,7 +304,7 @@ void SvmTest::testLine()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->DrawLine(Point(1, 1), Point(8, 8));
LineInfo aLineInfo(LineStyle::Dash, 7);
@@ -338,7 +338,7 @@ void SvmTest::testRect()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetLineColor(Color(0x123456));
pVirtualDev->SetFillColor(Color(0x654321));
@@ -366,7 +366,7 @@ void SvmTest::testRoundRect()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetLineColor(Color(0x123456));
pVirtualDev->SetFillColor(Color(0x654321));
@@ -393,7 +393,7 @@ void SvmTest::testEllipse()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetLineColor(Color(0x123456));
pVirtualDev->SetFillColor(Color(0x654321));
@@ -423,7 +423,7 @@ void SvmTest::testArc()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetLineColor(Color(0x123456));
pVirtualDev->SetFillColor(Color(0x654321));
@@ -453,7 +453,7 @@ void SvmTest::testPie()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetLineColor(Color(0x123456));
pVirtualDev->SetFillColor(Color(0x654321));
@@ -483,7 +483,7 @@ void SvmTest::testChord()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetLineColor(Color(0x123456));
pVirtualDev->SetFillColor(Color(0x654321));
@@ -526,7 +526,7 @@ void SvmTest::testPolyLine()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
tools::Polygon aPolygon(3);
aPolygon.SetPoint(Point(1, 8), 0);
@@ -578,7 +578,7 @@ void SvmTest::testPolygon()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
tools::Polygon aPolygon(3);
aPolygon.SetPoint(Point(1, 8), 0);
@@ -621,7 +621,7 @@ void SvmTest::testPolyPolygon()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
tools::Polygon aPolygon(3);
aPolygon.SetPoint(Point(1, 8), 0);
@@ -663,7 +663,7 @@ void SvmTest::testText()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->DrawText(Point(4,6), "xABC", 1, 2);
@@ -685,7 +685,7 @@ void SvmTest::testTextArray()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
long const aDX[] = { 10, 15, 20, 25, 30, 35 };
pVirtualDev->DrawTextArray(Point(4,6), "123456", aDX, 1, 4);
@@ -707,7 +707,7 @@ void SvmTest::testStrechText()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->DrawStretchText(Point(4,6), 10, "123456", 1, 4);
checkStrechText(writeAndRead(aGDIMetaFile, "strecthtext.svm"));
@@ -728,7 +728,7 @@ void SvmTest::testTextRect()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->DrawText(tools::Rectangle(Point(0,0), Size(5,5)), "123456", DrawTextFlags::Center);
checkTextRect(writeAndRead(aGDIMetaFile, "textrectangle.svm"));
@@ -748,7 +748,7 @@ void SvmTest::testTextLine()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->DrawTextLine(Point(4,6), 10, STRIKEOUT_SINGLE, LINESTYLE_SINGLE, LINESTYLE_SINGLE);
checkTextLine(writeAndRead(aGDIMetaFile, "textline.svm"));
@@ -785,7 +785,7 @@ void SvmTest::testBitmaps()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
Bitmap aBitmap1(Size(4,4), 24);
{
@@ -846,7 +846,7 @@ void SvmTest::testBitmapExs()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
Bitmap aBitmap1(Size(4,4), 24);
{
@@ -902,7 +902,7 @@ void SvmTest::testMasks()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
Bitmap aBitmap1(Size(4,4), 24);
{
@@ -948,7 +948,7 @@ void SvmTest::testPushPop()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetLineColor(COL_YELLOW);
pVirtualDev->Push();
@@ -977,7 +977,7 @@ void SvmTest::testTextColor()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetTextColor(Color(0x123456));
@@ -997,7 +997,7 @@ void SvmTest::testTextFillColor()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetTextFillColor(Color(0x234567));
@@ -1017,7 +1017,7 @@ void SvmTest::testTextLineColor()
{
GDIMetaFile aGDIMetaFile;
ScopedVclPtrInstance<VirtualDevice> pVirtualDev;
- setupBaseVirtualDevice(*pVirtualDev.get(), aGDIMetaFile);
+ setupBaseVirtualDevice(*pVirtualDev, aGDIMetaFile);
pVirtualDev->SetTextLineColor(Color(0x345678));
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 13b57d27e1e0..db292eebb298 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -1024,7 +1024,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
{
MetaGradientAction* pAct = static_cast<MetaGradientAction*>(pAction);
- ImplAddGradientEx( aMtf, *aMapVDev.get(),
+ ImplAddGradientEx( aMtf, *aMapVDev,
ImplGetRotatedPolygon( pAct->GetRect(), aRotAnchor, aRotOffset, fSin, fCos ),
pAct->GetGradient() );
}
@@ -1056,7 +1056,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
{
// Add rotated gradientex
MetaGradientExAction* pAct = static_cast<MetaGradientExAction*>(pAction);
- ImplAddGradientEx( aMtf, *aMapVDev.get(),
+ ImplAddGradientEx( aMtf, *aMapVDev,
ImplGetRotatedPolyPolygon( pAct->GetPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ),
pAct->GetGradient() );
}
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index 0c13f5fd6f9d..9b5a2de8acfd 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.cxx
@@ -182,7 +182,7 @@ void ImplAnimView::drawToPos( sal_uLong nPos )
if (xOldClip)
pRenderContext->SetClipRegion( maClip );
- pRenderContext->DrawOutDev( maDispPt, maDispSz, Point(), maSzPix, *aVDev.get() );
+ pRenderContext->DrawOutDev( maDispPt, maDispSz, Point(), maSzPix, *aVDev );
if (pGuard)
pGuard->SetPaintRect(tools::Rectangle(maDispPt, maDispSz));
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 7d1cbbde664d..45c00a8d3f88 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -707,7 +707,7 @@ Bitmap ImpGraphic::ImplGetBitmap(const GraphicConversionParameters& rParameters)
{
// get hairline and full bound rect
tools::Rectangle aHairlineRect;
- const tools::Rectangle aRect(maMetaFile.GetBoundRect(*aVDev.get(), &aHairlineRect));
+ const tools::Rectangle aRect(maMetaFile.GetBoundRect(*aVDev, &aHairlineRect));
if(!aRect.IsEmpty() && !aHairlineRect.IsEmpty())
{
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 8390b97286ab..373acaba0700 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -762,7 +762,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
aBackgroundComponent.aBounds,
aBackgroundComponent.aBgColor,
static_cast<const MetaRectAction*>(pCurrAct)->GetRect(),
- *aMapModeVDev.get()) )
+ *aMapModeVDev) )
bStillBackground=false; // incomplete occlusion of background
else
nLastBgAction=nActionNum; // this _is_ background
@@ -778,7 +778,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
aBackgroundComponent.aBounds,
aBackgroundComponent.aBgColor,
aPoly.GetBoundRect(),
- *aMapModeVDev.get()) )
+ *aMapModeVDev) )
bStillBackground=false; // incomplete occlusion of background
else
nLastBgAction=nActionNum; // this _is_ background
@@ -795,7 +795,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
aBackgroundComponent.aBounds,
aBackgroundComponent.aBgColor,
aPoly.GetBoundRect(),
- *aMapModeVDev.get()) )
+ *aMapModeVDev) )
bStillBackground=false; // incomplete occlusion of background
else
nLastBgAction=nActionNum; // this _is_ background
@@ -807,7 +807,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
aBackgroundComponent.aBounds,
aBackgroundComponent.aBgColor,
static_cast<const MetaWallpaperAction*>(pCurrAct)->GetRect(),
- *aMapModeVDev.get()) )
+ *aMapModeVDev) )
bStillBackground=false; // incomplete occlusion of background
else
nLastBgAction=nActionNum; // this _is_ background
@@ -816,14 +816,14 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
default:
{
if( ImplIsNotTransparent( *pCurrAct,
- *aMapModeVDev.get() ) )
+ *aMapModeVDev ) )
bStillBackground=false; // non-transparent action, possibly
// not uniform
else
// extend current bounds (next uniform action
// needs to fully cover this area)
aBackgroundComponent.aBounds.Union(
- ImplCalcActionBounds(*pCurrAct, *aMapModeVDev.get()) );
+ ImplCalcActionBounds(*pCurrAct, *aMapModeVDev) );
break;
}
}
@@ -871,7 +871,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
pCurrAct->Execute( aMapModeVDev.get() );
// cache bounds of current action
- const tools::Rectangle aBBCurrAct( ImplCalcActionBounds(*pCurrAct, *aMapModeVDev.get()) );
+ const tools::Rectangle aBBCurrAct( ImplCalcActionBounds(*pCurrAct, *aMapModeVDev) );
// accumulate collected bounds here, initialize with current action
tools::Rectangle aTotalBounds( aBBCurrAct ); // thus,
@@ -897,7 +897,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
// not be considered for connected components,
// too. Just put each of them into a separate
// component.
- aTotalComponents.bIsFullyTransparent = !ImplIsNotTransparent(*pCurrAct, *aMapModeVDev.get());
+ aTotalComponents.bIsFullyTransparent = !ImplIsNotTransparent(*pCurrAct, *aMapModeVDev);
if( !aBBCurrAct.IsEmpty() &&
!aTotalComponents.bIsFullyTransparent )
@@ -1294,7 +1294,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
// given background color
ImplConvertTransparentAction(rOutMtf,
*pCurrAct,
- *aMapModeVDev.get(),
+ *aMapModeVDev,
aBackgroundComponent.aBgColor);
}
else
diff --git a/vcl/source/graphic/GraphicObject2.cxx b/vcl/source/graphic/GraphicObject2.cxx
index ac3be21a5bfa..7148c1098c87 100644
--- a/vcl/source/graphic/GraphicObject2.cxx
+++ b/vcl/source/graphic/GraphicObject2.cxx
@@ -306,7 +306,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const tools::Rectangle& r
aVDev->SetMapMode( aMapMode );
// draw bitmap content
- if( ImplRenderTempTile( *aVDev.get(), nNumTilesInCacheX,
+ if( ImplRenderTempTile( *aVDev, nNumTilesInCacheX,
nNumTilesInCacheY, rSizePixel, pAttr ) )
{
BitmapEx aTileBitmap( aVDev->GetBitmap( Point(0,0), aVDev->GetOutputSize() ) );
@@ -321,7 +321,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const tools::Rectangle& r
else
aAlphaGraphic.SetGraphic( GetGraphic().GetBitmapEx().GetMask() );
- if( aAlphaGraphic.ImplRenderTempTile( *aVDev.get(), nNumTilesInCacheX,
+ if( aAlphaGraphic.ImplRenderTempTile( *aVDev, nNumTilesInCacheX,
nNumTilesInCacheY, rSizePixel, pAttr ) )
{
// Combine bitmap and alpha/mask
diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx
index 83c2dfb73529..98ef80eebddc 100644
--- a/vcl/source/graphic/Manager.cxx
+++ b/vcl/source/graphic/Manager.cxx
@@ -146,7 +146,7 @@ void Manager::unregisterGraphic(ImpGraphic* pImpGraphic)
std::shared_ptr<ImpGraphic> Manager::copy(std::shared_ptr<ImpGraphic> const& rImpGraphicPtr)
{
- auto pReturn = std::make_shared<ImpGraphic>(*rImpGraphicPtr.get());
+ auto pReturn = std::make_shared<ImpGraphic>(*rImpGraphicPtr);
registerGraphic(pReturn, "Copy");
return pReturn;
}
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index 2a42ae235532..b6ea1196c054 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -163,7 +163,7 @@ void loadImageFromStream(std::shared_ptr<SvStream> const & xStream, OUString con
else if (rPath.endsWith(".svg"))
{
rParameters.mbWriteImageToCache = true; // We always want to cache a SVG image
- vcl::bitmap::loadFromSvg(*xStream.get(), rPath, rParameters.mrBitmap, aScalePercentage / 100.0);
+ vcl::bitmap::loadFromSvg(*xStream, rPath, rParameters.mrBitmap, aScalePercentage / 100.0);
if (bConvertToDarkTheme)
BitmapFilter::Filter(rParameters.mrBitmap, BitmapLightenFilter());
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 899fbb97d75c..37b9636f2906 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -465,7 +465,7 @@ OUString escape(const OUString& rStr)
OUString WindowUIObject::dumpState() const
{
OUStringBuffer aStateString = "{\"name\":\"" + mxWindow->get_id() + "\"";
- aStateString.append(", \"ImplementationName\":\"").appendAscii(typeid(*mxWindow.get()).name()).append("\"");
+ aStateString.append(", \"ImplementationName\":\"").appendAscii(typeid(*mxWindow).name()).append("\"");
StringMap aState = const_cast<WindowUIObject*>(this)->get_state();
for (auto const& elem : aState)
{
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 1af613902663..8b45e80c9327 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -566,7 +566,7 @@ cairo::SurfaceSharedPtr X11SalGraphics::CreateBitmapSurface( const OutputDevice&
css::uno::Any X11SalGraphics::GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& /*rSize*/) const
{
- cairo::X11Surface& rXlibSurface=dynamic_cast<cairo::X11Surface&>(*rSurface.get());
+ cairo::X11Surface& rXlibSurface=dynamic_cast<cairo::X11Surface&>(*rSurface);
css::uno::Sequence< css::uno::Any > args( 3 );
args[0] <<= false; // do not call XFreePixmap on it
args[1] <<= rXlibSurface.getPixmap()->mhDrawable;
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index b9041acdefd4..2eb537931d50 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -2436,7 +2436,7 @@ bool WinSalGraphicsImpl::TryDrawBitmapGDIPlus(const SalTwoRect& rTR, const SalBi
paintToGdiPlus(
aGraphics,
rTR,
- *aARGB.get());
+ *aARGB);
return true;
}
@@ -2489,7 +2489,7 @@ bool WinSalGraphicsImpl::drawAlphaBitmap(
paintToGdiPlus(
aGraphics,
rTR,
- *aARGB.get());
+ *aARGB);
return true;
}
diff --git a/vcl/win/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx
index 4167d1a78c39..394ac4acebe8 100644
--- a/vcl/win/gdi/salgdi2.cxx
+++ b/vcl/win/gdi/salgdi2.cxx
@@ -169,8 +169,8 @@ void WinSalGraphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSal
{
std::unique_ptr<WinSalBitmap> pWinSalBitmap(new WinSalBitmap());
SalBitmap& rConstBitmap = const_cast<SalBitmap&>(rSalBitmap);
- convertToWinSalBitmap(rConstBitmap, *pWinSalBitmap.get());
- mpImpl->drawBitmap(rPosAry, *pWinSalBitmap.get());
+ convertToWinSalBitmap(rConstBitmap, *pWinSalBitmap);
+ mpImpl->drawBitmap(rPosAry, *pWinSalBitmap);
}
else
{
@@ -187,14 +187,14 @@ void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry,
{
std::unique_ptr<WinSalBitmap> pWinSalBitmap(new WinSalBitmap());
SalBitmap& rConstBitmap = const_cast<SalBitmap&>(rSSalBitmap);
- convertToWinSalBitmap(rConstBitmap, *pWinSalBitmap.get());
+ convertToWinSalBitmap(rConstBitmap, *pWinSalBitmap);
std::unique_ptr<WinSalBitmap> pWinTransparentSalBitmap(new WinSalBitmap());
SalBitmap& rConstTransparentBitmap = const_cast<SalBitmap&>(rSTransparentBitmap);
- convertToWinSalBitmap(rConstTransparentBitmap, *pWinTransparentSalBitmap.get());
+ convertToWinSalBitmap(rConstTransparentBitmap, *pWinTransparentSalBitmap);
- mpImpl->drawBitmap(rPosAry, *pWinSalBitmap.get(), *pWinTransparentSalBitmap.get());
+ mpImpl->drawBitmap(rPosAry, *pWinSalBitmap, *pWinTransparentSalBitmap);
}
else
{
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index ab59b663efb1..f6b0c2338e33 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1917,7 +1917,7 @@ public:
pDev->DrawWallpaper(aSubRect, aWallpaper );
rRenderContext.DrawOutDev(aExclude.TopLeft(), aExclude.GetSize(),
- Point( 0, 0 ), aExclude.GetSize(), *pDev.get() );
+ Point( 0, 0 ), aExclude.GetSize(), *pDev );
}
};
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index e610a32deb1e..b920af4a726a 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -636,7 +636,7 @@ void DomainMapperTableManager::endOfRowAction()
// a grid of "20:40:20" and it doesn't have to do something with the tableWidth
// -> so we have get the sum of each grid entry for the fullWidthRelative:
int nFullWidthRelative = 0;
- for (int i : (*pTableGrid.get()))
+ for (int i : (*pTableGrid))
nFullWidthRelative = o3tl::saturating_add(nFullWidthRelative, i);
if( pTableGrid->size() == ( m_nGridBefore + nGrids + m_nGridAfter ) && m_nCell.back( ) > 0 )
@@ -677,7 +677,7 @@ void DomainMapperTableManager::endOfRowAction()
{
double fGridWidth = 0.;
for ( sal_Int32 nGridCount = *aSpansIter; nGridCount > 0; --nGridCount )
- fGridWidth += (*pTableGrid.get())[nBorderGridIndex++];
+ fGridWidth += (*pTableGrid)[nBorderGridIndex++];
sal_Int16 nRelPos = rtl::math::round((fGridWidth * 10000) / nFullWidthRelative);
@@ -717,7 +717,7 @@ void DomainMapperTableManager::endOfRowAction()
// Avoid divide by zero (if there's no grid, position using cell widths).
if( nFullWidthRelative == 0 )
for (size_t i = 0; i < pCellWidths->size(); ++i)
- nFullWidthRelative += (*pCellWidths.get())[i];
+ nFullWidthRelative += (*pCellWidths)[i];
size_t nWidthsBound = pCellWidths->size() - 1;
if (nWidthsBound)
@@ -727,7 +727,7 @@ void DomainMapperTableManager::endOfRowAction()
for (size_t i = 0; i < nWidthsBound; ++i)
{
- nSum += (*pCellWidths.get())[i];
+ nSum += (*pCellWidths)[i];
pSeparators[nPos].Position = (nSum * 10000) / nFullWidthRelative; // Relative position
pSeparators[nPos].IsVisible = true;
nPos++;
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 8f0ad98c9702..c011777d2b8e 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -548,7 +548,7 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream & rStream)
{
// Resolving all item[n].xml files from CustomXml folder.
uno::Reference<embed::XRelationshipAccess> xRelationshipAccess;
- xRelationshipAccess.set(dynamic_cast<OOXMLStreamImpl&>(*mpStream.get()).accessDocumentStream(), uno::UNO_QUERY);
+ xRelationshipAccess.set(dynamic_cast<OOXMLStreamImpl&>(*mpStream).accessDocumentStream(), uno::UNO_QUERY);
if (xRelationshipAccess.is())
{
static const char sCustomType[] = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml";
@@ -622,7 +622,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/)
return;
}
uno::Reference<embed::XRelationshipAccess> xRelationshipAccess;
- xRelationshipAccess.set(dynamic_cast<OOXMLStreamImpl&>(*pStream.get()).accessDocumentStream(), uno::UNO_QUERY);
+ xRelationshipAccess.set(dynamic_cast<OOXMLStreamImpl&>(*pStream).accessDocumentStream(), uno::UNO_QUERY);
if (xRelationshipAccess.is())
{
@@ -715,7 +715,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/)
void OOXMLDocumentImpl::resolveEmbeddingsStream(const OOXMLStream::Pointer_t& pStream)
{
uno::Reference<embed::XRelationshipAccess> xRelationshipAccess;
- xRelationshipAccess.set(dynamic_cast<OOXMLStreamImpl&>(*pStream.get()).accessDocumentStream(), uno::UNO_QUERY);
+ xRelationshipAccess.set(dynamic_cast<OOXMLStreamImpl&>(*pStream).accessDocumentStream(), uno::UNO_QUERY);
if (xRelationshipAccess.is())
{
OUString const sChartType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart");
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 0d50937b0518..eba8a479e98a 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -2120,7 +2120,7 @@ void OOXMLFastContextHandlerMath::process()
// gcc4.4 (and 4.3 and possibly older) have a problem with dynamic_cast directly to the target class,
// so help it with an intermediate cast. I'm not sure what exactly the problem is, seems to be unrelated
// to RTLD_GLOBAL, so most probably a gcc bug.
- oox::FormulaImportBase& import = dynamic_cast<oox::FormulaImportBase&>(dynamic_cast<SfxBaseModel&>(*component.get()));
+ oox::FormulaImportBase& import = dynamic_cast<oox::FormulaImportBase&>(dynamic_cast<SfxBaseModel&>(*component));
import.readFormulaOoxml(buffer);
if (isForwardEvents())
{
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index f3449254ebf7..9ed80c64d34e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2728,8 +2728,8 @@ RTFError RTFDocumentImpl::popState()
// gcc4.4 (and 4.3 and possibly older) have a problem with dynamic_cast directly to the target class,
// so help it with an intermediate cast. I'm not sure what exactly the problem is, seems to be unrelated
// to RTLD_GLOBAL, so most probably a gcc bug.
- auto& rImport = dynamic_cast<oox::FormulaImportBase&>(
- dynamic_cast<SfxBaseModel&>(*xComponent.get()));
+ auto& rImport
+ = dynamic_cast<oox::FormulaImportBase&>(dynamic_cast<SfxBaseModel&>(*xComponent));
rImport.readFormulaOoxml(m_aMathBuffer);
auto pValue = new RTFValue(xObject);
RTFSprms aMathAttributes;
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 8988e52dd9f1..656e4c8a495e 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3448,7 +3448,7 @@ SvXMLImportContextRef SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPr
if(getSupportsMultipleContents() && dynamic_cast< SdXMLGraphicObjectShapeContext* >(xContext.get()))
{
- addContent(*mxImplContext.get());
+ addContent(*mxImplContext);
}
}
else if(getSupportsMultipleContents() && XML_NAMESPACE_DRAW == nPrefix && IsXMLToken(rLocalName, XML_IMAGE))
@@ -3460,7 +3460,7 @@ SvXMLImportContextRef SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPr
if(dynamic_cast< SdXMLGraphicObjectShapeContext* >(xContext.get()))
{
- addContent(*mxImplContext.get());
+ addContent(*mxImplContext);
}
}
else if( mbSupportsReplacement && !mxReplImplContext.is() &&
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index 177fadee8de8..7a5d0cba4292 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -426,7 +426,7 @@ void SvXMLAutoStylePoolP_Impl::AddFamily(
"Adding duplicate family " << rStrName <<
" with mismatching mapper ! " <<
typeid((*iter)->mxMapper.get()).name() << " " <<
- typeid(*rMapper.get()).name() );
+ typeid(*rMapper).name() );
}
#endif