[Libreoffice-commits] core.git: avmedia/source basctl/source basegfx/source basic/source canvas/source chart2/source cppcanvas/source cui/source dbaccess/source desktop/source drawinglayer/source filter/source include/sfx2 include/svtools include/svx include/vcl include/xmloff oox/source sc/qa sc/source sd/source sfx2/source shell/qa slideshow/source starmath/inc starmath/source svtools/source svx/source sw/inc sw/qa sw/source toolkit/source ucb/source vcl/backendtest vcl/qa vcl/source vcl/unx vcl/win vcl/workben writerfilter/source xmloff/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Jan 8 09:39:05 UTC 2019
avmedia/source/viewer/mediawindow_impl.cxx | 2
basctl/source/accessibility/accessibledialogcontrolshape.cxx | 2
basctl/source/accessibility/accessibledialogwindow.cxx | 2
basctl/source/basicide/baside2.hxx | 8
basctl/source/basicide/basides2.cxx | 2
basctl/source/basicide/basides3.cxx | 2
basctl/source/basicide/layout.cxx | 2
basegfx/source/tools/systemdependentdata.cxx | 2
basic/source/sbx/sbxexec.cxx | 2
basic/source/uno/scriptcont.cxx | 2
canvas/source/cairo/cairo_canvashelper_text.cxx | 2
canvas/source/cairo/cairo_textlayout.cxx | 2
canvas/source/directx/dx_canvasbitmap.cxx | 2
canvas/source/directx/dx_canvascustomsprite.cxx | 2
canvas/source/opengl/ogl_canvasbitmap.cxx | 2
canvas/source/opengl/ogl_canvascustomsprite.cxx | 2
canvas/source/vcl/backbuffer.cxx | 4
canvas/source/vcl/canvashelper_texturefill.cxx | 2
canvas/source/vcl/devicehelper.cxx | 4
canvas/source/vcl/spritecanvashelper.cxx | 4
canvas/source/vcl/textlayout.cxx | 6
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 2
chart2/source/controller/dialogs/res_LegendPosition.cxx | 2
chart2/source/controller/main/ChartController.cxx | 2
chart2/source/controller/main/ChartController_Tools.cxx | 2
chart2/source/controller/main/ControllerCommandDispatch.cxx | 4
chart2/source/tools/InternalDataProvider.cxx | 2
chart2/source/view/axes/VCartesianCoordinateSystem.cxx | 2
chart2/source/view/axes/VPolarCoordinateSystem.cxx | 2
cppcanvas/source/mtfrenderer/implrenderer.cxx | 4
cui/source/customize/SvxToolbarConfigPage.cxx | 12 -
cui/source/inc/headertablistbox.hxx | 4
cui/source/tabpages/grfpage.cxx | 2
dbaccess/source/core/dataaccess/ModelImpl.cxx | 2
dbaccess/source/ui/browser/genericcontroller.cxx | 2
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2
dbaccess/source/ui/querydesign/QueryTableView.cxx | 4
desktop/source/lib/init.cxx | 4
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 2
drawinglayer/source/tools/converters.cxx | 2
filter/source/graphicfilter/eps/eps.cxx | 2
filter/source/msfilter/mstoolbar.cxx | 4
filter/source/svg/svgfontexport.cxx | 2
include/sfx2/sidebar/TitleBar.hxx | 4
include/svtools/filectrl.hxx | 4
include/svtools/simptabl.hxx | 2
include/svx/ClassificationEditView.hxx | 2
include/svx/dlgctl3d.hxx | 2
include/svx/sdrpaintwindow.hxx | 6
include/vcl/lazydelete.hxx | 2
include/xmloff/xmlexp.hxx | 2
oox/source/ppt/pptgraphicshapecontext.cxx | 2
oox/source/ppt/pptshape.cxx | 4
oox/source/ppt/pptshapecontext.cxx | 2
oox/source/shape/ShapeContextHandler.cxx | 8
sc/qa/unit/tiledrendering/tiledrendering.cxx | 6
sc/source/core/tool/compiler.cxx | 2
sc/source/core/tool/interpr1.cxx | 4
sc/source/filter/excel/xecontent.cxx | 2
sc/source/filter/oox/workbookhelper.cxx | 2
sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx | 2
sc/source/ui/condformat/colorformat.cxx | 4
sc/source/ui/condformat/condformatdlgentry.cxx | 84 +++++-----
sc/source/ui/dbgui/csvgrid.cxx | 18 +-
sc/source/ui/dbgui/csvruler.cxx | 8
sc/source/ui/dbgui/pvfundlg.cxx | 4
sc/source/ui/formdlg/dwfunctr.cxx | 2
sc/source/ui/inc/inputwin.hxx | 2
sc/source/ui/miscdlgs/autofmt.cxx | 4
sc/source/ui/miscdlgs/crnrdlg.cxx | 6
sc/source/ui/optdlg/tpusrlst.cxx | 12 -
sc/source/ui/unoobj/cellsuno.cxx | 2
sc/source/ui/unoobj/fielduno.cxx | 2
sc/source/ui/view/tabview.cxx | 30 +--
sc/source/ui/view/tabview4.cxx | 16 -
sc/source/ui/view/tabview5.cxx | 8
sd/source/ui/animations/motionpathtag.cxx | 2
sd/source/ui/annotations/annotationtag.cxx | 2
sd/source/ui/dlg/animobjs.cxx | 2
sd/source/ui/func/fuformatpaintbrush.cxx | 2
sd/source/ui/func/fupage.cxx | 4
sd/source/ui/inc/DrawViewShell.hxx | 2
sd/source/ui/slideshow/showwin.cxx | 2
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 2
sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 4
sd/source/ui/view/viewoverlaymanager.cxx | 2
sfx2/source/appl/newhelp.hxx | 2
sfx2/source/dialog/backingwindow.cxx | 2
sfx2/source/doc/Metadatable.cxx | 2
shell/qa/zip/testzipimpl.cxx | 2
slideshow/source/engine/rehearsetimingsactivity.cxx | 2
slideshow/source/engine/shapes/viewbackgroundshape.cxx | 2
slideshow/source/engine/shapes/viewshape.cxx | 2
starmath/inc/view.hxx | 6
starmath/source/view.cxx | 4
svtools/source/contnr/imivctl1.cxx | 2
svtools/source/control/ctrlbox.cxx | 8
svtools/source/control/filectrl.cxx | 2
svtools/source/control/ruler.cxx | 34 ++--
svtools/source/control/valueset.cxx | 2
svtools/source/misc/sampletext.cxx | 2
svx/source/accessibility/AccessibleTextHelper.cxx | 2
svx/source/dialog/framelinkarray.cxx | 8
svx/source/dialog/frmsel.cxx | 2
svx/source/dialog/svxruler.cxx | 4
svx/source/fmcomp/gridctrl.cxx | 4
svx/source/sdr/attribute/sdrallfillattributeshelper.cxx | 8
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 8
svx/source/svdraw/sdrpaintwindow.cxx | 2
svx/source/svdraw/svddrgv.cxx | 2
svx/source/svdraw/svdhdl.cxx | 24 +-
svx/source/svdraw/svdograf.cxx | 2
svx/source/svdraw/svdxcgv.cxx | 4
svx/source/table/tablehandles.cxx | 6
svx/source/table/tableundo.cxx | 4
svx/source/unodraw/UnoGraphicExporter.cxx | 2
svx/source/unodraw/unoshape.cxx | 2
svx/source/xoutdev/xtabdash.cxx | 2
svx/source/xoutdev/xtabgrdt.cxx | 2
svx/source/xoutdev/xtabhtch.cxx | 2
svx/source/xoutdev/xtablend.cxx | 2
sw/inc/doc.hxx | 4
sw/qa/extras/tiledrendering/tiledrendering.cxx | 2
sw/source/core/doc/DocumentDeviceManager.cxx | 2
sw/source/core/unocore/unochart.cxx | 2
sw/source/core/unocore/unostyle.cxx | 4
sw/source/core/unocore/unotbl.cxx | 8
sw/source/core/unocore/unotext.cxx | 4
sw/source/filter/html/htmlatr.cxx | 2
sw/source/filter/ww8/ww8toolbar.cxx | 2
sw/source/ui/envelp/label1.cxx | 6
sw/source/ui/vba/vbafield.cxx | 2
sw/source/ui/vba/vbalistformat.cxx | 2
sw/source/uibase/app/docst.cxx | 2
sw/source/uibase/app/docstyle.cxx | 3
sw/source/uibase/misc/swruler.cxx | 4
sw/source/uibase/sidebar/PageSizeControl.cxx | 2
sw/source/uibase/sidebar/StylePresetsPanel.cxx | 6
toolkit/source/awt/vclxaccessiblecomponent.cxx | 2
ucb/source/ucp/webdav/webdavcontent.cxx | 40 ++--
vcl/backendtest/VisualBackendTest.cxx | 2
vcl/backendtest/outputdevice/outputdevice.cxx | 2
vcl/qa/cppunit/svm/svmtest.cxx | 48 ++---
vcl/source/gdi/gdimtf.cxx | 4
vcl/source/gdi/impanmvw.cxx | 2
vcl/source/gdi/impgraph.cxx | 2
vcl/source/gdi/print2.cxx | 18 +-
vcl/source/graphic/GraphicObject2.cxx | 4
vcl/source/graphic/Manager.cxx | 2
vcl/source/image/ImplImageTree.cxx | 2
vcl/source/uitest/uiobject.cxx | 2
vcl/unx/generic/gdi/salgdi.cxx | 2
vcl/win/gdi/gdiimpl.cxx | 4
vcl/win/gdi/salgdi2.cxx | 10 -
vcl/workben/vcldemo.cxx | 2
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 8
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 6
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4
xmloff/source/draw/ximpshap.cxx | 4
xmloff/source/style/impastpl.cxx | 2
161 files changed, 402 insertions(+), 403 deletions(-)
New commits:
commit 17dd2662ccfa9d04efbea74e5d7548db5b2126d4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Jan 7 13:52:59 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Jan 8 10:38:35 2019 +0100
convert "*xxx.get()" to "*xxx"
Change-Id: Ic307226591ff9702957ccdec486ccf70357eb6d9
Reviewed-on: https://gerrit.libreoffice.org/65951
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
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)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list