[Libreoffice-commits] core.git: 4 commits - chart2/source codemaker/source comphelper/source compilerplugins/clang cui/source drawinglayer/source editeng/source idl/inc include/svl include/svx include/ucbhelper reportdesign/source sc/source sdext/source sd/source sfx2/source starmath/source svx/source sw/source tools/source ucbhelper/source unodevtools/source vcl/qt5 vcl/source xmlsecurity/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Tue Oct 8 06:27:57 UTC 2019
chart2/source/controller/dialogs/dlg_DataSource.cxx | 4
codemaker/source/cppumaker/cpputype.cxx | 2
comphelper/source/misc/threadpool.cxx | 2
comphelper/source/property/property.cxx | 2
compilerplugins/clang/redundantpointerops.cxx | 24 +++--
compilerplugins/clang/test/redundantpointerops.cxx | 10 ++
cui/source/options/optchart.cxx | 6 -
cui/source/tabpages/backgrnd.cxx | 2
drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx | 2
drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx | 2
editeng/source/editeng/editdoc.cxx | 28 +++---
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/editobj.cxx | 34 +++----
editeng/source/editeng/editundo.cxx | 2
editeng/source/editeng/editview.cxx | 2
editeng/source/editeng/impedit.cxx | 2
editeng/source/editeng/impedit3.cxx | 2
editeng/source/editeng/impedit4.cxx | 2
editeng/source/editeng/impedit5.cxx | 2
idl/inc/lex.hxx | 6 -
include/svl/ondemand.hxx | 2
include/svx/ClassificationEditView.hxx | 2
include/ucbhelper/interactionrequest.hxx | 21 ----
include/ucbhelper/propertyvalueset.hxx | 22 ----
include/ucbhelper/providerhelper.hxx | 25 +----
reportdesign/source/core/api/Shape.cxx | 2
sc/source/core/data/dpcache.cxx | 8 -
sc/source/core/data/dpobject.cxx | 10 +-
sc/source/core/tool/detdata.cxx | 4
sc/source/core/tool/userlist.cxx | 4
sc/source/filter/excel/xestyle.cxx | 4
sc/source/filter/excel/xicontent.cxx | 2
sc/source/filter/excel/xilink.cxx | 2
sc/source/filter/rtf/rtfparse.cxx | 2
sc/source/filter/xml/XMLStylesExportHelper.cxx | 6 -
sc/source/filter/xml/xmlcelli.cxx | 4
sc/source/ui/condformat/condformatdlg.cxx | 2
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 2
sc/source/ui/dbgui/validate.cxx | 4
sc/source/ui/miscdlgs/scuiautofmt.cxx | 8 -
sd/source/filter/eppt/text.hxx | 2
sdext/source/pdfimport/tree/writertreevisiting.cxx | 4
sfx2/source/appl/childwinimpl.cxx | 8 -
sfx2/source/bastyp/fltfnc.cxx | 2
sfx2/source/control/bindings.cxx | 2
sfx2/source/control/shell.cxx | 2
sfx2/source/dialog/splitwin.cxx | 12 +-
starmath/source/ElementsDockingWindow.cxx | 4
svx/source/svdraw/svdobjuserdatalist.cxx | 2
sw/source/core/doc/doccomp.cxx | 4
sw/source/uibase/inc/redlndlg.hxx | 2
tools/source/debug/debug.cxx | 2
tools/source/inet/inetmime.cxx | 2
ucbhelper/source/provider/interactionrequest.cxx | 49 -----------
ucbhelper/source/provider/propertyvalueset.cxx | 32 -------
ucbhelper/source/provider/providerhelper.cxx | 28 ------
unodevtools/source/skeletonmaker/cpptypemaker.cxx | 2
vcl/qt5/Qt5Bitmap.cxx | 2
vcl/source/edit/textdoc.hxx | 4
vcl/source/image/ImplImageTree.cxx | 4
vcl/source/window/brdwin.cxx | 2
vcl/source/window/paint.cxx | 8 -
xmlsecurity/source/gpg/SecurityEnvironment.hxx | 2
63 files changed, 161 insertions(+), 294 deletions(-)
New commits:
commit 469e577852fd41655169cbb05fc610bd36a1e51a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Oct 7 14:45:16 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Oct 8 08:26:57 2019 +0200
use cppu::WeakImplHelper in ContentProviderImplHelper
Change-Id: I1b2c4a296de6d1d6769f9e82380d1b45d506daca
Reviewed-on: https://gerrit.libreoffice.org/80406
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index 95a7369bedd1..919a0909028f 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/ucb/XContentProvider.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
#include <ucbhelper/ucbhelperdllapi.h>
@@ -61,10 +61,10 @@ typedef std::vector< ContentImplHelperRef > ContentRefList;
* ( These set contains the properties added to a content using its
* XPropertyContainer interface )
*/
-class UCBHELPER_DLLPUBLIC ContentProviderImplHelper : public cppu::OWeakObject,
- public css::lang::XTypeProvider,
- public css::lang::XServiceInfo,
- public css::ucb::XContentProvider
+class UCBHELPER_DLLPUBLIC ContentProviderImplHelper :
+ public cppu::WeakImplHelper<
+ css::lang::XServiceInfo,
+ css::ucb::XContentProvider>
{
friend class ContentImplHelper;
@@ -135,21 +135,6 @@ public:
virtual ~ContentProviderImplHelper() override;
- // XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire()
- throw() override;
- virtual void SAL_CALL release()
- throw() override;
-
- // XTypeProvider
-
-
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId() override;
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes() override;
-
// XServiceInfo
diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index ff15d082e042..a2c2f21bdcc4 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.cxx
@@ -73,34 +73,6 @@ ContentProviderImplHelper::~ContentProviderImplHelper()
{
}
-// XInterface
-void SAL_CALL ContentProviderImplHelper::acquire()
- throw()
-{
- OWeakObject::acquire();
-}
-
-void SAL_CALL ContentProviderImplHelper::release()
- throw()
-{
- OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL ContentProviderImplHelper::queryInterface( const css::uno::Type & rType )
-{
- css::uno::Any aRet = cppu::queryInterface( rType,
- static_cast< lang::XTypeProvider* >(this),
- static_cast< lang::XServiceInfo* >(this),
- static_cast< css::ucb::XContentProvider* >(this)
- );
- return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-XTYPEPROVIDER_IMPL_3( ContentProviderImplHelper,
- lang::XTypeProvider,
- lang::XServiceInfo,
- css::ucb::XContentProvider );
-
// virtual
sal_Bool SAL_CALL ContentProviderImplHelper::supportsService(
const OUString& ServiceName )
commit 850abad67bc05f823bc3975367b33ec67449b5c5
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Oct 7 14:42:01 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Oct 8 08:26:42 2019 +0200
use cppu::WeakImplHelper in PropertyValueSet
Change-Id: I48b0292207a88234290ffc9a3ca5585ee9b924e3
Reviewed-on: https://gerrit.libreoffice.org/80405
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index 97ee7c6ec889..d1276fdb3ef5 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/sdbc/XColumnLocate.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/beans/Property.hpp>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
#include <ucbhelper/ucbhelperdllapi.h>
@@ -56,10 +56,9 @@ class PropertyValues;
* directly be returned by the implementation of the command.
*/
class UCBHELPER_DLLPUBLIC PropertyValueSet :
- public cppu::OWeakObject,
- public css::lang::XTypeProvider,
- public css::sdbc::XRow,
- public css::sdbc::XColumnLocate
+ public cppu::WeakImplHelper<
+ css::sdbc::XRow,
+ css::sdbc::XColumnLocate>
{
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter;
@@ -83,19 +82,6 @@ public:
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~PropertyValueSet() override;
- // XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire()
- throw() override;
- virtual void SAL_CALL release()
- throw() override;
-
- // XTypeProvider
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId() override;
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes() override;
-
// XRow
virtual sal_Bool SAL_CALL
wasNull() override;
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 32fabcff3b58..e1be42d2a39d 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -153,38 +153,6 @@ PropertyValueSet::~PropertyValueSet()
}
-// XInterface methods.
-void SAL_CALL PropertyValueSet::acquire()
- throw()
-{
- OWeakObject::acquire();
-}
-
-void SAL_CALL PropertyValueSet::release()
- throw()
-{
- OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL PropertyValueSet::queryInterface( const css::uno::Type & rType )
-{
- css::uno::Any aRet = cppu::queryInterface( rType,
- static_cast< XTypeProvider* >(this),
- static_cast< XRow* >(this),
- static_cast< XColumnLocate* >(this)
- );
- return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_3( PropertyValueSet,
- XTypeProvider,
- XRow,
- XColumnLocate );
-
-
// XRow methods.
commit aca7ea6b0082fe991d8430ee42c4172eae7f7849
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Oct 7 14:40:29 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Oct 8 08:26:28 2019 +0200
use cppu::WeakImplHelper in InteractionRequest
Change-Id: I5f79ac795d17158c3e74aa76baf8483892cec920
Reviewed-on: https://gerrit.libreoffice.org/80404
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index fca1a63c2cdd..137f75434093 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/ucb/XInteractionAuthFallback.hpp>
#include <com/sun/star/ucb/XInteractionReplaceExistingData.hpp>
#include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase.hxx>
#include <ucbhelper/ucbhelperdllapi.h>
#include <memory>
@@ -61,9 +61,8 @@ struct InteractionRequest_Impl;
* This class can also be used as base class for more specialized requests,
* like authentication requests.
*/
-class UCBHELPER_DLLPUBLIC InteractionRequest : public cppu::OWeakObject,
- public css::lang::XTypeProvider,
- public css::task::XInteractionRequest
+class UCBHELPER_DLLPUBLIC InteractionRequest :
+ public cppu::WeakImplHelper<css::task::XInteractionRequest>
{
std::unique_ptr<InteractionRequest_Impl> m_pImpl;
@@ -89,20 +88,6 @@ public:
void setContinuations(
const css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > & rContinuations );
- // XInterface
- virtual css::uno::Any SAL_CALL
- queryInterface( const css::uno::Type & rType ) override;
- virtual void SAL_CALL acquire()
- throw() override;
- virtual void SAL_CALL release()
- throw() override;
-
- // XTypeProvider
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes() override;
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId() override;
-
// XInteractionRequest
virtual css::uno::Any SAL_CALL
getRequest() override;
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index 277c2611ac95..0dbc568fcaa7 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -105,55 +105,6 @@ void InteractionRequest::setSelection(
// XInterface methods.
-// virtual
-void SAL_CALL InteractionRequest::acquire()
- throw()
-{
- OWeakObject::acquire();
-}
-
-
-// virtual
-void SAL_CALL InteractionRequest::release()
- throw()
-{
- OWeakObject::release();
-}
-
-
-// virtual
-uno::Any SAL_CALL
-InteractionRequest::queryInterface( const uno::Type & rType )
-{
- uno::Any aRet = cppu::queryInterface( rType,
- static_cast< lang::XTypeProvider * >( this ),
- static_cast< task::XInteractionRequest * >( this ) );
-
- return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-
-// XTypeProvider methods.
-
-
-// virtual
-uno::Sequence< sal_Int8 > SAL_CALL InteractionRequest::getImplementationId()
-{
- return css::uno::Sequence<sal_Int8>();
-}
-
-
-// virtual
-uno::Sequence< uno::Type > SAL_CALL InteractionRequest::getTypes()
-{
- static cppu::OTypeCollection s_aCollection(
- cppu::UnoType<lang::XTypeProvider>::get(),
- cppu::UnoType<task::XInteractionRequest>::get() );
-
- return s_aCollection.getTypes();
-}
-
-
// XInteractionRequest methods.
commit 231e16d9091c2d318d99c2f2eb985311e7138127
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Oct 7 15:45:13 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Oct 8 08:26:23 2019 +0200
loplugin:redundantpointerops simplify *p.get()
Change-Id: I12517651fb3f777fd08e384992bb3e84b340ad85
Reviewed-on: https://gerrit.libreoffice.org/80382
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index cb0b31b7a986..66b108d4c8e0 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -89,10 +89,10 @@ DataSourceDialog::DataSourceDialog(weld::Window * pParent,
, m_xBtnOK(m_xBuilder->weld_button("ok"))
{
m_xRangeChooserTabPage = std::make_unique<RangeChooserTabPage>(m_xTabControl->get_page("range"), this,
- *(m_apDialogModel.get()),
+ *m_apDialogModel,
m_apDocTemplateProvider.get(), true /* bHideDescription */ );
m_xDataSourceTabPage = std::make_unique<DataSourceTabPage>(m_xTabControl->get_page("series"), this,
- *(m_apDialogModel.get()),
+ *m_apDialogModel,
m_apDocTemplateProvider.get(), true /* bHideDescription */ );
m_xTabControl->connect_enter_page(LINK(this, DataSourceDialog, ActivatePageHdl));
m_xTabControl->connect_leave_page(LINK(this, DataSourceDialog, DeactivatePageHdl));
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 368cfb6e72f1..67b842f0c3d1 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -528,7 +528,7 @@ void CppuType::dumpInitializer(
break;
case codemaker::UnoType::Sort::Enum:
out << codemaker::cpp::scopedCppName(u2b(n)) << "_"
- << (dynamic_cast<unoidl::EnumTypeEntity&>(*ent.get()).
+ << (dynamic_cast<unoidl::EnumTypeEntity&>(*ent).
getMembers()[0].name);
break;
case codemaker::UnoType::Sort::String:
diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx
index edef87a844f2..95b6f2dff091 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -116,7 +116,7 @@ struct ThreadPoolStatic : public rtl::StaticWithInit< std::shared_ptr< ThreadPoo
ThreadPool& ThreadPool::getSharedOptimalPool()
{
- return *ThreadPoolStatic::get().get();
+ return *ThreadPoolStatic::get();
}
sal_Int32 ThreadPool::getPreferredConcurrency()
diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx
index 84a5abebc70b..75208c2c51b4 100644
--- a/comphelper/source/property/property.cxx
+++ b/comphelper/source/property/property.cxx
@@ -99,7 +99,7 @@ void copyProperties(const Reference<XPropertySet>& _rxSource,
}
else
{
- aBuffer.append( OUString::createFromAscii(typeid( *_rxDest.get() ).name()) );
+ aBuffer.append( OUString::createFromAscii(typeid( *_rxDest ).name()) );
}
aBuffer.append( "' implementation).\n" );
diff --git a/compilerplugins/clang/redundantpointerops.cxx b/compilerplugins/clang/redundantpointerops.cxx
index 68db603baf11..7c82825bd01d 100644
--- a/compilerplugins/clang/redundantpointerops.cxx
+++ b/compilerplugins/clang/redundantpointerops.cxx
@@ -113,14 +113,24 @@ bool RedundantPointerOps::VisitUnaryOperator(UnaryOperator const * unaryOperator
return true;
if (unaryOperator->getOpcode() != UO_Deref)
return true;
- auto innerOp = dyn_cast<UnaryOperator>(unaryOperator->getSubExpr()->IgnoreParenImpCasts());
- if (!innerOp || innerOp->getOpcode() != UO_AddrOf)
- return true;
+ auto subExpr = unaryOperator->getSubExpr()->IgnoreParenImpCasts();
+ auto innerOp = dyn_cast<UnaryOperator>(subExpr);
+ if (innerOp && innerOp->getOpcode() == UO_AddrOf)
+ report(
+ DiagnosticsEngine::Warning, "'&' followed by '*', rather use '.'",
+ compat::getBeginLoc(unaryOperator))
+ << unaryOperator->getSourceRange();
+ if (auto cxxMemberCallExpr = dyn_cast<CXXMemberCallExpr>(subExpr))
+ {
+ auto methodDecl = cxxMemberCallExpr->getMethodDecl();
+ if (methodDecl->getIdentifier() && methodDecl->getName() == "get"
+ && cxxMemberCallExpr->getRecordDecl()->getName() == "unique_ptr")
+ report(
+ DiagnosticsEngine::Warning, "'*' followed by '.get()', just use '*'",
+ compat::getBeginLoc(unaryOperator))
+ << unaryOperator->getSourceRange();
- report(
- DiagnosticsEngine::Warning, "'&' followed by '*', rather use '.'",
- compat::getBeginLoc(unaryOperator))
- << unaryOperator->getSourceRange();
+ }
return true;
}
diff --git a/compilerplugins/clang/test/redundantpointerops.cxx b/compilerplugins/clang/test/redundantpointerops.cxx
index c218c089caba..30c22b02614f 100644
--- a/compilerplugins/clang/test/redundantpointerops.cxx
+++ b/compilerplugins/clang/test/redundantpointerops.cxx
@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <memory>
+
struct Struct1 {
int x;
};
@@ -35,4 +37,12 @@ void function3(Struct1& s)
//{
// (*s).x = 1; // xxexpected-error {{'*' followed by '.', rather use '->' [loplugin:redundantpointerops]}}
//};
+
+int function5(std::unique_ptr<int> x)
+{
+ return *x.get(); // expected-error {{'*' followed by '.get()', just use '*' [loplugin:redundantpointerops]}}
+};
+
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index c3c9098acd89..4e322d0818a8 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -121,7 +121,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage(weld::Container* pPage, weld::Dia
{
m_SvxChartColorTableUniquePtr = std::make_unique<SvxChartColorTable>();
m_SvxChartColorTableUniquePtr->useDefault();
- m_SvxChartOptionsUniquePtr->SetDefaultColors(*m_SvxChartColorTableUniquePtr.get());
+ m_SvxChartOptionsUniquePtr->SetDefaultColors(*m_SvxChartColorTableUniquePtr);
}
Construct();
@@ -150,7 +150,7 @@ bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs )
{
if( m_SvxChartColorTableUniquePtr )
{
- rOutAttrs->Put(SvxChartColorTableItem(SID_SCH_EDITOPTIONS, *m_SvxChartColorTableUniquePtr.get()));
+ rOutAttrs->Put(SvxChartColorTableItem(SID_SCH_EDITOPTIONS, *m_SvxChartColorTableUniquePtr));
}
return true;
@@ -178,7 +178,7 @@ void SvxDefaultColorOptPage::SaveChartOptions()
{
if (m_SvxChartOptionsUniquePtr && m_SvxChartColorTableUniquePtr)
{
- m_SvxChartOptionsUniquePtr->SetDefaultColors(*m_SvxChartColorTableUniquePtr.get());
+ m_SvxChartOptionsUniquePtr->SetDefaultColors(*m_SvxChartColorTableUniquePtr);
m_SvxChartOptionsUniquePtr->Commit();
}
}
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index afb817602618..17bc6e6b3411 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1413,7 +1413,7 @@ DeactivateRC SvxBkgTabPage::DeactivatePage( SfxItemSet* _pSet )
void SvxBkgTabPage::Reset( const SfxItemSet* )
{
- maSet.Set( *m_pResetSet.get() );
+ maSet.Set( *m_pResetSet );
if ( m_xTblLBox && m_xTblLBox->get_visible() )
{
m_nActPos = -1;
diff --git a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
index bfad0d4a8acc..9ff260bf7cc0 100644
--- a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
@@ -52,7 +52,7 @@ namespace drawinglayer
return false;
}
- return *getColorModifier().get() == *rCompare.getColorModifier().get();
+ return *getColorModifier()== *rCompare.getColorModifier();
}
return false;
diff --git a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
index cb92070fe7de..b5ba0dd6feba 100644
--- a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
@@ -52,7 +52,7 @@ namespace drawinglayer
return false;
}
- return *getColorModifier().get() == *rCompare.getColorModifier().get();
+ return *getColorModifier() == *rCompare.getColorModifier();
}
return false;
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index a9192ec63b43..45c2cb163e06 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -394,12 +394,12 @@ sal_Int32 TextPortionList::Count() const
const TextPortion& TextPortionList::operator[](sal_Int32 nPos) const
{
- return *maPortions[nPos].get();
+ return *maPortions[nPos];
}
TextPortion& TextPortionList::operator[](sal_Int32 nPos)
{
- return *maPortions[nPos].get();
+ return *maPortions[nPos];
}
void TextPortionList::Append(TextPortion* p)
@@ -451,7 +451,7 @@ sal_Int32 TextPortionList::FindPortion(
sal_Int32 n = maPortions.size();
for (sal_Int32 i = 0; i < n; ++i)
{
- const TextPortion& rPortion = *maPortions[i].get();
+ const TextPortion& rPortion = *maPortions[i];
nTmpPos = nTmpPos + rPortion.GetLen();
if ( nTmpPos >= nCharPos )
{
@@ -472,7 +472,7 @@ sal_Int32 TextPortionList::GetStartPos(sal_Int32 nPortion)
sal_Int32 nPos = 0;
for (sal_Int32 i = 0; i < nPortion; ++i)
{
- const TextPortion& rPortion = *maPortions[i].get();
+ const TextPortion& rPortion = *maPortions[i];
nPos = nPos + rPortion.GetLen();
}
return nPos;
@@ -1067,7 +1067,7 @@ sal_Int32 EditLineList::FindLine(sal_Int32 nChar, bool bInclEnd)
sal_Int32 n = maLines.size();
for (sal_Int32 i = 0; i < n; ++i)
{
- const EditLine& rLine = *maLines[i].get();
+ const EditLine& rLine = *maLines[i];
if ( (bInclEnd && (rLine.GetEnd() >= nChar)) ||
(rLine.GetEnd() > nChar) )
{
@@ -1086,12 +1086,12 @@ sal_Int32 EditLineList::Count() const
const EditLine& EditLineList::operator[](sal_Int32 nPos) const
{
- return *maLines[nPos].get();
+ return *maLines[nPos];
}
EditLine& EditLineList::operator[](sal_Int32 nPos)
{
- return *maLines[nPos].get();
+ return *maLines[nPos];
}
void EditLineList::Append(EditLine* p)
@@ -1282,7 +1282,7 @@ void ContentNode::ExpandAttribs( sal_Int32 nIndex, sal_Int32 nNew, SfxItemPool&
sal_uInt16 nW = pAttrib->GetItem()->Which();
for ( sal_Int32 nA = 0; nA < nAttr; nA++ )
{
- const EditCharAttrib& r = *aCharAttribList.GetAttribs()[nA].get();
+ const EditCharAttrib& r = *aCharAttribList.GetAttribs()[nA];
if ( ( r.GetStart() == 0 ) && ( r.GetItem()->Which() == nW ) )
{
bExpand = false;
@@ -1610,7 +1610,7 @@ sal_uLong ContentNode::GetExpandedLen() const
const CharAttribList::AttribsType& rAttrs = GetCharAttribs().GetAttribs();
for (sal_Int32 nAttr = rAttrs.size(); nAttr; )
{
- const EditCharAttrib& rAttr = *rAttrs[--nAttr].get();
+ const EditCharAttrib& rAttr = *rAttrs[--nAttr];
if (rAttr.Which() == EE_FEATURE_FIELD)
{
nLen += static_cast<const EditCharAttribField&>(rAttr).GetFieldValue().getLength();
@@ -1671,7 +1671,7 @@ void ContentNode::UnExpandPosition( sal_Int32 &rPos, bool bBiasStart )
const CharAttribList::AttribsType& rAttrs = GetCharAttribs().GetAttribs();
for (size_t nAttr = 0; nAttr < rAttrs.size(); ++nAttr )
{
- const EditCharAttrib& rAttr = *rAttrs[nAttr].get();
+ const EditCharAttrib& rAttr = *rAttrs[nAttr];
assert (!(nAttr < rAttrs.size() - 1) ||
rAttrs[nAttr]->GetStart() <= rAttrs[nAttr + 1]->GetStart());
@@ -1951,7 +1951,7 @@ void EditDoc::RemoveItemsFromPool(const ContentNode& rNode)
{
for (sal_Int32 nAttr = 0; nAttr < rNode.GetCharAttribs().Count(); ++nAttr)
{
- const EditCharAttrib& rAttr = *rNode.GetCharAttribs().GetAttribs()[nAttr].get();
+ const EditCharAttrib& rAttr = *rNode.GetCharAttribs().GetAttribs()[nAttr];
GetItemPool().Remove(*rAttr.GetItem());
}
}
@@ -2733,7 +2733,7 @@ void CharAttribList::InsertAttrib( EditCharAttrib* pAttrib )
bool bInsert(true);
for (sal_Int32 i = 0, n = aAttribs.size(); i < n; ++i)
{
- const EditCharAttrib& rCurAttrib = *aAttribs[i].get();
+ const EditCharAttrib& rCurAttrib = *aAttribs[i];
if (rCurAttrib.GetStart() > nStart)
{
aAttribs.insert(aAttribs.begin()+i, std::unique_ptr<EditCharAttrib>(pAttrib));
@@ -2765,10 +2765,10 @@ void CharAttribList::OptimizeRanges( SfxItemPool& rItemPool )
#endif
for (sal_Int32 i = 0; i < static_cast<sal_Int32>(aAttribs.size()); ++i)
{
- EditCharAttrib& rAttr = *aAttribs[i].get();
+ EditCharAttrib& rAttr = *aAttribs[i];
for (sal_Int32 nNext = i+1; nNext < static_cast<sal_Int32>(aAttribs.size()); ++nNext)
{
- EditCharAttrib& rNext = *aAttribs[nNext].get();
+ EditCharAttrib& rNext = *aAttribs[nNext];
if (!rAttr.IsFeature() && rNext.GetStart() == rAttr.GetEnd() && rNext.Which() == rAttr.Which())
{
if (*rNext.GetItem() == *rAttr.GetItem())
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 582c42d56062..d787bc65628c 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2335,7 +2335,7 @@ void EditEngine::RemoveFields( const std::function<bool ( const SvxFieldData* )>
const CharAttribList::AttribsType& rAttrs = pNode->GetCharAttribs().GetAttribs();
for (size_t nAttr = rAttrs.size(); nAttr; )
{
- const EditCharAttrib& rAttr = *rAttrs[--nAttr].get();
+ const EditCharAttrib& rAttr = *rAttrs[--nAttr];
if (rAttr.Which() == EE_FEATURE_FIELD)
{
const SvxFieldData* pFldData = static_cast<const SvxFieldItem*>(rAttr.GetItem())->GetField();
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index be4f1d920c92..eab2d3645f30 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -105,7 +105,7 @@ void XParaPortionList::push_back(XParaPortion* p)
const XParaPortion& XParaPortionList::operator [](size_t i) const
{
- return *maList[i].get();
+ return *maList[i];
}
ContentInfo::ContentInfo( SfxItemPool& rPool ) :
@@ -687,7 +687,7 @@ void EditTextObjectImpl::GetCharAttribs( sal_Int32 nPara, std::vector<EECharAttr
return;
rLst.clear();
- const ContentInfo& rC = *aContents[nPara].get();
+ const ContentInfo& rC = *aContents[nPara];
for (const auto & aAttrib : rC.maCharAttribs)
{
const XEditAttribute& rAttr = *aAttrib;
@@ -708,13 +708,13 @@ const SvxFieldItem* EditTextObjectImpl::GetField() const
{
if (aContents.size() == 1)
{
- const ContentInfo& rC = *aContents[0].get();
+ const ContentInfo& rC = *aContents[0];
if (rC.GetText().getLength() == 1)
{
size_t nAttribs = rC.maCharAttribs.size();
for (size_t nAttr = nAttribs; nAttr; )
{
- const XEditAttribute& rX = *rC.maCharAttribs[--nAttr].get();
+ const XEditAttribute& rX = *rC.maCharAttribs[--nAttr];
if (rX.GetItem()->Which() == EE_FEATURE_FIELD)
return static_cast<const SvxFieldItem*>(rX.GetItem());
}
@@ -728,7 +728,7 @@ const SvxFieldData* EditTextObjectImpl::GetFieldData(sal_Int32 nPara, size_t nPo
if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size())
return nullptr;
- const ContentInfo& rC = *aContents[nPara].get();
+ const ContentInfo& rC = *aContents[nPara];
if (nPos >= rC.maCharAttribs.size())
// URL position is out-of-bound.
return nullptr;
@@ -762,11 +762,11 @@ bool EditTextObjectImpl::HasField( sal_Int32 nType ) const
size_t nParagraphs = aContents.size();
for (size_t nPara = 0; nPara < nParagraphs; ++nPara)
{
- const ContentInfo& rC = *aContents[nPara].get();
+ const ContentInfo& rC = *aContents[nPara];
size_t nAttrs = rC.maCharAttribs.size();
for (size_t nAttr = 0; nAttr < nAttrs; ++nAttr)
{
- const XEditAttribute& rAttr = *rC.maCharAttribs[nAttr].get();
+ const XEditAttribute& rAttr = *rC.maCharAttribs[nAttr];
if (rAttr.GetItem()->Which() != EE_FEATURE_FIELD)
continue;
@@ -784,7 +784,7 @@ bool EditTextObjectImpl::HasField( sal_Int32 nType ) const
const SfxItemSet& EditTextObjectImpl::GetParaAttribs(sal_Int32 nPara) const
{
- const ContentInfo& rC = *aContents[nPara].get();
+ const ContentInfo& rC = *aContents[nPara];
return rC.GetParaAttribs();
}
@@ -794,11 +794,11 @@ bool EditTextObjectImpl::RemoveCharAttribs( sal_uInt16 _nWhich )
for ( size_t nPara = aContents.size(); nPara; )
{
- ContentInfo& rC = *aContents[--nPara].get();
+ ContentInfo& rC = *aContents[--nPara];
for (size_t nAttr = rC.maCharAttribs.size(); nAttr; )
{
- XEditAttribute& rAttr = *rC.maCharAttribs[--nAttr].get();
+ XEditAttribute& rAttr = *rC.maCharAttribs[--nAttr];
if ( !_nWhich || (rAttr.GetItem()->Which() == _nWhich) )
{
pPool->Remove(*rAttr.GetItem());
@@ -848,7 +848,7 @@ void EditTextObjectImpl::GetAllSections( std::vector<editeng::Section>& rAttrs )
// First pass: determine section borders for each paragraph.
for (size_t nPara = 0; nPara < aContents.size(); ++nPara)
{
- const ContentInfo& rC = *aContents[nPara].get();
+ const ContentInfo& rC = *aContents[nPara];
std::vector<size_t>& rBorders = aParaBorders[nPara];
rBorders.push_back(0);
rBorders.push_back(rC.GetText().getLength());
@@ -906,7 +906,7 @@ void EditTextObjectImpl::GetAllSections( std::vector<editeng::Section>& rAttrs )
std::vector<editeng::Section>::iterator itAttr = aAttrs.begin();
for (sal_Int32 nPara = 0; nPara < static_cast<sal_Int32>(aContents.size()); ++nPara)
{
- const ContentInfo& rC = *aContents[nPara].get();
+ const ContentInfo& rC = *aContents[nPara];
itAttr = std::find_if(itAttr, aAttrs.end(), FindByParagraph(nPara));
if (itAttr == aAttrs.end())
@@ -960,7 +960,7 @@ void EditTextObjectImpl::GetStyleSheet(sal_Int32 nPara, OUString& rName, SfxStyl
if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size())
return;
- const ContentInfo& rC = *aContents[nPara].get();
+ const ContentInfo& rC = *aContents[nPara];
rName = rC.GetStyle();
rFamily = rC.GetFamily();
}
@@ -970,7 +970,7 @@ void EditTextObjectImpl::SetStyleSheet(sal_Int32 nPara, const OUString& rName, c
if (nPara < 0 || static_cast<size_t>(nPara) >= aContents.size())
return;
- ContentInfo& rC = *aContents[nPara].get();
+ ContentInfo& rC = *aContents[nPara];
rC.SetStyle(rName);
rC.SetFamily(rFamily);
}
@@ -984,7 +984,7 @@ bool EditTextObjectImpl::ImpChangeStyleSheets(
for (size_t nPara = 0; nPara < nParagraphs; ++nPara)
{
- ContentInfo& rC = *aContents[nPara].get();
+ ContentInfo& rC = *aContents[nPara];
if ( rC.GetFamily() == eOldFamily )
{
if ( rC.GetStyle() == rOldName )
@@ -1053,8 +1053,8 @@ bool EditTextObjectImpl::isWrongListEqual(const EditTextObjectImpl& rCompare) co
for (size_t i = 0, n = aContents.size(); i < n; ++i)
{
- const ContentInfo& rCandA = *aContents[i].get();
- const ContentInfo& rCandB = *rCompare.aContents[i].get();
+ const ContentInfo& rCandA = *aContents[i];
+ const ContentInfo& rCandB = *rCompare.aContents[i];
if(!rCandA.isWrongListEqual(rCandB))
{
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index de6f4f4940b8..5ab476c98698 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -539,7 +539,7 @@ void EditUndoSetAttribs::Undo()
bool bFields = false;
for ( sal_Int32 nPara = aESel.nStartPara; nPara <= aESel.nEndPara; nPara++ )
{
- const ContentAttribsInfo& rInf = *aPrevAttribs[nPara-aESel.nStartPara].get();
+ const ContentAttribsInfo& rInf = *aPrevAttribs[nPara-aESel.nStartPara];
// first the paragraph attributes ...
pEE->SetParaAttribsOnly(nPara, rInf.GetPrevParaAttribs());
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 5e16a43fe095..9ada4292ba12 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1214,7 +1214,7 @@ const SvxFieldItem* EditView::GetFieldAtSelection() const
const sal_Int32 nXPos = aPaM.GetIndex();
for (size_t nAttr = rAttrs.size(); nAttr; )
{
- const EditCharAttrib& rAttr = *rAttrs[--nAttr].get();
+ const EditCharAttrib& rAttr = *rAttrs[--nAttr];
if (rAttr.GetStart() == nXPos)
if (rAttr.Which() == EE_FEATURE_FIELD)
{
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 265dc3cbe79c..1137a1447e61 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1494,7 +1494,7 @@ const SvxFieldItem* ImpEditView::GetField( const Point& rPos, sal_Int32* pPara,
const sal_Int32 nXPos = aPaM.GetIndex();
for (size_t nAttr = rAttrs.size(); nAttr; )
{
- const EditCharAttrib& rAttr = *rAttrs[--nAttr].get();
+ const EditCharAttrib& rAttr = *rAttrs[--nAttr];
if (rAttr.GetStart() == nXPos)
{
if (rAttr.Which() == EE_FEATURE_FIELD)
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 865d6554ca60..846687d763f8 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1849,7 +1849,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te
const CharAttribList::AttribsType& rAttrs = pNode->GetCharAttribs().GetAttribs();
for (size_t nAttr = rAttrs.size(); nAttr; )
{
- const EditCharAttrib& rAttr = *rAttrs[--nAttr].get();
+ const EditCharAttrib& rAttr = *rAttrs[--nAttr];
if (rAttr.IsFeature() && rAttr.GetEnd() > nMinBreakPos && rAttr.GetEnd() <= nMaxBreakPos)
{
nMinBreakPos = rAttr.GetEnd();
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 836ae9557e6f..9e8110d4cde1 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1214,7 +1214,7 @@ EditSelection ImpEditEngine::InsertTextObject( const EditTextObject& rTextObject
bool bUpdateFields = false;
for (size_t nAttr = 0; nAttr < nNewAttribs; ++nAttr)
{
- const XEditAttribute& rX = *pC->GetCharAttribs()[nAttr].get();
+ const XEditAttribute& rX = *pC->GetCharAttribs()[nAttr];
// Can happen when paragraphs > 16K, it is simply wrapped.
//TODO! Still true, still needed?
if ( rX.GetEnd() <= aPaM.GetNode()->Len() )
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index dfb3395cd848..cb01c05b24f3 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -210,7 +210,7 @@ std::unique_ptr<EditUndoSetAttribs> ImpEditEngine::CreateAttribUndo( EditSelecti
for ( sal_Int32 nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ )
{
- const EditCharAttrib& rAttr = *pNode->GetCharAttribs().GetAttribs()[nAttr].get();
+ const EditCharAttrib& rAttr = *pNode->GetCharAttribs().GetAttribs()[nAttr];
if (rAttr.GetLen())
{
EditCharAttrib* pNew = MakeCharAttrib(*pPool, *rAttr.GetItem(), rAttr.GetStart(), rAttr.GetEnd());
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 7ddc3e9ce246..977cc2b50a36 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -159,7 +159,7 @@ public:
if(pCurToken != aTokList.begin())
--pCurToken;
- return *(*pRetToken).get();
+ return *(*pRetToken);
}
SvToken& GetToken_Next()
@@ -171,10 +171,10 @@ public:
SetMax();
- return *(*pRetToken).get();
+ return *(*pRetToken);
}
- SvToken& GetToken() const { return *(*pCurToken).get(); }
+ SvToken& GetToken() const { return *(*pCurToken); }
bool ReadIf( char cChar )
{
diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx
index fd0032c32c29..5ce944a96986 100644
--- a/include/svl/ondemand.hxx
+++ b/include/svl/ondemand.hxx
@@ -115,7 +115,7 @@ public:
const LocaleDataWrapper* get() const { return pCurrent; }
const LocaleDataWrapper* operator->() const { return get(); }
- const LocaleDataWrapper& operator*() const { return *get(); }
+ const LocaleDataWrapper& operator*() const { return *pCurrent; }
};
/** Load a calendar only if it's needed. Keep calendar for "en-US" locale
diff --git a/include/svx/ClassificationEditView.hxx b/include/svx/ClassificationEditView.hxx
index 5f9fef03a0ec..1123c0fae21a 100644
--- a/include/svx/ClassificationEditView.hxx
+++ b/include/svx/ClassificationEditView.hxx
@@ -50,7 +50,7 @@ public:
EditView& getEditView()
{
- return *m_xEditView.get();
+ return *m_xEditView;
}
};
diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index b89ca2022b87..313d180bc890 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -198,7 +198,7 @@ cppu::IPropertyArrayHelper& OShape::getInfoHelper()
aAggSeq = m_aProps.aComponent.m_xProperty->getPropertySetInfo()->getProperties();
m_pAggHelper.reset(new OPropertyArrayAggregationHelper(ShapePropertySet::getPropertySetInfo()->getProperties(),aAggSeq));
}
- return *(m_pAggHelper.get());
+ return *m_pAggHelper;
}
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index e2d595a5bef4..5746e3e1a2e4 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -647,7 +647,7 @@ bool ScDPCache::InitFromDataBase(DBConnector& rDB)
continue;
aBuckets.clear();
- Field& rField = *maFields[nCol].get();
+ Field& rField = *maFields[nCol];
SCROW nRow = 0;
do
{
@@ -961,7 +961,7 @@ SCROW ScDPCache::GetItemDataId(sal_uInt16 nDim, SCROW nRow, bool bRepeatIfEmpty)
{
OSL_ENSURE(nDim < mnColumnCount, "ScDPTableDataCache::GetItemDataId ");
- const Field& rField = *maFields[nDim].get();
+ const Field& rField = *maFields[nDim];
if (static_cast<size_t>(nRow) >= rField.maData.size())
{
// nRow is in the trailing empty rows area.
@@ -993,7 +993,7 @@ const ScDPItemData* ScDPCache::GetItemDataById(long nDim, SCROW nId) const
if (nDimPos < nSourceCount)
{
// source field.
- const Field& rField = *maFields[nDimPos].get();
+ const Field& rField = *maFields[nDimPos];
if (nItemId < rField.maItems.size())
return &rField.maItems[nItemId];
@@ -1287,7 +1287,7 @@ void ScDPCache::ResetGroupItems(long nDim, const ScDPNumGroupInfo& rNumInfo, sal
nDim -= nSourceCount;
if (nDim < static_cast<long>(maGroupFields.size()))
{
- GroupItems& rGI = *maGroupFields[nDim].get();
+ GroupItems& rGI = *maGroupFields[nDim];
rGI.maItems.clear();
rGI.maInfo = rNumInfo;
rGI.mnGroupType = nGroupType;
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 9cfc72391e46..28de482413e5 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2693,7 +2693,7 @@ void ScDPObject::ConvertOrientation(
pDim->RemoveSubtotalName();
if (nDimIndex < rLabels.size())
{
- const ScDPLabelData& rLabel = *rLabels[nDimIndex].get();
+ const ScDPLabelData& rLabel = *rLabels[nDimIndex];
if (!rLabel.maLayoutName.isEmpty())
pDim->SetLayoutName(rLabel.maLayoutName);
if (!rLabel.maSubtotalName.isEmpty())
@@ -3651,12 +3651,12 @@ void ScDPCollection::WriteRefsTo( ScDPCollection& r ) const
OSL_ENSURE( nSrcSize >= nDestSize, "WriteRefsTo: missing entries in document" );
for (size_t nSrcPos = 0; nSrcPos < nSrcSize; ++nSrcPos)
{
- const ScDPObject& rSrcObj = *maTables[nSrcPos].get();
+ const ScDPObject& rSrcObj = *maTables[nSrcPos];
const OUString& aName = rSrcObj.GetName();
bool bFound = false;
for (size_t nDestPos = 0; nDestPos < nDestSize && !bFound; ++nDestPos)
{
- ScDPObject& rDestObj = *r.maTables[nDestPos].get();
+ ScDPObject& rDestObj = *r.maTables[nDestPos];
if (rDestObj.GetName() == aName)
{
rSrcObj.WriteRefsTo(rDestObj); // found object, copy refs
@@ -3681,12 +3681,12 @@ size_t ScDPCollection::GetCount() const
ScDPObject& ScDPCollection::operator [](size_t nIndex)
{
- return *maTables[nIndex].get();
+ return *maTables[nIndex];
}
const ScDPObject& ScDPCollection::operator [](size_t nIndex) const
{
- return *maTables[nIndex].get();
+ return *maTables[nIndex];
}
ScDPObject* ScDPCollection::GetByName(const OUString& rName) const
diff --git a/sc/source/core/tool/detdata.cxx b/sc/source/core/tool/detdata.cxx
index d1233e0cf609..f64dc49d66fd 100644
--- a/sc/source/core/tool/detdata.cxx
+++ b/sc/source/core/tool/detdata.cxx
@@ -29,7 +29,7 @@ ScDetOpList::ScDetOpList(const ScDetOpList& rList) :
size_t nCount = rList.Count();
for (size_t i=0; i<nCount; i++)
- Append( new ScDetOpData( (*rList.aDetOpDataVector[i].get()) ) );
+ Append( new ScDetOpData( *rList.aDetOpDataVector[i] ) );
}
void ScDetOpList::DeleteOnTab( SCTAB nTab )
@@ -87,7 +87,7 @@ bool ScDetOpList::operator==( const ScDetOpList& r ) const
const ScDetOpData& ScDetOpList::GetObject( size_t nPos ) const
{
- return (*aDetOpDataVector[nPos].get());
+ return *aDetOpDataVector[nPos];
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx
index e650383c26bc..96e6983ac712 100644
--- a/sc/source/core/tool/userlist.cxx
+++ b/sc/source/core/tool/userlist.cxx
@@ -296,12 +296,12 @@ const ScUserListData* ScUserList::GetData(const OUString& rSubStr) const
const ScUserListData& ScUserList::operator[](size_t nIndex) const
{
- return *maData[nIndex].get();
+ return *maData[nIndex];
}
ScUserListData& ScUserList::operator[](size_t nIndex)
{
- return *maData[nIndex].get();
+ return *maData[nIndex];
}
ScUserList& ScUserList::operator=( const ScUserList& rOther )
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 4c30945d48e4..7f3ac9c25b53 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -347,7 +347,7 @@ void XclExpPaletteImpl::Finalize()
maColorIdDataVec.resize( nCount );
for( sal_uInt32 nIdx = 0; nIdx < nCount; ++nIdx )
{
- const XclListColor& listColor = *mxColorList->at( nIdx ).get();
+ const XclListColor& listColor = *mxColorList->at( nIdx );
maColorIdDataVec[ listColor.GetColorId() ].Set( listColor.GetColor(), nIdx );
}
@@ -654,7 +654,7 @@ sal_uInt32 XclExpPaletteImpl::GetLeastUsedListColor() const
for( sal_uInt32 nIdx = 0, nCount = mxColorList->size(); nIdx < nCount; ++nIdx )
{
- XclListColor& rEntry = *mxColorList->at( nIdx ).get();
+ XclListColor& rEntry = *mxColorList->at( nIdx );
// ignore the base colors
if( !rEntry.IsBaseColor() && (rEntry.GetWeighting() < nMinW) )
{
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index fb2f14235f43..686fac1ae423 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -891,7 +891,7 @@ void XclImpValidationManager::ReadDV( XclImpStream& rStrm )
maDVItems.push_back(
std::make_unique<DVItem>(aScRanges, ScValidationData(eValMode, eCondMode, xTokArr1.get(), xTokArr2.get(), &rDoc, rScRange.aStart)));
- DVItem& rItem = *maDVItems.back().get();
+ DVItem& rItem = *maDVItems.back();
rItem.maValidData.SetIgnoreBlank( ::get_flag( nFlags, EXC_DV_IGNOREBLANK ) );
rItem.maValidData.SetListType( ::get_flagvalue( nFlags, EXC_DV_SUPPRESSDROPDOWN, css::sheet::TableValidationVisibility::INVISIBLE, css::sheet::TableValidationVisibility::UNSORTED ) );
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index 653def1be9b9..40128838a629 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -676,7 +676,7 @@ void XclImpSupbook::ReadCrn( XclImpStream& rStrm )
{
if (mnSBTab >= maSupbTabList.size())
return;
- XclImpSupbookTab& rSbTab = *maSupbTabList[mnSBTab].get();
+ XclImpSupbookTab& rSbTab = *maSupbTabList[mnSBTab];
sal_uInt8 nXclColLast, nXclColFirst;
sal_uInt16 nXclRow;
nXclColLast = rStrm.ReaduInt8();
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index 9a258823c309..a0f4d4c758fb 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -203,7 +203,7 @@ void ScRTFParser::NewCellRow()
// Not flush on the right? => new table
if ( nLastWidth && !maDefaultList.empty() )
{
- const ScRTFCellDefault& rD = *maDefaultList.back().get();
+ const ScRTFCellDefault& rD = *maDefaultList.back();
if (rD.nTwips != nLastWidth)
{
SCCOL n1, n2;
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index dac67e964272..006248461bf2 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -1057,7 +1057,7 @@ sal_Int32 ScRowStyles::GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32
// Cache hit !
return maCache.mnStyle;
- StylesType& r = *aTables[nTable].get();
+ StylesType& r = *aTables[nTable];
if (!r.is_tree_valid())
r.build_tree();
sal_Int32 nStyle(0);
@@ -1079,7 +1079,7 @@ void ScRowStyles::AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nFie
const sal_Int32 nStringIndex)
{
OSL_ENSURE(static_cast<size_t>(nTable) < aTables.size(), "wrong table");
- StylesType& r = *aTables[nTable].get();
+ StylesType& r = *aTables[nTable];
r.insert_back(nField, nField+1, nStringIndex);
}
@@ -1088,7 +1088,7 @@ void ScRowStyles::AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nSta
{
OSL_ENSURE( nStartField <= nEndField, "bad field range");
OSL_ENSURE(static_cast<size_t>(nTable) < aTables.size(), "wrong table");
- StylesType& r = *aTables[nTable].get();
+ StylesType& r = *aTables[nTable];
r.insert_back(nStartField, nEndField+1, nStringIndex);
}
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 8a862e221057..5d8ecdd48401 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -321,7 +321,7 @@ void ScXMLTableRowCellContext::PushParagraphField(std::unique_ptr<SvxFieldData>
{
mbHasFormatRuns = true;
maFields.push_back(std::make_unique<Field>(std::move(pData)));
- Field& rField = *maFields.back().get();
+ Field& rField = *maFields.back();
sal_Int32 nPos = maParagraph.getLength();
maParagraph.append('\1'); // Placeholder text for inserted field item.
@@ -366,7 +366,7 @@ void ScXMLTableRowCellContext::PushFormat(sal_Int32 nBegin, sal_Int32 nEnd, cons
mbHasFormatRuns = true;
maFormats.push_back(std::make_unique<ParaFormat>(*mpEditEngine));
- ParaFormat& rFmt = *maFormats.back().get();
+ ParaFormat& rFmt = *maFormats.back();
rFmt.maSelection.nStartPara = rFmt.maSelection.nEndPara = mnCurParagraph;
rFmt.maSelection.nStartPos = nBegin;
rFmt.maSelection.nEndPos = nEnd;
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index fca7434887e1..9a86807f70ee 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -101,7 +101,7 @@ void ScCondFormatList::init(ScDocument* pDoc,
}
}
if(nCount)
- EntrySelectHdl(*maEntries[0].get());
+ EntrySelectHdl(*maEntries[0]);
}
else
{
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 0efce49f4f99..d9b89a5fadf2 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -613,7 +613,7 @@ bool ScPivotLayoutDialog::IsDataElement(SCCOL nColumn)
ScDPLabelData& ScPivotLayoutDialog::GetLabelData(SCCOL nColumn)
{
- return *maPivotParameters.maLabelArray[nColumn].get();
+ return *maPivotParameters.maLabelArray[nColumn];
}
void ScPivotLayoutDialog::PushDataFieldNames(std::vector<ScDPName>& rDataFieldNames)
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 2ee9cf39f446..41bc913db911 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -400,7 +400,7 @@ void ScTPValidationValue::Init()
m_xLbAllow->set_active( SC_VALIDDLG_ALLOW_ANY );
m_xLbValue->set_active( SC_VALIDDLG_DATA_EQUAL );
- SelectHdl( *m_xLbAllow.get() );
+ SelectHdl( *m_xLbAllow );
CheckHdl( *m_xCbShow );
}
@@ -448,7 +448,7 @@ void ScTPValidationValue::Reset( const SfxItemSet* rArgSet )
aFmlaStr = static_cast< const SfxStringItem* >( pItem )->GetValue();
SetSecondFormula( aFmlaStr );
- SelectHdl( *m_xLbAllow.get() );
+ SelectHdl( *m_xLbAllow );
CheckHdl( *m_xCbShow );
}
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index 82d80da27619..e4e18ab03384 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -217,7 +217,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl, weld::Button&, void)
bCoreDataChanged = true;
}
- SelFmtHdl( *m_xLbFormat.get() );
+ SelFmtHdl( *m_xLbFormat );
bOk = true;
}
}
@@ -271,11 +271,11 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl, weld::Button&, void)
pFormat->erase(it);
nIndex--;
- SelFmtHdl( *m_xLbFormat.get() );
+ SelFmtHdl( *m_xLbFormat );
}
}
- SelFmtHdl( *m_xLbFormat.get() );
+ SelFmtHdl( *m_xLbFormat );
}
IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl, weld::Button&, void)
@@ -336,7 +336,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl, weld::Button&, void)
bCoreDataChanged = true;
}
- SelFmtHdl( *m_xLbFormat.get() );
+ SelFmtHdl( *m_xLbFormat );
bOk = true;
bFmtRenamed = true;
}
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index 3ea830c0c5ce..4f32412d35e3 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -220,7 +220,7 @@ class ParagraphObj : public PropStateValue, public SOParagraph
bool empty() const { return mvPortions.empty(); }
- const PortionObj& front() const { return *mvPortions.front().get(); }
+ const PortionObj& front() const { return *mvPortions.front(); }
std::vector<std::unique_ptr<PortionObj> >::const_iterator begin() const { return mvPortions.begin(); }
std::vector<std::unique_ptr<PortionObj> >::const_iterator end() const { return mvPortions.end(); }
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index 4d089b3d3230..dd30b0f91c61 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -671,7 +671,7 @@ void WriterXmlOptimizer::checkHeaderAndFooter( PageElement& rElem )
auto it = std::find_if(rElem.Children.begin(), rElem.Children.end(), isParagraphElement);
if (it != rElem.Children.end())
{
- ParagraphElement& rPara = dynamic_cast<ParagraphElement&>(*it->get());
+ ParagraphElement& rPara = dynamic_cast<ParagraphElement&>(**it);
if( rPara.y+rPara.h < rElem.h*0.15 && rPara.isSingleLined( m_rProcessor ) )
{
auto next_it = it;
@@ -694,7 +694,7 @@ void WriterXmlOptimizer::checkHeaderAndFooter( PageElement& rElem )
if (rit == rElem.Children.rend())
return;
- ParagraphElement& rPara = dynamic_cast<ParagraphElement&>(*rit->get());
+ ParagraphElement& rPara = dynamic_cast<ParagraphElement&>(**rit);
if( !(rPara.y > rElem.h*0.85 && rPara.isSingleLined( m_rProcessor )) )
return;
diff --git a/sfx2/source/appl/childwinimpl.cxx b/sfx2/source/appl/childwinimpl.cxx
index 447df7319f8e..d04f0c2b4089 100644
--- a/sfx2/source/appl/childwinimpl.cxx
+++ b/sfx2/source/appl/childwinimpl.cxx
@@ -27,12 +27,12 @@ size_t SfxChildWinContextArr_Impl::size() const
const SfxChildWinContextFactory& SfxChildWinContextArr_Impl::operator []( size_t i ) const
{
- return *maData[i].get();
+ return *maData[i];
}
SfxChildWinContextFactory& SfxChildWinContextArr_Impl::operator []( size_t i )
{
- return *maData[i].get();
+ return *maData[i];
}
void SfxChildWinContextArr_Impl::push_back( std::unique_ptr<SfxChildWinContextFactory> p )
@@ -47,12 +47,12 @@ size_t SfxChildWinFactArr_Impl::size() const
const SfxChildWinFactory& SfxChildWinFactArr_Impl::operator []( size_t i ) const
{
- return *maData[i].get();
+ return *maData[i];
}
SfxChildWinFactory& SfxChildWinFactArr_Impl::operator []( size_t i )
{
- return *maData[i].get();
+ return *maData[i];
}
void SfxChildWinFactArr_Impl::push_back( std::unique_ptr<SfxChildWinFactory> p )
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index e8aabfda8fdb..65116d668add 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -277,7 +277,7 @@ namespace
// first Matcher created for this factory
aImplArr.push_back(std::make_unique<SfxFilterMatcher_Impl>(aName));
- return *aImplArr.back().get();
+ return *aImplArr.back();
}
}
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 0381423f1034..4543f70571a6 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -92,7 +92,7 @@ public:
SfxFoundCache_Impl& operator[] ( size_t i )
{
- return *maData[i].get();
+ return *maData[i];
}
size_t size() const
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index ca312f61a0d9..85c84d632df5 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -570,7 +570,7 @@ void SfxShell::SetVerbs(const css::uno::Sequence < css::embed::VerbDescriptor >&
if (!pImpl->aSlotArr.empty())
{
- SfxSlot& rSlot = *pImpl->aSlotArr[0].get();
+ SfxSlot& rSlot = *pImpl->aSlotArr[0];
pNewSlot->pNextSlot = rSlot.pNextSlot;
rSlot.pNextSlot = pNewSlot;
}
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index a71c91514e23..77b9ea1f4fd9 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -384,7 +384,7 @@ void SfxSplitWindow::Split()
sal_uInt16 nCount = maDockArr.size();
for ( sal_uInt16 n=0; n<nCount; n++ )
{
- const SfxDock_Impl& rD = *maDockArr[n].get();
+ const SfxDock_Impl& rD = *maDockArr[n];
if ( rD.pWin )
{
const sal_uInt16 nId = rD.nType;
@@ -440,7 +440,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
sal_uInt16 nCount = maDockArr.size();
for ( sal_uInt16 n=0; n<nCount; n++ )
{
- SfxDock_Impl& rDock = *maDockArr[n].get();
+ SfxDock_Impl& rDock = *maDockArr[n];
if ( rDock.bNewLine )
{
// The window opens a new line
@@ -520,7 +520,7 @@ void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow const *pDockWin, bool b
sal_uInt16 nCount = maDockArr.size();
for ( sal_uInt16 n=0; n<nCount; n++ )
{
- const SfxDock_Impl& rDock = *maDockArr[n].get();
+ const SfxDock_Impl& rDock = *maDockArr[n];
if ( rDock.nType == pDockWin->GetType() )
{
if ( rDock.bNewLine && n<nCount-1 )
@@ -589,7 +589,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
sal_uInt16 nInsertPos = 0;
for ( sal_uInt16 n=0; n<nCount; n++ )
{
- SfxDock_Impl& rD = *maDockArr[n].get();
+ SfxDock_Impl& rD = *maDockArr[n];
if (rD.pWin)
{
@@ -742,7 +742,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl const * pDock,
sal_uInt16 nCount = maDockArr.size();
for ( sal_uInt16 n=0; n<nCount; ++n )
{
- const SfxDock_Impl& rD = *maDockArr[n].get();
+ const SfxDock_Impl& rD = *maDockArr[n];
if ( rD.pWin )
{
const sal_uInt16 nId = rD.nType;
@@ -798,7 +798,7 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow const * pDockWin, bool bHide
sal_uInt16 nCount = maDockArr.size();
for ( sal_uInt16 n=0; n<nCount; n++ )
{
- SfxDock_Impl& rDock = *maDockArr[n].get();
+ SfxDock_Impl& rDock = *maDockArr[n];
if ( rDock.nType == pDockWin->GetType() )
{
rDock.pWin = nullptr;
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index daef8f190e2b..578851fb4af1 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -798,7 +798,7 @@ void SmElementsControl::KeyInput(const KeyEvent& rKEvt)
case KEY_SPACE:
assert(m_nCurrentElement < maElementList.size());
assert(maSelectHdlLink.IsSet());
- maSelectHdlLink.Call(*maElementList[m_nCurrentElement].get());
+ maSelectHdlLink.Call(*maElementList[m_nCurrentElement]);
collectUIInformation(OUString::number(m_nCurrentElement));
break;
@@ -1062,7 +1062,7 @@ bool SmElementsControl::itemTrigger(sal_uInt16 nPos)
if (nPos < m_nCurrentOffset || (nPos -= m_nCurrentOffset) >= maElementList.size())
return false;
- maSelectHdlLink.Call(*maElementList[nPos].get());
+ maSelectHdlLink.Call(*maElementList[nPos]);
collectUIInformation(OUString::number(nPos));
return true;
}
diff --git a/svx/source/svdraw/svdobjuserdatalist.cxx b/svx/source/svdraw/svdobjuserdatalist.cxx
index 2595b799bd74..582091c39829 100644
--- a/svx/source/svdraw/svdobjuserdatalist.cxx
+++ b/svx/source/svdraw/svdobjuserdatalist.cxx
@@ -21,7 +21,7 @@ size_t SdrObjUserDataList::GetUserDataCount() const
SdrObjUserData& SdrObjUserDataList::GetUserData(size_t nNum)
{
- return *maList.at(nNum).get();
+ return *maList.at(nNum);
}
void SdrObjUserDataList::AppendUserData(std::unique_ptr<SdrObjUserData> pData)
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 0df9cdf55068..f516d1ddc8cf 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -2451,8 +2451,8 @@ void LgstCommonSubseq::FindL( int *pL, int nStt1, int nEnd1,
return;
}
- memset( pBuff1.get(), 0, sizeof( *pBuff1.get() ) * ( nLen2 + 1 ) );
- memset( pBuff2.get(), 0, sizeof( *pBuff2.get() ) * ( nLen2 + 1 ) );
+ memset( pBuff1.get(), 0, sizeof( pBuff1[0] ) * ( nLen2 + 1 ) );
+ memset( pBuff2.get(), 0, sizeof( pBuff2[0] ) * ( nLen2 + 1 ) );
// Find lcs
for( int i = 1; i <= nLen1; i++ )
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index 447cd091becb..99243b52c4c0 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -107,7 +107,7 @@ public:
DECL_LINK( FilterChangedHdl, SvxTPFilter*, void );
- SvxAcceptChgCtr& GetChgCtrl() { return *m_xTabPagesCTRL.get(); }
+ SvxAcceptChgCtr& GetChgCtrl() { return *m_xTabPagesCTRL; }
bool HasRedlineAutoFormat() const { return m_bRedlnAutoFormat; }
void Init(SwRedlineTable::size_type nStart = 0);
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 22c3b08698bd..4d4a817a7f40 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -110,7 +110,7 @@ static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any &
}
if ( exception.Context.is() )
{
- const char* pContext = typeid( *exception.Context.get() ).name();
+ const char* pContext = typeid( *exception.Context ).name();
#if defined __GLIBCXX__
// demangle the type name, not necessary under windows, we already get demangled names there
int status;
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 49038921b7a8..f1c9080996dd 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -296,7 +296,7 @@ bool translateUTF8Char(const sal_Char *& rBegin,
return false;
DBG_ASSERT(nSize == 1,
"translateUTF8Char(): Bad conversion");
- rCharacter = *pBuffer.get();
+ rCharacter = pBuffer[0];
}
rBegin = p;
return true;
diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
index f5da4810edd7..9b145f23ae71 100644
--- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
@@ -929,7 +929,7 @@ void generateDocumentation(std::ostream & o,
}
generateDocumentation(
o, options, manager,
- u2b(dynamic_cast<unoidl::SingleInterfaceBasedServiceEntity&>(*entity.get())
+ u2b(dynamic_cast<unoidl::SingleInterfaceBasedServiceEntity&>(*entity)
.getBase()),
delegate);
break;
diff --git a/vcl/qt5/Qt5Bitmap.cxx b/vcl/qt5/Qt5Bitmap.cxx
index 20f477bf9d1b..b698046ae307 100644
--- a/vcl/qt5/Qt5Bitmap.cxx
+++ b/vcl/qt5/Qt5Bitmap.cxx
@@ -86,7 +86,7 @@ bool Qt5Bitmap::Create(const SalBitmap& rSalBmp)
const Qt5Bitmap* pBitmap = static_cast<const Qt5Bitmap*>(&rSalBmp);
if (pBitmap->m_pImage.get())
{
- m_pImage.reset(new QImage(*pBitmap->m_pImage.get()));
+ m_pImage.reset(new QImage(*pBitmap->m_pImage));
m_pBuffer.reset();
}
else
diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx
index 4bd67fc5e25d..11657463e82a 100644
--- a/vcl/source/edit/textdoc.hxx
+++ b/vcl/source/edit/textdoc.hxx
@@ -42,8 +42,8 @@ public:
void Clear();
sal_uInt16 Count() const { return maAttribs.size(); }
- const TextCharAttrib& GetAttrib( sal_uInt16 n ) const { return *maAttribs[n].get(); }
- TextCharAttrib& GetAttrib( sal_uInt16 n ) { return *maAttribs[n].get(); }
+ const TextCharAttrib& GetAttrib( sal_uInt16 n ) const { return *maAttribs[n]; }
+ TextCharAttrib& GetAttrib( sal_uInt16 n ) { return *maAttribs[n]; }
std::unique_ptr<TextCharAttrib> RemoveAttrib( sal_uInt16 n )
{
std::unique_ptr<TextCharAttrib> pReleased = std::move(maAttribs[n]);
diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx
index 5c1fb72ddc9e..21901a9b940e 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -518,9 +518,9 @@ ImplImageTree::IconCache &ImplImageTree::getIconCache(const ImageRequestParamete
IconSet &rSet = getCurrentIconSet();
auto it = rSet.maScaledIconCaches.find(rParameters.mnScalePercentage);
if ( it != rSet.maScaledIconCaches.end() )
- return *it->second.get();
+ return *it->second;
rSet.maScaledIconCaches[rParameters.mnScalePercentage] = std::make_unique<IconCache>();
- return *rSet.maScaledIconCaches[rParameters.mnScalePercentage].get();
+ return *rSet.maScaledIconCaches[rParameters.mnScalePercentage];
}
bool ImplImageTree::iconCacheLookup(ImageRequestParameters& rParameters)
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 2717803978df..1b436b544700 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -150,7 +150,7 @@ void ImplBorderWindowView::ImplInitTitle(ImplBorderFrameData* pData)
{
const StyleSettings& rStyleSettings = pData->mpOutDev->GetSettings().GetStyleSettings();
if (pData->mnTitleType == BorderWindowTitleType::Tearoff)
- pData->mnTitleHeight = ToolBox::ImplGetDragWidth(*pData->mpBorderWindow.get(), false) + 2;
+ pData->mnTitleHeight = ToolBox::ImplGetDragWidth(*pData->mpBorderWindow, false) + 2;
else
{
if (pData->mnTitleType == BorderWindowTitleType::Small)
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 85c182ab58e4..377d7d46d37a 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -128,7 +128,7 @@ PaintBufferGuard::~PaintBufferGuard()
aPaintRectSize = m_pWindow->PixelToLogic(aRectanglePixel.GetSize());
}
- m_pWindow->DrawOutDev(m_aPaintRect.TopLeft(), aPaintRectSize, m_aPaintRect.TopLeft(), aPaintRectSize, *mpFrameData->mpBuffer.get());
+ m_pWindow->DrawOutDev(m_aPaintRect.TopLeft(), aPaintRectSize, m_aPaintRect.TopLeft(), aPaintRectSize, *mpFrameData->mpBuffer);
}
}
@@ -287,10 +287,10 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
{
// double-buffering
PaintBufferGuard g(pFrameData, m_pWindow);
- m_pWindow->ApplySettings(*pFrameData->mpBuffer.get());
+ m_pWindow->ApplySettings(*pFrameData->mpBuffer);
- m_pWindow->PushPaintHelper(this, *pFrameData->mpBuffer.get());
- m_pWindow->Paint(*pFrameData->mpBuffer.get(), m_aPaintRect);
+ m_pWindow->PushPaintHelper(this, *pFrameData->mpBuffer);
+ m_pWindow->Paint(*pFrameData->mpBuffer, m_aPaintRect);
pFrameData->maBufferedRect.Union(m_aPaintRect);
}
else
diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.hxx b/xmlsecurity/source/gpg/SecurityEnvironment.hxx
index a8aacfa5a10b..c815e0e1f5d2 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.hxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.hxx
@@ -60,7 +60,7 @@ public:
virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromAscii(
const OUString& asciiCertificate ) override;
- GpgME::Context& getGpgContext() { return *m_ctx.get(); }
+ GpgME::Context& getGpgContext() { return *m_ctx; }
virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL getAllCertificates() override;
private:
More information about the Libreoffice-commits
mailing list