[Libreoffice-commits] core.git: 2 commits - accessibility/source avmedia/source basctl/source basic/source binaryurp/source canvas/source chart2/qa chart2/source codemaker/source comphelper/source configmgr/source connectivity/source cppuhelper/source cui/source dbaccess/source desktop/source drawinglayer/source editeng/qa editeng/source extensions/source filter/source forms/source formula/source i18npool/source l10ntools/source linguistic/source lotuswordpro/source oox/source package/source reportdesign/source salhelper/qa sax/source sc/qa scripting/source sc/source sdext/source sd/source sfx2/source slideshow/source starmath/source stoc/source store/source svl/source svtools/source svx/source sw/source toolkit/source ucb/source unoidl/source unoxml/source vcl/opengl vcl/source vcl/unx writerfilter/source writerperfect/qa xmloff/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Oct 17 06:27:00 UTC 2018
accessibility/source/extended/textwindowaccessibility.cxx | 4
avmedia/source/viewer/mediawindow.cxx | 4
avmedia/source/vlc/wrapper/Common.cxx | 2
avmedia/source/vlc/wrapper/EventManager.cxx | 2
avmedia/source/vlc/wrapper/Instance.cxx | 2
avmedia/source/vlc/wrapper/Media.cxx | 2
avmedia/source/vlc/wrapper/Player.cxx | 2
basctl/source/basicide/basides1.cxx | 4
basctl/source/basicide/doceventnotifier.cxx | 2
basctl/source/basicide/scriptdocument.cxx | 2
basic/source/basmgr/basmgr.cxx | 2
basic/source/classes/sbxmod.cxx | 2
binaryurp/source/bridge.cxx | 3
canvas/source/tools/elapsedtime.cxx | 3
canvas/source/tools/propertysethelper.cxx | 10
chart2/qa/extras/chart2export.cxx | 4
chart2/source/controller/dialogs/DataBrowser.cxx | 8
chart2/source/controller/dialogs/DataBrowserModel.cxx | 10
chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx | 2
chart2/source/controller/dialogs/res_ErrorBar.cxx | 14 -
chart2/source/controller/dialogs/tp_ChartType.cxx | 2
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx | 2
chart2/source/controller/main/ChartController_TextEdit.cxx | 7
chart2/source/controller/main/ChartController_Tools.cxx | 2
chart2/source/controller/main/ChartController_Window.cxx | 8
chart2/source/controller/main/ControllerCommandDispatch.cxx | 4
chart2/source/controller/sidebar/ChartAxisPanel.cxx | 6
chart2/source/controller/sidebar/ChartErrorBarPanel.cxx | 6
chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 6
chart2/source/model/main/ChartModel_Persistence.cxx | 6
chart2/source/tools/ConfigColorScheme.cxx | 6
chart2/source/tools/OPropertySet.cxx | 4
chart2/source/view/axes/VCartesianAxis.cxx | 20 -
chart2/source/view/axes/VCartesianGrid.cxx | 2
chart2/source/view/charttypes/VSeriesPlotter.cxx | 8
chart2/source/view/main/VDataSeries.cxx | 2
codemaker/source/codemaker/typemanager.cxx | 3
codemaker/source/cppumaker/cpputype.cxx | 16 -
codemaker/source/javamaker/javatype.cxx | 22 -
comphelper/source/container/enumerablemap.cxx | 4
comphelper/source/property/opropertybag.cxx | 2
configmgr/source/childaccess.cxx | 6
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 2
connectivity/source/commontools/paramwrapper.cxx | 2
connectivity/source/drivers/hsqldb/HDriver.cxx | 2
connectivity/source/drivers/jdbc/JConnection.cxx | 2
connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx | 34 +-
connectivity/source/drivers/mysqlc/mysqlc_types.cxx | 2
connectivity/source/drivers/mysqlc/mysqlc_types.hxx | 2
connectivity/source/drivers/odbc/OConnection.cxx | 2
connectivity/source/drivers/postgresql/pq_connection.cxx | 2
connectivity/source/parse/sqliterator.cxx | 2
connectivity/source/parse/sqlnode.cxx | 2
cppuhelper/source/factory.cxx | 4
cppuhelper/source/servicemanager.cxx | 10
cui/source/dialogs/SpellDialog.cxx | 2
dbaccess/source/core/api/KeySet.cxx | 3
dbaccess/source/core/api/RowSet.cxx | 4
dbaccess/source/core/api/RowSetBase.cxx | 6
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 7
dbaccess/source/filter/xml/xmlExport.cxx | 2
dbaccess/source/filter/xml/xmlHelper.cxx | 2
dbaccess/source/filter/xml/xmlfilter.cxx | 22 -
dbaccess/source/ui/control/RelationControl.cxx | 2
dbaccess/source/ui/dlg/adtabdlg.cxx | 2
dbaccess/source/ui/misc/DExport.cxx | 2
dbaccess/source/ui/misc/controllerframe.cxx | 2
dbaccess/source/ui/querydesign/JoinController.cxx | 2
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 10
dbaccess/source/ui/querydesign/querycontroller.cxx | 2
desktop/source/deployment/gui/dp_gui_service.cxx | 3
desktop/source/deployment/registry/component/dp_component.cxx | 8
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 12
desktop/source/deployment/registry/executable/dp_executable.cxx | 8
desktop/source/deployment/registry/help/dp_help.cxx | 12
desktop/source/deployment/registry/package/dp_package.cxx | 8
desktop/source/deployment/registry/script/dp_script.cxx | 8
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 16 -
drawinglayer/source/tools/wmfemfhelper.cxx | 4
editeng/qa/unit/core-test.cxx | 6
editeng/source/editeng/editdoc.cxx | 12
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/editobj.cxx | 18 -
editeng/source/editeng/editundo.cxx | 2
editeng/source/editeng/fieldupdater.cxx | 4
editeng/source/editeng/impedit2.cxx | 6
editeng/source/editeng/impedit5.cxx | 6
editeng/source/items/xmlcnitm.cxx | 6
editeng/source/uno/unoedprx.cxx | 4
extensions/source/bibliography/bibconfig.cxx | 2
extensions/source/logging/filehandler.cxx | 4
extensions/source/propctrlr/cellbindinghandler.cxx | 25 +
extensions/source/propctrlr/eformspropertyhandler.cxx | 46 +--
extensions/source/propctrlr/formcomponenthandler.cxx | 3
extensions/source/propctrlr/inspectormodelbase.cxx | 2
extensions/source/propctrlr/propcontroller.cxx | 2
extensions/source/propctrlr/propertycomposer.cxx | 10
extensions/source/propctrlr/submissionhandler.cxx | 35 +-
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 45 +--
extensions/source/scanner/sanedlg.cxx | 2
extensions/source/update/check/updatecheckjob.cxx | 2
filter/source/msfilter/eschesdo.cxx | 4
filter/source/msfilter/mstoolbar.cxx | 4
filter/source/svg/svgfilter.cxx | 9
filter/source/svg/svgwriter.cxx | 16 -
forms/source/component/ComboBox.cxx | 10
forms/source/component/Edit.cxx | 10
forms/source/component/ImageControl.cxx | 2
forms/source/component/Pattern.cxx | 10
forms/source/misc/InterfaceContainer.cxx | 25 +
forms/source/richtext/richtextcontrol.cxx | 4
forms/source/richtext/richtextmodel.cxx | 10
forms/source/xforms/datatypes.cxx | 2
forms/source/xforms/propertysetbase.cxx | 3
formula/source/ui/dlg/formula.cxx | 4
i18npool/source/localedata/localedata.cxx | 2
i18npool/source/transliteration/ignoreKana.cxx | 2
i18npool/source/transliteration/ignoreSize_ja_JP.cxx | 2
i18npool/source/transliteration/ignoreWidth.cxx | 2
l10ntools/source/helpmerge.cxx | 2
linguistic/source/convdic.cxx | 18 -
linguistic/source/convdicxml.cxx | 2
linguistic/source/lngsvcmgr.cxx | 2
lotuswordpro/source/filter/lwpfilter.cxx | 2
lotuswordpro/source/filter/lwplayout.cxx | 6
lotuswordpro/source/filter/lwptablelayout.cxx | 2
oox/source/drawingml/texteffectscontext.cxx | 2
oox/source/vml/vmldrawing.cxx | 2
package/source/xstor/xstorage.cxx | 4
reportdesign/source/core/api/Shape.cxx | 2
reportdesign/source/core/sdr/RptObject.cxx | 4
reportdesign/source/filter/xml/xmlfilter.cxx | 28 +-
reportdesign/source/ui/report/ReportController.cxx | 2
reportdesign/source/ui/report/ReportSection.cxx | 2
salhelper/qa/test_api.cxx | 2
sax/source/fastparser/legacyfastparser.cxx | 4
sc/qa/unit/subsequent_filters-test.cxx | 8
sc/qa/unit/ucalc_condformat.cxx | 2
sc/qa/unit/ucalc_formula.cxx | 4
sc/source/core/data/cellvalues.cxx | 4
sc/source/core/data/colorscale.cxx | 2
sc/source/core/data/documen3.cxx | 8
sc/source/core/data/documen5.cxx | 2
sc/source/core/data/documen8.cxx | 6
sc/source/core/data/document.cxx | 2
sc/source/core/data/dpobject.cxx | 16 -
sc/source/core/data/dptabsrc.cxx | 2
sc/source/core/data/markdata.cxx | 11
sc/source/core/data/pivot2.cxx | 2
sc/source/core/data/postit.cxx | 4
sc/source/core/data/simpleformulacalc.cxx | 2
sc/source/core/tool/cellkeytranslator.cxx | 2
sc/source/core/tool/chartlis.cxx | 8
sc/source/core/tool/chartlock.cxx | 4
sc/source/core/tool/interpr1.cxx | 14 -
sc/source/core/tool/interpr4.cxx | 2
sc/source/core/tool/rangenam.cxx | 2
sc/source/core/tool/userlist.cxx | 8
sc/source/filter/excel/excel.cxx | 2
sc/source/filter/excel/tokstack.cxx | 2
sc/source/filter/excel/xecontent.cxx | 10
sc/source/filter/excel/xeextlst.cxx | 8
sc/source/filter/excel/xename.cxx | 7
sc/source/filter/excel/xicontent.cxx | 10
sc/source/filter/excel/xihelper.cxx | 2
sc/source/filter/oox/condformatbuffer.cxx | 8
sc/source/filter/oox/extlstcontext.cxx | 2
sc/source/filter/oox/worksheetfragment.cxx | 2
sc/source/filter/rtf/rtfparse.cxx | 2
sc/source/filter/xcl97/xcl97esc.cxx | 2
sc/source/filter/xml/xmlcelli.cxx | 8
sc/source/filter/xml/xmldrani.cxx | 6
sc/source/filter/xml/xmltabi.cxx | 6
sc/source/ui/Accessibility/AccessibleText.cxx | 8
sc/source/ui/app/inputwin.cxx | 5
sc/source/ui/condformat/condformatdlgentry.cxx | 2
sc/source/ui/dbgui/validate.cxx | 2
sc/source/ui/docshell/docfunc.cxx | 2
sc/source/ui/docshell/externalrefmgr.cxx | 4
sc/source/ui/miscdlgs/anyrefdg.cxx | 2
sc/source/ui/unoobj/cellsuno.cxx | 2
sc/source/ui/unoobj/chart2uno.cxx | 10
sc/source/ui/unoobj/notesuno.cxx | 2
sc/source/ui/view/gridwin.cxx | 4
sc/source/ui/view/spelldialog.cxx | 3
sc/source/ui/view/tabview3.cxx | 5
scripting/source/dlgprov/dlgprov.cxx | 12
sd/source/core/sdpage_animations.cxx | 2
sd/source/core/stlfamily.cxx | 3
sd/source/core/stlsheet.cxx | 2
sd/source/filter/eppt/epptso.cxx | 8
sd/source/filter/html/pubdlg.cxx | 2
sd/source/filter/ppt/propread.cxx | 6
sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx | 6
sd/source/ui/annotations/annotationmanager.cxx | 4
sd/source/ui/annotations/annotationwindow.cxx | 2
sd/source/ui/app/sdmod1.cxx | 2
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx | 2
sd/source/ui/framework/configuration/ConfigurationController.cxx | 22 -
sd/source/ui/framework/configuration/ResourceId.cxx | 2
sd/source/ui/framework/factories/BasicPaneFactory.cxx | 2
sd/source/ui/framework/factories/BasicViewFactory.cxx | 8
sd/source/ui/framework/factories/ChildWindowPane.cxx | 2
sd/source/ui/framework/factories/ViewShellWrapper.cxx | 2
sd/source/ui/framework/module/CenterViewFocusModule.cxx | 2
sd/source/ui/framework/module/ShellStackGuard.cxx | 4
sd/source/ui/framework/tools/FrameworkHelper.cxx | 2
sd/source/ui/func/fuformatpaintbrush.cxx | 2
sd/source/ui/func/fupage.cxx | 4
sd/source/ui/presenter/PresenterCanvas.cxx | 2
sd/source/ui/presenter/PresenterPreviewCache.cxx | 12
sd/source/ui/presenter/PresenterTextView.cxx | 3
sd/source/ui/sidebar/MasterPageContainer.cxx | 12
sd/source/ui/sidebar/MasterPageContainerFiller.cxx | 4
sd/source/ui/sidebar/MasterPageContainerQueue.cxx | 6
sd/source/ui/sidebar/MasterPageDescriptor.cxx | 45 +--
sd/source/ui/slideshow/slideshow.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 5
sd/source/ui/slideshow/slideshowviewimpl.cxx | 42 +--
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 12
sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx | 18 -
sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx | 10
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 3
sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx | 4
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 24 -
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 2
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 4
sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 2
sd/source/ui/slidesorter/shell/SlideSorter.cxx | 3
sd/source/ui/slidesorter/shell/SlideSorterService.cxx | 54 +--
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 8
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 7
sd/source/ui/tools/PreviewRenderer.cxx | 4
sd/source/ui/tools/TimerBasedTaskExecution.cxx | 4
sd/source/ui/unoidl/DrawController.cxx | 4
sd/source/ui/unoidl/facreg.cxx | 2
sd/source/ui/view/Outliner.cxx | 20 -
sd/source/ui/view/ToolBarManager.cxx | 42 +--
sd/source/ui/view/ViewShellBase.cxx | 28 +-
sd/source/ui/view/ViewShellImplementation.cxx | 2
sd/source/ui/view/drviews7.cxx | 2
sd/source/ui/view/drviewsa.cxx | 4
sd/source/ui/view/outlview.cxx | 8
sd/source/ui/view/viewshe2.cxx | 2
sd/source/ui/view/viewshel.cxx | 4
sdext/source/presenter/PresenterBitmapContainer.cxx | 4
sdext/source/presenter/PresenterButton.cxx | 4
sdext/source/presenter/PresenterController.cxx | 8
sdext/source/presenter/PresenterNotesView.cxx | 2
sdext/source/presenter/PresenterPaneBase.cxx | 2
sdext/source/presenter/PresenterPaneBorderPainter.cxx | 35 +-
sdext/source/presenter/PresenterPaneFactory.cxx | 6
sdext/source/presenter/PresenterProtocolHandler.cxx | 6
sdext/source/presenter/PresenterScrollBar.cxx | 6
sdext/source/presenter/PresenterSlideShowView.cxx | 2
sdext/source/presenter/PresenterSlideSorter.cxx | 16 -
sdext/source/presenter/PresenterTheme.cxx | 68 ++--
sdext/source/presenter/PresenterTimer.cxx | 2
sdext/source/presenter/PresenterToolBar.cxx | 23 -
sdext/source/presenter/PresenterViewFactory.cxx | 6
sdext/source/presenter/PresenterWindowManager.cxx | 4
sfx2/source/bastyp/fltfnc.cxx | 2
sfx2/source/dialog/filedlghelper.cxx | 12
sfx2/source/dialog/securitypage.cxx | 8
sfx2/source/doc/graphhelp.cxx | 2
sfx2/source/doc/objstor.cxx | 2
sfx2/source/doc/objxtor.cxx | 2
sfx2/source/view/viewsh.cxx | 2
slideshow/source/engine/transitions/slidetransitionfactory.cxx | 2
starmath/source/accessibility.cxx | 4
starmath/source/document.cxx | 5
stoc/source/security/access_controller.cxx | 6
store/source/stortree.cxx | 2
svl/source/items/style.cxx | 8
svl/source/items/stylepool.cxx | 3
svtools/source/contnr/fileview.cxx | 3
svtools/source/control/ruler.cxx | 6
svtools/source/control/valueset.cxx | 36 +-
svtools/source/misc/dialogcontrolling.cxx | 3
svtools/source/misc/svtaccessiblefactory.cxx | 4
svx/source/accessibility/AccessibleEmptyEditSource.cxx | 12
svx/source/accessibility/AccessibleTextHelper.cxx | 2
svx/source/dialog/svxruler.cxx | 137 ++++------
svx/source/fmcomp/fmgridcl.cxx | 2
svx/source/fmcomp/gridcell.cxx | 6
svx/source/form/fmvwimp.cxx | 8
svx/source/form/formcontroller.cxx | 6
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 4
svx/source/sidebar/line/LinePropertyPanelBase.cxx | 6
svx/source/svdraw/svdograf.cxx | 2
svx/source/svdraw/svdpage.cxx | 17 -
svx/source/tbxctrls/tbcontrl.cxx | 4
svx/source/unodraw/unoshtxt.cxx | 4
sw/source/core/bastyp/calc.cxx | 4
sw/source/core/crsr/findattr.cxx | 5
sw/source/core/crsr/findtxt.cxx | 7
sw/source/core/doc/docfly.cxx | 2
sw/source/core/doc/docnew.cxx | 2
sw/source/core/doc/tblcpy.cxx | 2
sw/source/core/docnode/ndtbl.cxx | 4
sw/source/core/frmedt/fecopy.cxx | 2
sw/source/core/graphic/ndgrf.cxx | 2
sw/source/core/table/swnewtable.cxx | 2
sw/source/core/txtnode/atrfld.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 4
sw/source/core/txtnode/thints.cxx | 4
sw/source/core/undo/rolbck.cxx | 10
sw/source/core/undo/unattr.cxx | 19 -
sw/source/core/undo/unsect.cxx | 20 -
sw/source/core/undo/untbl.cxx | 4
sw/source/core/unocore/unofield.cxx | 2
sw/source/core/unocore/unoobj.cxx | 10
sw/source/core/unocore/unorefmk.cxx | 4
sw/source/core/unocore/unosect.cxx | 52 +--
sw/source/core/view/vnew.cxx | 5
sw/source/filter/html/htmlatr.cxx | 6
sw/source/filter/html/htmltab.cxx | 2
sw/source/filter/writer/writer.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 12
sw/source/filter/ww8/ww8par2.cxx | 8
sw/source/filter/ww8/ww8par4.cxx | 2
sw/source/filter/ww8/ww8par6.cxx | 4
sw/source/filter/ww8/ww8toolbar.cxx | 2
sw/source/filter/xml/xmlexp.cxx | 2
sw/source/ui/chrdlg/numpara.cxx | 2
sw/source/ui/dialog/uiregionsw.cxx | 3
sw/source/uibase/app/docsh.cxx | 2
sw/source/uibase/app/docsh2.cxx | 5
sw/source/uibase/app/docshini.cxx | 17 -
sw/source/uibase/app/docst.cxx | 4
sw/source/uibase/app/docstyle.cxx | 2
sw/source/uibase/app/swdll.cxx | 2
sw/source/uibase/dialog/regionsw.cxx | 2
sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 4
sw/source/uibase/misc/glosdoc.cxx | 2
sw/source/uibase/shells/txtcrsr.cxx | 2
sw/source/uibase/wrtsh/navmgr.cxx | 4
sw/source/uibase/wrtsh/wrtsh1.cxx | 2
toolkit/source/controls/grid/sortablegriddatamodel.cxx | 3
toolkit/source/controls/unocontrolmodel.cxx | 4
toolkit/source/helper/accessibilityclient.cxx | 4
toolkit/source/helper/formpdfexport.cxx | 2
ucb/source/ucp/cmis/std_inputstream.cxx | 12
ucb/source/ucp/cmis/std_outputstream.cxx | 8
ucb/source/ucp/webdav-neon/ContentProperties.cxx | 11
ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx | 8
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 112 +++-----
ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx | 9
unoidl/source/sourcefileprovider.cxx | 2
unoidl/source/unoidl-check.cxx | 7
unoxml/source/dom/attr.cxx | 24 +
vcl/opengl/PackedTextureAtlas.cxx | 6
vcl/opengl/salbmp.cxx | 4
vcl/source/filter/jpeg/jpegc.cxx | 2
vcl/source/gdi/gfxlink.cxx | 3
vcl/source/graphic/UnoGraphicObject.cxx | 4
vcl/source/window/window.cxx | 2
vcl/unx/generic/dtrans/X11_clipboard.cxx | 6
vcl/unx/generic/gdi/salgdi2.cxx | 8
writerfilter/source/dmapper/DomainMapper.cxx | 4
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 2
writerfilter/source/dmapper/NumberingManager.cxx | 2
writerperfect/qa/unit/DirectoryStreamTest.cxx | 2
xmloff/source/chart/SchXMLExport.cxx | 13
xmloff/source/chart/SchXMLImport.cxx | 19 -
xmloff/source/core/xmlexp.cxx | 4
xmloff/source/core/xmlimp.cxx | 10
xmloff/source/style/PageMasterImportPropMapper.cxx | 6
xmloff/source/style/impastpl.cxx | 24 -
xmloff/source/text/XMLPropertyBackpatcher.cxx | 6
xmloff/source/text/txtimp.cxx | 26 -
xmloff/source/text/txtimppr.cxx | 4
xmloff/source/text/txtparai.cxx | 28 --
374 files changed, 1405 insertions(+), 1417 deletions(-)
New commits:
commit ccb2a1f650bc505f8a4f1abebf8ce4f9396562a8
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Oct 16 15:23:12 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Oct 17 08:25:47 2018 +0200
clang-tidy readability-redundant-smartptr-get
redundant get() call on smart pointer
Change-Id: Icb5a03bbc15e79a30d3d135a507d22914d15c2bd
Reviewed-on: https://gerrit.libreoffice.org/61837
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 853d944864fd..c430df21e7f3 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1421,7 +1421,7 @@ void SAL_CALL Document::disposing()
{
m_aEngineListener.endListening();
m_aViewListener.endListening();
- if (m_xParagraphs.get() != nullptr)
+ if (m_xParagraphs != nullptr)
disposeParagraphs();
VCLXAccessibleComponent::disposing();
}
@@ -1609,7 +1609,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void)
void Document::init()
{
- if (m_xParagraphs.get() == nullptr)
+ if (m_xParagraphs == nullptr)
{
const sal_uInt32 nCount = m_rEngine.GetParagraphCount();
m_xParagraphs.reset(new Paragraphs);
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 03dadbee4fb3..861c7d377c93 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -397,13 +397,13 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL
}
}
- if( !xRet.is() && !xGraphic.get() )
+ if (!xRet.is() && !xGraphic)
{
const BitmapEx aBmpEx(AVMEDIA_BMP_EMPTYLOGO);
xGraphic.reset( new Graphic( aBmpEx ) );
}
- if( xGraphic.get() )
+ if (xGraphic)
xRet = xGraphic->GetXGraphic();
return xRet;
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 9cef7bdd41ec..007269ec71ad 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -631,14 +631,14 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
}
const SfxUnoAnyItem* pDocModelItem = rReq.GetArg<SfxUnoAnyItem>(SID_BASICIDE_ARG_DOCUMENT_MODEL);
- if ( !pDocument.get() && pDocModelItem )
+ if (!pDocument && pDocModelItem)
{
uno::Reference< frame::XModel > xModel( pDocModelItem->GetValue(), UNO_QUERY );
if ( xModel.is() )
pDocument.reset( new ScriptDocument( xModel ) );
}
- if ( !pDocument.get() )
+ if (!pDocument)
break;
const SfxStringItem* pLibNameItem = rReq.GetArg<SfxStringItem>(SID_BASICIDE_ARG_LIBNAME);
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 9a2a040a3a5d..ac990c66890d 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -302,7 +302,7 @@ namespace basctl
m_xDocModify.clear();
m_xScriptAccess.clear();
- if ( m_pDocListener.get() )
+ if (m_pDocListener)
m_pDocListener->dispose();
}
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 3dedac41d42a..f1ad7192aabf 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -1013,7 +1013,7 @@ void BasicManager::CheckModules( StarBASIC* pLib, bool bReference )
for ( const auto& pModule: pLib->GetModules() )
{
- DBG_ASSERT( pModule.get(), "Module not received!" );
+ DBG_ASSERT(pModule, "Module not received!");
if ( !pModule->IsCompiled() && !StarBASIC::GetErrorCode() )
{
pModule->Compile();
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index c9663ef08bd0..c4a3267e1f56 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2546,7 +2546,7 @@ void SbUserFormModule::Unload()
m_xDialog.clear(); //release ref to the uno object
SbxValues aVals;
bool bWaitForDispose = true; // assume dialog is showing
- if ( m_DialogListener.get() )
+ if (m_DialogListener)
{
bWaitForDispose = m_DialogListener->isShowing();
SAL_INFO("basic", "Showing " << bWaitForDispose );
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index d1c7256c6ad5..04f9ae5df2dc 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -607,7 +607,8 @@ bool Bridge::makeCall(
decrementActiveCalls();
decrementCalls();
}
- if (resp.get() == nullptr) {
+ if (resp == nullptr)
+ {
throw css::lang::DisposedException(
"Binary URP bridge disposed during call",
static_cast< cppu::OWeakObject * >(this));
diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx
index 6cb7fd546a8e..b03a85847313 100644
--- a/canvas/source/tools/elapsedtime.cxx
+++ b/canvas/source/tools/elapsedtime.cxx
@@ -78,8 +78,7 @@ void ElapsedTime::adjustTimer( double fOffset )
double ElapsedTime::getCurrentTime() const
{
- return m_pTimeBase.get() == nullptr
- ? getSystemTime() : m_pTimeBase->getElapsedTimeImpl();
+ return m_pTimeBase == nullptr ? getSystemTime() : m_pTimeBase->getElapsedTimeImpl();
}
double ElapsedTime::getElapsedTime() const
diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx
index 7fdc153bb5cd..35b67e03e3f0 100644
--- a/canvas/source/tools/propertysethelper.cxx
+++ b/canvas/source/tools/propertysethelper.cxx
@@ -86,7 +86,7 @@ namespace canvas
bool PropertySetHelper::isPropertyName( const OUString& aPropertyName ) const
{
- if( !mpMap.get() )
+ if (!mpMap)
return false;
Callbacks aDummy;
@@ -104,9 +104,7 @@ namespace canvas
const uno::Any& aValue )
{
Callbacks aCallbacks;
- if( !mpMap.get() ||
- !mpMap->lookup( aPropertyName,
- aCallbacks ) )
+ if (!mpMap || !mpMap->lookup(aPropertyName, aCallbacks))
{
throwUnknown( aPropertyName );
}
@@ -120,9 +118,7 @@ namespace canvas
uno::Any PropertySetHelper::getPropertyValue( const OUString& aPropertyName ) const
{
Callbacks aCallbacks;
- if( !mpMap.get() ||
- !mpMap->lookup( aPropertyName,
- aCallbacks ) )
+ if (!mpMap || !mpMap->lookup(aPropertyName, aCallbacks))
{
throwUnknown( aPropertyName );
}
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 9f82483f5e66..b828828a546f 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -558,7 +558,7 @@ void DataBrowser::clearHeaders()
void DataBrowser::RenewTable()
{
- if( ! m_apDataBrowserModel.get())
+ if (!m_apDataBrowserModel)
return;
long nOldRow = GetCurRow();
@@ -636,7 +636,7 @@ void DataBrowser::RenewTable()
OUString DataBrowser::GetColString( sal_Int32 nColumnId ) const
{
- OSL_ASSERT( m_apDataBrowserModel.get());
+ OSL_ASSERT(m_apDataBrowserModel);
if( nColumnId > 0 )
return m_apDataBrowserModel->getRoleOfColumn( nColumnId - 1 );
return OUString();
@@ -1119,14 +1119,14 @@ void DataBrowser::InitController(
bool DataBrowser::CellContainsNumbers( sal_uInt16 nCol ) const
{
- if( ! m_apDataBrowserModel.get())
+ if (!m_apDataBrowserModel)
return false;
return m_apDataBrowserModel->getCellType( lcl_getColumnInData( nCol )) == DataBrowserModel::NUMBER;
}
sal_uInt32 DataBrowser::GetNumberFormatKey( sal_uInt16 nCol ) const
{
- if( ! m_apDataBrowserModel.get())
+ if (!m_apDataBrowserModel)
return 0;
return m_apDataBrowserModel->getNumberFormatKey( lcl_getColumnInData( nCol ) );
}
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 10af6e5cbf4c..15e1d00c307b 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -279,7 +279,7 @@ private:
void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
{
- OSL_ASSERT( m_apDialogModel.get());
+ OSL_ASSERT(m_apDialogModel);
Reference< chart2::XInternalDataProvider > xDataProvider(
m_apDialogModel->getDataProvider(), uno::UNO_QUERY );
@@ -400,7 +400,7 @@ void DataBrowserModel::insertComplexCategoryLevel( sal_Int32 nAfterColumnIndex )
{
//create a new text column for complex categories
- OSL_ASSERT( m_apDialogModel.get());
+ OSL_ASSERT(m_apDialogModel);
Reference< chart2::XInternalDataProvider > xDataProvider( m_apDialogModel->getDataProvider(), uno::UNO_QUERY );
if (!xDataProvider.is())
return;
@@ -438,7 +438,7 @@ void DataBrowserModel::removeComplexCategoryLevel( sal_Int32 nAtColumnIndex )
void DataBrowserModel::removeDataSeriesOrComplexCategoryLevel( sal_Int32 nAtColumnIndex )
{
- OSL_ASSERT( m_apDialogModel.get());
+ OSL_ASSERT(m_apDialogModel);
if (nAtColumnIndex < 0 || static_cast<size_t>(nAtColumnIndex) >= m_aColumns.size())
// Out of bound.
return;
@@ -507,7 +507,7 @@ void DataBrowserModel::removeDataSeriesOrComplexCategoryLevel( sal_Int32 nAtColu
void DataBrowserModel::swapDataSeries( sal_Int32 nFirstColumnIndex )
{
- OSL_ASSERT( m_apDialogModel.get());
+ OSL_ASSERT(m_apDialogModel);
if( static_cast< tDataColumnVector::size_type >( nFirstColumnIndex ) < m_aColumns.size() - 1 )
{
Reference< chart2::XDataSeries > xSeries( m_aColumns[nFirstColumnIndex].m_xDataSeries );
@@ -521,7 +521,7 @@ void DataBrowserModel::swapDataSeries( sal_Int32 nFirstColumnIndex )
void DataBrowserModel::swapDataPointForAllSeries( sal_Int32 nFirstIndex )
{
- OSL_ASSERT( m_apDialogModel.get());
+ OSL_ASSERT(m_apDialogModel);
Reference< chart2::XInternalDataProvider > xDataProvider(
m_apDialogModel->getDataProvider(), uno::UNO_QUERY );
// lockControllers
diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
index 639fd1afe55c..55273a76fd3c 100644
--- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
+++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
@@ -42,7 +42,7 @@ TimerTriggeredControllerLock::~TimerTriggeredControllerLock()
void TimerTriggeredControllerLock::startTimer()
{
- if(!m_apControllerLockGuard.get())
+ if (!m_apControllerLockGuard)
m_apControllerLockGuard.reset( new ControllerLockGuardUNO(m_xModel) );
m_aTimer.Start();
}
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index ea7f55413225..9d958a582e86 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -192,7 +192,7 @@ void ErrorBarResources::SetChartDocumentForRangeChoosing(
m_apRangeSelectionHelper.reset( new RangeSelectionHelper( xChartDocument ));
// has internal data provider => rename "cell range" to "from data"
- OSL_ASSERT( m_apRangeSelectionHelper.get());
+ OSL_ASSERT(m_apRangeSelectionHelper);
if( m_bHasInternalDataProvider )
{
m_xRbRange->set_label(m_xUIStringRbRange->get_label());
@@ -435,8 +435,8 @@ IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged, weld::ToggleButton&, void)
IMPL_LINK(ErrorBarResources, ChooseRange, weld::Button&, rButton, void)
{
- OSL_ASSERT( m_apRangeSelectionHelper.get());
- if( ! m_apRangeSelectionHelper.get())
+ OSL_ASSERT(m_apRangeSelectionHelper);
+ if (!m_apRangeSelectionHelper)
return;
OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr );
@@ -665,8 +665,8 @@ void ErrorBarResources::FillValueSets()
void ErrorBarResources::listeningFinished(
const OUString & rNewRange )
{
- OSL_ASSERT( m_apRangeSelectionHelper.get());
- if( ! m_apRangeSelectionHelper.get())
+ OSL_ASSERT(m_apRangeSelectionHelper);
+ if (!m_apRangeSelectionHelper)
return;
// rNewRange becomes invalid after removing the listener
@@ -697,8 +697,8 @@ void ErrorBarResources::listeningFinished(
void ErrorBarResources::disposingRangeSelection()
{
- OSL_ASSERT( m_apRangeSelectionHelper.get());
- if( m_apRangeSelectionHelper.get())
+ OSL_ASSERT(m_apRangeSelectionHelper);
+ if (m_apRangeSelectionHelper)
m_apRangeSelectionHelper->stopRangeListening( false );
}
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 268c46dd5cf8..75f8a76ff5f8 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -432,7 +432,7 @@ SplineResourceGroup::SplineResourceGroup(weld::Builder* pBuilder, TabPageParent
SplinePropertiesDialog& SplineResourceGroup::getSplinePropertiesDialog()
{
- if( !m_xSplinePropertiesDialog.get() )
+ if (!m_xSplinePropertiesDialog)
{
m_xSplinePropertiesDialog.reset(new SplinePropertiesDialog(m_pParent.GetFrameWeld()));
}
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 6f151d647956..5f2a688cc64f 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -167,7 +167,7 @@ Graphic ViewElementListProvider::GetSymbolGraphic( sal_Int32 nStandardSymbol, co
SdrPage* pPage = new SdrPage( *pModel, false );
pPage->SetSize(Size(1000,1000));
pModel->InsertPage( pPage, 0 );
- std::unique_ptr<SdrView> pView( new SdrView( *pModel.get(), pVDev ) );
+ std::unique_ptr<SdrView> pView(new SdrView(*pModel, pVDev));
pView->hideMarkHandles();
SdrPageView* pPageView = pView->ShowSdrPage(pPage);
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index ef1df6ae35d2..0a9669626fcb 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -59,7 +59,8 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
if(!pTextObj)
return;
- OSL_PRECOND( !m_pTextActionUndoGuard.get(), "ChartController::StartTextEdit: already have a TextUndoGuard!?" );
+ OSL_PRECOND(!m_pTextActionUndoGuard,
+ "ChartController::StartTextEdit: already have a TextUndoGuard!?");
m_pTextActionUndoGuard.reset( new UndoGuard(
SchResId( STR_ACTION_EDIT_TEXT ), m_xUndoManager ) );
SdrOutliner* pOutliner = m_pDrawViewWrapper->getOutliner();
@@ -135,8 +136,8 @@ bool ChartController::EndTextEdit()
TitleHelper::setCompleteString( aString, uno::Reference<
css::chart2::XTitle >::query( xPropSet ), m_xCC );
- OSL_ENSURE( m_pTextActionUndoGuard.get(), "ChartController::EndTextEdit: no TextUndoGuard!" );
- if ( m_pTextActionUndoGuard.get() )
+ OSL_ENSURE(m_pTextActionUndoGuard, "ChartController::EndTextEdit: no TextUndoGuard!");
+ if (m_pTextActionUndoGuard)
m_pTextActionUndoGuard->commit();
}
m_pTextActionUndoGuard.reset();
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index e552656f1da6..d59ae46fb52e 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -246,7 +246,7 @@ void ChartController::executeDispatch_ScaleText()
ControllerLockGuardUNO aCtlLockGuard( getModel() );
std::unique_ptr<ReferenceSizeProvider> pRefSizeProv(impl_createReferenceSizeProvider());
- OSL_ASSERT( pRefSizeProv.get());
+ OSL_ASSERT(pRefSizeProv);
if (pRefSizeProv)
pRefSizeProv->toggleAutoResizeState();
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index e7f656337507..7e006d5f2cc1 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1315,11 +1315,11 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
return bReturn;
// handle accelerators
- if( ! m_apAccelExecute.get() && m_xFrame.is() && m_xCC.is() )
+ if (!m_apAccelExecute && m_xFrame.is() && m_xCC.is())
{
m_apAccelExecute = ::svt::AcceleratorExecute::createAcceleratorHelper();
- OSL_ASSERT( m_apAccelExecute.get());
- if( m_apAccelExecute.get() )
+ OSL_ASSERT(m_apAccelExecute);
+ if (m_apAccelExecute)
m_apAccelExecute->init( m_xCC, m_xFrame );
}
@@ -1328,7 +1328,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
bool bAlternate = aKeyCode.IsMod2();
bool bCtrl = aKeyCode.IsMod1();
- if( m_apAccelExecute.get() )
+ if (m_apAccelExecute)
bReturn = m_apAccelExecute->execute( aKeyCode );
if( bReturn )
return bReturn;
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index a8f39ee5c989..d920a4a8c988 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -522,8 +522,8 @@ void ControllerCommandDispatch::fireStatusEventForURLImpl(
void ControllerCommandDispatch::updateCommandAvailability()
{
- bool bModelStateIsValid = ( m_apModelState.get() != nullptr );
- bool bControllerStateIsValid = ( m_apControllerState.get() != nullptr );
+ bool bModelStateIsValid = (m_apModelState != nullptr);
+ bool bControllerStateIsValid = (m_apControllerState != nullptr);
// Model and controller states exist.
OSL_ASSERT( bModelStateIsValid );
OSL_ASSERT( bControllerStateIsValid );
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index dcf867eede57..1d0e0f014ba9 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -614,13 +614,11 @@ void ChartModel::impl_loadGraphics(
::utl::UcbStreamHelper::CreateStream(
xElementStream, true ) );
- if( apIStm.get() )
+ if (apIStm)
{
Graphic aGraphic;
- if( !GraphicConverter::Import(
- *apIStm.get(),
- aGraphic ) )
+ if (!GraphicConverter::Import(*apIStm, aGraphic))
{
m_aGraphicObjectVector.emplace_back(aGraphic );
}
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index 4484beadd204..84cf07235ddf 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -118,14 +118,14 @@ void ConfigColorScheme::retrieveConfigColors()
return;
// create config item if necessary
- if( ! m_apChartConfigItem.get())
+ if (!m_apChartConfigItem)
{
m_apChartConfigItem.reset(
new impl::ChartConfigItem( *this ));
m_apChartConfigItem->addPropertyNotification( aSeriesPropName );
}
- OSL_ASSERT( m_apChartConfigItem.get());
- if( ! m_apChartConfigItem.get())
+ OSL_ASSERT(m_apChartConfigItem);
+ if (!m_apChartConfigItem)
return;
// retrieve colors
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 0c45241d96f0..b18653887969 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -56,8 +56,8 @@ OPropertySet::OPropertySet( const OPropertySet & rOther, ::osl::Mutex & par_rMut
m_bSetNewValuesExplicitlyEvenIfTheyEqualDefault(false)
{
MutexGuard aGuard( m_rMutex );
- if( rOther.m_pImplProperties.get())
- m_pImplProperties.reset( new impl::ImplOPropertySet( * rOther.m_pImplProperties.get()));
+ if (rOther.m_pImplProperties)
+ m_pImplProperties.reset(new impl::ImplOPropertySet(*rOther.m_pImplProperties));
}
void OPropertySet::SetNewValuesExplicitlyEvenIfTheyEqualDefault()
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index c6f59216593e..85da43f53daf 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1557,12 +1557,12 @@ void VCartesianAxis::doStaggeringOfLabels( const AxisLabelProperties& rAxisLabel
double fRotationAngleDegree = m_aAxisLabelProperties.fRotationAngleDegree;
if( nTextLevel>0 )
{
- lcl_shiftLabels( *apTickIter.get(), aCummulatedLabelsDistance );
+ lcl_shiftLabels(*apTickIter, aCummulatedLabelsDistance);
fRotationAngleDegree = 0.0;
}
- aCummulatedLabelsDistance += lcl_getLabelsDistance( *apTickIter.get()
- , pTickFactory2D->getDistanceAxisTickToText( m_aAxisProperties )
- , fRotationAngleDegree );
+ aCummulatedLabelsDistance += lcl_getLabelsDistance(
+ *apTickIter, pTickFactory2D->getDistanceAxisTickToText(m_aAxisProperties),
+ fRotationAngleDegree);
}
}
}
@@ -1611,7 +1611,7 @@ void VCartesianAxis::createLabels()
{
if(nTextLevel==0)
{
- nScreenDistanceBetweenTicks = TickFactory2D::getTickScreenDistance( *apTickIter.get() );
+ nScreenDistanceBetweenTicks = TickFactory2D::getTickScreenDistance(*apTickIter);
if( nTextLevelCount>1 )
nScreenDistanceBetweenTicks*=2; //the above used tick iter does contain also the sub ticks -> thus the given distance is only the half
}
@@ -1624,7 +1624,8 @@ void VCartesianAxis::createLabels()
}
AxisLabelProperties& rAxisLabelProperties = m_aAxisProperties.m_bComplexCategories ? aComplexProps : m_aAxisLabelProperties;
- while( !createTextShapes( m_xTextTarget, *apTickIter.get(), rAxisLabelProperties, pTickFactory2D, nScreenDistanceBetweenTicks ) )
+ while (!createTextShapes(m_xTextTarget, *apTickIter, rAxisLabelProperties,
+ pTickFactory2D, nScreenDistanceBetweenTicks))
{
};
}
@@ -1666,7 +1667,8 @@ void VCartesianAxis::createMaximumLabels()
std::unique_ptr< TickIter > apTickIter(createMaximumLabelTickIterator( nTextLevel ));
if(apTickIter)
{
- while( !createTextShapes( m_xTextTarget, *apTickIter.get(), aAxisLabelProperties, pTickFactory2D, -1 ) )
+ while (!createTextShapes(m_xTextTarget, *apTickIter, aAxisLabelProperties,
+ pTickFactory2D, -1))
{
};
}
@@ -1802,7 +1804,9 @@ void VCartesianAxis::createShapes()
if( apTickIter )
{
double fRotationAngleDegree = m_aAxisLabelProperties.fRotationAngleDegree;
- B2DVector aLabelsDistance( lcl_getLabelsDistance( *apTickIter.get(), pTickFactory2D->getDistanceAxisTickToText( m_aAxisProperties ), fRotationAngleDegree ) );
+ B2DVector aLabelsDistance(lcl_getLabelsDistance(
+ *apTickIter, pTickFactory2D->getDistanceAxisTickToText(m_aAxisProperties),
+ fRotationAngleDegree));
sal_Int32 nCurrentLength = static_cast<sal_Int32>(aLabelsDistance.getLength());
aTickmarkPropertiesList.push_back( m_aAxisProperties.makeTickmarkPropertiesForComplexCategories( nOffset + nCurrentLength, 0 ) );
nOffset += nCurrentLength;
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index df74eeeaf05d..da6eca3acf0c 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -212,7 +212,7 @@ void VCartesianGrid::createShapes()
//create all scaled tickmark values
std::unique_ptr< TickFactory > apTickFactory( createTickFactory() );
- TickFactory& aTickFactory = *apTickFactory.get();
+ TickFactory& aTickFactory = *apTickFactory;
TickInfoArraysType aAllTickInfos;
aTickFactory.getAllTicks( aAllTickInfos );
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index d978310f4986..0a3716df0f98 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -364,7 +364,7 @@ OUString VSeriesPlotter::getLabelTextForValue( VDataSeries const & rDataSeries
{
OUString aNumber;
- if( m_apNumberFormatterWrapper.get())
+ if (m_apNumberFormatterWrapper)
{
sal_Int32 nNumberFormatKey = 0;
if( rDataSeries.hasExplicitNumberFormat(nPointIndex,bAsPercentage) )
@@ -1334,7 +1334,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
bResizeEquation = false;
if( bShowEquation )
{
- if( m_apNumberFormatterWrapper.get())
+ if (m_apNumberFormatterWrapper)
{ // iteration 0: default representation (no wrap)
// iteration 1: expected width (nFormulaWidth) is calculated
aFormula = xRegressionCurveCalculator->getFormattedRepresentation(
@@ -1356,7 +1356,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
{
aFormula.append( "R" ).append( OUStringLiteral1( aSuperscriptFigures[2] ) ).append( " = " );
double fR( xRegressionCurveCalculator->getCorrelationCoefficient());
- if( m_apNumberFormatterWrapper.get())
+ if (m_apNumberFormatterWrapper)
{
Color nLabelCol;
bool bColChanged;
@@ -1459,7 +1459,7 @@ long VSeriesPlotter::calculateTimeResolutionOnXAxis()
{
const std::vector< double >& rDateCategories = m_pExplicitCategoriesProvider->getDateCategories();
Date aNullDate(30,12,1899);
- if( m_apNumberFormatterWrapper.get() )
+ if (m_apNumberFormatterWrapper)
aNullDate = m_apNumberFormatterWrapper->getNullDate();
if( !rDateCategories.empty() )
{
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 20d7ab778ee9..5d54a7e32444 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -945,7 +945,7 @@ DataPointLabel* VDataSeries::getDataPointLabel( sal_Int32 index ) const
if( isAttributedDataPoint( index ) )
{
adaptPointCache( index );
- if( !m_apLabel_AttributedPoint.get() )
+ if (!m_apLabel_AttributedPoint)
m_apLabel_AttributedPoint
= getDataPointLabelFromPropertySet(getPropertiesOfPoint(index));
pRet = m_apLabel_AttributedPoint.get();
diff --git a/codemaker/source/codemaker/typemanager.cxx b/codemaker/source/codemaker/typemanager.cxx
index 345594a38b1f..2b54a4092772 100644
--- a/codemaker/source/codemaker/typemanager.cxx
+++ b/codemaker/source/codemaker/typemanager.cxx
@@ -178,8 +178,7 @@ codemaker::UnoType::Sort TypeManager::decompose(
switch (s) {
case codemaker::UnoType::Sort::Typedef:
if (resolveTypedefs) {
- n = dynamic_cast<unoidl::TypedefEntity&>(*ent.get()).
- getType();
+ n = dynamic_cast<unoidl::TypedefEntity&>(*ent).getType();
while (n.startsWith("[]")) {
++k; //TODO: overflow
n = n.copy(std::strlen("[]"));
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 722846b0efa6..4b3face0c702 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -736,9 +736,7 @@ OUString CppuType::getTypeClass(OUString const & name, bool cStyle)
? OUString("typelib_TypeClass_INTERFACE")
: OUString("::css::uno::TypeClass_INTERFACE");
case codemaker::UnoType::Sort::Typedef:
- return getTypeClass(
- dynamic_cast<unoidl::TypedefEntity&>(*ent.get()).getType(),
- cStyle);
+ return getTypeClass(dynamic_cast<unoidl::TypedefEntity&>(*ent).getType(), cStyle);
default:
for (;;) {
std::abort();
@@ -988,7 +986,7 @@ OUString CppuType::resolveOuterTypedefs(OUString const & name) const
if (m_typeMgr->getSort(n, &ent) != codemaker::UnoType::Sort::Typedef) {
return n;
}
- n = dynamic_cast<unoidl::TypedefEntity&>(*ent.get()).getType();
+ n = dynamic_cast<unoidl::TypedefEntity&>(*ent).getType();
}
}
@@ -1002,11 +1000,8 @@ OUString CppuType::resolveAllTypedefs(OUString const & name) const
break;
}
sal_Int32 k2;
- n = b2u(
- codemaker::UnoType::decompose(
- u2b(dynamic_cast<unoidl::TypedefEntity&>(*ent.get()).
- getType()),
- &k2));
+ n = b2u(codemaker::UnoType::decompose(
+ u2b(dynamic_cast<unoidl::TypedefEntity&>(*ent).getType()), &k2));
k1 += k2; //TODO: overflow
}
OUStringBuffer b;
@@ -3138,8 +3133,7 @@ sal_uInt32 ExceptionType::getTotalMemberCount(OUString const & base) const
throw CannotDumpException(
"exception type base " + base + " is not an exception type");
}
- unoidl::ExceptionTypeEntity& ent2(
- dynamic_cast< unoidl::ExceptionTypeEntity&>(*ent.get()));
+ unoidl::ExceptionTypeEntity& ent2(dynamic_cast<unoidl::ExceptionTypeEntity&>(*ent));
return getTotalMemberCount(ent2.getDirectBase())
+ ent2.getDirectMembers().size(); //TODO: overflow
}
diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index 5530392b278b..b5ece143572e 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -814,7 +814,7 @@ void handleEnumType(
static_cast< ClassFile::AccessFlags >(
ClassFile::ACC_PRIVATE | ClassFile::ACC_STATIC),
"<clinit>", "()V", code.get(), std::vector< OString >(), "");
- writeClassFile(options, className, *cf.get());
+ writeClassFile(options, className, *cf);
}
void addField(
@@ -1349,8 +1349,7 @@ void addPlainStructBaseArguments(
"unexpected entity \"" + base
+ "\" in call to addPlainStructBaseArguments");
}
- unoidl::PlainStructTypeEntity& ent2(
- dynamic_cast<unoidl::PlainStructTypeEntity&>(*ent.get()));
+ unoidl::PlainStructTypeEntity& ent2(dynamic_cast<unoidl::PlainStructTypeEntity&>(*ent));
if (!ent2.getDirectBase().isEmpty()) {
addPlainStructBaseArguments(
manager, dependencies, methodDescriptor, code,
@@ -1435,7 +1434,7 @@ void handlePlainStructType(
ClassFile::ACC_PUBLIC, "<init>", desc.getDescriptor(), code.get(),
std::vector< OString >(), desc.getSignature());
addTypeInfo(className, typeInfo, dependencies, cf.get());
- writeClassFile(options, className, *cf.get());
+ writeClassFile(options, className, *cf);
}
void handlePolyStructType(
@@ -1521,7 +1520,7 @@ void handlePolyStructType(
ClassFile::ACC_PUBLIC, "<init>", desc.getDescriptor(), code.get(),
std::vector< OString >(), desc.getSignature());
addTypeInfo(className, typeInfo, dependencies, cf.get());
- writeClassFile(options, className, *cf.get());
+ writeClassFile(options, className, *cf);
}
void addExceptionBaseArguments(
@@ -1538,8 +1537,7 @@ void addExceptionBaseArguments(
"unexpected entity \"" + base
+ "\" in call to addExceptionBaseArguments");
}
- unoidl::ExceptionTypeEntity& ent2(
- dynamic_cast<unoidl::ExceptionTypeEntity&>(*ent.get()));
+ unoidl::ExceptionTypeEntity& ent2(dynamic_cast<unoidl::ExceptionTypeEntity&>(*ent));
bool baseException = base == "com.sun.star.uno.Exception";
if (!baseException) {
addExceptionBaseArguments(
@@ -1827,7 +1825,7 @@ void handleExceptionType(
std::vector< OString >(), desc2.getSignature());
addTypeInfo(className, typeInfo, dependencies, cf.get());
- writeClassFile(options, className, *cf.get());
+ writeClassFile(options, className, *cf);
}
void createExceptionsAttribute(
@@ -1954,7 +1952,7 @@ void handleInterfaceType(
}
}
addTypeInfo(className, typeInfo, dependencies, cf.get());
- writeClassFile(options, className, *cf.get());
+ writeClassFile(options, className, *cf);
}
void handleTypedef(
@@ -2063,7 +2061,7 @@ void handleConstantGroup(
| ClassFile::ACC_FINAL),
codemaker::convertString(member.name), desc, valueIndex, sig);
}
- writeClassFile(options, className, *cf.get());
+ writeClassFile(options, className, *cf);
}
void addExceptionHandlers(
@@ -2324,7 +2322,7 @@ void handleService(
code.get(), std::vector< OString >(), "");
}
}
- writeClassFile(options, className, *cf.get());
+ writeClassFile(options, className, *cf);
}
void handleSingleton(
@@ -2440,7 +2438,7 @@ void handleSingleton(
ClassFile::ACC_PUBLIC | ClassFile::ACC_STATIC),
"get", desc.getDescriptor(), code.get(), std::vector< OString >(),
desc.getSignature());
- writeClassFile(options, className, *cf.get());
+ writeClassFile(options, className, *cf);
}
}
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index 3c5fe7951792..eb21b1795834 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -349,7 +349,7 @@ namespace comphelper
// create the comparator for the KeyType, and throw if the type is not supported
std::unique_ptr< IKeyPredicateLess > pComparator( getStandardLessPredicate( aKeyType, nullptr ) );
- if ( !pComparator.get() )
+ if (!pComparator)
throw IllegalTypeException("Unsupported key type.", *this );
// init members
@@ -369,7 +369,7 @@ namespace comphelper
void EnumerableMap::impl_initValues_throw( const Sequence< Pair< Any, Any > >& _initialValues )
{
OSL_PRECOND( m_aData.m_pValues.get() && m_aData.m_pValues->empty(), "EnumerableMap::impl_initValues_throw: illegal call!" );
- if ( !m_aData.m_pValues.get() || !m_aData.m_pValues->empty() )
+ if (!m_aData.m_pValues || !m_aData.m_pValues->empty())
throw RuntimeException();
const Pair< Any, Any >* mapping = _initialValues.getConstArray();
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx
index 718d04b56fb9..43dfc4cfdc71 100644
--- a/comphelper/source/property/opropertybag.cxx
+++ b/comphelper/source/property/opropertybag.cxx
@@ -277,7 +277,7 @@ namespace comphelper
::cppu::IPropertyArrayHelper& SAL_CALL OPropertyBag::getInfoHelper()
{
- if ( !m_pArrayHelper.get() )
+ if (!m_pArrayHelper)
{
Sequence< Property > aProperties;
m_aDynamicProperties.describeProperties( aProperties );
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index a13cbc3b6e14..9433548e8e55 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -252,7 +252,8 @@ void ChildAccess::setProperty(
css::uno::Any ChildAccess::asValue()
{
- if (changedValue_.get() != nullptr) {
+ if (changedValue_ != nullptr)
+ {
return *changedValue_;
}
css::uno::Any value;
@@ -295,7 +296,8 @@ void ChildAccess::commitChanges(bool valid, Modifications * globalModifications)
{
assert(globalModifications != nullptr);
commitChildChanges(valid, globalModifications);
- if (valid && changedValue_.get() != nullptr) {
+ if (valid && changedValue_ != nullptr)
+ {
std::vector<OUString> path(getAbsolutePath());
getComponents().addModification(path);
globalModifications->add(path);
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 38dbf9075333..08a89a539a32 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -150,7 +150,7 @@ namespace param
::cppu::IPropertyArrayHelper& ParameterWrapper::getInfoHelper()
{
- if ( !m_pInfoHelper.get() )
+ if (!m_pInfoHelper)
{
Sequence< Property > aProperties;
try
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 9f3ae07c3910..fc928b7325fa 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -259,7 +259,7 @@ namespace connectivity
if ( xStream.is() )
{
std::unique_ptr<SvStream> pStream( ::utl::UcbStreamHelper::CreateStream(xStream) );
- if ( pStream.get() )
+ if (pStream)
{
OString sLine;
OString sVersionString;
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index bfaef457d35e..3e365c74478f 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -666,7 +666,7 @@ void java_sql_Connection::loadDriverFromProperties( const OUString& _sDriverClas
ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
}
- if ( pDrvClass.get() )
+ if (pDrvClass)
{
LocalRef< jobject > driverObject( t.env() );
driverObject.set( pDrvClass->newInstanceObject() );
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
index b4a2844ce6f4..05204fe652a0 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.cxx
@@ -108,7 +108,7 @@ Reference<XResultSetMetaData> SAL_CALL OPreparedStatement::getMetaData()
{
MYSQL_RES* pRes = mysql_stmt_result_metadata(m_pStmt);
// TODO warning or error if no meta data.
- m_xMetaData = new OResultSetMetaData(*m_xConnection.get(), pRes);
+ m_xMetaData = new OResultSetMetaData(*m_xConnection, pRes);
}
return m_xMetaData;
}
@@ -135,19 +135,17 @@ sal_Bool SAL_CALL OPreparedStatement::execute()
if (!m_binds.empty() && mysql_stmt_bind_param(m_pStmt, m_binds.data()))
{
- MYSQL* pMysql = m_xConnection.get()->getMysqlConnection();
+ MYSQL* pMysql = m_xConnection->getMysqlConnection();
mysqlc_sdbc_driver::throwSQLExceptionWithMsg(mysql_stmt_error(m_pStmt), mysql_errno(pMysql),
- *this,
- m_xConnection.get()->getConnectionEncoding());
+ *this, m_xConnection->getConnectionEncoding());
}
int nFail = mysql_stmt_execute(m_pStmt);
if (nFail != 0)
{
- MYSQL* pMysql = m_xConnection.get()->getMysqlConnection();
+ MYSQL* pMysql = m_xConnection->getMysqlConnection();
mysqlc_sdbc_driver::throwSQLExceptionWithMsg(mysql_stmt_error(m_pStmt), mysql_errno(pMysql),
- *this,
- m_xConnection.get()->getConnectionEncoding());
+ *this, m_xConnection->getConnectionEncoding());
}
return !nFail;
@@ -160,20 +158,18 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate()
if (!m_binds.empty() && mysql_stmt_bind_param(m_pStmt, m_binds.data()))
{
- MYSQL* pMysql = m_xConnection.get()->getMysqlConnection();
+ MYSQL* pMysql = m_xConnection->getMysqlConnection();
mysqlc_sdbc_driver::throwSQLExceptionWithMsg(mysql_stmt_error(m_pStmt), mysql_errno(pMysql),
- *this,
- m_xConnection.get()->getConnectionEncoding());
+ *this, m_xConnection->getConnectionEncoding());
}
int nFail = mysql_stmt_execute(m_pStmt);
if (nFail != 0)
{
- MYSQL* pMysql = m_xConnection.get()->getMysqlConnection();
+ MYSQL* pMysql = m_xConnection->getMysqlConnection();
mysqlc_sdbc_driver::throwSQLExceptionWithMsg(mysql_stmt_error(m_pStmt), mysql_errno(pMysql),
- *this,
- m_xConnection.get()->getConnectionEncoding());
+ *this, m_xConnection->getConnectionEncoding());
}
sal_Int32 affectedRows = mysql_stmt_affected_rows(m_pStmt);
@@ -210,24 +206,22 @@ Reference<XResultSet> SAL_CALL OPreparedStatement::executeQuery()
if (!m_binds.empty() && mysql_stmt_bind_param(m_pStmt, m_binds.data()))
{
- MYSQL* pMysql = m_xConnection.get()->getMysqlConnection();
+ MYSQL* pMysql = m_xConnection->getMysqlConnection();
mysqlc_sdbc_driver::throwSQLExceptionWithMsg(mysql_stmt_error(m_pStmt), mysql_errno(pMysql),
- *this,
- m_xConnection.get()->getConnectionEncoding());
+ *this, m_xConnection->getConnectionEncoding());
}
int nFail = mysql_stmt_execute(m_pStmt);
if (nFail != 0)
{
- MYSQL* pMysql = m_xConnection.get()->getMysqlConnection();
+ MYSQL* pMysql = m_xConnection->getMysqlConnection();
mysqlc_sdbc_driver::throwSQLExceptionWithMsg(mysql_stmt_error(m_pStmt), mysql_errno(pMysql),
- *this,
- m_xConnection.get()->getConnectionEncoding());
+ *this, m_xConnection->getConnectionEncoding());
}
Reference<XResultSet> xResultSet;
- xResultSet = new OPreparedResultSet(*m_xConnection.get(), this, m_pStmt);
+ xResultSet = new OPreparedResultSet(*m_xConnection, this, m_pStmt);
return xResultSet;
}
diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx
index 7d7a741f93c5..7a767ccdbe7c 100644
--- a/connectivity/source/drivers/odbc/OConnection.cxx
+++ b/connectivity/source/drivers/odbc/OConnection.cxx
@@ -78,7 +78,7 @@ OConnection::~OConnection()
oslGenericFunction OConnection::getOdbcFunction(ODBC3SQLFunctionId _nIndex) const
{
- OSL_ENSURE(m_xDriver.get(),"OConnection::getOdbcFunction: m_xDriver is null!");
+ OSL_ENSURE(m_xDriver, "OConnection::getOdbcFunction: m_xDriver is null!");
return m_xDriver->getOdbcFunction(_nIndex);
}
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 172c6fc5f130..0e196d302e6d 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -521,7 +521,7 @@ void Connection::initialize( const Sequence< Any >& aArguments )
{
char *err;
std::shared_ptr<PQconninfoOption> oOpts(PQconninfoParse(o.getStr(), &err), PQconninfoFree);
- if ( oOpts.get() == nullptr )
+ if (oOpts == nullptr)
{
OUString errorMessage;
if ( err != nullptr)
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index dcca0fc9db4a..e29c8d394557 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -330,7 +330,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu
OUString sError;
std::unique_ptr< OSQLParseNode > pSubQueryNode( const_cast< OSQLParser& >( m_rParser ).parseTree( sError, sSubQueryCommand ) );
- if ( !pSubQueryNode.get() )
+ if (!pSubQueryNode)
break;
OSQLParseTreeIterator aSubQueryIterator( *this, m_rParser, pSubQueryNode.get() );
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 683ac9e3b3c2..7d9ca005c071 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -679,7 +679,7 @@ bool OSQLParseNode::impl_parseTableNameNodeToString_throw( OUStringBuffer& rStri
{
OUString sError;
std::unique_ptr< OSQLParseNode > pSubQueryNode( rParam.pParser->parseTree( sError, sCommand ) );
- if ( pSubQueryNode.get() )
+ if (pSubQueryNode)
{
// parse the sub-select to SDBC level, too
OUStringBuffer sSubSelect;
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 361cbb2c6750..ee08c612e4e1 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -553,7 +553,7 @@ ORegistryFactoryHelper::getPropertySetInfo()
IPropertyArrayHelper & ORegistryFactoryHelper::getInfoHelper()
{
::osl::MutexGuard guard( aMutex );
- if (m_property_array_helper.get() == nullptr)
+ if (m_property_array_helper == nullptr)
{
beans::Property prop(
"ImplementationKey" /* name */,
@@ -564,7 +564,7 @@ IPropertyArrayHelper & ORegistryFactoryHelper::getInfoHelper()
m_property_array_helper.reset(
new ::cppu::OPropertyArrayHelper( &prop, 1 ) );
}
- return *m_property_array_helper.get();
+ return *m_property_array_helper;
}
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index dd7139af252f..6c64911a5270 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -986,9 +986,8 @@ cppuhelper::ServiceManager::createInstanceWithContext(
{
std::shared_ptr< Data::Implementation > impl(
findServiceImplementation(Context, aServiceSpecifier));
- return impl.get() == nullptr
- ? css::uno::Reference< css::uno::XInterface >()
- : impl->createInstance(Context, false);
+ return impl == nullptr ? css::uno::Reference<css::uno::XInterface>()
+ : impl->createInstance(Context, false);
}
css::uno::Reference< css::uno::XInterface >
@@ -999,9 +998,8 @@ cppuhelper::ServiceManager::createInstanceWithArgumentsAndContext(
{
std::shared_ptr< Data::Implementation > impl(
findServiceImplementation(Context, ServiceSpecifier));
- return impl.get() == nullptr
- ? css::uno::Reference< css::uno::XInterface >()
- : impl->createInstanceWithArguments(Context, false, Arguments);
+ return impl == nullptr ? css::uno::Reference<css::uno::XInterface>()
+ : impl->createInstanceWithArguments(Context, false, Arguments);
}
css::uno::Type cppuhelper::ServiceManager::getElementType()
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index c92ec7d4ee5b..42c6721b3ec8 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -232,7 +232,7 @@ SpellDialog::~SpellDialog()
void SpellDialog::dispose()
{
- if (pImpl.get())
+ if (pImpl)
{
// save possibly modified user-dictionaries
Reference< XSearchableDictionaryList > xDicList( LinguMgr::GetDictionaryList() );
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 5b4f64891c76..52686ba92045 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -809,7 +809,8 @@ void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow, ORowSetRow const & _rK
aValue.setSigned(m_aSignedFlags[parameterName.second.nPosition-1]);
if ( (_rInsertRow->get())[parameterName.second.nPosition] != aValue )
{
- rtl::Reference<ORowSetValueVector> aCopy(new ORowSetValueVector(*m_aParameterValueForCache.get()));
+ rtl::Reference<ORowSetValueVector> aCopy(
+ new ORowSetValueVector(*m_aParameterValueForCache));
(aCopy->get())[i] = (_rInsertRow->get())[parameterName.second.nPosition];
m_aUpdatedParameter[i_nBookmark] = aCopy;
bChanged = true;
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 4d2787ef6d2d..8d6d7c60e798 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1704,7 +1704,9 @@ Reference< XResultSet > ORowSet::impl_prepareAndExecute_throw()
{
DELETEZ(m_pCache);
}
- m_pCache = new ORowSetCache( xResultSet, m_xComposer.get(), m_aContext, aComposedUpdateTableName, m_bModified, m_bNew, *m_aParameterValueForCache.get(),m_aFilter,m_nMaxRows );
+ m_pCache
+ = new ORowSetCache(xResultSet, m_xComposer.get(), m_aContext, aComposedUpdateTableName,
+ m_bModified, m_bNew, *m_aParameterValueForCache, m_aFilter, m_nMaxRows);
if ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY )
{
m_nPrivileges = Privilege::SELECT;
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 7518cacf1cd7..50df0f2e01ba 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -1412,14 +1412,14 @@ void ORowSetNotifier::fire()
std::vector<sal_Int32>& ORowSetNotifier::getChangedColumns() const
{
- OSL_ENSURE(m_pImpl.get(),"Illegal CTor call, use the other one!");
+ OSL_ENSURE(m_pImpl, "Illegal CTor call, use the other one!");
return m_pImpl->aChangedColumns;
}
void ORowSetNotifier::firePropertyChange()
{
- OSL_ENSURE(m_pImpl.get(),"Illegal CTor call, use the other one!");
- if( m_pImpl.get() )
+ OSL_ENSURE(m_pImpl, "Illegal CTor call, use the other one!");
+ if (m_pImpl)
{
for (auto const& changedColumn : m_pImpl->aChangedColumns)
{
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index cfac370ca6b0..06d453d645bb 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -773,8 +773,9 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( )
// normalize the statement so that it doesn't contain any application-level features anymore
OUString sError;
const std::unique_ptr< OSQLParseNode > pStatementTree( m_aSqlParser.parseTree( sError, sSQL ) );
- OSL_ENSURE( pStatementTree.get(), "OSingleSelectQueryComposer::getColumns: could not parse the column retrieval statement!" );
- if ( pStatementTree.get() )
+ OSL_ENSURE(pStatementTree, "OSingleSelectQueryComposer::getColumns: could not parse the "
+ "column retrieval statement!");
+ if (pStatementTree)
if ( !pStatementTree->parseNodeToExecutableStatement( sSQL, m_xConnection, m_aSqlParser, nullptr ) )
break;
@@ -1768,7 +1769,7 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC
OUString aErrorMsg;
std::unique_ptr<OSQLParseNode> pSqlParseNode( m_aSqlParser.parseTree(aErrorMsg,aSql));
- if ( pSqlParseNode.get() )
+ if (pSqlParseNode)
{
m_aAdditiveIterator.setParseTree(pSqlParseNode.get());
// normalize the filter
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 11e3c9768e9f..8f3f5757321e 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -749,7 +749,7 @@ void ODBExport::exportDelimiter()
void ODBExport::exportAutoIncrement()
{
- if ( m_aAutoIncrement.get() )
+ if (m_aAutoIncrement)
{
AddAttribute(XML_NAMESPACE_DB, XML_ADDITIONAL_COLUMN_STATEMENT,m_aAutoIncrement->second);
AddAttribute(XML_NAMESPACE_DB, XML_ROW_RETRIEVING_STATEMENT,m_aAutoIncrement->first);
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx
index bcdc8d2a24a3..16385e7d0df6 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -52,7 +52,7 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32
switch (_nType)
{
case XML_DB_TYPE_EQUAL:
- if ( !m_pDisplayHandler.get() )
+ if (!m_pDisplayHandler)
{
static const SvXMLEnumMapEntry<bool> aDisplayMap[] =
{
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index b99d19d905ee..8b34d35f4be4 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -629,7 +629,7 @@ void ODBFilter::fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap)
const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const
{
- if ( !m_pDocElemTokenMap.get() )
+ if (!m_pDocElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -648,7 +648,7 @@ const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const
const SvXMLTokenMap& ODBFilter::GetDocContentElemTokenMap() const
{
- if (!m_pDocContentElemTokenMap.get())
+ if (!m_pDocContentElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -669,7 +669,7 @@ const SvXMLTokenMap& ODBFilter::GetDocContentElemTokenMap() const
const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const
{
- if ( !m_pDatabaseElemTokenMap.get() )
+ if (!m_pDatabaseElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -690,7 +690,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const
const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const
{
- if ( !m_pDataSourceElemTokenMap.get() )
+ if (!m_pDataSourceElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -742,7 +742,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const
const SvXMLTokenMap& ODBFilter::GetLoginElemTokenMap() const
{
- if ( !m_pLoginElemTokenMap.get() )
+ if (!m_pLoginElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -760,7 +760,7 @@ const SvXMLTokenMap& ODBFilter::GetLoginElemTokenMap() const
const SvXMLTokenMap& ODBFilter::GetDatabaseDescriptionElemTokenMap() const
{
- if ( !m_pDatabaseDescriptionElemTokenMap.get() )
+ if (!m_pDatabaseDescriptionElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -776,7 +776,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseDescriptionElemTokenMap() const
const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const
{
- if ( !m_pDataSourceInfoElemTokenMap.get() )
+ if (!m_pDataSourceInfoElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -803,7 +803,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const
const SvXMLTokenMap& ODBFilter::GetDocumentsElemTokenMap() const
{
- if ( !m_pDocumentsElemTokenMap.get() )
+ if (!m_pDocumentsElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -824,7 +824,7 @@ const SvXMLTokenMap& ODBFilter::GetDocumentsElemTokenMap() const
const SvXMLTokenMap& ODBFilter::GetComponentElemTokenMap() const
{
- if ( !m_pComponentElemTokenMap.get() )
+ if (!m_pComponentElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -844,7 +844,7 @@ const SvXMLTokenMap& ODBFilter::GetComponentElemTokenMap() const
const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const
{
- if ( !m_pQueryElemTokenMap.get() )
+ if (!m_pQueryElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
@@ -869,7 +869,7 @@ const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const
const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const
{
- if ( !m_pColumnElemTokenMap.get() )
+ if (!m_pColumnElemTokenMap)
{
static const SvXMLTokenMapEntry aElemTokenMap[]=
{
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index aea44e1b4bc7..a9ae4dff51b0 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -402,7 +402,7 @@ namespace dbaui
OConnectionLineDataVec& rLines = m_pConnData->GetConnLineDataList();
for( const auto& rLine : rLines )
{
- rLine.get()->Reset();
+ rLine->Reset();
}
m_pConnData->setReferencingTable(_pSource->GetData());
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index ddee752f5376..3d12fe670f9a 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -401,7 +401,7 @@ void OAddTableDlg::impl_switchTo( ObjectList _eList )
void OAddTableDlg::Update()
{
- if ( !m_xCurrentList.get() )
+ if (!m_xCurrentList)
impl_switchTo( Tables );
else
m_xCurrentList->updateTableObjectList( m_rContext.allowViews() );
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index fec63a5630f3..d5032b306f85 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -674,7 +674,7 @@ bool ODatabaseExport::createRowSet()
{
m_pUpdateHelper.reset(new OParameterUpdateHelper(createPreparedStatment(m_xConnection->getMetaData(),m_xTable,m_vColumnPositions)));
- return m_pUpdateHelper.get() != nullptr;
+ return m_pUpdateHelper != nullptr;
}
bool ODatabaseExport::executeWizard(const OUString& _rTableName, const Any& _aTextColor, const FontDescriptor& _rFont)
diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx
index 93361c7a74fc..4bd0c9e4426d 100644
--- a/dbaccess/source/ui/misc/controllerframe.cxx
+++ b/dbaccess/source/ui/misc/controllerframe.cxx
@@ -119,7 +119,7 @@ namespace dbaui
static void lcl_setFrame_nothrow( ControllerFrame_Data& _rData, const Reference< XFrame >& _rxFrame )
{
// release old listener
- if ( _rData.m_pListener.get() )
+ if (_rData.m_pListener)
{
_rData.m_pListener->dispose();
_rData.m_pListener = nullptr;
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 34efc1019ae5..f41438313952 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -220,7 +220,7 @@ FeatureState OJoinController::GetState(sal_uInt16 _nId) const
AddTableDialogContext& OJoinController::impl_getDialogContext() const
{
- if ( !m_pDialogContext.get() )
+ if (!m_pDialogContext)
{
OJoinController* pNonConstThis = const_cast< OJoinController* >( this );
pNonConstThis->m_pDialogContext.reset( new AddTableDialogContext( *pNonConstThis ) );
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index f977ec528d03..e605156daebc 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -768,7 +768,7 @@ namespace
OUString aErrorMsg;
Reference<XPropertySet> xColumn;
std::unique_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(field,aCriteria,aErrorMsg,xColumn));
- if (pParseNode.get())
+ if (pParseNode)
{
if (bMulti && !(field->isOtherFunction() || (aFieldName.toChar() == '*')))
pParseNode->replaceNodeValue(field->GetAlias(),aFieldName);
@@ -798,7 +798,7 @@ namespace
OUString aErrorMsg;
Reference<XPropertySet> xColumn;
std::unique_ptr< ::connectivity::OSQLParseNode> pParseNode( _pView->getPredicateTreeFromEntry(field,aCriteria,aErrorMsg,xColumn));
- if (pParseNode.get())
+ if (pParseNode)
{
if (bMulti && !(field->isOtherFunction() || (aFieldName.toChar() == '*')))
pParseNode->replaceNodeValue(field->GetAlias(),aFieldName);
@@ -1125,7 +1125,7 @@ namespace
OUString aErrorMsg;
Reference<XPropertySet> xColumn;
std::unique_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(field,aTmp,aErrorMsg,xColumn));
- if (pParseNode.get())
+ if (pParseNode)
{
OUString sGroupBy;
pParseNode->getChild(0)->parseNodeToStr( sGroupBy,
@@ -2824,7 +2824,7 @@ OUString OQueryDesignView::getStatement()
::connectivity::OSQLParser& rParser( rController.getParser() );
OUString sErrorMessage;
std::unique_ptr<OSQLParseNode> pParseNode( rParser.parseTree( sErrorMessage, sSQL, true ) );
- if ( pParseNode.get() )
+ if (pParseNode)
{
OSQLParseNode* pNode = pParseNode->getChild(3)->getChild(1);
if ( pNode->count() > 1 )
@@ -2934,7 +2934,7 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(const OTableFieldDesc
sSql += "SELECT * FROM x WHERE " + pEntry->GetField() + _sCriteria;
std::unique_ptr<OSQLParseNode> pParseNode( rParser.parseTree( _rsErrorMessage, sSql, true ) );
nType = DataType::DOUBLE;
- if ( pParseNode.get() )
+ if (pParseNode)
{
OSQLParseNode* pColumnRef = pParseNode->getByRule(OSQLParseNode::column_ref);
if ( pColumnRef )
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 7026e023ef87..ff240a54130e 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -1711,7 +1711,7 @@ void OQueryController::impl_reset( const bool i_bForceCurrentControllerSettings
std::unique_ptr< ::connectivity::OSQLParseNode > pNode(
m_aSqlParser.parseTree( aErrorMsg, m_sStatement, m_bGraphicalDesign ) );
- if ( pNode.get() )
+ if (pNode)
{
delete m_pSqlIterator->getParseTree();
m_pSqlIterator->setParseTree( pNode.release() );
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 17bbd81131df..c9f125779e7b 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -270,7 +270,8 @@ void ServiceImpl::startExecuteModal(
}
}
- if (app.get() != nullptr) {
+ if (app != nullptr)
+ {
Application::Execute();
DeInitVCL();
}
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index e92dffe5c52d..f56c1da379c0 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -554,21 +554,21 @@ BackendImpl::BackendImpl(
void BackendImpl::addDataToDb(
OUString const & url, ComponentBackendDb::Data const & data)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->addEntry(url, data);
}
ComponentBackendDb::Data BackendImpl::readDataFromDb(OUString const & url)
{
ComponentBackendDb::Data data;
- if (m_backendDb.get())
+ if (m_backendDb)
data = m_backendDb->getEntry(url);
return data;
}
void BackendImpl::revokeEntryFromDb(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->revokeEntry(url);
}
@@ -582,7 +582,7 @@ BackendImpl::getSupportedPackageTypes()
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->removeEntry(url);
}
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index b9b8645dfc44..a30bf994c7f3 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -242,7 +242,7 @@ BackendImpl::BackendImpl(
void BackendImpl::addDataToDb(
OUString const & url, ConfigurationBackendDb::Data const & data)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->addEntry(url, data);
}
@@ -250,27 +250,27 @@ void BackendImpl::addDataToDb(
OUString const & url)
{
::boost::optional<ConfigurationBackendDb::Data> data;
- if (m_backendDb.get())
+ if (m_backendDb)
data = m_backendDb->getEntry(url);
return data;
}
void BackendImpl::revokeEntryFromDb(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->revokeEntry(url);
}
bool BackendImpl::hasActiveEntry(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
return m_backendDb->hasActiveEntry(url);
return false;
}
bool BackendImpl::activateEntry(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
return m_backendDb->activateEntry(url);
return false;
}
@@ -285,7 +285,7 @@ BackendImpl::getSupportedPackageTypes()
}
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->removeEntry(url);
}
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 64be7a09992e..e312369328dd 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -118,19 +118,19 @@ BackendImpl::BackendImpl(
void BackendImpl::addDataToDb(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->addEntry(url);
}
void BackendImpl::revokeEntryFromDb(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->revokeEntry(url);
}
bool BackendImpl::hasActiveEntry(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
return m_backendDb->hasActiveEntry(url);
return false;
}
@@ -146,7 +146,7 @@ BackendImpl::getSupportedPackageTypes()
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->removeEntry(url);
}
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index d5df148aeec9..0ac91ff197c6 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -159,7 +159,7 @@ BackendImpl::getSupportedPackageTypes()
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->removeEntry(url);
}
@@ -208,21 +208,21 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
OUString const & url)
{
::boost::optional<HelpBackendDb::Data> data;
- if (m_backendDb.get())
+ if (m_backendDb)
data = m_backendDb->getEntry(url);
return data;
}
bool BackendImpl::hasActiveEntry(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
return m_backendDb->hasActiveEntry(url);
return false;
}
bool BackendImpl::activateEntry(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
return m_backendDb->activateEntry(url);
return false;
}
@@ -533,13 +533,13 @@ void BackendImpl::implProcessHelp(
}
// Writing the data entry replaces writing the flag file. If we got to this
// point the registration was successful.
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->addEntry(xPackage->getURL(), data);
}
} //if (doRegisterPackage)
else
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->revokeEntry(xPackage->getURL());
}
}
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index c2ca9b0ca4c1..fb6ce8668582 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -334,7 +334,7 @@ void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaT
m_xRootRegistry->packageRemoved(item.first, item.second);
}
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->removeEntry(url);
}
@@ -420,7 +420,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
void BackendImpl::addDataToDb(
OUString const & url, ExtensionBackendDb::Data const & data)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->addEntry(url, data);
}
@@ -428,14 +428,14 @@ ExtensionBackendDb::Data BackendImpl::readDataFromDb(
OUString const & url)
{
ExtensionBackendDb::Data data;
- if (m_backendDb.get())
+ if (m_backendDb)
data = m_backendDb->getEntry(url);
return data;
}
void BackendImpl::revokeEntryFromDb(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->revokeEntry(url);
}
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index f3e5998f214c..68977d72a01c 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -168,13 +168,13 @@ BackendImpl::BackendImpl(
}
void BackendImpl::addDataToDb(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->addEntry(url);
}
bool BackendImpl::hasActiveEntry(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
return m_backendDb->hasActiveEntry(url);
return false;
}
@@ -195,13 +195,13 @@ BackendImpl::getSupportedPackageTypes()
}
void BackendImpl::revokeEntryFromDb(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->revokeEntry(url);
}
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->removeEntry(url);
}
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 3d956cfa5c93..825b1504e0de 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1042,7 +1042,7 @@ namespace drawinglayer
std::unique_ptr< vcl::PDFWriter::AnyWidget > pPDFControl(
::toolkitform::describePDFControl( rXControl, *mpPDFExtOutDevData ) );
- if(pPDFControl.get())
+ if (pPDFControl)
{
// still need to fill in the location (is a class Rectangle)
const basegfx::B2DRange aRangeLogic(rControlPrimitive.getB2DRange(getViewInformation2D()));
@@ -1056,7 +1056,7 @@ namespace drawinglayer
pPDFControl->TextFont.SetFontSize(aFontSize);
mpPDFExtOutDevData->BeginStructureElement(vcl::PDFWriter::Form);
- mpPDFExtOutDevData->CreateControl(*pPDFControl.get());
+ mpPDFExtOutDevData->CreateControl(*pPDFControl);
mpPDFExtOutDevData->EndStructureElement();
// no normal paint needed (see original UnoControlPDFExportContact::do_PaintObject);
@@ -1295,8 +1295,8 @@ namespace drawinglayer
rtl::Reference< primitive2d::PolygonHairlinePrimitive2D > xPLeft(new primitive2d::PolygonHairlinePrimitive2D(aLeft, rHairlinePrimitive.getBColor()));
rtl::Reference< primitive2d::PolygonHairlinePrimitive2D > xPRight(new primitive2d::PolygonHairlinePrimitive2D(aRight, rHairlinePrimitive.getBColor()));
- processBasePrimitive2D(*xPLeft.get());
- processBasePrimitive2D(*xPRight.get());
+ processBasePrimitive2D(*xPLeft);
+ processBasePrimitive2D(*xPRight);
}
else
{
@@ -1344,8 +1344,8 @@ namespace drawinglayer
rtl::Reference< primitive2d::PolygonStrokePrimitive2D > xPRight(new primitive2d::PolygonStrokePrimitive2D(
aRight, rStrokePrimitive.getLineAttribute(), rStrokePrimitive.getStrokeAttribute()));
- processBasePrimitive2D(*xPLeft.get());
- processBasePrimitive2D(*xPRight.get());
+ processBasePrimitive2D(*xPLeft);
+ processBasePrimitive2D(*xPRight);
}
else
{
@@ -1435,8 +1435,8 @@ namespace drawinglayer
aEmpty,
rStrokeArrowPrimitive.getEnd()));
- processBasePrimitive2D(*xPLeft.get());
- processBasePrimitive2D(*xPRight.get());
+ processBasePrimitive2D(*xPLeft);
+ processBasePrimitive2D(*xPRight);
}
else
{
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 265c7e0d6703..422c7033702c 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -3002,7 +3002,7 @@ namespace wmfemfhelper
}
else if (pA->GetComment().equalsIgnoreAsciiCase("EMF_PLUS_HEADER_INFO"))
{
- if (aEMFPlus.get())
+ if (aEMFPlus)
{
// error: should not yet exist
SAL_INFO("drawinglayer", "Error: multiple EMF_PLUS_HEADER_INFO");
@@ -3021,7 +3021,7 @@ namespace wmfemfhelper
}
else if (pA->GetComment().equalsIgnoreAsciiCase("EMF_PLUS"))
{
- if (!aEMFPlus.get())
+ if (!aEMFPlus)
{
// error: should exist
SAL_INFO("drawinglayer", "Error: EMF_PLUS before EMF_PLUS_HEADER_INFO");
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 106c8963a226..f85ad0287e5d 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -1629,7 +1629,7 @@ void Test::testSectionAttributes()
aEngine.QuickSetAttribs(*pSet, ESelection(0,3,0,9)); // 'bbbccc'
std::unique_ptr<EditTextObject> pEditText(aEngine.CreateTextObject());
- CPPUNIT_ASSERT_MESSAGE("Failed to create text object.", pEditText.get());
+ CPPUNIT_ASSERT_MESSAGE("Failed to create text object.", pEditText);
std::vector<editeng::Section> aAttrs;
pEditText->GetAllSections(aAttrs);
@@ -1678,7 +1678,7 @@ void Test::testSectionAttributes()
aEngine.QuickSetAttribs(*pSet, ESelection(4,0,4,5));
std::unique_ptr<EditTextObject> pEditText(aEngine.CreateTextObject());
- CPPUNIT_ASSERT_MESSAGE("Failed to create text object.", pEditText.get());
+ CPPUNIT_ASSERT_MESSAGE("Failed to create text object.", pEditText);
std::vector<editeng::Section> aAttrs;
pEditText->GetAllSections(aAttrs);
CPPUNIT_ASSERT_EQUAL(size_t(5), aAttrs.size());
@@ -1739,7 +1739,7 @@ void Test::testSectionAttributes()
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aEngine.GetParagraphCount());
std::unique_ptr<EditTextObject> pEditText(aEngine.CreateTextObject());
- CPPUNIT_ASSERT_MESSAGE("Failed to create text object.", pEditText.get());
+ CPPUNIT_ASSERT_MESSAGE("Failed to create text object.", pEditText);
std::vector<editeng::Section> aAttrs;
pEditText->GetAllSections(aAttrs);
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 8185d7412b47..f4c761183276 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1927,7 +1927,7 @@ public:
explicit RemoveEachItemFromPool(EditDoc& rDoc) : mrDoc(rDoc) {}
void operator() (const std::unique_ptr<ContentNode>& rNode)
{
- mrDoc.RemoveItemsFromPool(*rNode.get());
+ mrDoc.RemoveItemsFromPool(*rNode);
}
};
@@ -2800,7 +2800,7 @@ const EditCharAttrib* CharAttribList::FindAttrib( sal_uInt16 nWhich, sal_Int32 n
AttribsType::const_reverse_iterator it = aAttribs.rbegin(), itEnd = aAttribs.rend();
for (; it != itEnd; ++it)
{
- const EditCharAttrib& rAttr = *it->get();
+ const EditCharAttrib& rAttr = **it;
if (rAttr.Which() == nWhich && rAttr.IsIn(nPos))
return &rAttr;
}
@@ -2814,7 +2814,7 @@ EditCharAttrib* CharAttribList::FindAttrib( sal_uInt16 nWhich, sal_Int32 nPos )
AttribsType::reverse_iterator it = aAttribs.rbegin(), itEnd = aAttribs.rend();
for (; it != itEnd; ++it)
{
- EditCharAttrib& rAttr = *it->get();
+ EditCharAttrib& rAttr = **it;
if (rAttr.Which() == nWhich && rAttr.IsIn(nPos))
return &rAttr;
}
@@ -2826,7 +2826,7 @@ const EditCharAttrib* CharAttribList::FindNextAttrib( sal_uInt16 nWhich, sal_Int
assert(nWhich);
for (auto const& attrib : aAttribs)
{
- const EditCharAttrib& rAttr = *attrib.get();
+ const EditCharAttrib& rAttr = *attrib;
if (rAttr.GetStart() >= nFromPos && rAttr.Which() == nWhich)
return &rAttr;
}
@@ -2838,7 +2838,7 @@ bool CharAttribList::HasAttrib( sal_Int32 nStartPos, sal_Int32 nEndPos ) const
AttribsType::const_reverse_iterator it = aAttribs.rbegin(), itEnd = aAttribs.rend();
for (; it != itEnd; ++it)
{
- const EditCharAttrib& rAttr = *it->get();
+ const EditCharAttrib& rAttr = **it;
if (rAttr.GetStart() < nEndPos && rAttr.GetEnd() > nStartPos)
return true;
}
@@ -2888,7 +2888,7 @@ bool CharAttribList::HasBoundingAttrib( sal_Int32 nBound ) const
AttribsType::const_reverse_iterator it = aAttribs.rbegin(), itEnd = aAttribs.rend();
for (; it != itEnd; ++it)
{
- const EditCharAttrib& rAttr = *it->get();
+ const EditCharAttrib& rAttr = **it;
if (rAttr.GetEnd() < nBound)
return false;
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index c78d53fb9123..4d69891b289d 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2301,7 +2301,7 @@ EFieldInfo EditEngine::GetFieldInfo( sal_Int32 nPara, sal_uInt16 nField ) const
sal_uInt16 nCurrentField = 0;
for (auto const& attrib : pNode->GetCharAttribs().GetAttribs())
{
- const EditCharAttrib& rAttr = *attrib.get();
+ const EditCharAttrib& rAttr = *attrib;
if (rAttr.Which() == EE_FEATURE_FIELD)
{
if ( nCurrentField == nField )
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 7ff6af5bead3..12c6643fdd42 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -128,7 +128,7 @@ ContentInfo::ContentInfo( const ContentInfo& rCopyFrom, SfxItemPool& rPoolToUse
for (const auto & aAttrib : rCopyFrom.maCharAttribs)
{
- const XEditAttribute& rAttr = *aAttrib.get();
+ const XEditAttribute& rAttr = *aAttrib;
std::unique_ptr<XEditAttribute> pMyAttr = MakeXEditAttribute(
rPoolToUse, *rAttr.GetItem(), rAttr.GetStart(), rAttr.GetEnd());
maCharAttribs.push_back(std::move(pMyAttr));
@@ -463,7 +463,7 @@ void EditTextObjectImpl::ObjectInDestruction(const SfxItemPool& rSfxItemPool)
ContentInfosType aReplaced;
aReplaced.reserve(aContents.size());
for (auto const& content : aContents)
- aReplaced.push_back(std::unique_ptr<ContentInfo>(new ContentInfo(*content.get(), *pNewPool)));
+ aReplaced.push_back(std::unique_ptr<ContentInfo>(new ContentInfo(*content, *pNewPool)));
aReplaced.swap(aContents);
// set local variables
@@ -566,7 +566,7 @@ EditTextObjectImpl::EditTextObjectImpl( EditTextObject* pFront, const EditTextOb
aContents.reserve(r.aContents.size());
for (auto const& content : r.aContents)
- aContents.push_back(std::unique_ptr<ContentInfo>(new ContentInfo(*content.get(), *pPool)));
+ aContents.push_back(std::unique_ptr<ContentInfo>(new ContentInfo(*content, *pPool)));
}
EditTextObjectImpl::~EditTextObjectImpl()
@@ -597,7 +597,7 @@ void EditTextObjectImpl::NormalizeString( svl::SharedStringPool& rPool )
{
for (auto const& content : aContents)
{
- ContentInfo& rInfo = *content.get();
+ ContentInfo& rInfo = *content;
rInfo.NormalizeString(rPool);
}
}
@@ -608,7 +608,7 @@ std::vector<svl::SharedString> EditTextObjectImpl::GetSharedStrings() const
aSSs.reserve(aContents.size());
for (auto const& content : aContents)
{
- const ContentInfo& rInfo = *content.get();
+ const ContentInfo& rInfo = *content;
aSSs.push_back(rInfo.GetSharedString());
}
return aSSs;
@@ -700,7 +700,7 @@ void EditTextObjectImpl::GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttr
const ContentInfo& rC = *aContents[nPara].get();
for (const auto & aAttrib : rC.maCharAttribs)
{
- const XEditAttribute& rAttr = *aAttrib.get();
+ const XEditAttribute& rAttr = *aAttrib;
EECharAttrib aEEAttr;
aEEAttr.pAttr = rAttr.GetItem();
aEEAttr.nStart = rAttr.GetStart();
@@ -746,7 +746,7 @@ const SvxFieldData* EditTextObjectImpl::GetFieldData(sal_Int32 nPara, size_t nPo
size_t nCurPos = 0;
for (auto const& charAttrib : rC.maCharAttribs)
{
- const XEditAttribute& rAttr = *charAttrib.get();
+ const XEditAttribute& rAttr = *charAttrib;
if (rAttr.GetItem()->Which() != EE_FEATURE_FIELD)
// Skip attributes that are not fields.
continue;
@@ -864,7 +864,7 @@ void EditTextObjectImpl::GetAllSections( std::vector<editeng::Section>& rAttrs )
rBorders.push_back(rC.GetText().getLength());
for (const auto & aAttrib : rC.maCharAttribs)
{
- const XEditAttribute& rAttr = *aAttrib.get();
+ const XEditAttribute& rAttr = *aAttrib;
const SfxPoolItem* pItem = rAttr.GetItem();
if (!pItem)
continue;
@@ -928,7 +928,7 @@ void EditTextObjectImpl::GetAllSections( std::vector<editeng::Section>& rAttrs )
for (const auto & aAttrib : rC.maCharAttribs)
{
- const XEditAttribute& rXAttr = *aAttrib.get();
+ const XEditAttribute& rXAttr = *aAttrib;
const SfxPoolItem* pItem = rXAttr.GetItem();
if (!pItem)
continue;
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index 95d6db4c85b3..f283524d328f 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -550,7 +550,7 @@ void EditUndoSetAttribs::Undo()
ContentNode* pNode = pEE->GetEditDoc().GetObject( nPara );
for (const auto & nAttr : rInf.GetPrevCharAttribs())
{
- const EditCharAttrib& rX = *nAttr.get();
+ const EditCharAttrib& rX = *nAttr;
// is automatically "poolsized"
pEE->GetEditDoc().InsertAttrib(pNode, rX.GetStart(), rX.GetEnd(), *rX.GetItem());
if (rX.Which() == EE_FEATURE_FIELD)
diff --git a/editeng/source/editeng/fieldupdater.cxx b/editeng/source/editeng/fieldupdater.cxx
index aab517773c41..bdb544b5d868 100644
--- a/editeng/source/editeng/fieldupdater.cxx
+++ b/editeng/source/editeng/fieldupdater.cxx
@@ -31,11 +31,11 @@ public:
EditTextObjectImpl::ContentInfosType& rContents = mrObj.GetContents();
for (std::unique_ptr<ContentInfo> & i : rContents)
{
- ContentInfo& rContent = *i.get();
+ ContentInfo& rContent = *i;
ContentInfo::XEditAttributesType& rAttribs = rContent.GetCharAttribs();
for (std::unique_ptr<XEditAttribute> & rAttrib : rAttribs)
{
- XEditAttribute& rAttr = *rAttrib.get();
+ XEditAttribute& rAttr = *rAttrib;
const SfxPoolItem* pItem = rAttr.GetItem();
if (pItem->Which() != EE_FEATURE_FIELD)
// This is not a field item.
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index d1f985ac631c..6637796ea687 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2083,7 +2083,7 @@ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, sal_Int32 nChars )
const CharAttribList::AttribsType& rAttribs = rPaM.GetNode()->GetCharAttribs().GetAttribs();
for (const auto & rAttrib : rAttribs)
{
- const EditCharAttrib& rAttr = *rAttrib.get();
+ const EditCharAttrib& rAttr = *rAttrib;
if (rAttr.GetEnd() >= nStart && rAttr.GetStart() < nEnd)
{
EditSelection aSel( rPaM );
@@ -2961,7 +2961,7 @@ bool ImpEditEngine::UpdateFields()
CharAttribList::AttribsType& rAttribs = pNode->GetCharAttribs().GetAttribs();
for (std::unique_ptr<EditCharAttrib> & rAttrib : rAttribs)
{
- EditCharAttrib& rAttr = *rAttrib.get();
+ EditCharAttrib& rAttr = *rAttrib;
if (rAttr.Which() == EE_FEATURE_FIELD)
{
EditCharAttribField& rField = static_cast<EditCharAttribField&>(rAttr);
@@ -3356,7 +3356,7 @@ void ImpEditEngine::UpdateSelections()
bool bChanged = false;
for (std::unique_ptr<DeletedNodeInfo> & aDeletedNode : aDeletedNodes)
{
- const DeletedNodeInfo& rInf = *aDeletedNode.get();
+ const DeletedNodeInfo& rInf = *aDeletedNode;
if ( ( aCurSel.Min().GetNode() == rInf.GetNode() ) ||
( aCurSel.Max().GetNode() == rInf.GetNode() ) )
{
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index e9e7c67046ce..e34edc9abf35 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -435,7 +435,7 @@ SfxItemSet ImpEditEngine::GetAttribs( sal_Int32 nPara, sal_Int32 nStart, sal_Int
const CharAttribList::AttribsType& rAttrs = pNode->GetCharAttribs().GetAttribs();
for (const auto & nAttr : rAttrs)
{
- const EditCharAttrib& rAttr = *nAttr.get();
+ const EditCharAttrib& rAttr = *nAttr;
if ( nStart == nEnd )
{
@@ -549,7 +549,7 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const SfxItemSet& rSet, SetA
CharAttribList::AttribsType& rAttribs = pNode->GetCharAttribs().GetAttribs();
for (std::unique_ptr<EditCharAttrib> & rAttrib : rAttribs)
{
- EditCharAttrib& rAttr = *rAttrib.get();
+ EditCharAttrib& rAttr = *rAttrib;
if (rAttr.GetStart() > nEndPos)
break;
@@ -746,7 +746,7 @@ void ImpEditEngine::GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttrib>&
const CharAttribList::AttribsType& rAttrs = pNode->GetCharAttribs().GetAttribs();
for (const auto & i : rAttrs)
{
- const EditCharAttrib& rAttr = *i.get();
+ const EditCharAttrib& rAttr = *i;
EECharAttrib aEEAttr;
aEEAttr.pAttr = rAttr.GetItem();
aEEAttr.nStart = rAttr.GetStart();
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index 5c28cba3de24..1e50742ee19a 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -53,7 +53,7 @@ bool SvXMLAttrContainerItem::operator==( const SfxPoolItem& rItem ) const
{
DBG_ASSERT( dynamic_cast< const SvXMLAttrContainerItem* >(&rItem) != nullptr,
"SvXMLAttrContainerItem::operator ==(): Bad type");
- return *pImpl.get() == *static_cast<const SvXMLAttrContainerItem&>(rItem).pImpl.get();
+ return *pImpl == *static_cast<const SvXMLAttrContainerItem&>(rItem).pImpl;
}
bool SvXMLAttrContainerItem::GetPresentation(
@@ -74,8 +74,8 @@ sal_uInt16 SvXMLAttrContainerItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/
bool SvXMLAttrContainerItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
- Reference<XNameContainer> xContainer =
- new SvUnoAttributeContainer( o3tl::make_unique<SvXMLAttrContainerData>( *pImpl.get() ) );
+ Reference<XNameContainer> xContainer
+ = new SvUnoAttributeContainer(o3tl::make_unique<SvXMLAttrContainerData>(*pImpl));
rVal <<= xContainer;
return true;
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index dc1dbfc69ec7..1929777c2f26 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -306,7 +306,7 @@ std::unique_ptr<SvxEditSource> SvxEditSourceAdapter::Clone() const
{
std::unique_ptr< SvxEditSource > pClonedAdaptee( mpAdaptee->Clone() );
- if( pClonedAdaptee.get() )
+ if (pClonedAdaptee)
{
std::unique_ptr<SvxEditSourceAdapter> pClone(new SvxEditSourceAdapter());
pClone->SetEditSource( std::move(pClonedAdaptee) );
@@ -390,7 +390,7 @@ SfxBroadcaster& SvxEditSourceAdapter::GetBroadcaster() const
void SvxEditSourceAdapter::SetEditSource( std::unique_ptr< SvxEditSource > && pAdaptee )
{
- if( pAdaptee.get() )
+ if (pAdaptee)
{
mpAdaptee = std::move(pAdaptee);
mbEditSourceValid = true;
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index bf3ea97bdd58..e18d60a13aaa 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -270,7 +270,7 @@ const Mapping* BibConfig::GetMapping(const BibDBDescriptor& rDesc) const
{
for(std::unique_ptr<Mapping> const & i : mvMappings)
{
- Mapping& rMapping = *i.get();
+ Mapping& rMapping = *i;
bool bURLEqual = rDesc.sDataSource == rMapping.sURL;
if(rDesc.sTableOrQuery == rMapping.sTableName && bURLEqual)
return &rMapping;
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index 94e5898d8b08..d93753dd2a44 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -206,7 +206,7 @@ namespace logging
void FileHandler::impl_writeString_nothrow( const OString& _rEntry )
{
- OSL_PRECOND( m_pFile.get(), "FileHandler::impl_writeString_nothrow: no file!" );
+ OSL_PRECOND(m_pFile, "FileHandler::impl_writeString_nothrow: no file!");
sal_uInt64 nBytesToWrite( _rEntry.getLength() );
sal_uInt64 nBytesWritten( 0 );
@@ -304,7 +304,7 @@ namespace logging
void SAL_CALL FileHandler::flush( )
{
MethodGuard aGuard( *this );
- if(!m_pFile.get())
+ if (!m_pFile)
{
OSL_PRECOND(false, "FileHandler::flush: no file!");
return;
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index bd7cbe3ed117..ea8f9924e1bc 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -100,8 +100,9 @@ namespace pcr
{
::osl::MutexGuard aGuard( m_aMutex );
PropertyId nActuatingPropId( impl_getPropertyId_throwRuntime( _rActuatingPropertyName ) );
- OSL_PRECOND( m_pHelper.get(), "CellBindingPropertyHandler::actuatingPropertyChanged: inconsistentcy!" );
- // if we survived impl_getPropertyId_throwRuntime, we should have a helper, since no helper implies no properties
+ OSL_PRECOND(m_pHelper,
+ "CellBindingPropertyHandler::actuatingPropertyChanged: inconsistentcy!");
+ // if we survived impl_getPropertyId_throwRuntime, we should have a helper, since no helper implies no properties
OSL_PRECOND( _rxInspectorUI.is(), "FormComponentPropertyHandler::actuatingPropertyChanged: no access to the UI!" );
if ( !_rxInspectorUI.is() )
@@ -229,8 +230,8 @@ namespace pcr
::osl::MutexGuard aGuard( m_aMutex );
PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
- OSL_ENSURE( m_pHelper.get(), "CellBindingPropertyHandler::getPropertyValue: inconsistency!" );
- // if we survived impl_getPropertyId_throwUnknownProperty, we should have a helper, since no helper implies no properties
+ OSL_ENSURE(m_pHelper, "CellBindingPropertyHandler::getPropertyValue: inconsistency!");
+ // if we survived impl_getPropertyId_throwUnknownProperty, we should have a helper, since no helper implies no properties
Any aReturn;
switch ( nPropId )
@@ -275,8 +276,8 @@ namespace pcr
::osl::MutexGuard aGuard( m_aMutex );
PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
- OSL_ENSURE( m_pHelper.get(), "CellBindingPropertyHandler::setPropertyValue: inconsistency!" );
- // if we survived impl_getPropertyId_throwUnknownProperty, we should have a helper, since no helper implies no properties
+ OSL_ENSURE(m_pHelper, "CellBindingPropertyHandler::setPropertyValue: inconsistency!");
+ // if we survived impl_getPropertyId_throwUnknownProperty, we should have a helper, since no helper implies no properties
try
{
@@ -347,8 +348,10 @@ namespace pcr
::osl::MutexGuard aGuard( m_aMutex );
Any aPropertyValue;
- OSL_ENSURE( m_pHelper.get(), "CellBindingPropertyHandler::convertToPropertyValue: we have no SupportedProperties!" );
- if ( !m_pHelper.get() )
+ OSL_ENSURE(
+ m_pHelper,
+ "CellBindingPropertyHandler::convertToPropertyValue: we have no SupportedProperties!");
+ if (!m_pHelper)
return aPropertyValue;
PropertyId nPropId( m_pInfoService->getPropertyId( _rPropertyName ) );
@@ -396,8 +399,10 @@ namespace pcr
::osl::MutexGuard aGuard( m_aMutex );
Any aControlValue;
- OSL_ENSURE( m_pHelper.get(), "CellBindingPropertyHandler::convertToControlValue: we have no SupportedProperties!" );
- if ( !m_pHelper.get() )
+ OSL_ENSURE(
+ m_pHelper,
+ "CellBindingPropertyHandler::convertToControlValue: we have no SupportedProperties!");
+ if (!m_pHelper)
return aControlValue;
PropertyId nPropId( m_pInfoService->getPropertyId( _rPropertyName ) );
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 60ae7318cf09..b099b3250822 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -99,8 +99,10 @@ namespace pcr
::osl::MutexGuard aGuard( m_aMutex );
PropertyId nPropId( impl_getPropertyId_throwUnknownProperty( _rPropertyName ) );
- OSL_ENSURE( m_pHelper.get(), "EFormsPropertyHandler::getPropertyValue: we don't have any SupportedProperties!" );
- // if we survived impl_getPropertyId_throwUnknownProperty, we should have a helper, since no helper implies no properties
+ OSL_ENSURE(
+ m_pHelper,
+ "EFormsPropertyHandler::getPropertyValue: we don't have any SupportedProperties!");
+ // if we survived impl_getPropertyId_throwUnknownProperty, we should have a helper, since no helper implies no properties
Any aReturn;
try
@@ -157,8 +159,10 @@ namespace pcr
::osl::MutexGuard aGuard( m_aMutex );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list